mirror of
https://github.com/morluto/rea
synced 2026-10-27 06:33:32 -04:00
fix(javascript): align module lookup and source evidence
Preserve CommonJS literal paths and confined ESM URL semantics, including package main fallback, directory intent, Unicode identity, and present opaque modules. Parse extraction inputs at their AST/source owner, retain skipped HTML and source-map coverage, and distinguish endpoint candidates from proven receiver facts. Version structural fingerprints with computed literal contents and propagate them through worker contracts. Reviewed fixes include #1810, #1840, #2642, #2700, #2702, #2714, #2803, #2960, #2968, #2986, #3035, and #3036. Validation: 158 resolver tests passed; public CLI/MCP module lookup controls, package-main/Unicode workflows, and six builtin workflows passed in the current compiled lane. Worker schema/fingerprint regressions passed. Large public pdf.js completion and real Electron analysis remain unverified.
This commit is contained in:
@@ -51,6 +51,13 @@ interface CandidateIndex {
|
||||
string,
|
||||
readonly StaticRuntimeCandidate[]
|
||||
>;
|
||||
readonly byNativeDeclarationPath: ReadonlyMap<
|
||||
string,
|
||||
readonly {
|
||||
readonly candidate: StaticRuntimeCandidate;
|
||||
readonly sourcePath: string | null;
|
||||
}[]
|
||||
>;
|
||||
readonly byLayerCategoryPath: ReadonlyMap<
|
||||
string,
|
||||
readonly StaticRuntimeCandidate[]
|
||||
@@ -170,9 +177,25 @@ const candidatesWithLocation = (
|
||||
const located = new Map<string, LocatedCandidate>();
|
||||
for (const layer of layers)
|
||||
for (const mapping of mappedRuntimePaths(layer, entity))
|
||||
for (const candidate of index.byLayerCategoryPath.get(
|
||||
layerCategoryPathKey(layer.layerId, entity.staticKind, mapping.path),
|
||||
) ?? []) {
|
||||
for (const candidate of [
|
||||
...(index.byLayerCategoryPath.get(
|
||||
layerCategoryPathKey(layer.layerId, entity.staticKind, mapping.path),
|
||||
) ?? []),
|
||||
...(mapping.fileStyle === null || mapping.nativeRelativePath === null
|
||||
? []
|
||||
: (
|
||||
index.byNativeDeclarationPath.get(
|
||||
`${mapping.fileStyle}\0${layerCategoryPathKey(layer.layerId, entity.staticKind, mapping.nativeRelativePath)}`,
|
||||
) ?? []
|
||||
)
|
||||
.filter(
|
||||
({ sourcePath }) =>
|
||||
mapping.artifactPrefix === "" ||
|
||||
(sourcePath !== null &&
|
||||
sourcePath.startsWith(`${mapping.artifactPrefix}/`)),
|
||||
)
|
||||
.map(({ candidate }) => candidate)),
|
||||
]) {
|
||||
const key = candidateKey(candidate);
|
||||
if (!located.has(key)) located.set(key, { candidate, mapping });
|
||||
}
|
||||
@@ -189,6 +212,10 @@ const indexCandidates = (
|
||||
): CandidateIndex => {
|
||||
const byCategoryDigest = new Map<string, StaticRuntimeCandidate[]>();
|
||||
const byLayerCategoryPath = new Map<string, StaticRuntimeCandidate[]>();
|
||||
const byNativeDeclarationPath = new Map<
|
||||
string,
|
||||
{ candidate: StaticRuntimeCandidate; sourcePath: string | null }[]
|
||||
>();
|
||||
for (const candidate of candidates) {
|
||||
for (const { sha256 } of candidate.digests)
|
||||
appendIndex(
|
||||
@@ -202,14 +229,23 @@ const indexCandidates = (
|
||||
layerCategoryPathKey(candidate.layer.layerId, candidate.category, path),
|
||||
candidate,
|
||||
);
|
||||
for (const style of ["posix", "windows"] as const)
|
||||
for (const { path, sourcePath } of candidate.nativeDeclarationPaths[
|
||||
style
|
||||
])
|
||||
appendIndex(
|
||||
byNativeDeclarationPath,
|
||||
`${style}\0${layerCategoryPathKey(candidate.layer.layerId, candidate.category, path)}`,
|
||||
{ candidate, sourcePath },
|
||||
);
|
||||
}
|
||||
return { byCategoryDigest, byLayerCategoryPath };
|
||||
return { byCategoryDigest, byLayerCategoryPath, byNativeDeclarationPath };
|
||||
};
|
||||
|
||||
const appendIndex = (
|
||||
index: Map<string, StaticRuntimeCandidate[]>,
|
||||
const appendIndex = <Value>(
|
||||
index: Map<string, Value[]>,
|
||||
key: string,
|
||||
candidate: StaticRuntimeCandidate,
|
||||
candidate: Value,
|
||||
): void => {
|
||||
const values = index.get(key);
|
||||
if (values === undefined) index.set(key, [candidate]);
|
||||
|
||||
Reference in New Issue
Block a user