fix(hopper): resolve FAT loaders and original file coordinates

This commit is contained in:
morluto
2026-10-09 05:12:36 +08:00
parent b2d5bc1109
commit 35f1ddd6bc
13 changed files with 489 additions and 112 deletions
@@ -3,7 +3,11 @@ import {
type AnalysisProfileCommitment,
} from "../../domain/analysisProfile.js";
import type { BinaryTarget } from "../../domain/binaryTarget.js";
import { AnalysisCancelledError } from "../../domain/analysisErrorCore.js";
import {
AnalysisCancelledError,
AnalysisUnsupportedTargetError,
} from "../../domain/analysisErrorCore.js";
import type { AnalysisError } from "../../domain/analysisErrorBase.js";
import { jsonObjectSchema, type JsonValue } from "../../domain/jsonValue.js";
import { err, ok, type Result } from "../../domain/result.js";
import type { AnalysisProviderCandidate } from "../AnalysisProvider.js";
@@ -16,6 +20,7 @@ export interface AnalysisProviderCandidateEvaluation {
readonly status: AnalysisProviderCandidateStatus;
readonly profile?: AnalysisProfileCommitment;
readonly compatibility?: Readonly<Record<string, JsonValue>>;
readonly profileError?: AnalysisError;
}
/** Resolve and validate one provider profile without starting its client. */
@@ -51,12 +56,27 @@ export const evaluateAnalysisProviderCandidate = async (
return err(new AnalysisCancelledError("open_binary"));
if (!resolved.ok && resolved.error instanceof AnalysisCancelledError)
return err(resolved.error);
if (!resolved.ok)
return ok(
rejectedProfile(candidate, status, resolved.error.message, {
error_tag: resolved.error._tag,
}),
);
if (!resolved.ok) {
const error = resolved.error;
const rejection =
error instanceof AnalysisUnsupportedTargetError
? {
candidate,
status: {
...status,
targetSupport: {
status: "unsupported" as const,
code: "target_format_unsupported" as const,
reason: error.reason,
diagnostics: { path: error.path, error_tag: error._tag },
},
},
}
: rejectedProfile(candidate, status, error.message, {
error_tag: error._tag,
});
return ok({ ...rejection, profileError: error });
}
try {
if (resolved.value.profile === null)
return ok(
@@ -212,15 +212,10 @@ describe("analysis provider registry: binding failures and cancellation", () =>
failed.provider,
]).select(DATABASE_TARGET, "failed");
if (explicit.ok) throw new Error("expected provider selection rejection");
expect(explicit.error).toBeInstanceOf(ProviderSelectionError);
if (explicit.error instanceof ProviderSelectionError)
expect(explicit.error.rejections).toMatchObject([
{
providerId: "failed",
code: "version_unresolved",
diagnostics: { error_tag: "ProviderAdapterError" },
},
]);
expect(explicit.error).toMatchObject({
_tag: "ProviderAdapterError",
providerId: "failed",
});
});
it("cancels a pending profile probe even when the adapter ignores its signal", async () => {
@@ -6,6 +6,7 @@ import {
import type { AnalysisProfileCommitment } from "../../domain/analysisProfile.js";
import type { BinaryTarget } from "../../domain/binaryTarget.js";
import { AnalysisCancelledError } from "../../domain/analysisErrorCore.js";
import type { AnalysisError } from "../../domain/analysisErrorBase.js";
import {
ProviderSelectionError,
type ProviderSelectionFailureReason,
@@ -147,12 +148,7 @@ export class AnalysisProviderRegistry {
target: BinaryTarget,
requestedSelector?: AnalysisProviderSelector,
options: { readonly signal?: AbortSignal } = {},
): Promise<
Result<
AnalysisProviderSelection,
ProviderSelectionError | AnalysisCancelledError
>
> {
): Promise<Result<AnalysisProviderSelection, AnalysisError>> {
if (signalIsAborted(options.signal))
return err(new AnalysisCancelledError("open_binary"));
const parsedRequest =
@@ -224,12 +220,7 @@ export class AnalysisProviderRegistry {
context: TargetSelectionContext,
providerId: string,
source: AnalysisProviderBinding["selectionSource"],
): Promise<
Result<
AnalysisProviderSelection,
ProviderSelectionError | AnalysisCancelledError
>
> {
): Promise<Result<AnalysisProviderSelection, AnalysisError>> {
const { baseline, signal, target } = context;
const provider = this.#byId.get(providerId);
if (provider === undefined)
@@ -253,6 +244,8 @@ export class AnalysisProviderRegistry {
);
if (!evaluation.ok) return evaluation;
const evaluated = evaluation.value;
if (evaluated.profileError !== undefined)
return err(evaluated.profileError);
const statuses = replaceCandidate(baseline, evaluated.status);
if (
evaluated.profile === undefined ||
@@ -275,12 +268,7 @@ export class AnalysisProviderRegistry {
async #selectAutomatically(
context: TargetSelectionContext,
): Promise<
Result<
AnalysisProviderSelection,
ProviderSelectionError | AnalysisCancelledError
>
> {
): Promise<Result<AnalysisProviderSelection, AnalysisError>> {
const { baseline, signal, target } = context;
const results = await Promise.all(
this.#providers.map(