mirror of
https://github.com/abhigyanpatwari/GitNexus.git
synced 2026-11-16 09:22:00 +00:00
Merge branch 'main' into fix/cobol-copy-external-copybook-dirs
This commit is contained in:
commit
f3fcbb439a
131 changed files with 12123 additions and 438 deletions
12
.github/workflows/ci-tests.yml
vendored
12
.github/workflows/ci-tests.yml
vendored
|
|
@ -774,6 +774,18 @@ jobs:
|
|||
run: node --import tsx bench/objective-c-resolution/measure.mjs --check
|
||||
working-directory: gitnexus
|
||||
|
||||
- name: Callable-value reference resolution guards (#3399)
|
||||
if: ${{ !cancelled() }}
|
||||
# Build-free: pins the resolved-target SET of `resolveValueRefTarget`
|
||||
# (exact site/resolved/declined counts plus an order-independent
|
||||
# fingerprint) and asserts its per-site cost stays independent of
|
||||
# workspace size across a 4x file-count step. The pass resolves a
|
||||
# qualified receiver through `scopes.qualifiedNames`, a workspace-wide
|
||||
# index: keyed it is O(1) per site, scanned it is O(files) — a
|
||||
# regression a fixture cannot see and a 257-file binding table can.
|
||||
run: node --import tsx bench/value-ref-resolution/measure.mjs --check
|
||||
working-directory: gitnexus
|
||||
|
||||
- name: CFG construction time / disk / memory guards (#2081 M1)
|
||||
if: ${{ !cancelled() }}
|
||||
# Build-free: asserts collectFunctionCfgs output is unchanged
|
||||
|
|
|
|||
2
.github/workflows/docker.yml
vendored
2
.github/workflows/docker.yml
vendored
|
|
@ -138,7 +138,7 @@ jobs:
|
|||
|
||||
# Required for multi-platform (linux/arm64) emulation.
|
||||
- name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@96fe6ef7f33517b61c61be40b68a1882f3264fb8 # v4.2.0
|
||||
uses: docker/setup-qemu-action@1f40c72289eff860ee54a304f1438e3cff362e0a # v4.3.0
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@37fe631027851001ddb9b187196cc803df7f5f0e # v4.3.0
|
||||
|
|
|
|||
2
.github/workflows/publish.yml
vendored
2
.github/workflows/publish.yml
vendored
|
|
@ -831,7 +831,7 @@ jobs:
|
|||
fi
|
||||
|
||||
- name: Create GitHub Release
|
||||
uses: softprops/action-gh-release@3d0d9888cb7fd7b750713d6e236d1fcb99157228 # v2
|
||||
uses: softprops/action-gh-release@efb35369e0ad2afab669f228072c1b0d510eae64 # v2
|
||||
with:
|
||||
tag_name: ${{ steps.vtag-gate.outputs.vtag }}
|
||||
name: >-
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
# GitNexus (Akon Labs)
|
||||
|
||||
**⚠️ Important Notice:** GitNexus has NO official cryptocurrency, token, or coin. Any token/coin using the GitNexus name on Pump.fun or any other platform is **not affiliated with, endorsed by, or created by** this project or its maintainers. Do not purchase any cryptocurrency claiming association with GitNexus.
|
||||
|
||||
<div align="center">
|
||||
|
||||
<a href="https://trendshift.io/repositories/19809" target="_blank">
|
||||
|
|
|
|||
|
|
@ -137,6 +137,7 @@ export type {
|
|||
FinalizeOutput,
|
||||
FinalizedScc,
|
||||
FinalizeStats,
|
||||
AmbiguousWildcardExport,
|
||||
} from './scope-resolution/finalize-algorithm.js';
|
||||
|
||||
// Scope-aware registries + 7-step lookup (RFC §4; Ring 2 SHARED #917)
|
||||
|
|
|
|||
|
|
@ -5,13 +5,14 @@
|
|||
* Pure logic that takes per-file parse output (`ParsedImport[]` +
|
||||
* `SymbolDefinition[]`) and returns:
|
||||
*
|
||||
* - Linked `ImportEdge[]` per module scope, with `targetModuleScope` and
|
||||
* `targetDefId` filled where resolvable; edges that could not be
|
||||
* resolved within the hard fixpoint cap are marked
|
||||
* - Linked `ImportEdge[]` keyed by binding scope (`fromScope`; module
|
||||
* scope unless `importsBindAtLexicalScope` is on), with
|
||||
* `targetModuleScope` and `targetDefId` filled where resolvable; edges
|
||||
* that could not be resolved within the hard fixpoint cap are marked
|
||||
* `linkStatus: 'unresolved'`.
|
||||
* - Materialized `bindings` per module scope — local defs merged with
|
||||
* imported / wildcard-expanded / re-exported names via the provider's
|
||||
* `mergeBindings` precedence.
|
||||
* - Materialized `bindings` keyed by the same scopes — local defs merged
|
||||
* with imported / wildcard-expanded / re-exported names via the
|
||||
* provider's `mergeBindings` precedence.
|
||||
* - The SCC condensation of the import graph, exposed so disjoint SCCs
|
||||
* can be processed in parallel by callers that want that.
|
||||
*
|
||||
|
|
@ -39,7 +40,7 @@ import type { BindingRef, ImportEdge, ParsedImport, ScopeId, WorkspaceIndex } fr
|
|||
/** Per-file input for the finalize pass. */
|
||||
export interface FinalizeFile {
|
||||
readonly filePath: string;
|
||||
/** The module scope id for this file; owns the finalized imports + bindings. */
|
||||
/** Default binding scope for imports without lexical provenance or opt-in. */
|
||||
readonly moduleScope: ScopeId;
|
||||
readonly parsedImports: readonly ParsedImport[];
|
||||
/**
|
||||
|
|
@ -84,6 +85,10 @@ export interface FinalizeInput {
|
|||
* expects pure answers.
|
||||
*/
|
||||
export interface FinalizeHooks {
|
||||
/** Bind imports at their extracted lexical scope. Missing provenance retains
|
||||
* the legacy module-scope behavior. Opt-in: lexical position and language
|
||||
* import-binding semantics are distinct facts. */
|
||||
readonly importsBindAtLexicalScope?: boolean;
|
||||
/**
|
||||
* Resolve a raw import target to the concrete file path that owns it.
|
||||
* Return `null` when no target file is resolvable (e.g., `np.foo` when
|
||||
|
|
@ -114,6 +119,34 @@ export interface FinalizeHooks {
|
|||
*/
|
||||
expandsWildcardTo(targetModuleScope: ScopeId, workspaceIndex: WorkspaceIndex): readonly string[];
|
||||
|
||||
/**
|
||||
* Does this language make two `wildcard` re-exports that both DECLARE the
|
||||
* same name AMBIGUOUS (no winner), rather than overloads or redeclarations
|
||||
* of one entity?
|
||||
*
|
||||
* True for ECMAScript modules: `export * from './a'; export * from './b'`
|
||||
* with `collide` declared in both excludes the name from the module's
|
||||
* exports, so binding either source is a guess. False (the default) for
|
||||
* languages whose wildcard import is `#include`, `require`, or a package
|
||||
* fan-out, where the same name declared in two files is an overload set
|
||||
* (C++ `write_audit(int)` / `write_audit(int, int)` across two headers), a
|
||||
* redeclaration of one function, or a per-file `init` — legal, and resolved
|
||||
* downstream by arity or by definition. Only a language that opts in has
|
||||
* its collisions refused and reported via `ambiguousWildcardExports`.
|
||||
*/
|
||||
readonly wildcardCollisionIsAmbiguous?: boolean;
|
||||
|
||||
/**
|
||||
* A named import / named re-export binds only to MODULE-LEVEL declarations
|
||||
* of the target file. Opt-in for languages whose `import { x }` can never
|
||||
* reach a class member: without it, a class method sharing a name with a
|
||||
* top-level value — or standing alone — wins the callable preference in
|
||||
* `findExportByName` and the import binds to a symbol the module cannot
|
||||
* export (a confident wrong edge). Languages that bind module-level members
|
||||
* by bare name (static members, module functions) leave it off.
|
||||
*/
|
||||
readonly namedImportsBindTopLevelOnly?: boolean;
|
||||
|
||||
/**
|
||||
* Merge `incoming` bindings into `existing` for a given name. Called
|
||||
* once per name at each scope. Typical rules:
|
||||
|
|
@ -164,12 +197,32 @@ export interface FinalizeStats {
|
|||
readonly unresolvedEdges: number;
|
||||
readonly sccCount: number;
|
||||
readonly largestSccSize: number;
|
||||
/**
|
||||
* Names a file re-exported through two or more `export *` sources that each
|
||||
* DECLARE the name, so the language names no winner. The finalize pass
|
||||
* refuses to bind them (they are absent from the file's re-export closure
|
||||
* AND from its wildcard-expanded module-scope bindings) instead of taking the
|
||||
* first-listed source and publishing the guess as `import-resolved`.
|
||||
* Reported so the caller can record the refusal — an importer of that name
|
||||
* stays unresolved, and the reason must be auditable rather than silent.
|
||||
*/
|
||||
readonly ambiguousWildcardExports: readonly AmbiguousWildcardExport[];
|
||||
}
|
||||
|
||||
/** One refused `export *` collision — see `FinalizeStats.ambiguousWildcardExports`. */
|
||||
export interface AmbiguousWildcardExport {
|
||||
readonly filePath: string;
|
||||
readonly name: string;
|
||||
/** `nodeId`s of the colliding declarations, in `export *` declaration order. */
|
||||
readonly candidateDefIds: readonly string[];
|
||||
}
|
||||
|
||||
export interface FinalizeOutput {
|
||||
/** Linked `ImportEdge[]` per module scope, in original input order. */
|
||||
/** Linked `ImportEdge[]` keyed by binding scope (`fromScope`). Module scope
|
||||
* for languages that bind file-wide; nested lexical scopes when
|
||||
* `importsBindAtLexicalScope` is on. */
|
||||
readonly imports: ReadonlyMap<ScopeId, readonly ImportEdge[]>;
|
||||
/** Materialized bindings per module scope. */
|
||||
/** Materialized bindings keyed by the same scopes as `imports`. */
|
||||
readonly bindings: ReadonlyMap<ScopeId, ReadonlyMap<string, readonly BindingRef[]>>;
|
||||
/** SCCs in reverse-topological order (leaves first). */
|
||||
readonly sccs: readonly FinalizedScc[];
|
||||
|
|
@ -223,7 +276,33 @@ export function finalize(input: FinalizeInput, hooks: FinalizeHooks): FinalizeOu
|
|||
// SCC-condensed). Eliminates the recursive crawl that the per-edge
|
||||
// `tryFinalize` call site used to do; lookups are O(1) afterwards.
|
||||
// See `buildReexportClosures` for the algorithm.
|
||||
const reexportClosures = buildReexportClosures(input.files, byFilePath, edgeIndex);
|
||||
// A local import is a dependency of its file, not a re-export of that file.
|
||||
const moduleEdgeIndex = new Map<string, ImportEdgeDraft[]>();
|
||||
for (const file of input.files) {
|
||||
moduleEdgeIndex.set(
|
||||
file.filePath,
|
||||
(edgeIndex.get(file.filePath) ?? []).filter((d) => d.fromScope === file.moduleScope),
|
||||
);
|
||||
}
|
||||
const ambiguityByFile = collectAmbiguityByFile(
|
||||
input.files,
|
||||
byFilePath,
|
||||
moduleEdgeIndex,
|
||||
hooks.wildcardCollisionIsAmbiguous === true,
|
||||
hooks.namedImportsBindTopLevelOnly === true,
|
||||
);
|
||||
const ambiguousByFile = new Map<string, ReadonlySet<string>>();
|
||||
for (const [filePath, byName] of ambiguityByFile) {
|
||||
ambiguousByFile.set(filePath, new Set(byName.keys()));
|
||||
}
|
||||
const topLevelOnly = hooks.namedImportsBindTopLevelOnly === true;
|
||||
const reexportClosures = buildReexportClosures(
|
||||
input.files,
|
||||
byFilePath,
|
||||
moduleEdgeIndex,
|
||||
ambiguousByFile,
|
||||
topLevelOnly,
|
||||
);
|
||||
|
||||
// ── Phase 3: process SCCs in reverse-topological order (leaves first).
|
||||
// Within each SCC, run a bounded fixpoint that resolves intra-SCC edges.
|
||||
|
|
@ -231,6 +310,19 @@ export function finalize(input: FinalizeInput, hooks: FinalizeHooks): FinalizeOu
|
|||
// already finalized); edges inside the SCC may need multiple passes.
|
||||
const linkedByScope = new Map<ScopeId, readonly ImportEdge[]>();
|
||||
let linkedEdges = 0;
|
||||
// Every refused wildcard name, reported from the ambiguity map rather than from
|
||||
// the edges phase 4 happens to drop: a language whose `expandsWildcardTo`
|
||||
// returns nothing (TypeScript — `export *` never binds names locally) drops
|
||||
// no expanded edge, yet its importers were refused through the closure just
|
||||
// the same, and that refusal must still be visible. Named-vs-named conflicts
|
||||
// remain refused above but are not export-star collisions in this audit.
|
||||
const ambiguousWildcardExports: AmbiguousWildcardExport[] = [];
|
||||
for (const [filePath, byName] of ambiguityByFile) {
|
||||
for (const [name, ambiguity] of byName) {
|
||||
if (ambiguity.kind !== 'wildcard') continue;
|
||||
ambiguousWildcardExports.push({ filePath, name, candidateDefIds: ambiguity.candidateDefIds });
|
||||
}
|
||||
}
|
||||
|
||||
for (const scc of sccs) {
|
||||
const sccFiles = new Set(scc.files);
|
||||
|
|
@ -249,7 +341,7 @@ export function finalize(input: FinalizeInput, hooks: FinalizeHooks): FinalizeOu
|
|||
if (drafts === undefined) continue;
|
||||
for (const draft of drafts) {
|
||||
if (draft.finalized !== null) continue;
|
||||
const finalized = tryFinalize(draft, byFilePath, reexportClosures);
|
||||
const finalized = tryFinalize(draft, byFilePath, reexportClosures, topLevelOnly);
|
||||
if (finalized !== null) {
|
||||
draft.finalized = finalized;
|
||||
progressed = true;
|
||||
|
|
@ -272,13 +364,25 @@ export function finalize(input: FinalizeInput, hooks: FinalizeHooks): FinalizeOu
|
|||
}
|
||||
}
|
||||
|
||||
// ── Phase 4: collect finalized `ImportEdge[]` per module scope, preserving
|
||||
// ── Phase 4: collect finalized `ImportEdge[]` per binding scope, preserving
|
||||
// input order within each file, and wildcard-expand where applicable.
|
||||
for (const file of input.files) {
|
||||
const drafts = edgeIndex.get(file.filePath);
|
||||
if (drafts === undefined) continue;
|
||||
const finalized: ImportEdge[] = [];
|
||||
const finalizedByScope = new Map<ScopeId, ImportEdge[]>([[file.moduleScope, []]]);
|
||||
// Names this file's `export *` sources collide on (see
|
||||
// `collectAmbiguousWildcards`). Their expanded edges are dropped here, so
|
||||
// the file's own module scope does not bind an arbitrary winner either —
|
||||
// suppressing them only in the closure would leave this binding standing,
|
||||
// and it was this binding, not the closure, that produced the published
|
||||
// `import-resolved` guess.
|
||||
const ambiguousHere = ambiguousByFile.get(file.filePath) ?? EMPTY_NAME_SET;
|
||||
for (const d of drafts) {
|
||||
let finalized = finalizedByScope.get(d.fromScope);
|
||||
if (finalized === undefined) {
|
||||
finalized = [];
|
||||
finalizedByScope.set(d.fromScope, finalized);
|
||||
}
|
||||
const edge = d.finalized;
|
||||
if (edge === null) {
|
||||
throw new Error(`Invariant violated: import edge was not finalized for ${file.filePath}`);
|
||||
|
|
@ -286,16 +390,25 @@ export function finalize(input: FinalizeInput, hooks: FinalizeHooks): FinalizeOu
|
|||
if (d.source.kind === 'wildcard' && edge.linkStatus !== 'unresolved') {
|
||||
// Produce one `wildcard-expanded` ImportEdge per exported name.
|
||||
const expanded = expandWildcard(edge, byFilePath, hooks, input.workspaceIndex);
|
||||
for (const e of expanded) finalized.push(e);
|
||||
for (const e of expanded) {
|
||||
if (
|
||||
d.fromScope === file.moduleScope &&
|
||||
e.kind === 'wildcard-expanded' &&
|
||||
ambiguousHere.has(e.localName)
|
||||
)
|
||||
continue;
|
||||
finalized.push(e);
|
||||
}
|
||||
} else {
|
||||
finalized.push(edge);
|
||||
}
|
||||
if (edge.linkStatus !== 'unresolved') linkedEdges++;
|
||||
}
|
||||
linkedByScope.set(file.moduleScope, Object.freeze(finalized));
|
||||
for (const [scopeId, edges] of finalizedByScope)
|
||||
linkedByScope.set(scopeId, Object.freeze(edges));
|
||||
}
|
||||
|
||||
// ── Phase 5: materialize module-scope bindings (local + imports + wildcards),
|
||||
// ── Phase 5: materialize bindings (local + scoped imports + wildcards),
|
||||
// delegating precedence to `provider.mergeBindings`.
|
||||
const bindingsByScope = materializeBindings(input.files, linkedByScope, hooks);
|
||||
|
||||
|
|
@ -312,6 +425,7 @@ export function finalize(input: FinalizeInput, hooks: FinalizeHooks): FinalizeOu
|
|||
unresolvedEdges: totalEdges - linkedEdges,
|
||||
sccCount,
|
||||
largestSccSize,
|
||||
ambiguousWildcardExports: Object.freeze(ambiguousWildcardExports),
|
||||
};
|
||||
|
||||
return Object.freeze({
|
||||
|
|
@ -339,6 +453,10 @@ function makeEdgeDrafts(
|
|||
hooks: FinalizeHooks,
|
||||
workspace: WorkspaceIndex,
|
||||
): ImportEdgeDraft[] {
|
||||
const fromScope =
|
||||
hooks.importsBindAtLexicalScope === true
|
||||
? (parsed.declaredAtScope ?? file.moduleScope)
|
||||
: file.moduleScope;
|
||||
// Dynamic-unresolved passes through — no `BindingRef`, no target file.
|
||||
if (parsed.kind === 'dynamic-unresolved') {
|
||||
const base: ImportEdge = {
|
||||
|
|
@ -351,7 +469,7 @@ function makeEdgeDrafts(
|
|||
{
|
||||
source: parsed,
|
||||
fromFile: file.filePath,
|
||||
fromScope: file.moduleScope,
|
||||
fromScope,
|
||||
targetFile: null,
|
||||
base,
|
||||
finalized: base, // already fully finalized
|
||||
|
|
@ -381,7 +499,7 @@ function makeEdgeDrafts(
|
|||
{
|
||||
source: parsed,
|
||||
fromFile: file.filePath,
|
||||
fromScope: file.moduleScope,
|
||||
fromScope,
|
||||
targetFile: null,
|
||||
base,
|
||||
finalized: base,
|
||||
|
|
@ -417,7 +535,7 @@ function makeEdgeDrafts(
|
|||
return {
|
||||
source: parsed,
|
||||
fromFile: file.filePath,
|
||||
fromScope: file.moduleScope,
|
||||
fromScope,
|
||||
targetFile: tf,
|
||||
base,
|
||||
finalized: isFileLevelTerminal ? base : null,
|
||||
|
|
@ -529,6 +647,7 @@ function tryFinalize(
|
|||
draft: ImportEdgeDraft,
|
||||
byFilePath: Map<string, FinalizeFile>,
|
||||
reexportClosures: ReadonlyMap<string, FileReexportClosure>,
|
||||
topLevelOnly: boolean,
|
||||
): ImportEdge | null {
|
||||
const targetFile = draft.targetFile;
|
||||
if (targetFile === null) return draft.base; // already terminal
|
||||
|
|
@ -552,7 +671,11 @@ function tryFinalize(
|
|||
// so consumers can reach the module as a symbol — but its absence is not
|
||||
// a failure.
|
||||
if (draft.base.kind === 'namespace') {
|
||||
const moduleDef = findExportByName(targetModule.localDefs, extractExportedName(draft.source));
|
||||
const moduleDef = findExportByName(
|
||||
targetModule.localDefs,
|
||||
extractExportedName(draft.source),
|
||||
topLevelOnly,
|
||||
);
|
||||
return {
|
||||
...draft.base,
|
||||
targetModuleScope: targetModule.moduleScope,
|
||||
|
|
@ -564,7 +687,7 @@ function tryFinalize(
|
|||
// local defs. Multi-hop re-export chains settle iteratively — each hop
|
||||
// resolves once its prior hop is finalized.
|
||||
const importedName = extractExportedName(draft.source);
|
||||
const exported = findExportByName(targetModule.localDefs, importedName);
|
||||
const exported = findExportByName(targetModule.localDefs, importedName, topLevelOnly);
|
||||
|
||||
if (exported !== undefined) {
|
||||
const transitiveVia =
|
||||
|
|
@ -691,15 +814,18 @@ function buildReexportClosures(
|
|||
files: readonly FinalizeFile[],
|
||||
byFilePath: ReadonlyMap<string, FinalizeFile>,
|
||||
edgeIndex: ReadonlyMap<string, ImportEdgeDraft[]>,
|
||||
ambiguous: ReadonlyMap<string, ReadonlySet<string>>,
|
||||
topLevelOnly: boolean,
|
||||
): ReadonlyMap<string, FileReexportClosure> {
|
||||
const closures = new Map<string, Map<string, ReexportClosureEntry>>();
|
||||
for (const file of files) closures.set(file.filePath, new Map());
|
||||
|
||||
// ── Step 1: build the re-export sub-graph (only resolvable wildcard /
|
||||
// reexport / flagged-named targets contribute edges), and collect the
|
||||
// per-file ambiguous names in the same walk.
|
||||
// reexport / flagged-named targets contribute edges). The per-file
|
||||
// ambiguous-name sets arrive precomputed (`collectAmbiguityByFile`) because
|
||||
// phase 4 consults the same sets when it expands wildcards into module
|
||||
// scope — one source of truth for "this name has no winner".
|
||||
const subGraph = new Map<string, Set<string>>();
|
||||
const ambiguous = new Map<string, ReadonlySet<string>>();
|
||||
for (const file of files) {
|
||||
const targets = new Set<string>();
|
||||
const drafts = edgeIndex.get(file.filePath);
|
||||
|
|
@ -710,7 +836,6 @@ function buildReexportClosures(
|
|||
if (!byFilePath.has(d.targetFile)) continue;
|
||||
targets.add(d.targetFile);
|
||||
}
|
||||
ambiguous.set(file.filePath, collectAmbiguousReexports(drafts, byFilePath));
|
||||
}
|
||||
subGraph.set(file.filePath, targets);
|
||||
}
|
||||
|
|
@ -726,7 +851,7 @@ function buildReexportClosures(
|
|||
if (!scc.isCycle) {
|
||||
const filePath = scc.files[0];
|
||||
if (filePath !== undefined) {
|
||||
populateFileClosure(filePath, byFilePath, edgeIndex, closures, ambiguous);
|
||||
populateFileClosure(filePath, byFilePath, edgeIndex, closures, ambiguous, topLevelOnly);
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
|
@ -740,7 +865,9 @@ function buildReexportClosures(
|
|||
progressed = false;
|
||||
iter++;
|
||||
for (const filePath of scc.files) {
|
||||
if (populateFileClosure(filePath, byFilePath, edgeIndex, closures, ambiguous)) {
|
||||
if (
|
||||
populateFileClosure(filePath, byFilePath, edgeIndex, closures, ambiguous, topLevelOnly)
|
||||
) {
|
||||
progressed = true;
|
||||
}
|
||||
}
|
||||
|
|
@ -820,6 +947,220 @@ function isNamedReexport(draft: ImportEdgeDraft): draft is ImportEdgeDraft & {
|
|||
* are still filling in, so detecting them needs a set that grows during the
|
||||
* fixpoint — the thing this pre-pass exists to avoid.
|
||||
*/
|
||||
/**
|
||||
* Per-file set of re-exported names that have NO decidable winner, from both
|
||||
* detectors: `collectAmbiguousReexports` (flagged-named vs flagged-named) and
|
||||
* `collectAmbiguousWildcards` (`export *` vs `export *`, direct declarations).
|
||||
* Fixed for the whole run; consulted by the closure fixpoint AND by phase 4's
|
||||
* wildcard expansion, so a refused name is absent from BOTH the exports an
|
||||
* importer can reach and the module-scope bindings the file itself sees.
|
||||
*/
|
||||
interface ReexportAmbiguity {
|
||||
readonly kind: 'named' | 'wildcard';
|
||||
readonly candidateDefIds: readonly string[];
|
||||
}
|
||||
|
||||
function collectAmbiguityByFile(
|
||||
files: readonly FinalizeFile[],
|
||||
byFilePath: ReadonlyMap<string, FinalizeFile>,
|
||||
edgeIndex: ReadonlyMap<string, ImportEdgeDraft[]>,
|
||||
wildcardCollisionIsAmbiguous: boolean,
|
||||
topLevelOnly: boolean,
|
||||
): ReadonlyMap<string, ReadonlyMap<string, ReexportAmbiguity>> {
|
||||
const out = new Map<string, ReadonlyMap<string, ReexportAmbiguity>>();
|
||||
for (const file of files) {
|
||||
const drafts = edgeIndex.get(file.filePath);
|
||||
if (drafts === undefined) continue;
|
||||
const byName = new Map<string, ReexportAmbiguity>();
|
||||
for (const name of collectAmbiguousReexports(drafts, byFilePath)) {
|
||||
byName.set(name, {
|
||||
kind: 'named',
|
||||
candidateDefIds: namedReexportCandidates(drafts, byFilePath, name, topLevelOnly),
|
||||
});
|
||||
}
|
||||
// Wildcard-vs-wildcard is a language rule (`FinalizeHooks.
|
||||
// wildcardCollisionIsAmbiguous`): ECMAScript excludes the name, C++
|
||||
// overloads it. Without the opt-in this half stays first-wins.
|
||||
if (wildcardCollisionIsAmbiguous) {
|
||||
for (const [name, ids] of collectAmbiguousWildcards(file, drafts, byFilePath)) {
|
||||
if (!byName.has(name)) byName.set(name, { kind: 'wildcard', candidateDefIds: ids });
|
||||
}
|
||||
}
|
||||
if (byName.size === 0) continue;
|
||||
out.set(file.filePath, byName);
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
/** The declarations a flagged-named collision on `localName` points at. */
|
||||
function namedReexportCandidates(
|
||||
drafts: readonly ImportEdgeDraft[],
|
||||
byFilePath: ReadonlyMap<string, FinalizeFile>,
|
||||
localName: string,
|
||||
topLevelOnly: boolean,
|
||||
): readonly string[] {
|
||||
const ids: string[] = [];
|
||||
for (const draft of drafts) {
|
||||
if (!isNamedReexport(draft) || draft.source.localName !== localName) continue;
|
||||
const targetFile = draft.targetFile;
|
||||
if (targetFile === null) continue;
|
||||
const target = byFilePath.get(targetFile);
|
||||
if (target === undefined) continue;
|
||||
const def = findExportByName(target.localDefs, draft.source.importedName, topLevelOnly);
|
||||
if (def !== undefined && !ids.includes(def.nodeId)) ids.push(def.nodeId);
|
||||
}
|
||||
return Object.freeze(ids);
|
||||
}
|
||||
|
||||
/**
|
||||
* `export * from './a'; export * from './b'` where BOTH `a` and `b` declare
|
||||
* `collide`: the language names no winner (ECMAScript excludes the name from
|
||||
* the module's exports entirely; a direct `import { collide }` of it is a
|
||||
* SyntaxError-class ambiguity). First-wins here published the `a` binding as
|
||||
* `import-resolved` at full confidence — a definite target for a call that has
|
||||
* none, which is the incorrect-context-over-missing-context failure in its
|
||||
* purest form. The name is refused instead and reported.
|
||||
*
|
||||
* Decidable in this pre-pass because it reads only the targets' own
|
||||
* `localDefs` — nothing that fills in during the closure fixpoint. Collisions
|
||||
* that arrive TRANSITIVELY (two wildcards whose targets each re-export the
|
||||
* name from somewhere else) are still first-wins; detecting them needs a set
|
||||
* that grows mid-fixpoint, the thing this pre-pass exists to avoid.
|
||||
*
|
||||
* A name the file DECLARES itself, or re-exports by NAME, is excluded: an
|
||||
* explicit export shadows every `export *`, so those collisions are legal and
|
||||
* resolved by precedence, not ambiguous.
|
||||
*
|
||||
* Only MODULE-LEVEL, EXPORT-SHAPED declarations can collide. `localDefs` also
|
||||
* carries class members, properties and parameters (a `Property:value` on two
|
||||
* unrelated classes, an interface field named `move`), which no `export *`
|
||||
* publishes. Counting those produced thousands of phantom collisions on a real
|
||||
* monorepo (2,640 on grafana) and — the dangerous half — would have refused a
|
||||
* genuinely exported `move()` because some class elsewhere had a `move`
|
||||
* property. The wildcard closure loop tolerates the wider set because nobody
|
||||
* imports a property by name; a refusal cannot afford the same tolerance.
|
||||
*
|
||||
* Export evidence, when the language supplies it (`SymbolDefinition.isExported`,
|
||||
* tri-state), settles the rest: a def marked `false` is module-private and is
|
||||
* neither a provider here nor published by the closure
|
||||
* (`indexTopLevelExportsByName`), so a private `function foo` beside an exported
|
||||
* one no longer refuses the export — and, the half that matters more, cannot be
|
||||
* the first-listed winner the closure binds either. A def marked `true` counts
|
||||
* whatever its label, `Variable` included: the closure publishes a `Variable`,
|
||||
* so two sources each exporting `const alpha` are a real collision and must be
|
||||
* refused rather than first-wins.
|
||||
*
|
||||
* Without evidence (`isExported` undefined — most languages) `Variable` is
|
||||
* excluded from the COLLISION set only: the typical top-level `const` in a
|
||||
* barrel's sources is module-private (`const category = ['Axis']` in fourteen
|
||||
* option-builder files), so counting it would refuse a real exported constant
|
||||
* of the same name for nothing. Residual risk, accepted, for that evidence-free
|
||||
* case: a non-exported `function`/`class` sharing its name with an exported one
|
||||
* behind the same barrel is counted as a collision and the export is refused —
|
||||
* a missing edge, never a wrong one. `ownerId` is only set for class members, so
|
||||
* a callable nested in an object literal (`showIf: (cfg) => …` across fourteen
|
||||
* option-builder files) still counts as a provider when unmarked. Measured
|
||||
* before the export marker existed: grafana@871af0720 refuses 52 names (from
|
||||
* 2,640 before the member exclusion), discourse@3f71fa15c 5.
|
||||
*/
|
||||
|
||||
/** Labels that are never a module export, whatever their owner. */
|
||||
const NON_EXPORTABLE_MEMBER_LABELS: readonly string[] = [
|
||||
'Property',
|
||||
'Method',
|
||||
'Constructor',
|
||||
'Parameter',
|
||||
'Field',
|
||||
];
|
||||
/** Labels excluded from the collision set when no export evidence is present. */
|
||||
const UNMARKED_NON_COLLIDING_LABELS: ReadonlySet<string> = new Set([
|
||||
...NON_EXPORTABLE_MEMBER_LABELS,
|
||||
'Variable',
|
||||
]);
|
||||
/**
|
||||
* Labels a module can never export by name: class/interface members and
|
||||
* parameters. Filtered by LABEL, not `ownerId` — `ownerId` is populated in a
|
||||
* later pass and is not reliable while the closure is built.
|
||||
*/
|
||||
const MEMBER_LABELS: ReadonlySet<string> = new Set(NON_EXPORTABLE_MEMBER_LABELS);
|
||||
|
||||
/**
|
||||
* A declaration `export *` could publish, for COLLISION purposes: top-level, of
|
||||
* an exportable kind, and not marked module-private. With export evidence the
|
||||
* label rule yields to the marker (an exported `Variable` collides; a private
|
||||
* `function` does not); without it `Variable` is left out — see the header.
|
||||
*/
|
||||
function isWildcardPublishable(def: SymbolDefinition): boolean {
|
||||
// Explicit evidence wins over the label: a CommonJS `module.exports = {
|
||||
// alpha() {} }` member is labeled Method and IS the module's export.
|
||||
if (def.isExported === true) return true;
|
||||
if (def.isExported === false) return false;
|
||||
if (def.ownerId !== undefined) return false;
|
||||
return !UNMARKED_NON_COLLIDING_LABELS.has(def.type);
|
||||
}
|
||||
|
||||
/**
|
||||
* Can a declaration of the barrel's OWN shadow a name its `export *` sources
|
||||
* collide on? Only a module-level binding can — ECMAScript's explicit-export
|
||||
* precedence is about the module's own exports. A class MEMBER named `clash`
|
||||
* (`export class Unrelated { clash() {} }`) is not such a binding and must not
|
||||
* switch the collision check off; it did, and a confident edge to one source's
|
||||
* `clash` was emitted where the import should have been refused.
|
||||
*/
|
||||
function canShadowWildcard(def: SymbolDefinition): boolean {
|
||||
if (def.isExported === true) return true;
|
||||
if (def.isExported === false) return false;
|
||||
if (def.ownerId !== undefined) return false;
|
||||
return !MEMBER_LABELS.has(def.type);
|
||||
}
|
||||
function collectAmbiguousWildcards(
|
||||
file: FinalizeFile,
|
||||
drafts: readonly ImportEdgeDraft[],
|
||||
byFilePath: ReadonlyMap<string, FinalizeFile>,
|
||||
): ReadonlyMap<string, readonly string[]> {
|
||||
const shadowed = new Set<string>();
|
||||
for (const def of file.localDefs) {
|
||||
if (!canShadowWildcard(def)) continue;
|
||||
const name = deriveSimpleName(def);
|
||||
if (name !== null) shadowed.add(name);
|
||||
}
|
||||
for (const draft of drafts) {
|
||||
if (isNamedReexport(draft)) shadowed.add(draft.source.localName);
|
||||
}
|
||||
|
||||
// name → (target file → declaring def ids), in declaration order.
|
||||
const providers = new Map<string, Map<string, string[]>>();
|
||||
for (const draft of drafts) {
|
||||
if (draft.source.kind !== 'wildcard') continue;
|
||||
const targetFile = draft.targetFile;
|
||||
if (targetFile === null) continue;
|
||||
const target = byFilePath.get(targetFile);
|
||||
if (target === undefined) continue;
|
||||
for (const def of target.localDefs) {
|
||||
if (!isWildcardPublishable(def)) continue;
|
||||
const name = deriveSimpleName(def);
|
||||
if (name === null || shadowed.has(name)) continue;
|
||||
let byTarget = providers.get(name);
|
||||
if (byTarget === undefined) {
|
||||
byTarget = new Map<string, string[]>();
|
||||
providers.set(name, byTarget);
|
||||
}
|
||||
const ids = byTarget.get(targetFile);
|
||||
if (ids === undefined) byTarget.set(targetFile, [def.nodeId]);
|
||||
else ids.push(def.nodeId);
|
||||
}
|
||||
}
|
||||
const conflicting = new Map<string, readonly string[]>();
|
||||
for (const [name, byTarget] of providers) {
|
||||
// Two DIFFERENT source files declaring the name. The same file declaring
|
||||
// it twice (overloads, a declaration merged with its namespace) is one
|
||||
// provider and not a collision.
|
||||
if (byTarget.size < 2) continue;
|
||||
conflicting.set(name, Object.freeze([...byTarget.values()].flat()));
|
||||
}
|
||||
return conflicting;
|
||||
}
|
||||
|
||||
function collectAmbiguousReexports(
|
||||
drafts: readonly ImportEdgeDraft[],
|
||||
byFilePath: ReadonlyMap<string, FinalizeFile>,
|
||||
|
|
@ -859,6 +1200,7 @@ function populateFileClosure(
|
|||
edgeIndex: ReadonlyMap<string, ImportEdgeDraft[]>,
|
||||
closures: Map<string, Map<string, ReexportClosureEntry>>,
|
||||
ambiguousByFile: ReadonlyMap<string, ReadonlySet<string>>,
|
||||
topLevelOnly: boolean,
|
||||
): boolean {
|
||||
const myClosure = closures.get(filePath);
|
||||
if (myClosure === undefined) return false;
|
||||
|
|
@ -883,7 +1225,7 @@ function populateFileClosure(
|
|||
if (ambiguous.has(localName) || myClosure.has(localName)) continue;
|
||||
|
||||
const importedName = draft.source.importedName;
|
||||
const direct = findExportByName(targetModule.localDefs, importedName);
|
||||
const direct = findExportByName(targetModule.localDefs, importedName, topLevelOnly);
|
||||
if (direct !== undefined) {
|
||||
myClosure.set(localName, { def: direct, via: Object.freeze([targetFile]) });
|
||||
continue;
|
||||
|
|
@ -909,9 +1251,27 @@ function populateFileClosure(
|
|||
const targetModule = byFilePath.get(targetFile);
|
||||
if (targetModule === undefined) continue;
|
||||
|
||||
for (const def of targetModule.localDefs) {
|
||||
const name = deriveSimpleName(def);
|
||||
if (name === null || ambiguous.has(name) || myClosure.has(name)) continue;
|
||||
// Fan out the WINNER per name, not every def. `export const alpha = () =>
|
||||
// {}` emits both a `Variable` (the lexical declaration) and a `Function`
|
||||
// (the arrow) under the same simple name; iterating `localDefs` raw let
|
||||
// whichever came first — the `Variable` — claim the closure slot, and a
|
||||
// call bound to a value shadow emits no CALLS edge. Named re-exports
|
||||
// already go through `findExportByName`'s callable-preferred index; the
|
||||
// wildcard hop is the same lookup and must apply the same preference.
|
||||
// Measured: grafana `Button`/`clearButtonStyles` (arrow consts behind
|
||||
// `export *`) resolved 8 of 475 ledger entries before this.
|
||||
// Over TOP-LEVEL declarations only. `localDefs` also carries class members;
|
||||
// `Foo.render` (label `Method`, callable) outranked the file's real
|
||||
// `const render` in the callable-preferred index and `import { render }`
|
||||
// bound to a symbol `export *` can never publish — a confident wrong edge
|
||||
// where the value shadow used to yield none. Gated by the same hook as the
|
||||
// named-import path: only a language that opted in (ECMAScript, where
|
||||
// `export *` cannot publish a class member) narrows; every other language's
|
||||
// wildcard keeps the wide index, whose members are legitimately reachable.
|
||||
for (const [name, def] of (topLevelOnly ? indexTopLevelExportsByName : indexExportsByName)(
|
||||
targetModule.localDefs,
|
||||
)) {
|
||||
if (ambiguous.has(name) || myClosure.has(name)) continue;
|
||||
myClosure.set(name, { def, via: Object.freeze([targetFile]) });
|
||||
}
|
||||
const targetClosure = closures.get(targetFile);
|
||||
|
|
@ -993,6 +1353,13 @@ function deriveSimpleName(def: SymbolDefinition): string | null {
|
|||
function findExportByName(
|
||||
defs: readonly SymbolDefinition[],
|
||||
name: string,
|
||||
/**
|
||||
* `true` (a `namedImportsBindTopLevelOnly` language): consult only
|
||||
* module-level declarations, so a class member can neither outrank a
|
||||
* top-level value nor bind on its own. Phase-4 wildcard expansion keeps
|
||||
* the wide index — that is the path languages use to bind members.
|
||||
*/
|
||||
topLevelOnly: boolean = false,
|
||||
): SymbolDefinition | undefined {
|
||||
// GENERIC RULE (applies to every language using this finalize
|
||||
// algorithm): when MULTIPLE `SymbolDefinition`s share the same simple
|
||||
|
|
@ -1018,7 +1385,7 @@ function findExportByName(
|
|||
//
|
||||
// See `gitnexus/test/integration/resolvers/typescript-hof-callbacks.test.ts`
|
||||
// for the cross-file regression this rule prevents.
|
||||
return indexExportsByName(defs).get(name);
|
||||
return (topLevelOnly ? indexTopLevelExportsByName(defs) : indexExportsByName(defs)).get(name);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1062,6 +1429,47 @@ function indexExportsByName(
|
|||
return index;
|
||||
}
|
||||
|
||||
/**
|
||||
* `indexExportsByName` restricted to declarations a module publishes by name:
|
||||
* members (by LABEL — `ownerId` is stamped by a later reconcile pass and is not
|
||||
* reliable while the closure is built) are skipped unless the language marked
|
||||
* them exported (a CommonJS `module.exports = { alpha() {} }` member), and so
|
||||
* is any def the language marked module-private (`isExported === false`) — a
|
||||
* function nested inside another function carries the Function label and used
|
||||
* to displace the real exported value of the same name here; a barrel cannot
|
||||
* republish what its source never exported, and binding it would put a private
|
||||
* `function foo` in front of the exported one another source provides.
|
||||
* `Variable` stays, since a barrel legitimately republishes a `const`. Same
|
||||
* memoization contract.
|
||||
*/
|
||||
const TOP_LEVEL_EXPORTS_BY_NAME = new WeakMap<
|
||||
readonly SymbolDefinition[],
|
||||
ReadonlyMap<string, SymbolDefinition>
|
||||
>();
|
||||
|
||||
function indexTopLevelExportsByName(
|
||||
defs: readonly SymbolDefinition[],
|
||||
): ReadonlyMap<string, SymbolDefinition> {
|
||||
const cached = TOP_LEVEL_EXPORTS_BY_NAME.get(defs);
|
||||
if (cached !== undefined) return cached;
|
||||
const index = new Map<string, SymbolDefinition>();
|
||||
for (const d of defs) {
|
||||
// Evidence over label, both ways: a marked-private def (a function nested
|
||||
// in another function carries the Function label too) is skipped, and a
|
||||
// marked-exported member (`module.exports = { alpha() {} }`) is admitted.
|
||||
if (d.isExported === false) continue;
|
||||
if (d.isExported !== true && MEMBER_LABELS.has(d.type)) continue;
|
||||
const name = deriveSimpleName(d);
|
||||
if (name === null) continue;
|
||||
const existing = index.get(name);
|
||||
if (existing === undefined) index.set(name, d);
|
||||
else if (!isCallableOrTypeLike(existing.type) && isCallableOrTypeLike(d.type))
|
||||
index.set(name, d);
|
||||
}
|
||||
TOP_LEVEL_EXPORTS_BY_NAME.set(defs, index);
|
||||
return index;
|
||||
}
|
||||
|
||||
const EMPTY_NAME_SET: ReadonlySet<string> = new Set();
|
||||
|
||||
const CALLABLE_OR_TYPE_LIKE: ReadonlySet<string> = new Set([
|
||||
|
|
@ -1179,7 +1587,7 @@ function materializeBindings(
|
|||
linkedByScope: ReadonlyMap<ScopeId, readonly ImportEdge[]>,
|
||||
hooks: FinalizeHooks,
|
||||
): ReadonlyMap<ScopeId, ReadonlyMap<string, readonly BindingRef[]>> {
|
||||
const out = new Map<ScopeId, ReadonlyMap<string, readonly BindingRef[]>>();
|
||||
const buckets = new Map<ScopeId, Map<string, readonly BindingRef[]>>();
|
||||
|
||||
// Build a `nodeId → SymbolDefinition` index once across all files
|
||||
// (O(N_files × D_defs)) so the per-edge lookup below is O(1) instead
|
||||
|
|
@ -1204,8 +1612,17 @@ function materializeBindings(
|
|||
scopeBindings.set(name, hooks.mergeBindings(existing, incoming, file.moduleScope));
|
||||
}
|
||||
|
||||
// Layer in finalized imports.
|
||||
const imports = linkedByScope.get(file.moduleScope) ?? [];
|
||||
buckets.set(file.moduleScope, scopeBindings);
|
||||
}
|
||||
|
||||
// Layer imports into their binding scope; lexical locals already live in
|
||||
// the scope tree and must not be copied into unrelated scope buckets.
|
||||
for (const [scopeId, imports] of linkedByScope) {
|
||||
let scopeBindings = buckets.get(scopeId);
|
||||
if (scopeBindings === undefined) {
|
||||
scopeBindings = new Map();
|
||||
buckets.set(scopeId, scopeBindings);
|
||||
}
|
||||
for (const edge of imports) {
|
||||
if (edge.targetDefId === undefined || edge.linkStatus === 'unresolved') continue;
|
||||
const def = defById.get(edge.targetDefId);
|
||||
|
|
@ -1224,15 +1641,18 @@ function materializeBindings(
|
|||
if (name === null) continue;
|
||||
const incoming: BindingRef[] = [{ def, origin, via: edge }];
|
||||
const existing = scopeBindings.get(name) ?? [];
|
||||
scopeBindings.set(name, hooks.mergeBindings(existing, incoming, file.moduleScope));
|
||||
scopeBindings.set(name, hooks.mergeBindings(existing, incoming, scopeId));
|
||||
}
|
||||
}
|
||||
|
||||
const out = new Map<ScopeId, ReadonlyMap<string, readonly BindingRef[]>>();
|
||||
for (const [scopeId, scopeBindings] of buckets) {
|
||||
// Freeze nested buckets for immutability.
|
||||
const frozen = new Map<string, readonly BindingRef[]>();
|
||||
for (const [name, refs] of scopeBindings) {
|
||||
frozen.set(name, Object.freeze(refs.slice()));
|
||||
}
|
||||
out.set(file.moduleScope, frozen);
|
||||
out.set(scopeId, frozen);
|
||||
}
|
||||
|
||||
return out;
|
||||
|
|
|
|||
|
|
@ -111,6 +111,18 @@ export interface SymbolDefinition {
|
|||
* source (for example an anonymous class). Consumers may use this only as a
|
||||
* conservative priority hint; it does not change graph-node identity. */
|
||||
isSynthetic?: boolean;
|
||||
/**
|
||||
* Whether the producing language saw EXPORT EVIDENCE on this declaration —
|
||||
* an `export` modifier, a later `export { name }` specifier, an `export
|
||||
* default name`. TRI-STATE, and the absence is load-bearing: `undefined`
|
||||
* means the language emitted no verdict (most languages, and any ECMAScript
|
||||
* file whose export surface is a CommonJS assignment the marker cannot read),
|
||||
* which readers MUST treat as "unknown" and fall back to their prior
|
||||
* behavior. Only `false` says "this module does not publish the name": a
|
||||
* `false` keeps a module-private `function foo` from being counted as a
|
||||
* wildcard provider or bound through a barrel's `export *` closure.
|
||||
*/
|
||||
isExported?: boolean;
|
||||
/** Links Method/Constructor/Property to owning Class/Struct/Trait nodeId */
|
||||
ownerId?: string;
|
||||
/** #1982/#1993: bridge-held enclosing-namespace path (e.g. `NS1`, `Outer.Inner`)
|
||||
|
|
|
|||
|
|
@ -107,7 +107,14 @@ export type CaptureMatch = Readonly<Record<string, Capture>>;
|
|||
* produced when `expandsWildcardTo` materializes a wildcard against target
|
||||
* exports — a provider must never emit it at parse time.
|
||||
*/
|
||||
export type ParsedImport =
|
||||
export type ParsedImport = ParsedImportSyntax & {
|
||||
/** Lexical location retained by extraction, independently of execution timing.
|
||||
* Absent for legacy or synthesized imports. Binding semantics remain opt-in
|
||||
* through FinalizeHooks.importsBindAtLexicalScope. */
|
||||
readonly declaredAtScope?: ScopeId;
|
||||
};
|
||||
|
||||
type ParsedImportSyntax =
|
||||
/**
|
||||
* Per-name import without rename.
|
||||
*
|
||||
|
|
@ -183,14 +190,15 @@ export type ParsedImport =
|
|||
* field exists.** The natural place to decide it looks like the graph
|
||||
* bridge, by walking the scope the finalized edges hang off; that is
|
||||
* exactly what `graph-bridge/imports-to-edges.ts` once attempted, and it
|
||||
* is dead code by construction. `finalize-algorithm.ts:295` publishes
|
||||
* every file's finalized edges as
|
||||
* `linkedByScope.set(file.moduleScope, …)`, so the map the bridge
|
||||
* receives is keyed by the file's **Module** scope and by nothing else:
|
||||
* the walk starts at a `Module` every time and answers `false` for every
|
||||
* import in the tree. Finalize cannot recover the position either —
|
||||
* `FinalizeFile.parsedImports` is a flat per-file `ParsedImport[]` with
|
||||
* no scope attached. The extractor is the last stage that still knows
|
||||
* is dead code by construction. Default finalize still publishes each
|
||||
* file's edges under `file.moduleScope`, so a bridge walk that starts
|
||||
* there answers `false` for every import. Resolvers that opt into
|
||||
* `importsBindAtLexicalScope` instead key the edge by
|
||||
* `parsed.declaredAtScope` when extraction placed the statement (Rust
|
||||
* `use` in a function body is the example). Even then the *execution*
|
||||
* question — does this import run at module init? — is not the same as
|
||||
* the lexical key, and `FinalizeFile.parsedImports` is still a flat
|
||||
* per-file list. The extractor is the last stage that still knows
|
||||
* where the statement sat (`scope-extractor.ts`, Pass 3), so it marks the
|
||||
* fact here and it rides the edge from there — see
|
||||
* {@link ImportEdge.runsOnlyWhenCalled}.
|
||||
|
|
|
|||
80
gitnexus-web/package-lock.json
generated
80
gitnexus-web/package-lock.json
generated
|
|
@ -11,7 +11,7 @@
|
|||
"@langchain/anthropic": "^1.5.8",
|
||||
"@langchain/core": "^1.2.8",
|
||||
"@langchain/google-genai": "^2.2.0",
|
||||
"@langchain/langgraph": "^1.4.9",
|
||||
"@langchain/langgraph": "^1.4.14",
|
||||
"@langchain/ollama": "^1.3.0",
|
||||
"@langchain/openai": "^1.5.3",
|
||||
"@sigma/edge-curve": "^3.1.0",
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
"pandemonium": "^2.4.0",
|
||||
"react": "^19.2.5",
|
||||
"react-dom": "^19.2.8",
|
||||
"react-i18next": "^17.0.12",
|
||||
"react-i18next": "^17.0.13",
|
||||
"react-markdown": "^10.1.0",
|
||||
"react-syntax-highlighter": "^16.1.1",
|
||||
"react-zoom-pan-pinch": "^4.0.3",
|
||||
|
|
@ -51,14 +51,14 @@
|
|||
"@playwright/test": "^1.62.1",
|
||||
"@testing-library/jest-dom": "^7.0.0",
|
||||
"@testing-library/react": "^16.3.3",
|
||||
"@testing-library/user-event": "^14.6.6",
|
||||
"@testing-library/user-event": "^14.6.7",
|
||||
"@types/dompurify": "^3.2.0",
|
||||
"@types/node": "^26.0.1",
|
||||
"@types/react": "^19.2.14",
|
||||
"@types/react": "^19.2.18",
|
||||
"@types/react-dom": "^19.2.4",
|
||||
"@types/react-syntax-highlighter": "^15.5.13",
|
||||
"@vercel/node": "^5.10.2",
|
||||
"@vitejs/plugin-react": "^6.0.5",
|
||||
"@vitejs/plugin-react": "^6.1.1",
|
||||
"@vitest/coverage-v8": "^4.1.11",
|
||||
"jsdom": "^29.1.1",
|
||||
"tree-sitter-wasms": "^0.1.13",
|
||||
|
|
@ -1165,14 +1165,14 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@langchain/langgraph": {
|
||||
"version": "1.4.9",
|
||||
"resolved": "https://registry.npmjs.org/@langchain/langgraph/-/langgraph-1.4.9.tgz",
|
||||
"integrity": "sha512-EvD9rS66Cya09y6rbMgD3Ir8miAkJQFo7FyJOPRPO736Kz3y5TeyeBDOS8ctff/jRc788bPijHx2NVFM79Qqig==",
|
||||
"version": "1.4.14",
|
||||
"resolved": "https://registry.npmjs.org/@langchain/langgraph/-/langgraph-1.4.14.tgz",
|
||||
"integrity": "sha512-uWAdRYTllfKCnTrlyovExPJCHJwcf3Wl2LzUlnaqsT7Rmoo3aCeYtq/7MV/Pw4q11motG8pR8bjr6T6V8Pe1gQ==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@langchain/langgraph-checkpoint": "^1.1.3",
|
||||
"@langchain/langgraph-sdk": "~1.9.28",
|
||||
"@langchain/protocol": "^0.0.18",
|
||||
"@langchain/langgraph-checkpoint": "^1.1.5",
|
||||
"@langchain/langgraph-sdk": "~1.10.2",
|
||||
"@langchain/protocol": "^0.0.19",
|
||||
"@standard-schema/spec": "1.1.0"
|
||||
},
|
||||
"engines": {
|
||||
|
|
@ -1184,9 +1184,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@langchain/langgraph-checkpoint": {
|
||||
"version": "1.1.3",
|
||||
"resolved": "https://registry.npmjs.org/@langchain/langgraph-checkpoint/-/langgraph-checkpoint-1.1.3.tgz",
|
||||
"integrity": "sha512-wgzdQNeEsdw1e+4lvlj0tdq/RYR/k1vPin10g0ymGoehZDDgd9nvIllGXSXN4TFgF9sf5qQP/KTkOcLfeseIhA==",
|
||||
"version": "1.1.5",
|
||||
"resolved": "https://registry.npmjs.org/@langchain/langgraph-checkpoint/-/langgraph-checkpoint-1.1.5.tgz",
|
||||
"integrity": "sha512-BwDwl5VeTOh6CVuiIPgsUgfK51vTJDMSbFcSCUfjJWsl8/DPdK/mbv+ejxJstkSk/BlSPMP4JfXWcN6jD2ea2Q==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
|
|
@ -1196,12 +1196,12 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@langchain/langgraph-sdk": {
|
||||
"version": "1.9.28",
|
||||
"resolved": "https://registry.npmjs.org/@langchain/langgraph-sdk/-/langgraph-sdk-1.9.28.tgz",
|
||||
"integrity": "sha512-4j3XuM0PvtmAbL8mPfBS99ez3+ytRfgbOpAR/nOeaejTRF3Q9dNw2QnaGLGng8wLPtGLoSj+SYgUOVxy9Bv9vg==",
|
||||
"version": "1.10.2",
|
||||
"resolved": "https://registry.npmjs.org/@langchain/langgraph-sdk/-/langgraph-sdk-1.10.2.tgz",
|
||||
"integrity": "sha512-86qsfdBZWu1ZgywLN8AThU/jXi9rjPDZPWcTJp4SA1A/L62ypTNoSXbvtiwZt1odokXccYTxK1XWS8tmVdvEmw==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@langchain/protocol": "^0.0.18",
|
||||
"@langchain/protocol": "^0.0.19",
|
||||
"@types/json-schema": "^7.0.15",
|
||||
"p-queue": "^9.0.1",
|
||||
"p-retry": "^7.1.1"
|
||||
|
|
@ -1209,9 +1209,7 @@
|
|||
"peerDependencies": {
|
||||
"@langchain/core": "^1.1.48",
|
||||
"react": "^18 || ^19",
|
||||
"react-dom": "^18 || ^19",
|
||||
"svelte": "^4.0.0 || ^5.0.0",
|
||||
"vue": "^3.0.0"
|
||||
"react-dom": "^18 || ^19"
|
||||
},
|
||||
"peerDependenciesMeta": {
|
||||
"react": {
|
||||
|
|
@ -1219,12 +1217,6 @@
|
|||
},
|
||||
"react-dom": {
|
||||
"optional": true
|
||||
},
|
||||
"svelte": {
|
||||
"optional": true
|
||||
},
|
||||
"vue": {
|
||||
"optional": true
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -1295,9 +1287,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@langchain/protocol": {
|
||||
"version": "0.0.18",
|
||||
"resolved": "https://registry.npmjs.org/@langchain/protocol/-/protocol-0.0.18.tgz",
|
||||
"integrity": "sha512-XW1egQtPfsGI41w2AMZNFZrUIwFSQHTjVMZs0OaTpCAvht/QLoaPN8FQcsysMVypOhupG28J29yOorrc70otBQ==",
|
||||
"version": "0.0.19",
|
||||
"resolved": "https://registry.npmjs.org/@langchain/protocol/-/protocol-0.0.19.tgz",
|
||||
"integrity": "sha512-9hKcRrH7cBX6gfutdfXPoft1OCchHe4FEpALoDJMl5Qu+n/YG5ynZmyu8+8cxORlPwHBoKTxggvXz+76M1yX1Q==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@mapbox/node-pre-gyp": {
|
||||
|
|
@ -2101,9 +2093,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@testing-library/user-event": {
|
||||
"version": "14.6.6",
|
||||
"resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-14.6.6.tgz",
|
||||
"integrity": "sha512-Jbs9FpkkIDw8FgSc6kOVsOv8JuuqGAL7J4X1oot77JxAoDlkNn2GRkd0aYRVuQ+pVQAiHWVkE4rX/dkF5fBiCw==",
|
||||
"version": "14.6.7",
|
||||
"resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-14.6.7.tgz",
|
||||
"integrity": "sha512-MPCpX8bxe8zS+JmmTwLp8jd0dy1rAm60Te/SL8JrQM3qvQJcBOs1d7IefJMyZzqM3EWBrDn/LWDt1BCGu4ASfg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
|
|
@ -2535,9 +2527,9 @@
|
|||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@types/react": {
|
||||
"version": "19.2.14",
|
||||
"resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.14.tgz",
|
||||
"integrity": "sha512-ilcTH/UniCkMdtexkoCN0bI7pMcJDvmQFPvuPvmEaYA/NSfFTAgdUSLAoVjaRJm7+6PvcM+q1zYOwS4wTYMF9w==",
|
||||
"version": "19.2.18",
|
||||
"resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.18.tgz",
|
||||
"integrity": "sha512-AnzbBERsrLKtk2XSfTbYRLjQPdy116Sty4q+T+Bp3IC4l6jNBvreVPAHmpq9qhXQM7CXZPjLVmGMw9sy+hxQ3w==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"csstype": "^3.2.2"
|
||||
|
|
@ -2716,9 +2708,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@vitejs/plugin-react": {
|
||||
"version": "6.0.5",
|
||||
"resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-6.0.5.tgz",
|
||||
"integrity": "sha512-BOVzne/NL162sMdResB25mUv+vWMF5NoAjNf09TeGlE7ZpszZWSD3winycicLJw72yeVsoCn/2kOhEuCvEShMA==",
|
||||
"version": "6.1.1",
|
||||
"resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-6.1.1.tgz",
|
||||
"integrity": "sha512-yxLaQV9gkhS8ezJqCM6+ndU7mDY6gqAg75NQ+0IjwEI8IYOmQCgkRwHKVSfWXW076DsqMo0Dk+0FK1U+M5RgFw==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
|
|
@ -2730,6 +2722,7 @@
|
|||
"peerDependencies": {
|
||||
"@rolldown/plugin-babel": "^0.1.7 || ^0.2.0",
|
||||
"babel-plugin-react-compiler": "^1.0.0",
|
||||
"oxc-transform-react": "^0.145.0",
|
||||
"vite": "^8.0.0"
|
||||
},
|
||||
"peerDependenciesMeta": {
|
||||
|
|
@ -2738,6 +2731,9 @@
|
|||
},
|
||||
"babel-plugin-react-compiler": {
|
||||
"optional": true
|
||||
},
|
||||
"oxc-transform-react": {
|
||||
"optional": true
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -7304,9 +7300,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/react-i18next": {
|
||||
"version": "17.0.12",
|
||||
"resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-17.0.12.tgz",
|
||||
"integrity": "sha512-lFWPEGkxQ6RhusdUkysFBD58VHfSSzvHBzqMgN0SvfVpdQGfwtNkStTqdy08/sJd7s807qqutgx93fRpD0DJ3Q==",
|
||||
"version": "17.0.13",
|
||||
"resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-17.0.13.tgz",
|
||||
"integrity": "sha512-Cc1PscmblIHA1kljTqDwrcVMI21ydgmUzw0UAeQBe7pAOgfuRLfzXze4EUBQoeDiICzFIXXhHFoZxuetNg5D0Q==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.29.7",
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
"@langchain/anthropic": "^1.5.8",
|
||||
"@langchain/core": "^1.2.8",
|
||||
"@langchain/google-genai": "^2.2.0",
|
||||
"@langchain/langgraph": "^1.4.9",
|
||||
"@langchain/langgraph": "^1.4.14",
|
||||
"@langchain/ollama": "^1.3.0",
|
||||
"@langchain/openai": "^1.5.3",
|
||||
"@sigma/edge-curve": "^3.1.0",
|
||||
|
|
@ -46,7 +46,7 @@
|
|||
"pandemonium": "^2.4.0",
|
||||
"react": "^19.2.5",
|
||||
"react-dom": "^19.2.8",
|
||||
"react-i18next": "^17.0.12",
|
||||
"react-i18next": "^17.0.13",
|
||||
"react-markdown": "^10.1.0",
|
||||
"react-syntax-highlighter": "^16.1.1",
|
||||
"react-zoom-pan-pinch": "^4.0.3",
|
||||
|
|
@ -61,14 +61,14 @@
|
|||
"@playwright/test": "^1.62.1",
|
||||
"@testing-library/jest-dom": "^7.0.0",
|
||||
"@testing-library/react": "^16.3.3",
|
||||
"@testing-library/user-event": "^14.6.6",
|
||||
"@testing-library/user-event": "^14.6.7",
|
||||
"@types/dompurify": "^3.2.0",
|
||||
"@types/node": "^26.0.1",
|
||||
"@types/react": "^19.2.14",
|
||||
"@types/react": "^19.2.18",
|
||||
"@types/react-dom": "^19.2.4",
|
||||
"@types/react-syntax-highlighter": "^15.5.13",
|
||||
"@vercel/node": "^5.10.2",
|
||||
"@vitejs/plugin-react": "^6.0.5",
|
||||
"@vitejs/plugin-react": "^6.1.1",
|
||||
"@vitest/coverage-v8": "^4.1.11",
|
||||
"jsdom": "^29.1.1",
|
||||
"tree-sitter-wasms": "^0.1.13",
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
{
|
||||
"_comment": "Per-language baselines for bench/scope-capture/measure.mjs --check. fingerprint = order-independent sha256 over the lang-resolution/<lang>-* fixture corpus + a 20-entity synthetic source (correctness gate; re-baseline intentionally on a legitimate capture change). scaling_budget = max allowed (t800/t250)/(800/250); ~1.0 is linear, ~3.2 is quadratic. The synthetic source is now HERITAGE-BEARING for every language (each Entity extends/implements/embeds/uses-trait/conforms-to a shared base) so the #1951 @reference.inherits synth is gated at scale, not just the base capture loop. All languages thread the tree-sitter captured node instead of re-deriving it with findNodeAtRange(tree.rootNode,...) per match, so all are linear (go #1915, python #1918, ruby/php/rust/csharp #1951, java #1956).",
|
||||
"go": {
|
||||
"fingerprint": "9c554a9d698a2b79fb419852daadca87b8aae88180cceabf9c8d82f3e3300f2e",
|
||||
"fingerprint": "2e3099db962f82f9d8641707a8b2bcf6875dafec1f54904f2dec7ac65ba22e9f",
|
||||
"_rebaselined_3190_ctor_qualified_name": "#3190: generic composite-literal constructors now carry @reference.qualified-name with the written pkg.Box[T] spelling so constructor fallback can tell a qualifier from a bare unique-name guess. DIGEST DRIFT ONLY: the tag is added to existing constructor matches (captureGroups unchanged on go-constructor-type-inference/cmd/main.go). Prior 990e4921a7ef0e6aa4d7da92b671de91fa2621cb27918adb27742740dc6ad902 -> 2e3099db962f82f9d8641707a8b2bcf6875dafec1f54904f2dec7ac65ba22e9f; capture_groups_fp 2579, fixture_count 122.",
|
||||
"_rebaselined_3190": "Corrected go-method-enrichment/app.go to share package animal with its declarations; its capture count is now 16 rather than 15. No Go emitter change. Scaling budget unchanged.",
|
||||
"scaling_budget": 1.5,
|
||||
"_rebaselined_callable_flow_2522_review": "PR #2522 review hardening: callable operands retain expression/qualified identity and formals retain signature metadata. Prior 3d4e32e7490c830516126e28931827949baa3594cb521f7a3d8dcfed95b6018a -> 57b3c55135af8d2af33b9a7c4bf89796a7bee5b5822b402a2dea91af7232cf4a; scaling 1.058 < 1.5.",
|
||||
"_rebaselined_callable_flow_2522_followup": "PR #2522 follow-up: provider-owned callable assignment/copy/formal/argument/invoke facts with invocation/constructor-result suppression. Prior 09ecd94911b830f52fa8807560abcbd79f163d02a2072870c1a59297e9a326e1 -> 3d4e32e7490c830516126e28931827949baa3594cb521f7a3d8dcfed95b6018a; scaling 1.039 < 1.5.",
|
||||
|
|
@ -137,8 +139,9 @@
|
|||
"_rebaselined": "#1919 review CF3 fix: extended kotlin-local-property-owner (init/accessor destructuring) + new dart-accessor-owner fixture (getter/setter ownership). Fingerprint-only corpus drift; scaling ~1.0."
|
||||
},
|
||||
"java": {
|
||||
"fingerprint": "2bf47cc19b595a9889ac21ec0154c6ce6786271d68551f21d1bc14c626bcd4ff",
|
||||
"fingerprint": "e22a753b9f59331898a3a27c43072b588c33639937b1f618f6c70ce04f072a9f",
|
||||
"scaling_budget": 1.5,
|
||||
"_rebaselined_3190_ctor_qualified_name": "#3190: qualified constructors (`new pkg.Foo()`, `new pkg.Box<T>()`) now copy @reference.call.constructor.qualified onto @reference.qualified-name so constructor fallback treats the written qualifier as precise. DIGEST DRIFT ONLY: the tag is added to existing F35 matches. Prior 2bf47cc19b595a9889ac21ec0154c6ce6786271d68551f21d1bc14c626bcd4ff -> e22a753b9f59331898a3a27c43072b588c33639937b1f618f6c70ce04f072a9f; capture_groups_fp 3586, fixture_count 209.",
|
||||
"_rebaselined_2935_synthetic_declarations": "PR #2935 review follow-up: synthesized Java anonymous classes and bodied enum constants now carry the presence-only @declaration.is-synthetic sidecar used to preserve source-written dispatch targets at the fanout cap. DIGEST DRIFT ONLY, NOT A CAPTURE-SET CHANGE: the tag is attached to existing synthetic declaration matches; capture groups and fixture count remain 5755/18405, 3512, and 206. Prior 36d689c58526c4482fbd701d1d9ca156623a3970734ead145717858712271ab5 -> 2e2150b4f4d64519e3f4c6d7a2c12259178d3117872203c904fab8cba96a694a; CI scaling 0.971 < 1.5.",
|
||||
"_rebaselined_2917_record_component_accessors": "#2917: every implicit Java record-component accessor now emits a component-bounded @scope.function plus @declaration.method/name/zero-arity/return-type metadata. The scope boundary prevents subsequent record-body references from being attributed to the accessor. Java was the only general language fingerprint to move; capture groups scale by exactly two per generated record component (small 5755 -> 6255, large 18405 -> 20005). Prior 36d689c58526c4482fbd701d1d9ca156623a3970734ead145717858712271ab5 -> 901a66c7dc0f071eeef9e4864b2519e5b58a1a141a1f9a7817ea42f7ff70eafb; scaling 0.961 < 1.5. Re-measured after merging origin/main, which carries #2935's is-synthetic sidecar on top of the same corpus: 2e2150b4f4d64519e3f4c6d7a2c12259178d3117872203c904fab8cba96a694a -> 79dafc369eaeb7183ee8cc1149b1a6c21ad672c7e5b806fe8b0060e5a952c79a; scaling 1.085 < 1.5, capture groups 6255/20005, capture_groups_fp 3560, fixture_count 206 (unchanged by the merge).",
|
||||
"_rebaselined_2900_record_heritage": "#2900 review follow-up: the Java scale unit now includes a record implementing Marker, so the record-declaration @reference.inherits path is fingerprinted and exercised at scale. Prior b29e263524f55151dcb7cfc4c929d3d1d7bb360355cee4e832158f927857f663 -> 36d689c58526c4482fbd701d1d9ca156623a3970734ead145717858712271ab5; scaling 1.042 < 1.5.",
|
||||
|
|
@ -171,7 +174,8 @@
|
|||
"capture_groups_fp": 680
|
||||
},
|
||||
"typescript": {
|
||||
"fingerprint": "fed04ed1d5db112387781e405da208ae6b3ab803889773b0455be96f01b893ff",
|
||||
"fingerprint": "60e75bbe846f7200005f12c4d95c32e82d9d3feae9f2fd594e484670762b82b0",
|
||||
"_rebaselined_3190": "Capture matches now retain explicit ESM export/private evidence, including synthesized default HOCs; CommonJS surfaces remain undecided. Capture group counts unchanged. Scaling budget unchanged.",
|
||||
"scaling_budget": 1.5,
|
||||
"_rebaselined_2934_import_type_only": "#2934: `import-decomposer.ts` attaches a presence-only `@import.type-only` synthetic capture to specifiers `tsc` erases, so `check --cycles` can stop counting type-only edges as initialization cycles. DIGEST DRIFT ONLY, NOT A CAPTURE-SET CHANGE \u2014 the tag is added to import matches that already existed, never a new match, the same shape as the #2747 receiver-chain rebaseline. Every count is unchanged: capture_groups_fp 2414, fixture_count 155, capture_groups_small/large 4503/14403 (those measure the SYNTHETIC scaling source, which has no imports at all). The fingerprint moves because `canonicalizeMatch` in measure.mjs hashes every TAG on every match, synthetics included, so one extra presence-only tag on an existing match rewrites that match's canonical string. Attribution is exact, not inferred: neutralizing ONLY the `m['@import.type-only'] = \u2026` assignment in import-decomposer.ts and re-running returns the fingerprint to c2fbf8a89e5686dd\u2026 byte-for-byte, so nothing else in the TypeScript capture stream moved. All 14 other languages report ok. Scaling 0.997 < 1.5. NOTE ON THE CONTROL: javascript did not move (2026993b\u2026, 43 fixtures), but it is a WEAK control here \u2014 `import type` is TypeScript-only syntax, so a JS corpus cannot express the construct and could not have drifted either way. It evidences no collateral damage, not the correctness of the TS change; the exact-attribution check above is what does that. Prior c2fbf8a89e5686dd1ff3659b20d41d8b05ebcc9790356e3653ee0c8ca5d365c8 -> f719163eb03a447c9e40ca316a905dd76cee82192a75a403df478ebbdc13e98f.",
|
||||
"_rebaselined_callable_flow_2522_review": "PR #2522 review hardening: callable operands retain expression/qualified identity and formals retain signature metadata. Prior 27f937bfb47d4bded316ea3c785ff659c8cd88a5761d928f113477a08c802c78 -> e05446620c5b80b7aae291cfdf32f693580fada2ae687124769b04a0c03bfe63; scaling 0.983 < 1.5.",
|
||||
|
|
@ -197,7 +201,8 @@
|
|||
"_rebaselined_1432_member_call_callee_name": "#1432 (Zig): the shared callable-flow reader no longer names a callee by simple name for a MEMBER call (`@callable-flow.direct-callee-name` requires a direct designator: `f(x)`, `ns.f(x)`), and a member call is a field-stored-callable invoke only when a MEMBER store (`o.f = handler`) or a declared callable-typed field is visible - a same-named plain binding no longer gates it. CAPTURE-EMISSION CHANGE, not fixture growth (fixture_count unchanged). Drift: `await svc.verify<GuestPayload>(token, ...)` (typescript-generic-calls/src/guest.ts, member call) and `initializer()(() => {...})` (typescript-hof-callbacks/src/store.ts, call-of-call) lose `direct-callee-name`. `await verifyToken<AdminPayload>(token, ...)` (admin.ts/auth.ts) KEEPS `direct-callee-name|verifyToken`: tree-sitter-typescript parses `await f<T>(x)` as call_expression(function: await_expression(f), type_arguments, ...), and wrappedExpression now unwraps `await_expression` so the direct designator survives as it does for the un-awaited spelling. capture_groups_fp 2465 (unchanged). Prior 05d1dadd6c9ef35c74079fa50f341b1b36e4fb02c9a89dd1b59f32b7cfd5e633 -> fed04ed1d5db112387781e405da208ae6b3ab803889773b0455be96f01b893ff."
|
||||
},
|
||||
"javascript": {
|
||||
"fingerprint": "2026993b81b873839dd2ef8797d9c14d9c48516b2b57b05ac17d8d43f2f4eba3",
|
||||
"fingerprint": "b916c7072b30d09b4949803810604830ea1aca1cfdda0d9d9312f7cb22f7a10a",
|
||||
"_rebaselined_3190": "Capture matches now retain explicit ESM export/private evidence, including synthesized default HOCs; CommonJS surfaces remain undecided. Capture group counts unchanged. Scaling budget unchanged.",
|
||||
"scaling_budget": 1.5,
|
||||
"_rebaselined_callable_flow_2522_review": "PR #2522 review hardening: callable operands retain expression/qualified identity and formals retain signature metadata. Prior b59fe8135b6a31a12bc3f872b224054b16592588153ae3661d03958d787c76f3 -> 479927409bbdd9852a36172c8260aa56df260e99129a7a9c20a0d1903dd5538b; scaling 1.050 < 1.5.",
|
||||
"_rebaselined_callable_flow_2522_followup": "PR #2522 follow-up: lexical callable bindings, direct-callee argument metadata, and invocation-result suppression. Prior 917a9cd975ba035bdad71fdb70cd72eeddec58c25797e5a1addfa6172808a55c -> b59fe8135b6a31a12bc3f872b224054b16592588153ae3661d03958d787c76f3; scaling 1.093 < 1.5.",
|
||||
|
|
|
|||
37
gitnexus/bench/value-ref-resolution/baseline.json
Normal file
37
gitnexus/bench/value-ref-resolution/baseline.json
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
{
|
||||
"_what": "Baselines for bench/value-ref-resolution/measure.mjs --check (#3399). Guards the resolved-target SET of `resolveValueRefTarget` and the per-site cost of its four channels across a 4x file-count step, over a synthetic Zig corpus whose shape is fixed in measure.mjs. Per module: 12 CONTAINER registrations (`ElementN.getJ`), 1 NAMESPACE (`dom_utils.compare`), 1 HUB (`hub.compare`), 1 BARE (`register(onTick)`), and 2 declines (a non-callable namespace member `dom_utils.DEFAULT_NS`, a non-callable bare argument `Bridge(ElementN)`) — 17 sites, 15 resolved.",
|
||||
|
||||
"_triage": "READ THIS BEFORE RE-RUNNING. modules, files, value_ref_sites, resolved, declined and fingerprint are DETERMINISTIC: a re-run never changes them, and none may be re-baselined to make CI green — drift means the resolved target set moved, which is a behaviour change to explain. linear_scaling_budget is the only timing arm; runner contention dominates it, so re-run alone on an idle machine and read `reps` in the report before investigating. If exactly one arm fails and it is that one, suspect the machine.",
|
||||
|
||||
"small": {
|
||||
"modules": 80,
|
||||
"files": 240,
|
||||
"value_ref_sites": 1360,
|
||||
"resolved": 1200,
|
||||
"declined": 160,
|
||||
"fingerprint": "4ca2933e25cfa9c84518fca6608c9a6f318f81a1c5bad63cb2f09b7394bfb792"
|
||||
},
|
||||
"large": {
|
||||
"modules": 320,
|
||||
"files": 960,
|
||||
"value_ref_sites": 5440,
|
||||
"resolved": 4800,
|
||||
"declined": 640,
|
||||
"fingerprint": "249266f180388e9f1240a7e81f1141afbc51ef25d5c4b3286a681992dab69e61"
|
||||
},
|
||||
|
||||
"linear_scaling_budget": 1.6,
|
||||
"_linear_scaling_note": "(t_large/t_small)/(320/80) over the per-site resolution loop; ~1.0 is linear. A RATIO rather than a millisecond ceiling, and there is deliberately no ms gate at all: wall-clock measures the runner, and this repo has been bitten twice by a fixed budget (bench/callable-value-flow's widening_overhead failed at 2.07 and 1.975 against 1.9 on a shared runner while the code was correct, both on a sub-11ms measurement). Same reasoning, same shape as bench/parse-dispatch-rounds' pack_scaling_budget. Budget is 1.6 — 1.40x the measured maximum, matching the ~1.5x its siblings use on ratios. What it catches: the four channels each consult a wider index than the last, and channel 4 (CONTAINER) reaches `scopes.qualifiedNames`, a WORKSPACE-WIDE index — keyed it is O(1) per site, scanned it is O(names) per site. Verified load-bearing rather than assumed: replacing `QualifiedNameIndex.get` with a full scan (in gitnexus-shared/dist — the bench resolves the built package, so patching src changes nothing) takes the factor from ~1.0 to 2.07, well clear of this budget. Only 1 of the 17 sites per module reaches that fallback (the `dom_utils.DEFAULT_NS` decline, whose module receiver is not class-like), which is why the signal is 2.07 and not the ~4 a per-site scan on every site would give.",
|
||||
|
||||
"_measured": {
|
||||
"linear_factor": 1.146,
|
||||
"linear_factor_samples": [
|
||||
0.907, 0.969, 0.988, 1.03, 1.043, 1.048, 1.05, 1.051, 1.052, 1.107, 1.123, 1.146
|
||||
],
|
||||
"small_ms": 2.078,
|
||||
"large_ms_4x": 9.197,
|
||||
"us_per_site": "1.36-1.53 small / 1.37-1.69 large",
|
||||
"reps": 15
|
||||
},
|
||||
"_measured_note": "Maxima over 12 runs on a box that was NOT idle, so the spread is an upper bound on real noise. small_ms / large_ms_4x / us_per_site are recorded for context only — NOTHING gates on them, because an absolute millisecond is exactly the gate this file avoids. `us_per_site` staying flat between the two arms is the same property linear_scaling_budget gates, read directly."
|
||||
}
|
||||
303
gitnexus/bench/value-ref-resolution/measure.mjs
Normal file
303
gitnexus/bench/value-ref-resolution/measure.mjs
Normal file
|
|
@ -0,0 +1,303 @@
|
|||
#!/usr/bin/env node
|
||||
/**
|
||||
* Build-free scaling and correctness guard for callable-value reference
|
||||
* resolution (#3399).
|
||||
*
|
||||
* WHAT IS GUARDED. `resolveValueRefTarget` is the per-site half of
|
||||
* `emitPropertyDispatchCalls`: for every `value-ref` reference site it names the
|
||||
* callable the source handed over as a value. #3399 replaced a single lexical
|
||||
* walk with four channels, and each one reaches for a wider index than the last:
|
||||
*
|
||||
* 1. BARE `register(onTick)` — `findCallableBindingInScope`
|
||||
* 2. NAMESPACE `bridge.accessor(utils.compare, …)` — the file's own
|
||||
* namespace `@import` edges, then the target's module scope
|
||||
* 3. HUB `bridge.accessor(hub.compare, …)` — the same, through the
|
||||
* finalized/augmented channel a re-export publishes into
|
||||
* 4. CONTAINER `bridge.accessor(Element.getNamespaceUri, …)` —
|
||||
* `findClassBindingInScope`, whose miss path falls back to
|
||||
* `scopes.qualifiedNames`, a WORKSPACE-WIDE index
|
||||
*
|
||||
* Channel 4 is why this bench exists. A workspace-wide index consulted per site
|
||||
* is linear only while the lookup is keyed; make it a scan — or make any of the
|
||||
* three guards around it (`isOwnerNameShadowedBySomethingElse`,
|
||||
* `isNamespaceNameShadowed`, `findOwnedMember`) walk a collection that grows
|
||||
* with the repo — and a registration table that costs O(sites) today costs
|
||||
* O(sites x files) tomorrow. That regression is invisible on a fixture and
|
||||
* expensive on lightpanda-io/browser, where `bridge.{accessor,function,…}`
|
||||
* appears 2,047 times across 257 files.
|
||||
*
|
||||
* HOW. Two corpora of identical shape, 4x apart in file count, and the per-site
|
||||
* resolution loop is the ONLY thing timed — extraction, ownership reconciliation
|
||||
* and finalize are setup. `linear_factor` is `(t_large/t_small) / (N_large/N_small)`:
|
||||
* ~1.0 linear, ~4.x quadratic on this 4x step.
|
||||
*
|
||||
* A RATIO IS THE ONLY TIMING GATE — no millisecond ceiling, deliberately.
|
||||
* `min_ms` and `us_per_site` are printed for context and nothing compares them
|
||||
* to anything: a wall-clock budget measures the runner, and this repo has been
|
||||
* bitten by that twice already (`bench/callable-value-flow`'s `widening_overhead`
|
||||
* failed at 2.07 and 1.975 against a 1.9 budget on a shared runner while the
|
||||
* code was correct, both times on a sub-11ms measurement). Dividing the large
|
||||
* arm by the small one divides the machine out, which is what
|
||||
* `bench/parse-dispatch-rounds` settled on for the same reason.
|
||||
*
|
||||
* A timing gate alone would be satisfied by a fast wrong answer, so the
|
||||
* correctness half is exact and comes first: the site/resolved/declined counts
|
||||
* per arm, plus an order-independent sha256 over every (site -> resolved target)
|
||||
* pair. The fingerprint is a CORRECTNESS gate — drift means the resolved target
|
||||
* set moved, which is a behaviour change to be explained, never re-baselined to
|
||||
* make CI green.
|
||||
*
|
||||
* WHY A ZIG CORPUS for a language-neutral pass. Zig is the only language whose
|
||||
* provider sets `namespaceExportsIncludeImportedNames`, so it is the only one
|
||||
* that can exercise channel 3 at all; and the file-as-struct idiom puts channels
|
||||
* 2 and 4 in one file, which is the shape #3399 was filed over. The corpus also
|
||||
* carries two DECLINE controls — a non-callable namespace member and a
|
||||
* non-callable bare argument — so a change that widened the callable gate would
|
||||
* move `declined` rather than hiding inside the timing.
|
||||
*
|
||||
* Container naming is load-bearing in the corpus: a Zig file-as-struct is minted
|
||||
* under the FILE STEM, so `ElementN.zig` must write `const ElementN = @This();`
|
||||
* and register `ElementN.getJ`. Spelling the alias `Element` instead is the
|
||||
* documented `@This()`-alias limitation, every channel-4 site declines, and the
|
||||
* bench would time a corpus that resolves nothing.
|
||||
*
|
||||
* Usage:
|
||||
* node --import tsx bench/value-ref-resolution/measure.mjs
|
||||
* node --import tsx bench/value-ref-resolution/measure.mjs --check
|
||||
*/
|
||||
import { createHash } from 'node:crypto';
|
||||
import { readFileSync } from 'node:fs';
|
||||
import { dirname, join } from 'node:path';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
import { performance } from 'node:perf_hooks';
|
||||
|
||||
import { extractParsedFile } from '../../src/core/ingestion/scope-extractor-bridge.ts';
|
||||
import { finalizeScopeModel } from '../../src/core/ingestion/finalize-orchestrator.ts';
|
||||
import { createSemanticModel } from '../../src/core/ingestion/model/semantic-model.ts';
|
||||
import { reconcileOwnership } from '../../src/core/ingestion/scope-resolution/pipeline/reconcile-ownership.ts';
|
||||
import { resolveValueRefTarget } from '../../src/core/ingestion/scope-resolution/passes/property-dispatch.ts';
|
||||
import { zigScopeResolver } from '../../src/core/ingestion/languages/zig/scope-resolver.ts';
|
||||
|
||||
const HERE = dirname(fileURLToPath(import.meta.url));
|
||||
const SMALL_MODULES = 80;
|
||||
const LARGE_MODULES = 320;
|
||||
/** Registrations per module through the CONTAINER channel. */
|
||||
const ACCESSORS_PER_MODULE = 12;
|
||||
/**
|
||||
* Min-of-N, and N is 15 rather than a handful: `bench/import-target` measured
|
||||
* N=5 tripping its own budget about one run in twenty while N=15 held every
|
||||
* language inside a 1.13-1.26x swing, and `bench/parse-dispatch-rounds` uses 15
|
||||
* on the same grounds. The whole run is ~5 s, so the reps are nearly free.
|
||||
*/
|
||||
const REPS = 15;
|
||||
|
||||
/**
|
||||
* One module = three files, mirroring `test/fixtures/lang-resolution/zig-idioms/
|
||||
* src/webapi/`: a namespace-only helper, a hub that re-exports one of its
|
||||
* members and declares nothing, and a file-as-struct carrying the binding table.
|
||||
*/
|
||||
function moduleFiles(i) {
|
||||
const accessors = Array.from(
|
||||
{ length: ACCESSORS_PER_MODULE },
|
||||
(_, j) => `pub fn get${j}(self: *Element${i}) u8 { return self._n; }`,
|
||||
).join('\n');
|
||||
const registrations = Array.from(
|
||||
{ length: ACCESSORS_PER_MODULE },
|
||||
(_, j) => ` pub const a${j} = bridge.accessor(Element${i}.get${j}, null, .{});`,
|
||||
).join('\n');
|
||||
return [
|
||||
{
|
||||
path: `src/dom_utils${i}.zig`,
|
||||
content: `pub const DEFAULT_NS: u8 = 7;\npub fn compare(a: u8, b: u8) u8 { return if (a > b) a else b; }\n`,
|
||||
},
|
||||
{
|
||||
path: `src/hub${i}.zig`,
|
||||
content: `pub const compare = @import("dom_utils${i}.zig").compare;\n`,
|
||||
},
|
||||
{
|
||||
path: `src/Element${i}.zig`,
|
||||
content: `const Element${i} = @This();
|
||||
const dom_utils = @import("dom_utils${i}.zig");
|
||||
const hub = @import("hub${i}.zig");
|
||||
|
||||
_n: u8 = 0,
|
||||
|
||||
${accessors}
|
||||
|
||||
fn onTick(self: *Element${i}) u8 { return self._n; }
|
||||
|
||||
pub const JsApi = struct {
|
||||
pub const bridge = Bridge(Element${i});
|
||||
${registrations}
|
||||
pub const comparator = bridge.accessor(dom_utils.compare, null, .{});
|
||||
pub const hubbed = bridge.accessor(hub.compare, null, .{});
|
||||
pub const defaultNs = bridge.accessor(dom_utils.DEFAULT_NS, null, .{});
|
||||
};
|
||||
|
||||
pub fn boot() void { register(onTick); }
|
||||
|
||||
pub fn register(comptime f: anytype) void { _ = f; }
|
||||
|
||||
fn Bridge(comptime T: type) type {
|
||||
_ = T;
|
||||
return struct {
|
||||
pub fn accessor(comptime g: anytype, comptime s: anytype, comptime o: anytype) u8 {
|
||||
_ = g;
|
||||
_ = s;
|
||||
_ = o;
|
||||
return 0;
|
||||
}
|
||||
};
|
||||
}
|
||||
`,
|
||||
},
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* Everything `resolveValueRefTarget` reads, built the way the pipeline builds it
|
||||
* (`runScopeResolution` phases 1-2): real extraction through the Zig provider,
|
||||
* `populateOwners`, `reconcileOwnership` into the SemanticModel, then finalize.
|
||||
* Hand-assembling the indexes instead would pin this file's idea of their shape
|
||||
* rather than the code's.
|
||||
*/
|
||||
function buildCorpus(modules) {
|
||||
const parsedFiles = [];
|
||||
for (let i = 0; i < modules; i++) {
|
||||
for (const file of moduleFiles(i)) {
|
||||
const parsed = extractParsedFile(zigScopeResolver.languageProvider, file.content, file.path);
|
||||
if (parsed === undefined) {
|
||||
throw new Error(
|
||||
`scope extraction failed for ${file.path} — the vendored tree-sitter-zig ` +
|
||||
`grammar is unavailable on this host, so this bench cannot run`,
|
||||
);
|
||||
}
|
||||
zigScopeResolver.populateOwners(parsed);
|
||||
parsedFiles.push(parsed);
|
||||
}
|
||||
}
|
||||
const model = createSemanticModel();
|
||||
reconcileOwnership(parsedFiles, model);
|
||||
const allFilePaths = new Set(parsedFiles.map((p) => p.filePath));
|
||||
const scopes = finalizeScopeModel(parsedFiles, {
|
||||
hooks: {
|
||||
resolveImportTarget: (raw, from) =>
|
||||
zigScopeResolver.resolveImportTarget(raw, from, allFilePaths),
|
||||
mergeBindings: (existing, incoming, scopeId) =>
|
||||
zigScopeResolver.mergeBindings(existing, incoming, scopeId),
|
||||
expandsWildcardTo: (scope, files) => zigScopeResolver.expandsWildcardTo(scope, files),
|
||||
},
|
||||
});
|
||||
return { parsedFiles, scopes, model };
|
||||
}
|
||||
|
||||
/** The timed loop: every `value-ref` site, resolved exactly as the pass does. */
|
||||
function resolveAll({ parsedFiles, scopes, model }, pairs) {
|
||||
let sites = 0;
|
||||
let resolved = 0;
|
||||
for (const parsed of parsedFiles) {
|
||||
for (const site of parsed.referenceSites) {
|
||||
if (site.kind !== 'value-ref') continue;
|
||||
sites++;
|
||||
const def = resolveValueRefTarget(
|
||||
site,
|
||||
parsed.filePath,
|
||||
scopes,
|
||||
model,
|
||||
// The provider hook the pass is handed in `run.ts`; Zig sets it.
|
||||
zigScopeResolver.namespaceExportsIncludeImportedNames === true,
|
||||
);
|
||||
if (def === undefined) continue;
|
||||
resolved++;
|
||||
pairs?.push(
|
||||
`${parsed.filePath}:${site.atRange.startLine}:${site.atRange.startCol}->${def.nodeId}`,
|
||||
);
|
||||
}
|
||||
}
|
||||
return { sites, resolved };
|
||||
}
|
||||
|
||||
function measure(modules) {
|
||||
const corpus = buildCorpus(modules);
|
||||
const pairs = [];
|
||||
const counts = resolveAll(corpus, pairs);
|
||||
let bestMs = Infinity;
|
||||
for (let i = 0; i < REPS; i++) {
|
||||
const start = performance.now();
|
||||
resolveAll(corpus, undefined);
|
||||
bestMs = Math.min(bestMs, performance.now() - start);
|
||||
}
|
||||
// Order-independent: the walk order is an implementation detail, the resolved
|
||||
// SET is the behaviour.
|
||||
pairs.sort();
|
||||
return {
|
||||
modules,
|
||||
files: corpus.parsedFiles.length,
|
||||
value_ref_sites: counts.sites,
|
||||
resolved: counts.resolved,
|
||||
declined: counts.sites - counts.resolved,
|
||||
fingerprint: createHash('sha256').update(pairs.join('\n')).digest('hex'),
|
||||
min_ms: Number(bestMs.toFixed(3)),
|
||||
us_per_site: Number(((bestMs * 1000) / Math.max(counts.sites, 1)).toFixed(3)),
|
||||
};
|
||||
}
|
||||
|
||||
const report = { small: measure(SMALL_MODULES), large: measure(LARGE_MODULES) };
|
||||
report.reps = REPS;
|
||||
report.workload_ratio = LARGE_MODULES / SMALL_MODULES;
|
||||
report.scaling_ratio = Number(
|
||||
(report.large.min_ms / Math.max(report.small.min_ms, 0.001)).toFixed(3),
|
||||
);
|
||||
report.linear_factor = Number((report.scaling_ratio / report.workload_ratio).toFixed(3));
|
||||
|
||||
if (!process.argv.includes('--check')) {
|
||||
console.log(JSON.stringify(report, null, 2));
|
||||
process.exit(0);
|
||||
}
|
||||
|
||||
const baseline = JSON.parse(readFileSync(join(HERE, 'baseline.json'), 'utf8'));
|
||||
const failures = [];
|
||||
const requirePositiveNumber = (path, value) => {
|
||||
if (typeof value !== 'number' || !Number.isFinite(value) || value <= 0) {
|
||||
failures.push(`${path}: expected a finite positive number, got ${JSON.stringify(value)}`);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
};
|
||||
for (const arm of ['small', 'large']) {
|
||||
// Correctness first: counts AND the resolved-target set.
|
||||
for (const key of [
|
||||
'modules',
|
||||
'files',
|
||||
'value_ref_sites',
|
||||
'resolved',
|
||||
'declined',
|
||||
'fingerprint',
|
||||
]) {
|
||||
if (report[arm][key] !== baseline[arm][key]) {
|
||||
failures.push(
|
||||
`${arm}.${key}: expected ${JSON.stringify(baseline[arm][key])}, got ${JSON.stringify(report[arm][key])}`,
|
||||
);
|
||||
}
|
||||
}
|
||||
// `min_ms` / `us_per_site` are reported, never gated — see the header.
|
||||
}
|
||||
if (
|
||||
requirePositiveNumber('linear_scaling_budget', baseline.linear_scaling_budget) &&
|
||||
report.linear_factor > baseline.linear_scaling_budget
|
||||
) {
|
||||
failures.push(
|
||||
`linear_factor ${report.linear_factor} exceeds budget ${baseline.linear_scaling_budget} ` +
|
||||
`(runtime ${report.scaling_ratio}x for ${report.workload_ratio}x work; ` +
|
||||
`~1.0 is linear). Re-run alone on an idle machine before investigating — ` +
|
||||
`this is the only arm a busy runner can move.`,
|
||||
);
|
||||
}
|
||||
|
||||
console.log(JSON.stringify(report, null, 2));
|
||||
if (failures.length > 0) {
|
||||
console.error('[value-ref-resolution --check] FAIL');
|
||||
for (const failure of failures) console.error(` - ${failure}`);
|
||||
process.exit(1);
|
||||
}
|
||||
console.log('[value-ref-resolution --check] PASS');
|
||||
|
|
@ -36,9 +36,9 @@
|
|||
*
|
||||
* Only files heavy enough to matter are listed; everything else is carried by
|
||||
* {@link PER_FILE_OVERHEAD_SEC} alone. These are load-balancing hints, NOT
|
||||
* assertions — no
|
||||
* test asserts a runtime, and drift only makes the split slightly less even, so
|
||||
* a stale entry is harmless and refreshing them is optional. Deliberately not
|
||||
* assertions — no test measures elapsed time against this table. Missing or
|
||||
* stale heavy entries can still overload a shard; refresh them from failed
|
||||
* CI logs and replay that profile in the partition tests. Deliberately not
|
||||
* auto-generated: a committed table is reviewable and works offline, and the
|
||||
* alternative (timing files at CI runtime to decide the split) would make the
|
||||
* partition depend on the very machine load it is trying to protect against.
|
||||
|
|
@ -49,13 +49,15 @@ export const WINDOWS_WEIGHTS_SEC: Readonly<Record<string, number>> = {
|
|||
'test/integration/cli-e2e.test.ts': 621,
|
||||
'test/integration/worker-pool.test.ts': 222,
|
||||
'test/unit/incremental-vector-extension-ordering.test.ts': 87,
|
||||
// ESTIMATE, not a measurement (#2841): this suite drives more full
|
||||
// `runFullAnalysis` cycles than the VECTOR sibling above, so the 8 s
|
||||
// PER_FILE_OVERHEAD floor would badly under-charge it and skew the Windows
|
||||
// split — the failure mode that produced the job timeouts this table exists
|
||||
// to prevent. Scaled from the sibling's measured 87 s by analyze-run count.
|
||||
// Replace with a real figure after the first green Windows matrix run.
|
||||
'test/unit/incremental-index-extension-dml-gate.test.ts': 180,
|
||||
// Measured on Windows in run 34014266125 (#3190, 2026-09-06). These DB
|
||||
// suites landed together on shard 3: the old 180s estimate and missing
|
||||
// entries made a ~27-minute recorded load look like an ~12-minute shard.
|
||||
// Upstream speedups may reduce these figures; retaining conservative weights
|
||||
// keeps the expensive suites distributed without changing the watchdog.
|
||||
'test/unit/incremental-index-extension-dml-gate.test.ts': 414,
|
||||
'test/integration/skills-e2e.test.ts': 444,
|
||||
'test/integration/fts-extension-e2e.test.ts': 146,
|
||||
'test/integration/analyze-wal-checkpoint-failure.test.ts': 86,
|
||||
'test/integration/cli-limit-e2e.test.ts': 75,
|
||||
'test/unit/hooks.test.ts': 26,
|
||||
'test/integration/analyze-heap-oom-e2e.test.ts': 23,
|
||||
|
|
|
|||
|
|
@ -36,6 +36,18 @@ const PLATFORM_LOGIC = [
|
|||
// must exercise the Windows backslash branch, so run it on the OS matrix (#2394).
|
||||
'test/unit/cli-entry.test.ts',
|
||||
'test/unit/platform-capabilities.test.ts',
|
||||
// The tsconfig loader rebases `paths` targets through `path.resolve`, so the
|
||||
// wildcard suffix it must recognise is `/*` on POSIX and `\*` on Windows. It
|
||||
// only looked for `/*`, and every alias target came back as `src*` on
|
||||
// Windows while the Ubuntu run stayed green — so this file has to run where
|
||||
// the separator differs.
|
||||
'test/unit/tsconfig-index.test.ts',
|
||||
// The unit half of the same rebasing rule. Fixture-free and pathApi-injectable
|
||||
// (every separator assertion passes an explicit `path.win32` / `path.posix`),
|
||||
// so unlike the fixture suite above it fails on EVERY runner when the
|
||||
// normalisation is removed rather than only on windows-latest. Registered
|
||||
// beside its fixture sibling so the two halves stay discoverable as one group.
|
||||
'test/unit/tsconfig-rebase-target.test.ts',
|
||||
// The gitnexus-plan safe writer resolves every name through a per-platform
|
||||
// backend: Linux anchors through /proc/self/fd, macOS resolves lexically and
|
||||
// verifies each step against descriptors it holds open. Publication is link(2)
|
||||
|
|
|
|||
|
|
@ -609,10 +609,20 @@ export function formatImpactResult(result: any): string {
|
|||
}
|
||||
// #1858 — an interface / indirection boundary on the path makes this a lower
|
||||
// bound; surface it so the count is not read as exhaustive.
|
||||
//
|
||||
// The header names no cause AND asserts no omitted caller, because it cannot
|
||||
// know either. DI / dynamic dispatch was the only producer of `lower-bound`
|
||||
// when this was written; #3399 added callables named in VALUE position (a
|
||||
// registration table, a callback argument), and one of its producers is a
|
||||
// probe that could not RUN — `callableValueReferenceBoundaries` hedges on a
|
||||
// failed query and says in so many words that whether the symbol is
|
||||
// registered is unknown. A header claiming "some callers are not traced"
|
||||
// would there assert an omission nothing established, and would contradict
|
||||
// the bullet printed directly under it. The bullets carry the cause — they
|
||||
// are generated per-cause by `computeEpistemicBoundary` — so the header only
|
||||
// has to say the count is a floor.
|
||||
if (result.epistemic === 'lower-bound') {
|
||||
lines.push(
|
||||
'⚠️ Lower bound — unresolved indirection on the path (callers binding via DI / dynamic dispatch are not traced; actual impact may be higher):',
|
||||
);
|
||||
lines.push('⚠️ Lower bound — impact may be incomplete and actual impact may be higher:');
|
||||
for (const b of result.boundaries || []) lines.push(` • ${b}`);
|
||||
}
|
||||
pushCallgraphRiskLines(lines, result);
|
||||
|
|
|
|||
38
gitnexus/src/core/graph/edge-reasons.ts
Normal file
38
gitnexus/src/core/graph/edge-reasons.ts
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
/**
|
||||
* Edge `reason` values that mark a CALLS edge as a HEURISTIC GUESS rather than
|
||||
* a resolution.
|
||||
*
|
||||
* The distinction exists because an edge's `confidence` number cannot carry it.
|
||||
* `GLOBAL_NAME_FALLBACK_REASON` edges are emitted at exactly 0.5 — the same
|
||||
* number as `process-processor`'s `MIN_TRACE_CONFIDENCE` and
|
||||
* `community-processor`'s `MIN_CONFIDENCE_LARGE` — so a `confidence < 0.5`
|
||||
* gate does NOT exclude them. Anything that must exclude guesses has to read
|
||||
* the reason, which is why `KnowledgeGraph.forEachRelationshipFields` passes it
|
||||
* and why `GraphEmitSink` retains a reason column.
|
||||
*/
|
||||
|
||||
/**
|
||||
* The target was chosen because its SIMPLE NAME is unique in the workspace —
|
||||
* not because any import, scope chain, or type binding led to it.
|
||||
*
|
||||
* Emitted by the unique-simple-name tiers of the free-call fallback
|
||||
* (`pickUniqueGlobalCallable` and constructor-form `pickUniqueGlobalClass`),
|
||||
* and only for the languages that opt into `allowGlobalFreeCallFallback`. It
|
||||
* is a name collision away from being wrong and must never be presented as
|
||||
* an import-resolved edge: a reader who cannot tell the two apart has no way
|
||||
* to discount the guess.
|
||||
*/
|
||||
export const GLOBAL_NAME_FALLBACK_REASON = 'global-name-fallback';
|
||||
|
||||
/**
|
||||
* Reasons excluded from process tracing and large-graph community detection.
|
||||
*
|
||||
* Both walks exist to describe how the program actually flows. Seeding a flow
|
||||
* from a unique-name guess produces a confident-looking trace through code that
|
||||
* may never call each other, which is worse than a shorter honest trace.
|
||||
*/
|
||||
const HEURISTIC_EDGE_REASONS: ReadonlySet<string> = new Set([GLOBAL_NAME_FALLBACK_REASON]);
|
||||
|
||||
/** True when this edge's target was guessed by name rather than resolved. */
|
||||
export const isHeuristicEdgeReason = (reason: string): boolean =>
|
||||
HEURISTIC_EDGE_REASONS.has(reason);
|
||||
|
|
@ -163,9 +163,17 @@ export const createKnowledgeGraph = (): KnowledgeGraph => {
|
|||
relationshipMap.forEach(fn);
|
||||
},
|
||||
forEachRelationshipFields(
|
||||
fn: (sourceId: string, targetId: string, type: RelationshipType, confidence: number) => void,
|
||||
fn: (
|
||||
sourceId: string,
|
||||
targetId: string,
|
||||
type: RelationshipType,
|
||||
confidence: number,
|
||||
reason: string,
|
||||
) => void,
|
||||
) {
|
||||
relationshipMap.forEach((rel) => fn(rel.sourceId, rel.targetId, rel.type, rel.confidence));
|
||||
relationshipMap.forEach((rel) =>
|
||||
fn(rel.sourceId, rel.targetId, rel.type, rel.confidence, rel.reason),
|
||||
);
|
||||
},
|
||||
getNode: (id: string) => nodeMap.get(id),
|
||||
|
||||
|
|
|
|||
|
|
@ -31,14 +31,26 @@ export interface KnowledgeGraph {
|
|||
* Zero-allocation relationship scan: fields, not objects (#2680).
|
||||
*
|
||||
* The whole-graph scans (the local-symbol pruner, community detection,
|
||||
* process extraction) read only these four fields, and materializing a
|
||||
* process extraction) read only these five fields, and materializing a
|
||||
* `GraphRelationship` per edge just to read them dominates iteration cost once
|
||||
* relationships are held columnar — measured at ~90 ms per analyze on a
|
||||
* million-edge graph. Prefer this over `forEachRelationship` in any pass that
|
||||
* walks every edge and needs no other field.
|
||||
*
|
||||
* `reason` is passed because confidence alone cannot separate a heuristic
|
||||
* name guess from a resolved edge that happens to sit at the same number:
|
||||
* the global-name fallback emits at exactly the process/community threshold
|
||||
* (0.5), so the walks that must exclude it have to read the reason. See
|
||||
* `GraphEmitSink`'s reason column, added for this consumer.
|
||||
*/
|
||||
forEachRelationshipFields: (
|
||||
fn: (sourceId: string, targetId: string, type: RelationshipType, confidence: number) => void,
|
||||
fn: (
|
||||
sourceId: string,
|
||||
targetId: string,
|
||||
type: RelationshipType,
|
||||
confidence: number,
|
||||
reason: string,
|
||||
) => void,
|
||||
) => void;
|
||||
getNode: (id: string) => GraphNode | undefined;
|
||||
nodeCount: number;
|
||||
|
|
|
|||
|
|
@ -200,8 +200,11 @@ function collectReferenceSites(parsedFiles: readonly ParsedFile[]) {
|
|||
*/
|
||||
function withDefaultHooks(partial: Partial<FinalizeHooks>): FinalizeHooks {
|
||||
return {
|
||||
importsBindAtLexicalScope: partial.importsBindAtLexicalScope === true,
|
||||
resolveImportTarget: partial.resolveImportTarget ?? (() => null),
|
||||
isNamespaceImport: partial.isNamespaceImport,
|
||||
wildcardCollisionIsAmbiguous: partial.wildcardCollisionIsAmbiguous === true,
|
||||
namedImportsBindTopLevelOnly: partial.namedImportsBindTopLevelOnly === true,
|
||||
expandsWildcardTo: partial.expandsWildcardTo ?? (() => []),
|
||||
mergeBindings:
|
||||
partial.mergeBindings ??
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
import fs from 'fs/promises';
|
||||
import path from 'path';
|
||||
import { createRequire } from 'node:module';
|
||||
import type Parser from 'tree-sitter';
|
||||
|
||||
import { isHardcodedIgnoredDirectoryAtPath } from '../../../config/ignore-service.js';
|
||||
import { logger } from '../../logger.js';
|
||||
|
|
@ -214,6 +215,8 @@ interface WorkspaceScope {
|
|||
readonly include: readonly string[];
|
||||
/** `!`-prefixed patterns, with the `!` stripped. */
|
||||
readonly exclude: readonly string[];
|
||||
readonly includeRe: readonly RegExp[];
|
||||
readonly excludeRe: readonly RegExp[];
|
||||
}
|
||||
|
||||
/** Whether `dir` (repo-relative, `''` for the root) is an admitted package. */
|
||||
|
|
@ -221,8 +224,21 @@ function admits(scope: WorkspaceScope | null, dir: string): boolean {
|
|||
// The root package is always itself, workspace or not.
|
||||
if (dir === '') return true;
|
||||
if (scope === null) return false;
|
||||
if (scope.exclude.some((pattern) => globToRegExp(pattern).test(dir))) return false;
|
||||
return scope.include.some((pattern) => globToRegExp(pattern).test(dir));
|
||||
// An exclusion covers the directory AND everything under it: `!packages/legacy`
|
||||
// must keep `packages/legacy/foo` out even when a nested workspace root inside
|
||||
// the excluded subtree re-declares `packages/*`.
|
||||
if (scope.excludeRe.some((re) => matchesDirOrAncestor(re, dir))) return false;
|
||||
return scope.includeRe.some((re) => re.test(dir));
|
||||
}
|
||||
|
||||
function matchesDirOrAncestor(re: RegExp, dir: string): boolean {
|
||||
let current = dir;
|
||||
while (current !== '') {
|
||||
if (re.test(current)) return true;
|
||||
const slash = current.lastIndexOf('/');
|
||||
current = slash === -1 ? '' : current.slice(0, slash);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -272,9 +288,69 @@ function globToRegExp(pattern: string): RegExp {
|
|||
* tooling that does not read pnpm's file).
|
||||
*/
|
||||
async function loadWorkspaceScope(repoRoot: string): Promise<WorkspaceScope | null> {
|
||||
const patterns: string[] = [];
|
||||
// Every workspace ROOT in the repo, not just the top level. keycloak keeps its
|
||||
// JavaScript workspace at `js/pnpm-workspace.yaml`; reading only the repo root
|
||||
// found no workspace, admitted no package, and `@keycloak/keycloak-ui-shared`
|
||||
// (780–845 raw calls per SHA) resolved 7 times. Patterns from a nested root
|
||||
// are rebased onto that root so `packages/*` under `js/` admits `js/packages/x`.
|
||||
//
|
||||
// Gated, though: a nested root counts only when the repo root declares NO
|
||||
// workspace (keycloak), or when the nested root's directory is itself admitted
|
||||
// by the root's scope. Unioning every nested root unconditionally let an
|
||||
// `examples/*/package.json` starter (turborepo/vite/nuxt templates carry
|
||||
// `workspaces`) admit its example packages — and, being shallow, outrank the
|
||||
// real package of the same name — and let a root inside an excluded subtree
|
||||
// re-admit what the outer `!exclusion` had removed.
|
||||
const [rootPatterns, workspaceRoots] = await Promise.all([
|
||||
readWorkspacePatternsAt(repoRoot),
|
||||
findWorkspaceRoots(repoRoot),
|
||||
]);
|
||||
const rootScope = rootPatterns.length === 0 ? null : toScope(rootPatterns);
|
||||
const patterns: string[] = [...rootPatterns];
|
||||
const admitted: { root: string; prefix: string }[] = [];
|
||||
for (const root of workspaceRoots) {
|
||||
if (root === repoRoot) continue;
|
||||
const prefix = repoRelativeDir(repoRoot, root);
|
||||
if (rootScope !== null && !admits(rootScope, prefix)) continue;
|
||||
admitted.push({ root, prefix });
|
||||
}
|
||||
const nested = await Promise.all(
|
||||
admitted.map(async ({ root, prefix }) => {
|
||||
const rebase = (p: string): string => {
|
||||
const negated = p.startsWith('!');
|
||||
const body = negated ? p.slice(1) : p;
|
||||
const joined = prefix === '' ? body : `${prefix}/${body.replace(/^\.\//, '')}`;
|
||||
return negated ? `!${joined}` : joined;
|
||||
};
|
||||
return (await readWorkspacePatternsAt(root)).map(rebase);
|
||||
}),
|
||||
);
|
||||
for (const batch of nested) patterns.push(...batch);
|
||||
|
||||
const rootManifest = await readJsonFile(path.join(repoRoot, 'package.json'));
|
||||
if (patterns.length === 0) return null;
|
||||
return toScope(patterns);
|
||||
}
|
||||
|
||||
function toScope(patterns: readonly string[]): WorkspaceScope {
|
||||
const include = patterns.filter((p) => !p.startsWith('!'));
|
||||
const exclude = patterns.filter((p) => p.startsWith('!')).map((p) => p.slice(1));
|
||||
return {
|
||||
include,
|
||||
exclude,
|
||||
includeRe: include.map(globToRegExp),
|
||||
excludeRe: exclude.map(globToRegExp),
|
||||
};
|
||||
}
|
||||
|
||||
/** The workspace patterns declared at ONE directory, all three spellings merged. */
|
||||
async function readWorkspacePatternsAt(root: string): Promise<string[]> {
|
||||
const [rootManifest, yamlPkgs, ymlPkgs, lerna] = await Promise.all([
|
||||
readJsonFile(path.join(root, 'package.json')),
|
||||
readYamlPackages(path.join(root, 'pnpm-workspace.yaml')),
|
||||
readYamlPackages(path.join(root, 'pnpm-workspace.yml')),
|
||||
readJsonFile(path.join(root, 'lerna.json')),
|
||||
]);
|
||||
const patterns: string[] = [];
|
||||
const workspaces = rootManifest?.workspaces;
|
||||
if (Array.isArray(workspaces)) {
|
||||
patterns.push(...workspaces.filter((w): w is string => typeof w === 'string'));
|
||||
|
|
@ -285,20 +361,114 @@ async function loadWorkspaceScope(repoRoot: string): Promise<WorkspaceScope | nu
|
|||
patterns.push(...nested.filter((w): w is string => typeof w === 'string'));
|
||||
}
|
||||
}
|
||||
|
||||
patterns.push(...(await readYamlPackages(path.join(repoRoot, 'pnpm-workspace.yaml'))));
|
||||
patterns.push(...(await readYamlPackages(path.join(repoRoot, 'pnpm-workspace.yml'))));
|
||||
|
||||
const lerna = await readJsonFile(path.join(repoRoot, 'lerna.json'));
|
||||
patterns.push(...yamlPkgs, ...ymlPkgs);
|
||||
if (Array.isArray(lerna?.packages)) {
|
||||
patterns.push(...lerna.packages.filter((w): w is string => typeof w === 'string'));
|
||||
}
|
||||
return patterns;
|
||||
}
|
||||
|
||||
if (patterns.length === 0) return null;
|
||||
return {
|
||||
include: patterns.filter((p) => !p.startsWith('!')),
|
||||
exclude: patterns.filter((p) => p.startsWith('!')).map((p) => p.slice(1)),
|
||||
};
|
||||
/**
|
||||
* Directories that declare a workspace: the repo root plus any directory (to a
|
||||
* shallow depth — workspace roots sit near the top) holding a
|
||||
* `pnpm-workspace.yaml`, a `lerna.json`, or a `package.json` with `workspaces`.
|
||||
*/
|
||||
const WORKSPACE_ROOT_MAX_DEPTH = 4;
|
||||
/**
|
||||
* Bound on the depth-≤4 directory walk. Generous on purpose: the previous 2,000
|
||||
* cap tripped silently in readdir order, so WHICH packages existed — and which
|
||||
* imports resolved — varied between two checkouts of the same commit. Tripping
|
||||
* it now warns, so a truncated scan is a logged fact rather than a quiet one.
|
||||
*/
|
||||
const WORKSPACE_ROOT_SCAN_MAX_DIRS = 50_000;
|
||||
/**
|
||||
* Directory names whose nested `workspaces` are starters, fixtures, or test
|
||||
* trees — never members. A leftover `test/pnpm-workspace.yaml` must not become
|
||||
* a workspace root when the repo root declares none (the #2953 first-wins
|
||||
* class). A root `workspaces` glob that lists `test/*` still admits those
|
||||
* packages through the package.json walk; this set only stops nested-root
|
||||
* discovery from descending into those names.
|
||||
*/
|
||||
const NON_MEMBER_ROOT_DIRS = new Set([
|
||||
'example',
|
||||
'examples',
|
||||
'fixture',
|
||||
'fixtures',
|
||||
'template',
|
||||
'templates',
|
||||
'sample',
|
||||
'samples',
|
||||
'test',
|
||||
'tests',
|
||||
'e2e',
|
||||
'__tests__',
|
||||
'spec',
|
||||
'specs',
|
||||
]);
|
||||
|
||||
/**
|
||||
* Vite's `DEFAULT_CONFIG_FILES` order. The first filename that exists is the
|
||||
* config Vite loads; leftover siblings are not a second live entry.
|
||||
*/
|
||||
const VITE_CONFIG_FILES = [
|
||||
'vite.config.js',
|
||||
'vite.config.mjs',
|
||||
'vite.config.ts',
|
||||
'vite.config.cjs',
|
||||
'vite.config.mts',
|
||||
'vite.config.cts',
|
||||
] as const;
|
||||
|
||||
function isMissingPath(err: unknown): boolean {
|
||||
return (err as NodeJS.ErrnoException).code === 'ENOENT';
|
||||
}
|
||||
|
||||
async function readDirSorted(dir: string): Promise<import('fs').Dirent[] | null> {
|
||||
try {
|
||||
return (await fs.readdir(dir, { withFileTypes: true })).sort((a, b) =>
|
||||
a.name < b.name ? -1 : a.name > b.name ? 1 : 0,
|
||||
);
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
async function findWorkspaceRoots(repoRoot: string): Promise<string[]> {
|
||||
const roots: string[] = [repoRoot];
|
||||
const queue: { dir: string; depth: number }[] = [{ dir: repoRoot, depth: 0 }];
|
||||
let scanned = 0;
|
||||
while (scanned < queue.length) {
|
||||
if (scanned >= WORKSPACE_ROOT_SCAN_MAX_DIRS) {
|
||||
logger.warn(
|
||||
`[node] workspace-root scan of ${repoRoot} hit the ${WORKSPACE_ROOT_SCAN_MAX_DIRS}-directory cap; nested workspace roots below it were not considered`,
|
||||
);
|
||||
break;
|
||||
}
|
||||
const { dir, depth } = queue[scanned++]!;
|
||||
const entries = await readDirSorted(dir);
|
||||
if (entries === null) continue;
|
||||
if (dir !== repoRoot) {
|
||||
const names = new Set(entries.filter((e) => e.isFile()).map((e) => e.name));
|
||||
let declares =
|
||||
names.has('pnpm-workspace.yaml') ||
|
||||
names.has('pnpm-workspace.yml') ||
|
||||
names.has('lerna.json');
|
||||
if (!declares && names.has('package.json')) {
|
||||
const manifest = await readJsonFile(path.join(dir, 'package.json'));
|
||||
declares = manifest?.workspaces !== undefined && manifest.workspaces !== null;
|
||||
}
|
||||
if (declares) roots.push(dir);
|
||||
}
|
||||
if (depth >= WORKSPACE_ROOT_MAX_DEPTH) continue;
|
||||
for (const entry of entries) {
|
||||
if (!entry.isDirectory()) continue;
|
||||
if (NON_MEMBER_ROOT_DIRS.has(entry.name.toLowerCase())) continue;
|
||||
const child = path.join(dir, entry.name);
|
||||
if (isHardcodedIgnoredDirectoryAtPath(repoRoot, child)) continue;
|
||||
queue.push({ dir: child, depth: depth + 1 });
|
||||
}
|
||||
}
|
||||
return roots;
|
||||
}
|
||||
|
||||
async function readJsonFile(filePath: string): Promise<Record<string, unknown> | null> {
|
||||
|
|
@ -327,6 +497,39 @@ async function readYamlPackages(filePath: string): Promise<string[]> {
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Per-repo memo. The TS/JS/Vue scope resolvers and the unresolved-call ledger
|
||||
* classifier each ask for the same map during one analyze; without this the
|
||||
* 20k-directory walk ran once per asker (four times on a full run, one of them
|
||||
* inside the index lock). Invalidated at the start of every `runFullAnalysis`
|
||||
* so a long-lived server never serves a stale package map across runs.
|
||||
*/
|
||||
const workspacePackagesMemo = new Map<string, Promise<NodeWorkspacePackages | null>>();
|
||||
|
||||
export function invalidateNodeWorkspacePackages(repoRoot: string): void {
|
||||
workspacePackagesMemo.delete(path.resolve(repoRoot));
|
||||
}
|
||||
|
||||
export async function loadNodeWorkspacePackages(
|
||||
repoRoot: string,
|
||||
): Promise<NodeWorkspacePackages | null> {
|
||||
const key = path.resolve(repoRoot);
|
||||
const cached = workspacePackagesMemo.get(key);
|
||||
if (cached !== undefined) return cached;
|
||||
const pending: Promise<NodeWorkspacePackages | null> = loadNodeWorkspacePackagesUncached(
|
||||
repoRoot,
|
||||
).catch((err: unknown) => {
|
||||
// Evict only OUR entry. If this load was invalidated while in flight and a
|
||||
// newer load has since been installed under the same key, deleting by key
|
||||
// alone would evict that one, and every later caller would start another
|
||||
// full scan instead of joining it.
|
||||
if (workspacePackagesMemo.get(key) === pending) workspacePackagesMemo.delete(key);
|
||||
throw err;
|
||||
});
|
||||
workspacePackagesMemo.set(key, pending);
|
||||
return pending;
|
||||
}
|
||||
|
||||
/**
|
||||
* Collect the `package.json` of every ADMITTED workspace package.
|
||||
*
|
||||
|
|
@ -334,7 +537,7 @@ async function readYamlPackages(filePath: string): Promise<string[]> {
|
|||
* declaration, so this is far cheaper than the C# namespace scan next door,
|
||||
* which reads every `.cs` file.
|
||||
*/
|
||||
export async function loadNodeWorkspacePackages(
|
||||
async function loadNodeWorkspacePackagesUncached(
|
||||
repoRoot: string,
|
||||
): Promise<NodeWorkspacePackages | null> {
|
||||
const scope = await loadWorkspaceScope(repoRoot);
|
||||
|
|
@ -353,12 +556,10 @@ export async function loadNodeWorkspacePackages(
|
|||
const { dir, depth } = queue[queueHead++]!;
|
||||
dirsScanned++;
|
||||
|
||||
let entries: import('fs').Dirent[];
|
||||
try {
|
||||
entries = await fs.readdir(dir, { withFileTypes: true });
|
||||
} catch {
|
||||
continue;
|
||||
}
|
||||
// Sorted: same-depth name collisions resolve first-wins, and readdir order
|
||||
// is filesystem-dependent.
|
||||
const entries = await readDirSorted(dir);
|
||||
if (entries === null) continue;
|
||||
|
||||
for (const entry of entries) {
|
||||
if (entry.isDirectory()) {
|
||||
|
|
@ -421,10 +622,34 @@ async function readManifest(
|
|||
const value = parsed[field];
|
||||
if (typeof value === 'string') push(entries, rebase(value));
|
||||
}
|
||||
}
|
||||
// Entry points that name BUILD OUTPUT (`main: dist/x.js`, `exports: ./dist/…`)
|
||||
// never match an indexed source file — the package's real source entry has to
|
||||
// be discovered. keycloak's `@keycloak/keycloak-ui-shared` publishes
|
||||
// `dist/keycloak-ui-shared.js` and keeps its entry in `vite.config.ts`
|
||||
// (`build.lib.entry: 'src/main.ts'`); with only the declared fields it had 7
|
||||
// resolved calls against ~845 raw. Tried in a fixed order, and ONLY appended
|
||||
// (declared entries keep precedence): `source` / `publishConfig.source`, the
|
||||
// vite `lib.entry`, then `src/main` / `src/index`. More than one candidate
|
||||
// that exists on disk is recorded as ambiguous rather than picked — a wrong
|
||||
// entry binds every import of the package to the wrong file.
|
||||
// A package whose `exports` map has no `"."` (only subpaths) refuses the bare
|
||||
// specifier outright; discovery must not manufacture a `src/index` root for it.
|
||||
const rootlessExports = declaresExports && rootExports.length === 0;
|
||||
const discovered = rootlessExports
|
||||
? { entries: [], ambiguous: [], allowConventional: false }
|
||||
: await discoverSourceEntries(parsed, dir, repoRoot);
|
||||
for (const entry of discovered.entries) push(entries, entry);
|
||||
if (!declaresExports && discovered.allowConventional) {
|
||||
for (const conventional of ['src/index', 'index', 'lib/index']) {
|
||||
push(entries, joinRepoPath(packageDir, conventional));
|
||||
}
|
||||
}
|
||||
if (discovered.ambiguous.length > 0) {
|
||||
logger.warn(
|
||||
`[node] package ${name}: ${discovered.ambiguous.length} candidate source entries (${discovered.ambiguous.join(', ')}) — none adopted; declare \`source\` or a single lib entry`,
|
||||
);
|
||||
}
|
||||
|
||||
const subpathImports = new Map<string, readonly string[]>();
|
||||
collectImports(parsed.imports, subpathImports, rebase);
|
||||
|
|
@ -508,6 +733,195 @@ function collectImports(
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Does a declared entry point at build output rather than source? Output
|
||||
* directories and minified bundles. A plain `.js` is NOT build output on its
|
||||
* own — `main: "src/index.js"` / `index.js` is a JavaScript package's source,
|
||||
* and treating every `.js` as output ran discovery for essentially every CJS
|
||||
* package and could adopt a `src/main` beside the real entry.
|
||||
*/
|
||||
function looksLikeBuildOutput(entry: string): boolean {
|
||||
return /(^|\/)(dist|build|lib|out|esm|cjs|umd)\//.test(entry) || /\.min\.[cm]?js$/.test(entry);
|
||||
}
|
||||
|
||||
function declaredRootExportStrings(exportsRoot: unknown): string[] {
|
||||
if (typeof exportsRoot === 'string') return [exportsRoot];
|
||||
if (exportsRoot === null || typeof exportsRoot !== 'object') return [];
|
||||
const dot = (exportsRoot as Record<string, unknown>)['.'];
|
||||
if (typeof dot === 'string') return [dot];
|
||||
if (dot === null || typeof dot !== 'object') return [];
|
||||
return Object.values(dot).filter((v): v is string => typeof v === 'string');
|
||||
}
|
||||
|
||||
async function existingStems(repoRoot: string, stems: readonly string[]): Promise<string[]> {
|
||||
const present = await Promise.all(stems.map((stem) => stemExists(repoRoot, stem)));
|
||||
const existing: string[] = [];
|
||||
for (let i = 0; i < stems.length; i++) {
|
||||
if (present[i]) push(existing, stems[i]!);
|
||||
}
|
||||
return existing;
|
||||
}
|
||||
|
||||
async function discoverSourceEntries(
|
||||
parsed: Record<string, unknown>,
|
||||
dir: string,
|
||||
repoRoot: string,
|
||||
): Promise<{ entries: string[]; ambiguous: string[]; allowConventional: boolean }> {
|
||||
const packageDir = repoRelativeDir(repoRoot, dir);
|
||||
const rebase = (raw: string): string => joinRepoPath(packageDir, stripEntryPrefixes(raw));
|
||||
const declared: string[] = declaredRootExportStrings(parsed.exports);
|
||||
for (const field of ['module', 'main']) {
|
||||
const value = parsed[field];
|
||||
if (typeof value === 'string') declared.push(value);
|
||||
}
|
||||
// Only when every declared entry is build output (or nothing is declared and
|
||||
// the conventional stems are absent) does discovery run at all.
|
||||
if (declared.length > 0 && !declared.every(looksLikeBuildOutput))
|
||||
return { entries: [], ambiguous: [], allowConventional: true };
|
||||
|
||||
const candidates: string[] = [];
|
||||
const source = parsed.source;
|
||||
if (typeof source === 'string') candidates.push(rebase(source));
|
||||
const publishConfig = parsed.publishConfig;
|
||||
if (publishConfig !== null && typeof publishConfig === 'object') {
|
||||
const ps = (publishConfig as Record<string, unknown>).source;
|
||||
if (typeof ps === 'string') candidates.push(rebase(ps));
|
||||
}
|
||||
let hasViteConfig = false;
|
||||
for (const cfg of VITE_CONFIG_FILES) {
|
||||
let text: string;
|
||||
try {
|
||||
text = await fs.readFile(path.join(dir, cfg), 'utf-8');
|
||||
} catch (err) {
|
||||
if (isMissingPath(err)) continue;
|
||||
// Present but unreadable: Vite still selected this filename.
|
||||
hasViteConfig = true;
|
||||
break;
|
||||
}
|
||||
hasViteConfig = true;
|
||||
try {
|
||||
const entry = await staticViteEntry(text);
|
||||
if (entry !== null) push(candidates, rebase(entry));
|
||||
} catch {
|
||||
// Parse/load failure is not a missing file — do not fall through to a leftover sibling.
|
||||
}
|
||||
break;
|
||||
}
|
||||
let existing = await existingStems(repoRoot, candidates);
|
||||
// A config we cannot establish is not evidence for a conventional entry.
|
||||
if (existing.length === 0 && !hasViteConfig) {
|
||||
existing = await existingStems(
|
||||
repoRoot,
|
||||
['src/main', 'src/index'].map((conventional) => joinRepoPath(packageDir, conventional)),
|
||||
);
|
||||
}
|
||||
const allowConventional = !hasViteConfig && candidates.length === 0;
|
||||
if (existing.length > 1) return { entries: [], ambiguous: existing, allowConventional };
|
||||
return { entries: existing, ambiguous: [], allowConventional };
|
||||
}
|
||||
|
||||
/** Read a literal exported build.lib.entry without evaluating repository code. */
|
||||
async function staticViteEntry(text: string): Promise<string | null> {
|
||||
// Most manifests need no Vite discovery. Keep native grammars off that path.
|
||||
const [{ default: TreeSitter }, { default: grammar }, { parseSourceSafe }] = await Promise.all([
|
||||
import('tree-sitter'),
|
||||
import('tree-sitter-typescript'),
|
||||
import('../../tree-sitter/safe-parse.js'),
|
||||
]);
|
||||
const parser = new TreeSitter();
|
||||
parser.setLanguage(grammar.typescript);
|
||||
const tree = parseSourceSafe(parser, text);
|
||||
if (tree.rootNode.hasError) return null;
|
||||
const exports = tree.rootNode.namedChildren.filter(
|
||||
(node) => node.type === 'export_statement' && node.children.some((c) => c.type === 'default'),
|
||||
);
|
||||
if (exports.length !== 1) return null;
|
||||
let config = unwrapViteDefineConfig(tree, exports[0]!.childForFieldName('value'));
|
||||
if (config === null) return null;
|
||||
for (const key of ['build', 'lib', 'entry']) config = staticObjectProperty(config, key);
|
||||
return staticStringValue(config);
|
||||
}
|
||||
|
||||
/** Unwrap `defineConfig({...})` from Vite; refuse local or re-exported helpers. */
|
||||
function unwrapViteDefineConfig(
|
||||
tree: { rootNode: Parser.SyntaxNode },
|
||||
config: Parser.SyntaxNode | null,
|
||||
): Parser.SyntaxNode | null {
|
||||
if (config?.type !== 'call_expression') return config;
|
||||
if (config.childForFieldName('function')?.text !== 'defineConfig') return null;
|
||||
// A locally defined helper need not preserve its argument like Vite does.
|
||||
if (
|
||||
tree.rootNode
|
||||
.descendantsOfType(['function_declaration', 'variable_declarator'])
|
||||
.some((node) => node.childForFieldName('name')?.text === 'defineConfig')
|
||||
)
|
||||
return null;
|
||||
for (const statement of tree.rootNode.namedChildren) {
|
||||
if (statement.type !== 'import_statement') continue;
|
||||
if (!statement.descendantsOfType('identifier').some((n) => n.text === 'defineConfig')) continue;
|
||||
if (staticStringValue(statement.childForFieldName('source')) !== 'vite') return null;
|
||||
const identityImport = statement.descendantsOfType('import_specifier').some((specifier) => {
|
||||
const imported = specifier.childForFieldName('name')?.text;
|
||||
const local = specifier.childForFieldName('alias')?.text ?? imported;
|
||||
return imported === 'defineConfig' && local === 'defineConfig';
|
||||
});
|
||||
if (!identityImport) return null;
|
||||
}
|
||||
const args = config
|
||||
.childForFieldName('arguments')
|
||||
?.namedChildren.filter((n) => n.type !== 'comment');
|
||||
if (args?.length !== 1) return null;
|
||||
return args[0]!;
|
||||
}
|
||||
|
||||
function staticStringValue(node: Parser.SyntaxNode | null): string | null {
|
||||
if (node?.type !== 'string' || node.namedChildren.some((n) => n.type === 'escape_sequence'))
|
||||
return null;
|
||||
return node.text.slice(1, -1);
|
||||
}
|
||||
|
||||
/** Reject computed keys, spreads and duplicate properties that could override a value. */
|
||||
function staticObjectProperty(
|
||||
node: Parser.SyntaxNode | null,
|
||||
key: string,
|
||||
): Parser.SyntaxNode | null {
|
||||
if (node?.type !== 'object') return null;
|
||||
let value: Parser.SyntaxNode | null = null;
|
||||
for (const member of node.namedChildren) {
|
||||
if (member.type === 'comment') continue;
|
||||
if (member.type !== 'pair') return null;
|
||||
const name = member.childForFieldName('key');
|
||||
if (name?.type !== 'property_identifier' && name?.type !== 'string') return null;
|
||||
if (name.type === 'string') {
|
||||
const property = staticStringValue(name);
|
||||
if (property === null) return null;
|
||||
if (property !== key) continue;
|
||||
} else if (name.text !== key) {
|
||||
continue;
|
||||
}
|
||||
if (value !== null) return null;
|
||||
value = member.childForFieldName('value');
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
/** A repo-relative stem exists as a source file (with any TS/JS extension). */
|
||||
// The root is threaded explicitly: a module-level "current root" clobbered
|
||||
// under two concurrent scans and turned an ambiguity refusal into a confident
|
||||
// wrong entry (the second repo's root made one candidate "not exist").
|
||||
async function stemExists(repoRoot: string, stem: string): Promise<boolean> {
|
||||
const abs = path.join(repoRoot, stem);
|
||||
for (const ext of ['', '.ts', '.tsx', '.mts', '.cts', '.js', '.jsx', '.mjs', '.cjs']) {
|
||||
try {
|
||||
const st = await fs.stat(abs + ext);
|
||||
if (st.isFile()) return true;
|
||||
} catch {
|
||||
/* try next */
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/** `"./src/index.ts"` -> `"src/index"`; leaves an extension-less path alone. */
|
||||
function stripEntryPrefixes(entry: string): string {
|
||||
const withoutDot = entry.replace(/^\.\//, '').replace(/^\//, '');
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import path from 'path';
|
|||
import type { CsharpStructureLineScanner } from './languages/csharp/namespace-siblings.js';
|
||||
|
||||
import { isDev } from './utils/env.js';
|
||||
import { isHardcodedIgnoredDirectoryAtPath } from '../../config/ignore-service.js';
|
||||
|
||||
import { mapConcurrent } from '../../lib/utils.js';
|
||||
import { logger } from '../logger.js';
|
||||
|
|
@ -182,13 +183,24 @@ export interface SwiftPackageConfig {
|
|||
/** Zig package config parsed from build.zig.zon and the root build.zig */
|
||||
export interface ZigBuildZonConfig {
|
||||
/**
|
||||
* Map of dependency name -> the raw `.path = "..."` value, exactly as
|
||||
* written in build.zig.zon (relative to the repo root, and possibly
|
||||
* escaping it: `../local_dep`). Consumers normalize — see
|
||||
* `normalizeZigDepPath` below, which rejects absolute
|
||||
* and repo-escaping values. `.url`-based deps cannot be resolved to a
|
||||
* repo-local file (they unpack into a build cache outside the repo) and so
|
||||
* are not included here.
|
||||
* Map of dependency name -> the dep's directory, in one of two spellings
|
||||
* depending on which package this config describes:
|
||||
*
|
||||
* - ROOT package (`pkg === ''`): the raw `.path = "..."` value, exactly as
|
||||
* written in build.zig.zon (relative to the repo root, and possibly
|
||||
* escaping it: `../local_dep`). This is what `parseZigBuildZon` promises
|
||||
* and what its tests pin.
|
||||
* - NESTED package: repo-relative and already normalized, because a nested
|
||||
* package's `.path` is written relative to ITS directory and means
|
||||
* nothing against the repo-relative keys consumers match on
|
||||
* (`packages/app`'s `../core` is stored as `packages/core`). A dep
|
||||
* escaping the REPO root is dropped rather than stored.
|
||||
*
|
||||
* Either spelling is safe to hand to `normalizeZigDepPath` below — it rejects
|
||||
* absolute and repo-escaping values and is idempotent on an already
|
||||
* normalized one, which is what `resolveZigImportInternal` relies on.
|
||||
* `.url`-based deps cannot be resolved to a repo-local file (they unpack into
|
||||
* a build cache outside the repo) and so are not included here.
|
||||
*/
|
||||
pathDeps: Map<string, string>;
|
||||
/**
|
||||
|
|
@ -228,6 +240,29 @@ export interface ZigBuildZonConfig {
|
|||
buildModules?: readonly ZigBuildModule[];
|
||||
}
|
||||
|
||||
/**
|
||||
* One Zig build package: the directory whose `build.zig` / `build.zig.zon`
|
||||
* declare the config, and that config with every path REPO-relative.
|
||||
*
|
||||
* A Zig module's import table is declared by the `build.zig` of the package it
|
||||
* belongs to, so a repo holding several packages holds several import tables —
|
||||
* the same shape a TypeScript monorepo has with a `tsconfig.json` per package.
|
||||
*/
|
||||
export interface ZigPackageScope {
|
||||
/** Repo-relative directory the package governs (`''` for the repo root). */
|
||||
readonly dir: string;
|
||||
readonly config: ZigBuildZonConfig;
|
||||
}
|
||||
|
||||
/**
|
||||
* Every Zig build package in the repo, indexed so the nearest one to a file
|
||||
* wins — the `TsconfigIndex` analogue, and for the same reason.
|
||||
*/
|
||||
export interface ZigWorkspaceIndex {
|
||||
/** Deepest-first, so the first `dir` that prefixes a file path governs it. */
|
||||
readonly packages: readonly ZigPackageScope[];
|
||||
}
|
||||
|
||||
/** One build module of the root `build.zig` — see `ZigBuildZonConfig.buildModules`. */
|
||||
export interface ZigBuildModule {
|
||||
/** The `addModule("<name>", …)` name; absent for `createModule` bindings
|
||||
|
|
@ -646,10 +681,21 @@ export async function loadSwiftPackageConfig(repoRoot: string): Promise<SwiftPac
|
|||
* string literals — a commented-out `.path` or a `}` inside a comment
|
||||
* or string cannot declare a dep or truncate the block.
|
||||
*/
|
||||
export async function loadZigBuildConfig(repoRoot: string): Promise<ZigBuildZonConfig | null> {
|
||||
export async function loadZigBuildConfig(
|
||||
repoRoot: string,
|
||||
packageDir = '',
|
||||
): Promise<ZigBuildZonConfig | null> {
|
||||
// Every path this function returns is REPO-relative, because that is the
|
||||
// keyspace `allFilePaths` uses. The parsers below answer package-relative, so
|
||||
// a nested package rebases them through `inPackage`. For the root package
|
||||
// (`packageDir === ''`) the prefix is empty and every value is byte-identical
|
||||
// to what this function returned before nested packages existed.
|
||||
const pkg = packageDir === '' ? '' : `${packageDir}/`;
|
||||
const inPackage = (relToPackage: string): string => `${pkg}${relToPackage}`;
|
||||
const packageFile = (name: string): string => path.join(repoRoot, packageDir, name);
|
||||
let config: ZigBuildZonConfig | null = null;
|
||||
try {
|
||||
const raw = await fs.readFile(path.join(repoRoot, 'build.zig.zon'), 'utf-8');
|
||||
const raw = await fs.readFile(packageFile('build.zig.zon'), 'utf-8');
|
||||
config = parseZigBuildZon(raw);
|
||||
} catch {
|
||||
// No zon (or unreadable): the root build.zig may still declare modules.
|
||||
|
|
@ -661,9 +707,11 @@ export async function loadZigBuildConfig(repoRoot: string): Promise<ZigBuildZonC
|
|||
let rootModules: Map<string, string> | undefined;
|
||||
let rootBuildZig: string | null = null;
|
||||
try {
|
||||
rootBuildZig = await fs.readFile(path.join(repoRoot, 'build.zig'), 'utf-8');
|
||||
rootBuildZig = await fs.readFile(packageFile('build.zig'), 'utf-8');
|
||||
const parsed = parseZigRootModules(rootBuildZig);
|
||||
if (parsed.size > 0) rootModules = parsed;
|
||||
if (parsed.size > 0) {
|
||||
rootModules = new Map(Array.from(parsed, ([name, root]) => [name, inPackage(root)]));
|
||||
}
|
||||
} catch {
|
||||
// No root build.zig — nothing to declare.
|
||||
}
|
||||
|
|
@ -671,7 +719,7 @@ export async function loadZigBuildConfig(repoRoot: string): Promise<ZigBuildZonC
|
|||
if (config === null) {
|
||||
if (rootBuildZig === null) return null;
|
||||
// No zon: no path deps, so `dep.module(…)` operands resolve to nothing.
|
||||
const buildModules = parseZigBuildModules(rootBuildZig);
|
||||
const buildModules = rebaseZigBuildModules(parseZigBuildModules(rootBuildZig), inPackage);
|
||||
if (!rootModules && buildModules.length === 0) return null;
|
||||
return {
|
||||
pathDeps: new Map(),
|
||||
|
|
@ -688,9 +736,22 @@ export async function loadZigBuildConfig(repoRoot: string): Promise<ZigBuildZonC
|
|||
// Per path dep: the modules its build.zig NAMES (`addModule("core", …)`),
|
||||
// repo-relative — what a root-build.zig `dep.module("core")` operand means.
|
||||
const depModules = new Map<string, ReadonlyMap<string, string>>();
|
||||
// A nested package's `.path` values are written relative to ITS directory, so
|
||||
// they are rebased here and stored repo-relative; `resolveZigImportInternal`
|
||||
// then reads them through the same `normalizeZigDepPath`, which is idempotent
|
||||
// on an already-normalized value. A dep that escapes the REPO root (not merely
|
||||
// the package) resolves to nothing and is dropped. The root package keeps its
|
||||
// raw spelling, which is what `parseZigBuildZon` promises and its tests pin.
|
||||
const pathDeps = pkg === '' ? config.pathDeps : new Map<string, string>();
|
||||
for (const [depName, depPath] of config.pathDeps) {
|
||||
const rel = normalizeZigDepPath(depPath);
|
||||
// Asked of the value AS WRITTEN, before the package prefix goes on: an
|
||||
// absolute `.path` points outside the repository whichever package declared
|
||||
// it, and prefixing hides that from `normalizeZigDepPath`. See
|
||||
// `isAbsoluteZigDepPath`.
|
||||
if (isAbsoluteZigDepPath(depPath)) continue;
|
||||
const rel = normalizeZigDepPath(`${pkg}${depPath}`);
|
||||
if (rel === null) continue;
|
||||
if (pkg !== '') pathDeps.set(depName, rel);
|
||||
let buildZig: string;
|
||||
try {
|
||||
buildZig = await fs.readFile(path.join(repoRoot, rel, 'build.zig'), 'utf-8');
|
||||
|
|
@ -706,15 +767,177 @@ export async function loadZigBuildConfig(repoRoot: string): Promise<ZigBuildZonC
|
|||
}
|
||||
if (named.size > 0) depModules.set(depName, named);
|
||||
}
|
||||
const buildModules = rootBuildZig === null ? [] : parseZigBuildModules(rootBuildZig, depModules);
|
||||
const buildModules =
|
||||
rootBuildZig === null
|
||||
? []
|
||||
: rebaseZigBuildModules(
|
||||
parseZigBuildModules(rootBuildZig, depModules),
|
||||
inPackage,
|
||||
depModules,
|
||||
);
|
||||
return {
|
||||
...config,
|
||||
pathDeps,
|
||||
...(moduleRoots.size > 0 ? { moduleRoots } : {}),
|
||||
...(rootModules ? { rootModules } : {}),
|
||||
...(buildModules.length > 0 ? { buildModules } : {}),
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Rebase a package's own build modules to repo-relative paths.
|
||||
*
|
||||
* `parseZigBuildModules` answers package-relative for everything it read out of
|
||||
* the `build.zig` it was handed, with one exception: an alias resolved through
|
||||
* `depModules` (`addImport("api", dep.module("core"))`) is already repo-relative,
|
||||
* because `depModules` was built that way. Prefixing that a second time would
|
||||
* point the alias at a path no file has. The already-repo-relative values are
|
||||
* therefore identified by membership in `depModules`, not guessed at from their
|
||||
* shape.
|
||||
*/
|
||||
function rebaseZigBuildModules(
|
||||
modules: readonly ZigBuildModule[],
|
||||
inPackage: (relToPackage: string) => string,
|
||||
depModules?: ReadonlyMap<string, ReadonlyMap<string, string>>,
|
||||
): ZigBuildModule[] {
|
||||
if (inPackage('') === '') return [...modules];
|
||||
const fromDep = new Set<string>();
|
||||
for (const named of depModules?.values() ?? [])
|
||||
for (const root of named.values()) fromDep.add(root);
|
||||
return modules.map((mod) => ({
|
||||
...(mod.name !== undefined ? { name: mod.name } : {}),
|
||||
root: inPackage(mod.root),
|
||||
imports: new Map(
|
||||
Array.from(mod.imports, ([alias, root]) => [
|
||||
alias,
|
||||
fromDep.has(root) ? root : inPackage(root),
|
||||
]),
|
||||
),
|
||||
}));
|
||||
}
|
||||
|
||||
/** Bounds for the package walk, mirroring the tsconfig scan. */
|
||||
const ZIG_SCAN_MAX_DIRS = 20_000;
|
||||
const ZIG_SCAN_MAX_DEPTH = 24;
|
||||
|
||||
/**
|
||||
* The Zig build package governing `filePath` — the nearest one at or above it.
|
||||
*
|
||||
* A Zig module's import table is declared by the `build.zig` of the package the
|
||||
* file belongs to, so the nearest enclosing package is the faithful reading of
|
||||
* `@import("name")` at that site, exactly as `tsconfigFor` reads a non-relative
|
||||
* specifier against the nearest enclosing project.
|
||||
*
|
||||
* There is deliberately NO fall-through to an enclosing package when the nearest
|
||||
* one does not bind the name. Falling through is how a vendored dependency's
|
||||
* `@import("config")` silently resolved to the outer repo's `config` module —
|
||||
* the same failure `loadTsconfigIndex` documents for a package whose own
|
||||
* tsconfig declares no `baseUrl`, and the same failure the per-module import
|
||||
* tables in `resolveZigImportInternal` already exist to prevent one level down.
|
||||
*/
|
||||
export function zigPackageFor(
|
||||
index: ZigWorkspaceIndex | null | undefined,
|
||||
filePath: string,
|
||||
): ZigBuildZonConfig | null {
|
||||
if (index === null || index === undefined) return null;
|
||||
for (const scope of index.packages) {
|
||||
if (scope.dir === '') return scope.config;
|
||||
if (filePath.startsWith(`${scope.dir}/`)) return scope.config;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Load every Zig build package in the repo, nearest-first.
|
||||
*
|
||||
* Called with no `packageDir` — which is how every call site read it before
|
||||
* this function existed — `loadZigBuildConfig` reads the ROOT `build.zig` /
|
||||
* `build.zig.zon` and nothing else. That is the whole configuration of a
|
||||
* single-package repo and none of the configuration of a monorepo: a repo
|
||||
* laying its packages out as `packages/<name>/build.zig` has no root build
|
||||
* files at all, so the loader answers `null` and EVERY bare
|
||||
* `@import("<module>")` in it goes unresolved — cross-file resolution silently
|
||||
* degrades to relative imports only. Measured on a two-package fixture:
|
||||
* `config = null`, `@import("core")` → `null`.
|
||||
*
|
||||
* The loader itself is not root-bound any more: this function is what supplies
|
||||
* it a `packageDir`, one per package below.
|
||||
*
|
||||
* So the packages are discovered the way tsconfigs are (`findTsconfigFiles`):
|
||||
* one bounded breadth-first walk that skips the hardcoded ignore set, then
|
||||
* deepest-first ordering so `zigPackageFor` can take the first match.
|
||||
*
|
||||
* Called from `ScopeResolver.loadResolutionConfig`, which the orchestrator runs
|
||||
* once per LANGUAGE workspace pass — so the walk happens only for repos that
|
||||
* actually contain Zig. `loadImportConfigs`, which runs unconditionally for
|
||||
* every repo, keeps calling `loadZigBuildConfig` for the root package alone;
|
||||
* that is the same split TypeScript already has between the cheap
|
||||
* `loadTsconfigPaths` and the repo-walking `loadTsconfigIndex`.
|
||||
*/
|
||||
export async function loadZigWorkspaceIndex(repoRoot: string): Promise<ZigWorkspaceIndex | null> {
|
||||
const dirs = await findZigPackageDirs(repoRoot);
|
||||
if (dirs.length === 0) return null;
|
||||
const packages: ZigPackageScope[] = [];
|
||||
for (const dir of dirs) {
|
||||
const config = await loadZigBuildConfig(repoRoot, dir);
|
||||
// A `build.zig` that declares no module and no path dep contributes nothing
|
||||
// a lookup could answer with. Keeping it as an empty scope would be worse
|
||||
// than dropping it: it would shadow an enclosing package that DOES declare
|
||||
// the name, and answer nothing in its place.
|
||||
if (config !== null) packages.push({ dir, config });
|
||||
}
|
||||
if (packages.length === 0) return null;
|
||||
// Deepest first, so `zigPackageFor` takes the most specific package rather
|
||||
// than whichever the walk reached first.
|
||||
packages.sort((a, b) => b.dir.length - a.dir.length || a.dir.localeCompare(b.dir));
|
||||
return { packages };
|
||||
}
|
||||
|
||||
/** Repo-relative directories holding a `build.zig` and/or a `build.zig.zon`. */
|
||||
async function findZigPackageDirs(repoRoot: string): Promise<string[]> {
|
||||
const found: string[] = [];
|
||||
const queue: { dir: string; depth: number }[] = [{ dir: repoRoot, depth: 0 }];
|
||||
// A HEAD INDEX rather than `queue.shift()`. The queue is pushed to while it is
|
||||
// drained, which keeps the array in a mode where `shift()` memmoves the whole
|
||||
// remainder instead of taking V8's left-trimming fast path — so the walk is
|
||||
// quadratic in the frontier, and `ZIG_SCAN_MAX_DIRS` is the bound on how bad
|
||||
// that gets. Measured at that bound (20,000 dequeues): 53 ms at fan-out 4 and
|
||||
// 81 ms at fan-out 20, against 0.8 ms here — 66-106x, paid before any config
|
||||
// is read. Memory is unchanged: entries were already retained by the pushes,
|
||||
// `shift()` only dropped the head.
|
||||
let queueHead = 0;
|
||||
let dirsScanned = 0;
|
||||
|
||||
while (queueHead < queue.length && dirsScanned < ZIG_SCAN_MAX_DIRS) {
|
||||
const { dir, depth } = queue[queueHead++]!;
|
||||
dirsScanned++;
|
||||
let entries: import('fs').Dirent[];
|
||||
try {
|
||||
entries = await fs.readdir(dir, { withFileTypes: true });
|
||||
} catch {
|
||||
continue;
|
||||
}
|
||||
let isPackage = false;
|
||||
for (const entry of entries) {
|
||||
if (entry.isDirectory()) {
|
||||
const childDir = path.join(dir, entry.name);
|
||||
if (isHardcodedIgnoredDirectoryAtPath(repoRoot, childDir)) continue;
|
||||
if (depth < ZIG_SCAN_MAX_DEPTH) queue.push({ dir: childDir, depth: depth + 1 });
|
||||
continue;
|
||||
}
|
||||
if (!entry.isFile()) continue;
|
||||
// Either marker declares a package: a `build.zig` with no zon still names
|
||||
// modules, and a zon with no build.zig still names path deps.
|
||||
if (entry.name === 'build.zig' || entry.name === 'build.zig.zon') isPackage = true;
|
||||
}
|
||||
if (isPackage) {
|
||||
const rel = path.relative(repoRoot, dir).split(path.sep).join('/');
|
||||
found.push(rel === '.' || rel === '' ? '' : rel);
|
||||
}
|
||||
}
|
||||
return found;
|
||||
}
|
||||
|
||||
/**
|
||||
* Normalize a `.path` value from build.zig.zon into a repo-relative form.
|
||||
* Returns null for paths that escape the repo root (start with `..`) or
|
||||
|
|
@ -722,13 +945,38 @@ export async function loadZigBuildConfig(repoRoot: string): Promise<ZigBuildZonC
|
|||
* to the empty string (the repo root itself). Shared with the import
|
||||
* resolver so both sides agree on which deps are in-repo.
|
||||
*/
|
||||
export function normalizeZigDepPath(depPath: string): string | null {
|
||||
// Normalize separators BEFORE the absolute check so every Windows spelling
|
||||
// is visible to it: POSIX (`/x`), drive (`C:\x`, `C:/x`), root-relative
|
||||
// (`\x` → `/x`) and UNC (`\\server\share` → `//server/share`) paths all
|
||||
// point outside the repository.
|
||||
/**
|
||||
* Does this `.path` value point outside the repository BY ITS SPELLING —
|
||||
* POSIX absolute (`/dep`), Windows drive-qualified (`C:\dep`, `C:/dep`),
|
||||
* root-relative (`\dep`) or UNC (`\\server\share`)?
|
||||
*
|
||||
* Separators are normalized first so every Windows spelling is visible to the
|
||||
* one test. Exported-in-spirit rather than inlined because it must be asked in
|
||||
* TWO places and the two must not drift: `normalizeZigDepPath` asks it of the
|
||||
* value it is given, and `loadZigBuildConfig` asks it of a NESTED package's
|
||||
* value BEFORE prefixing the package directory. That second call is the whole
|
||||
* point — prefixing turns `/dep` into `packages/app//dep`, which is relative by
|
||||
* inspection, so the check inside `normalizeZigDepPath` no longer sees an
|
||||
* absolute path and the empty segment is simply dropped, mapping an
|
||||
* out-of-repo dependency onto a real in-repo directory if one happens to exist.
|
||||
*
|
||||
* `path.posix.join` is NOT a substitute: it strips the leading slash too
|
||||
* (`join('packages/app/', '/dep')` is `packages/app/dep`), so it produces the
|
||||
* same fabricated path without ever rejecting anything.
|
||||
*
|
||||
* A `..` prefix is deliberately NOT handled here. `../core` escapes the
|
||||
* package but not necessarily the repo, and rebasing it is exactly what the
|
||||
* nested-package branch exists to do; `normalizeZigDepPath` rejects the ones
|
||||
* that still escape the ROOT after rebasing.
|
||||
*/
|
||||
function isAbsoluteZigDepPath(depPath: string): boolean {
|
||||
const normalized = depPath.replace(/\\/g, '/');
|
||||
if (normalized.startsWith('/') || /^[A-Za-z]:\//.test(normalized)) return null;
|
||||
return normalized.startsWith('/') || /^[A-Za-z]:\//.test(normalized);
|
||||
}
|
||||
|
||||
export function normalizeZigDepPath(depPath: string): string | null {
|
||||
const normalized = depPath.replace(/\\/g, '/');
|
||||
if (isAbsoluteZigDepPath(depPath)) return null;
|
||||
const parts: string[] = [];
|
||||
for (const part of normalized.split('/')) {
|
||||
if (part === '' || part === '.') continue;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,77 @@
|
|||
/**
|
||||
* Dart's veto on the global-name fallback — see
|
||||
* `ScopeResolver.isGlobalNameFallbackPlausible`.
|
||||
*
|
||||
* Dart's privacy is LIBRARY-scoped and marked in the identifier itself: a name
|
||||
* beginning with `_` is visible only inside its own library and cannot be
|
||||
* imported by any spelling. So a `_`-prefixed candidate in another file is an
|
||||
* impossible call, not an unlikely one.
|
||||
*
|
||||
* The exact boundary is `part` / `part of` — one library spanning several
|
||||
* files, with `_` names shared between them — and the extractor does not
|
||||
* surface `part` directives yet (the Dart query captures only `library_import`;
|
||||
* nothing in `languages/dart/` reads `part`). Without them a cross-file `_`
|
||||
* candidate is UNDECIDABLE, not impossible: refusing on "different file" would
|
||||
* delete real edges on Flutter's dominant generated-code idiom (`factory
|
||||
* Foo.fromJson(j) => _$FooFromJson(j)` calls into `foo.g.dart`, a `part` beside
|
||||
* it), and refusing on "different directory" is wrong too — a `part` URI is a
|
||||
* relative URI and legally traverses directories (`part '../shared/gen.dart';`).
|
||||
* An earlier version refused the cross-directory case as "no `part` layout can
|
||||
* make this legal"; that claim was false, so the hook now REFUSES NOTHING and
|
||||
* every cross-file `_` candidate stays a LABELED edge (0.5 /
|
||||
* `global-name-fallback`), which is the honest answer until `part` is
|
||||
* extracted. A caller that names the candidate's file in a directive is
|
||||
* recognized already, for the day the extractor surfaces `part` as an import
|
||||
* target; at that point "not the same library" becomes decidable and the
|
||||
* refusal can return.
|
||||
*
|
||||
* Public names are left to the labeled-edge path. Dart does require an import
|
||||
* for a cross-library public name, but the fallback exists partly to recover
|
||||
* edges where the import chain was not reconstructed, and refusing every
|
||||
* cross-file public call would delete real edges to buy a rule the `_` marker
|
||||
* already gives for free.
|
||||
*/
|
||||
|
||||
import type { ParsedFile, SymbolDefinition } from 'gitnexus-shared';
|
||||
import {
|
||||
modulePathReaches,
|
||||
stripExtension,
|
||||
} from '../../scope-resolution/utils/name-fallback-visibility.js';
|
||||
|
||||
/** Dart privacy marker: a leading underscore on the declared identifier. Read
|
||||
* from the last `qualifiedName` segment, so `_Foo.bar` is public `bar` on a
|
||||
* private class and `Foo._bar` is the private member. */
|
||||
function isPrivateDartName(candidate: SymbolDefinition): boolean {
|
||||
const qualified = candidate.qualifiedName ?? '';
|
||||
const dot = qualified.lastIndexOf('.');
|
||||
const simple = dot === -1 ? qualified : qualified.slice(dot + 1);
|
||||
return simple.startsWith('_');
|
||||
}
|
||||
|
||||
/**
|
||||
* Are these two files parts of one library? True when the caller names the
|
||||
* candidate's file in a `part` / `part of` directive, which the extractor
|
||||
* surfaces as an ordinary import target.
|
||||
*/
|
||||
function sharesLibrary(callerParsed: ParsedFile, candidateFilePath: string): boolean {
|
||||
const candidateModule = stripExtension(candidateFilePath);
|
||||
for (const imp of callerParsed.parsedImports) {
|
||||
if (modulePathReaches(stripExtension(imp.targetRaw), candidateModule)) return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
export function dartIsGlobalNameFallbackPlausible(ctx: {
|
||||
readonly callerParsed: ParsedFile;
|
||||
readonly candidate: SymbolDefinition;
|
||||
}): boolean {
|
||||
if (ctx.candidate.filePath === ctx.callerParsed.filePath) return true;
|
||||
if (!isPrivateDartName(ctx.candidate)) return true;
|
||||
// A directive naming the candidate's file is positive evidence of one library.
|
||||
if (sharesLibrary(ctx.callerParsed, ctx.candidate.filePath)) return true;
|
||||
// Any other file may be a `part` of the caller's library — a sibling or, via
|
||||
// a relative `part` URI, a file in another directory. Undecidable without
|
||||
// `part` extraction (see the header), so allowed as a labeled guess, never
|
||||
// refused.
|
||||
return true;
|
||||
}
|
||||
|
|
@ -41,6 +41,7 @@ import { decodeMarker } from '../../utils/heritage-marker.js';
|
|||
import { typeApplicationArguments } from '../../utils/template-arguments.js';
|
||||
import type { HeritageTypeArgumentSink } from '../../scope-resolution/utils/generic-instantiation.js';
|
||||
import { expandDartWildcardNames } from './expand-wildcards.js';
|
||||
import { dartIsGlobalNameFallbackPlausible } from './name-fallback-visibility.js';
|
||||
|
||||
interface ClassDefRef {
|
||||
readonly graphId: string;
|
||||
|
|
@ -233,5 +234,6 @@ export const dartScopeResolver: ScopeResolver = {
|
|||
// No `new`: bare `Foo()` resolves to the type; with cross-file imports the
|
||||
// callee is reachable workspace-wide.
|
||||
allowGlobalFreeCallFallback: true,
|
||||
isGlobalNameFallbackPlausible: dartIsGlobalNameFallbackPlausible,
|
||||
constructorCallTargetsClass: true,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -508,11 +508,24 @@ function normalizeGenericConstructorCapture(
|
|||
if (referenceNode !== undefined && referenceNode.type === 'generic_type') {
|
||||
const base = referenceNode.childForFieldName('type');
|
||||
if (base !== null) {
|
||||
grouped['@reference.name'] = syntheticCapture(
|
||||
'@reference.name',
|
||||
base,
|
||||
extractSimpleTypeNameText(base),
|
||||
);
|
||||
const simple = extractSimpleTypeNameText(base);
|
||||
// Keep the written `pkg.Box[T]` spelling so constructor resolution
|
||||
// can tell a package-qualified type from a bare unique-name guess.
|
||||
// `Box[T]` is also `text !== simple` (`Box[T]` vs `Box`) — that is
|
||||
// not a qualifier. Only a `qualified_type` base (`pkg.Box`) is.
|
||||
if (
|
||||
grouped['@reference.qualified-name'] === undefined &&
|
||||
base.type === 'qualified_type' &&
|
||||
referenceNode.text.length > 0 &&
|
||||
referenceNode.text !== simple
|
||||
) {
|
||||
grouped['@reference.qualified-name'] = syntheticCapture(
|
||||
'@reference.qualified-name',
|
||||
referenceNode,
|
||||
referenceNode.text,
|
||||
);
|
||||
}
|
||||
grouped['@reference.name'] = syntheticCapture('@reference.name', base, simple);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,126 @@
|
|||
/**
|
||||
* Go's veto on the global-name fallback — see
|
||||
* `ScopeResolver.isGlobalNameFallbackPlausible`.
|
||||
*
|
||||
* Go's visibility rules are unusually decidable from a file path and an
|
||||
* identifier, which is why this is the language the guard is most complete for:
|
||||
*
|
||||
* 1. A package IS a directory. Two files in the same directory see each
|
||||
* other's identifiers with no import and no qualification, so a same-
|
||||
* directory candidate is always plausible.
|
||||
* 2. An identifier is exported iff it begins with an upper-case letter. An
|
||||
* UNEXPORTED identifier is invisible outside its own package — no import
|
||||
* makes it reachable, so a cross-directory candidate with a lower-case
|
||||
* initial is not unlikely, it is IMPOSSIBLE.
|
||||
* 3. A bare exported identifier from another package requires a DOT import.
|
||||
* Ordinary, alias, and blank imports never introduce a bare callable.
|
||||
*
|
||||
* Rule 2 is the one that matters most in practice: `uniqueHelperXyz` defined
|
||||
* once in package `a` used to acquire a caller in package `b` purely because
|
||||
* the name was unique in the repo, and the resulting edge was published as
|
||||
* `import-resolved` — a caller Go itself would reject.
|
||||
*
|
||||
* Methods require a receiver and never qualify for this bare-name tier.
|
||||
*/
|
||||
|
||||
import type { ParsedFile, SymbolDefinition } from 'gitnexus-shared';
|
||||
import {
|
||||
modulePathReaches,
|
||||
directoryOf,
|
||||
} from '../../scope-resolution/utils/name-fallback-visibility.js';
|
||||
import { inferGoPackageName } from './package-clause.js';
|
||||
|
||||
/**
|
||||
* Compare actual package clauses, not a guessed `_test` suffix convention:
|
||||
* `foo_test` can itself be a production package name. Missing source remains
|
||||
* undecidable, while the test-file boundary is always available from the path.
|
||||
*/
|
||||
function classifyGoFile(
|
||||
filePath: string,
|
||||
sourceTextOf: ((p: string) => string | undefined) | undefined,
|
||||
): { isTest: boolean; declared: string | undefined } {
|
||||
const isTest = filePath.endsWith('_test.go');
|
||||
const text = sourceTextOf?.(filePath);
|
||||
return {
|
||||
isTest,
|
||||
declared: text === undefined ? undefined : (inferGoPackageName(text) ?? undefined),
|
||||
};
|
||||
}
|
||||
|
||||
/** Go export rule: an upper-case initial, by Unicode letter case. */
|
||||
function isExportedGoName(name: string): boolean {
|
||||
return /^\p{Lu}/u.test(name);
|
||||
}
|
||||
|
||||
/**
|
||||
* The simple identifier a Go declaration contributes to its package scope: the
|
||||
* last segment of `qualifiedName`, which is `Type.method` for a method and the
|
||||
* bare identifier for a function. Either way the LAST segment is the identifier
|
||||
* whose case decides export.
|
||||
*/
|
||||
function goSimpleName(candidate: SymbolDefinition): string {
|
||||
const qualified = candidate.qualifiedName ?? '';
|
||||
const dot = qualified.lastIndexOf('.');
|
||||
return dot === -1 ? qualified : qualified.slice(dot + 1);
|
||||
}
|
||||
|
||||
export function goIsGlobalNameFallbackPlausible(ctx: {
|
||||
readonly sourceTextOf?: (filePath: string) => string | undefined;
|
||||
readonly callerParsed: ParsedFile;
|
||||
readonly candidate: SymbolDefinition;
|
||||
readonly site?: { readonly rawQualifiedName?: string };
|
||||
}): boolean {
|
||||
// A PATH-QUALIFIED call (`pkg.Export()`) reached this tier because the
|
||||
// qualifier could not be followed. Qualification removes the bare-name
|
||||
// "only a dot import introduces this identifier" rule — not export or
|
||||
// test-package visibility. `other.private()` is still impossible.
|
||||
const isPackageQualified = ctx.site?.rawQualifiedName !== undefined;
|
||||
// Methods require a receiver, even within their own package or a dot import.
|
||||
if (ctx.candidate.type === 'Method' || ctx.candidate.qualifiedName?.includes('.')) return false;
|
||||
const callerDir = directoryOf(ctx.callerParsed.filePath);
|
||||
const candidateDir = directoryOf(ctx.candidate.filePath);
|
||||
// Same directory is NOT the same package (rule 1, refined): a `_test.go`
|
||||
// file may declare `foo_test`, and test-only declarations are invisible to
|
||||
// non-test files. Apply the split `package-siblings.ts` uses for the
|
||||
// confident tier, so the heuristic tier cannot reopen what it closed.
|
||||
if (callerDir === candidateDir) {
|
||||
const caller = classifyGoFile(ctx.callerParsed.filePath, ctx.sourceTextOf);
|
||||
const cand = classifyGoFile(ctx.candidate.filePath, ctx.sourceTextOf);
|
||||
// Non-test files never see test-only declarations.
|
||||
if (cand.isTest && !caller.isTest) return false;
|
||||
// Different clauses require an explicit dot import, even in one directory.
|
||||
// Fall through to the exported/import checks for external test packages.
|
||||
// Missing source leaves package identity undecidable.
|
||||
if (
|
||||
caller.declared === undefined ||
|
||||
cand.declared === undefined ||
|
||||
caller.declared === cand.declared
|
||||
)
|
||||
return true;
|
||||
}
|
||||
|
||||
// Different package — and a `_test.go` file's
|
||||
// declarations are compiled only into ITS OWN package's test binary. No other
|
||||
// package, test or not, can see them, exported or not. Decidable from the
|
||||
// path alone, so it comes before every exception below (the module-root
|
||||
// exception in particular used to accept a root `helper_test.go` export).
|
||||
if (classifyGoFile(ctx.candidate.filePath, ctx.sourceTextOf).isTest) return false;
|
||||
|
||||
const simpleName = goSimpleName(ctx.candidate);
|
||||
// No identifier to read the case of — an unanswered question, not a refusal.
|
||||
if (simpleName === '') return true;
|
||||
// Unexported across a package boundary (rule 2): no import can reach it.
|
||||
if (!isExportedGoName(simpleName)) return false;
|
||||
if (isPackageQualified) return true;
|
||||
|
||||
// Only a dot import introduces a bare name. A candidate in the module ROOT package has an empty
|
||||
// directory, which `modulePathReaches` cannot align against any import path
|
||||
// (the root package is imported by the module path alone, which the repo-
|
||||
// relative layout does not carry). That is an unanswered question, not a
|
||||
// refusal — a dot import is plausible even if its path cannot be aligned.
|
||||
return ctx.callerParsed.parsedImports.some(
|
||||
(imp) =>
|
||||
imp.kind === 'wildcard' &&
|
||||
(candidateDir === '' || modulePathReaches(imp.targetRaw, candidateDir)),
|
||||
);
|
||||
}
|
||||
|
|
@ -4,92 +4,189 @@ import type { ScopeResolutionIndexes } from '../../model/scope-resolution-indexe
|
|||
import { expandGoDotImports } from './expand-wildcards.js';
|
||||
import { goPackageDir, inferGoPackageName } from './package-clause.js';
|
||||
|
||||
function isGoTestFile(filePath: string): boolean {
|
||||
return filePath.endsWith('_test.go');
|
||||
}
|
||||
|
||||
/**
|
||||
* O(n²×d) where n = files per package, d = defs per file.
|
||||
* Acceptable for V1 since Go packages are typically small (< 20 files).
|
||||
* Future optimization: build a name→def inverted index per package to reduce
|
||||
* to O(n×d).
|
||||
* The package a `_test.go` file's clause belongs to, given the package names
|
||||
* the directory's NON-test files declare.
|
||||
*
|
||||
* `package foo_test` is the external-test convention ONLY when the directory's
|
||||
* real package is `foo`; the `_test` suffix is otherwise a legal identifier
|
||||
* (`package foo_test` in a directory whose non-test files also say `foo_test`).
|
||||
* Stripping it unconditionally keyed such a package's own internal tests as
|
||||
* external tests of a non-existent `foo`, so they saw no sibling at all — a
|
||||
* resolution miss on every same-package call. Strip only when the stripped
|
||||
* name is what the non-test siblings declare; with no non-test sibling to ask
|
||||
* (a test-only directory) the convention is assumed, as before.
|
||||
*/
|
||||
function testFilePackageOf(
|
||||
declared: string,
|
||||
nonTestPackagesInDir: ReadonlySet<string> | undefined,
|
||||
): { readonly pkg: string; readonly external: boolean } {
|
||||
if (!declared.endsWith('_test') || declared.length <= '_test'.length) {
|
||||
return { pkg: declared, external: false };
|
||||
}
|
||||
const stripped = declared.slice(0, -'_test'.length);
|
||||
if (nonTestPackagesInDir !== undefined && nonTestPackagesInDir.has(declared)) {
|
||||
return { pkg: declared, external: false };
|
||||
}
|
||||
if (nonTestPackagesInDir === undefined || nonTestPackagesInDir.has(stripped)) {
|
||||
return { pkg: stripped, external: true };
|
||||
}
|
||||
// Neither name is declared by a non-test sibling: keep the clause as written.
|
||||
return { pkg: declared, external: false };
|
||||
}
|
||||
|
||||
interface IndexedDef {
|
||||
readonly filePath: string;
|
||||
readonly ref: BindingRef;
|
||||
}
|
||||
|
||||
/** name → defs, in package file order. */
|
||||
type NameIndex = Map<string, IndexedDef[]>;
|
||||
|
||||
function defBareName(def: SymbolDefinition): string {
|
||||
return def.qualifiedName?.split('.').pop() ?? def.qualifiedName ?? '';
|
||||
}
|
||||
|
||||
function appendToIndex(
|
||||
index: NameIndex,
|
||||
filePath: string,
|
||||
defs: readonly SymbolDefinition[],
|
||||
): void {
|
||||
for (const def of defs) {
|
||||
const name = defBareName(def);
|
||||
if (name === '') continue;
|
||||
const list = index.get(name) ?? [];
|
||||
list.push({ filePath, ref: { def, origin: 'namespace' } });
|
||||
index.set(name, list);
|
||||
}
|
||||
}
|
||||
|
||||
function publishIndex(
|
||||
augmentations: Map<ScopeId, Map<string, BindingRef[]>>,
|
||||
index: NameIndex,
|
||||
receiverPath: string,
|
||||
receiverModule: ScopeId,
|
||||
): void {
|
||||
if (index.size === 0) return;
|
||||
let scopeBindings = augmentations.get(receiverModule);
|
||||
if (scopeBindings === undefined) {
|
||||
scopeBindings = new Map<string, BindingRef[]>();
|
||||
augmentations.set(receiverModule, scopeBindings);
|
||||
}
|
||||
for (const [name, entries] of index) {
|
||||
let bucket = scopeBindings.get(name);
|
||||
const seen =
|
||||
bucket === undefined ? new Set<string>() : new Set(bucket.map((b) => b.def.nodeId));
|
||||
for (const entry of entries) {
|
||||
if (entry.filePath === receiverPath) continue;
|
||||
if (seen.has(entry.ref.def.nodeId)) continue;
|
||||
if (bucket === undefined) {
|
||||
bucket = [];
|
||||
scopeBindings.set(name, bucket);
|
||||
}
|
||||
bucket.push(entry.ref);
|
||||
seen.add(entry.ref.def.nodeId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Publish same-package sibling bindings, including `_test.go` files.
|
||||
*
|
||||
* Internal tests (`package foo`) see production and other internal-test names.
|
||||
* External tests (`package foo_test`) get no bare-name bindings across that
|
||||
* partition — qualified `foo.X` and `import .` stay on the import resolver.
|
||||
* Non-test files never see test-only helpers (`go build` does not compile them).
|
||||
*
|
||||
* Per-package name→def indexes are built in O(n×d). Each receiver walks only
|
||||
* the partitions it can see, so defs are not re-scanned against every sibling
|
||||
* file. Binding refs are allocated once and reused across receivers.
|
||||
*/
|
||||
export function populateGoPackageSiblings(
|
||||
parsedFiles: readonly ParsedFile[],
|
||||
indexes: ScopeResolutionIndexes,
|
||||
ctx: { readonly fileContents: ReadonlyMap<string, string> },
|
||||
): void {
|
||||
// 0. Filter out test files — Go _test.go files should not contribute
|
||||
// same-package sibling bindings to non-test files.
|
||||
const nonTestFiles = parsedFiles.filter((f) => !f.filePath.endsWith('_test.go'));
|
||||
|
||||
// 1. Expand dot imports first so subsequent same-package sibling
|
||||
// augmentation can also see dot-imported names.
|
||||
expandGoDotImports(nonTestFiles, indexes);
|
||||
// augmentation can also see dot-imported names. Test files dot-import too.
|
||||
expandGoDotImports(parsedFiles, indexes);
|
||||
|
||||
// 2. Group files by package directory plus package name. Go package
|
||||
// identity is directory-scoped; repeated `package main` directories
|
||||
// must not see each other's unqualified names.
|
||||
const packageByFile = new Map<string, string>();
|
||||
for (const parsed of nonTestFiles) {
|
||||
// Same derivation as `populateGoWorkspaceOwners` — one shared resolver, so
|
||||
// the two passes cannot disagree about a file's package (#2837). The
|
||||
// no-clause case is reported there; warning twice for one fact would be
|
||||
// noise.
|
||||
const pkgName = inferGoPackageName(ctx.fileContents.get(parsed.filePath) ?? '');
|
||||
if (pkgName !== null) {
|
||||
packageByFile.set(parsed.filePath, `${goPackageDir(parsed.filePath)}\0${pkgName}`);
|
||||
}
|
||||
//
|
||||
// `_test.go` files join the INTERNAL package's bucket (a `foo_test`
|
||||
// external test is keyed by `foo`, its `external` flag marking the
|
||||
// partition so no bare-name bindings cross it), so one bucket holds
|
||||
// everything the test binary compiles together, and the visibility
|
||||
// rules below decide who sees whom.
|
||||
interface SiblingFile {
|
||||
readonly filePath: string;
|
||||
readonly defs: readonly SymbolDefinition[];
|
||||
readonly isTest: boolean;
|
||||
readonly external: boolean;
|
||||
}
|
||||
const filesByPackage = new Map<string, SiblingFile[]>();
|
||||
// Same derivation as `populateGoWorkspaceOwners` — one shared resolver, so
|
||||
// the two passes cannot disagree about a file's package (#2837). The
|
||||
// no-clause case is reported there; warning twice for one fact would be
|
||||
// noise.
|
||||
const declaredByFile = new Map<string, string>();
|
||||
const nonTestPackagesByDir = new Map<string, Set<string>>();
|
||||
for (const parsed of parsedFiles) {
|
||||
const declared = inferGoPackageName(ctx.fileContents.get(parsed.filePath) ?? '');
|
||||
if (declared === null) continue;
|
||||
declaredByFile.set(parsed.filePath, declared);
|
||||
if (isGoTestFile(parsed.filePath)) continue;
|
||||
const dir = goPackageDir(parsed.filePath);
|
||||
const names = nonTestPackagesByDir.get(dir) ?? new Set<string>();
|
||||
names.add(declared);
|
||||
nonTestPackagesByDir.set(dir, names);
|
||||
}
|
||||
for (const parsed of parsedFiles) {
|
||||
const declared = declaredByFile.get(parsed.filePath);
|
||||
if (declared === undefined) continue;
|
||||
const isTest = isGoTestFile(parsed.filePath);
|
||||
const dir = goPackageDir(parsed.filePath);
|
||||
const { pkg, external } = isTest
|
||||
? testFilePackageOf(declared, nonTestPackagesByDir.get(dir))
|
||||
: { pkg: declared, external: false };
|
||||
const key = `${dir}\0${pkg}`;
|
||||
const list = filesByPackage.get(key) ?? [];
|
||||
list.push({ filePath: parsed.filePath, defs: parsed.localDefs, isTest, external });
|
||||
filesByPackage.set(key, list);
|
||||
}
|
||||
|
||||
const filesByPackage = new Map<string, { filePath: string; defs: SymbolDefinition[] }[]>();
|
||||
for (const parsed of nonTestFiles) {
|
||||
const pkgName = packageByFile.get(parsed.filePath);
|
||||
if (pkgName === undefined) continue;
|
||||
const list = filesByPackage.get(pkgName) ?? [];
|
||||
list.push({ filePath: parsed.filePath, defs: [...parsed.localDefs] });
|
||||
filesByPackage.set(pkgName, list);
|
||||
}
|
||||
|
||||
// 2. Use bindingAugmentations channel per I8
|
||||
// 3. Use bindingAugmentations channel per I8. Same-package files see ALL
|
||||
// sibling names (exported and unexported). Cross-package visibility is
|
||||
// the import resolver's job.
|
||||
const augmentations = indexes.bindingAugmentations as Map<ScopeId, Map<string, BindingRef[]>>;
|
||||
|
||||
for (const [, siblings] of filesByPackage) {
|
||||
for (const target of siblings) {
|
||||
const targetModule = indexes.moduleScopes.byFilePath.get(target.filePath);
|
||||
if (targetModule === undefined) continue;
|
||||
|
||||
for (const receiver of siblings) {
|
||||
if (receiver.filePath === target.filePath) continue; // no self-reference
|
||||
const receiverModule = indexes.moduleScopes.byFilePath.get(receiver.filePath);
|
||||
if (receiverModule === undefined) continue;
|
||||
|
||||
for (const def of target.defs) {
|
||||
// Go: same-package sibling files can see ALL names (both
|
||||
// exported/uppercase and unexported/lowercase). Only cross-
|
||||
// package visibility requires uppercase first letter.
|
||||
const name = def.qualifiedName?.split('.').pop() ?? def.qualifiedName ?? '';
|
||||
if (name === '') continue;
|
||||
|
||||
const bucket = getAugmentationBucket(augmentations, receiverModule, name);
|
||||
if (bucket.some((b) => b.def.nodeId === def.nodeId)) continue;
|
||||
bucket.push({ def, origin: 'namespace' });
|
||||
}
|
||||
for (const siblings of filesByPackage.values()) {
|
||||
if (siblings.length < 2) continue;
|
||||
const production: NameIndex = new Map();
|
||||
const internalTest: NameIndex = new Map();
|
||||
const external: NameIndex = new Map();
|
||||
const receivers: { file: SiblingFile; module: ScopeId }[] = [];
|
||||
for (const file of siblings) {
|
||||
const module = indexes.moduleScopes.byFilePath.get(file.filePath);
|
||||
if (module === undefined) continue;
|
||||
receivers.push({ file, module });
|
||||
if (file.external) appendToIndex(external, file.filePath, file.defs);
|
||||
else if (file.isTest) appendToIndex(internalTest, file.filePath, file.defs);
|
||||
else appendToIndex(production, file.filePath, file.defs);
|
||||
}
|
||||
for (const { file, module } of receivers) {
|
||||
if (file.external) {
|
||||
publishIndex(augmentations, external, file.filePath, module);
|
||||
continue;
|
||||
}
|
||||
publishIndex(augmentations, production, file.filePath, module);
|
||||
if (file.isTest) publishIndex(augmentations, internalTest, file.filePath, module);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function getAugmentationBucket(
|
||||
augmentations: Map<ScopeId, Map<string, BindingRef[]>>,
|
||||
scopeId: ScopeId,
|
||||
name: string,
|
||||
): BindingRef[] {
|
||||
let scopeBindings = augmentations.get(scopeId);
|
||||
if (scopeBindings === undefined) {
|
||||
scopeBindings = new Map<string, BindingRef[]>();
|
||||
augmentations.set(scopeId, scopeBindings);
|
||||
}
|
||||
let bucketArr = scopeBindings.get(name);
|
||||
if (bucketArr === undefined) {
|
||||
bucketArr = [];
|
||||
scopeBindings.set(name, bucketArr);
|
||||
}
|
||||
return bucketArr;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ import { detectGoInterfaceImplementations } from './interface-impls.js';
|
|||
import { populateGoRangeBindings } from './range-binding.js';
|
||||
import { expandGoWildcardNames } from './expand-wildcards.js';
|
||||
import { goMapValueType } from './interpret.js';
|
||||
import { goIsGlobalNameFallbackPlausible } from './name-fallback-visibility.js';
|
||||
|
||||
/** Slice `[]T` and array `[N]T` / `[...]T` → the element spelling. Hoisted —
|
||||
* a literal inside the hook would mint a fresh RegExp per folded subscript. */
|
||||
|
|
@ -85,6 +86,7 @@ export const goScopeResolver: ScopeResolver = {
|
|||
hoistTypeBindingsToModule: true,
|
||||
propagatesReturnTypesAcrossImports: true,
|
||||
allowGlobalFreeCallFallback: true,
|
||||
isGlobalNameFallbackPlausible: goIsGlobalNameFallbackPlausible,
|
||||
|
||||
populateNamespaceSiblings: populateGoPackageSiblings,
|
||||
mirrorNamespaceTypeBindings: mirrorGoNamespaceTypeBindings,
|
||||
|
|
|
|||
|
|
@ -357,6 +357,26 @@ export function emitJavaScopeCaptures(
|
|||
}
|
||||
}
|
||||
|
||||
// Qualified constructor `new pkg.Foo()` already binds the simple tail as
|
||||
// `@reference.name` (F35). Copy the scoped spelling onto
|
||||
// `@reference.qualified-name` so constructor resolution can treat it as a
|
||||
// written qualifier instead of a bare unique-name guess (C# does the same).
|
||||
const ctorQualifiedNode = nodeMap['@reference.call.constructor.qualified'];
|
||||
const ctorQualifiedText = grouped['@reference.call.constructor.qualified']?.text;
|
||||
if (
|
||||
ctorQualifiedNode !== undefined &&
|
||||
ctorQualifiedText !== undefined &&
|
||||
ctorQualifiedText.length > 0 &&
|
||||
ctorQualifiedText !== grouped['@reference.name']?.text &&
|
||||
grouped['@reference.qualified-name'] === undefined
|
||||
) {
|
||||
grouped['@reference.qualified-name'] = syntheticCapture(
|
||||
'@reference.qualified-name',
|
||||
ctorQualifiedNode,
|
||||
ctorQualifiedText,
|
||||
);
|
||||
}
|
||||
|
||||
// Synthesize `@reference.arity` on every callsite.
|
||||
const callTag = (
|
||||
['@reference.call.free', '@reference.call.member', '@reference.call.constructor'] as const
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@ import {
|
|||
syntheticCapture,
|
||||
type SyntaxNode,
|
||||
} from '../../utils/ast-helpers.js';
|
||||
import { collectEsmExportEvidence, esmExportVerdict } from '../../ts-js-export-marker.js';
|
||||
import { splitImportStatement } from '../typescript/import-decomposer.js';
|
||||
import { getJsParser, getJsScopeQuery, jsCachedTreeMatchesGrammar } from './query.js';
|
||||
import { computeTsArityMetadata } from '../typescript/arity-metadata.js';
|
||||
|
|
@ -983,6 +984,8 @@ export function emitJsScopeCaptures(
|
|||
}
|
||||
|
||||
const rawMatches = getJsScopeQuery(filePath).matches(tree.rootNode);
|
||||
// Export evidence, read once per file (see `ts-js-export-marker.ts`).
|
||||
const exportEvidence = collectEsmExportEvidence(tree.rootNode, filePath);
|
||||
const out: CaptureMatch[] = [];
|
||||
|
||||
for (const m of rawMatches) {
|
||||
|
|
@ -1124,6 +1127,13 @@ export function emitJsScopeCaptures(
|
|||
fnNode,
|
||||
deriveDefaultExportHocName(filePath),
|
||||
);
|
||||
// This declaration's name is synthetic, so the later query-name
|
||||
// marker cannot see it. The HOC predicate already proves the export.
|
||||
grouped['@declaration.is-exported'] = syntheticCapture(
|
||||
'@declaration.is-exported',
|
||||
fnNode,
|
||||
'true',
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1207,6 +1217,20 @@ export function emitJsScopeCaptures(
|
|||
// non-call match, an absent receiver, or a chain with no nameable base
|
||||
// all leave `grouped` untouched.
|
||||
synthesizeReceiverChainCapture(grouped, groupedNodes['@reference.receiver']);
|
||||
// `@declaration.is-exported`: a verdict for every declaration the file's
|
||||
// export surface can decide (see `ts-js-export-marker.ts`); nothing where
|
||||
// it cannot, because absence is the honest answer there.
|
||||
const declNameNode = groupedNodes['@declaration.name'];
|
||||
if (exportEvidence !== undefined && declNameNode !== undefined) {
|
||||
const verdict = esmExportVerdict(declNameNode, exportEvidence);
|
||||
if (verdict !== undefined) {
|
||||
grouped['@declaration.is-exported'] = syntheticCapture(
|
||||
'@declaration.is-exported',
|
||||
declNameNode,
|
||||
verdict ? 'true' : 'false',
|
||||
);
|
||||
}
|
||||
}
|
||||
out.push(grouped);
|
||||
|
||||
// Synthesize `this` receiver type-bindings on class member functions.
|
||||
|
|
|
|||
|
|
@ -97,6 +97,12 @@ const javascriptScopeResolver: ScopeResolver = {
|
|||
// explicit imports at the call site. Workspace-wide unique-name fallback
|
||||
// recovers these edges.
|
||||
allowGlobalFreeCallFallback: true,
|
||||
|
||||
// Same ECMAScript `export *` exclusivity as TypeScript: a name declared by
|
||||
// two wildcard sources is refused, not guessed.
|
||||
exclusiveWildcardReexports: true,
|
||||
// Same ECMAScript rule as TypeScript: named imports bind module-level declarations only.
|
||||
namedImportsBindTopLevelOnly: true,
|
||||
};
|
||||
|
||||
export { javascriptScopeResolver };
|
||||
|
|
|
|||
|
|
@ -0,0 +1,196 @@
|
|||
/**
|
||||
* Ruby's veto on the global-name fallback — see
|
||||
* `ScopeResolver.isGlobalNameFallbackPlausible`.
|
||||
*
|
||||
* Ruby keeps the labeled fallback deliberately: with autoload (Rails' zeitwerk,
|
||||
* `ActiveSupport::Dependencies`) a file genuinely can call a method whose
|
||||
* defining file it never requires, so "no require" is NOT evidence of
|
||||
* impossibility the way it is in Go or Rust.
|
||||
*
|
||||
* What IS decidable is namespacing — but only for CLASS bodies. A method
|
||||
* defined inside a `class` is not callable as a bare `helper()` from another
|
||||
* file unless that file names the class somehow (a receiver `Ns.helper`, a
|
||||
* subclass declaration, an `include`, a `require`). A method defined inside a
|
||||
* `module` body is different in kind: modules exist to be mixed in, and Rails
|
||||
* mixes them in for you — every `*Helper` module is included into views and
|
||||
* controllers by the framework, and concerns arrive through `included do`
|
||||
* hooks — so a bare `format_money()` in a view legitimately reaches
|
||||
* `module ApplicationHelper` with no `include`, `require`, or constant
|
||||
* anywhere in the caller. Refusing that would delete real edges on exactly the
|
||||
* codebase shape Ruby's fallback exists to serve. So module-owned methods stay
|
||||
* a LABELED guess, and the refusal targets CLASS-owned methods whose class the
|
||||
* caller never names. A top-level method (`ownerId === undefined`) is left
|
||||
* alone, since that is the shape autoload actually delivers. When the owner
|
||||
* cannot be found or typed (no `parsedFileOf`, owner outside the file set),
|
||||
* the question is unanswered and the edge is allowed.
|
||||
*
|
||||
* "Never names" is read from the caller's own text-visible signals — its
|
||||
* `require`/`include`/`extend` targets, and any reference site spelling the
|
||||
* namespace's constant. If any of them mentions the namespace, the call is
|
||||
* plausible and the labeled edge stands. `require` paths are snake_case
|
||||
* (`billing/invoice_service`) while constants are CamelCase
|
||||
* (`Billing::InvoiceService`), so the comparison normalizes both sides —
|
||||
* without that the `require` branch never matched anything.
|
||||
*
|
||||
* One more thing a caller file can do without naming the class: INHERIT its
|
||||
* way to it. `class UsersController < AdminController` reaches every method
|
||||
* `ApplicationController` defines while naming only `AdminController`, and an
|
||||
* `include Concern` reaches whatever that concern includes in turn. Neither
|
||||
* chain is decidable from one file, so a caller with ANY inheritance or mixin
|
||||
* surface (an `inherits` site, an `include`/`extend`/`prepend` marker) is
|
||||
* treated as plausible. So is a caller file that DEFINES a module: a module's
|
||||
* methods run against whatever class includes the module, and call that class's
|
||||
* methods bare — `module PostGuardian; def can_see?; is_staff? ...` reaches
|
||||
* `class Guardian#is_staff?` because Guardian includes PostGuardian, a fact the
|
||||
* module file never states. What remains refused is the shape Ruby itself
|
||||
* rejects: a bare call to a class's method from a file that inherits nothing,
|
||||
* mixes in nothing, defines no module, and never spells the class. Measured on
|
||||
* discourse@3f71fa15c that is ~1000 refusals, and the sample is what the rule
|
||||
* promises: RSpec `before`/`after`/`subject` guessed to serializer methods of
|
||||
* the same name, `Gemfile`'s `gem` to `Plugin::Instance#gem`, `routes.rb`'s
|
||||
* `get` to `Draft#get` — fabricated callers, every one.
|
||||
*/
|
||||
|
||||
import type { ParsedFile, SymbolDefinition } from 'gitnexus-shared';
|
||||
import { moduleSegments } from '../../scope-resolution/utils/name-fallback-visibility.js';
|
||||
import { HERITAGE_MARKER_PREFIX } from '../../utils/heritage-marker.js';
|
||||
|
||||
/**
|
||||
* The namespace segments a candidate's qualified name declares, minus the
|
||||
* method itself. `Billing::Invoice#total` / `Billing.Invoice.total` → the
|
||||
* `Billing`, `Invoice` constants a caller would have to name.
|
||||
*/
|
||||
function namespaceConstantsOf(candidate: SymbolDefinition): readonly string[] {
|
||||
const qualified = candidate.qualifiedName;
|
||||
if (qualified === undefined || qualified === '') return [];
|
||||
const segments = qualified
|
||||
.split(/::|\.|#/)
|
||||
.map((s) => s.trim())
|
||||
.filter((s) => s !== '');
|
||||
// Drop the trailing method name; what remains is the namespace chain.
|
||||
const namespace = segments.slice(0, -1);
|
||||
// Only CONSTANTS name a Ruby namespace (upper-case initial). A lower-case
|
||||
// segment is a receiver expression, not a namespace a caller can mention.
|
||||
return namespace.filter((s) => /^[A-Z]/.test(s));
|
||||
}
|
||||
|
||||
/**
|
||||
* `billing/invoice_service` vs `InvoiceService`: a path segment names a
|
||||
* constant when, with underscores removed, the two are equal case-insensitively.
|
||||
* Zeitwerk's own inflection rule, minus acronym overrides — over-matching here
|
||||
* only loses a refusal (the edge stays, labeled), which is the safe direction.
|
||||
*/
|
||||
function pathSegmentNamesConstant(segment: string, constant: string): boolean {
|
||||
return segment.replace(/_/g, '').toLowerCase() === constant.toLowerCase();
|
||||
}
|
||||
|
||||
function requireReachesConstant(targetRaw: string, constant: string): boolean {
|
||||
for (const segment of moduleSegments(targetRaw)) {
|
||||
if (pathSegmentNamesConstant(segment, constant)) return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* The declared kind of the candidate's owner, read from the candidate's own
|
||||
* file. Ruby labels `class` bodies `Class` and `module` bodies `Trait`
|
||||
* (`query.ts`: "module (labeled Trait for class-like registry lookup)").
|
||||
* `undefined` when the owner cannot be found — an unanswered question.
|
||||
*/
|
||||
function ownerLabelOf(
|
||||
candidate: SymbolDefinition,
|
||||
parsedFileOf: ((filePath: string) => ParsedFile | undefined) | undefined,
|
||||
): string | undefined {
|
||||
const ownerId = candidate.ownerId;
|
||||
if (ownerId === undefined || parsedFileOf === undefined) return undefined;
|
||||
const owner = parsedFileOf(candidate.filePath)?.localDefs.find((d) => d.nodeId === ownerId);
|
||||
return owner?.type;
|
||||
}
|
||||
|
||||
/**
|
||||
* Calls that rebind `self` for the duration of a block: inside
|
||||
* `service.instance_eval do … end` a bare `helper()` is dispatched on
|
||||
* `service`, so it legitimately reaches a class-owned method the caller file
|
||||
* never names. Detected on the caller's SOURCE TEXT, not the call site — the
|
||||
* site does not know which block encloses it — so any file that uses one of
|
||||
* these forms keeps its class-owned guesses LABELED rather than refused. Coarse
|
||||
* in the safe direction: it loses refusals in that file, never an edge.
|
||||
*/
|
||||
const SELF_REBINDING_CALL =
|
||||
/\b(?:instance_eval|instance_exec|class_eval|class_exec|module_eval|module_exec)\b/;
|
||||
|
||||
export function rubyIsGlobalNameFallbackPlausible(ctx: {
|
||||
readonly callerParsed: ParsedFile;
|
||||
readonly candidate: SymbolDefinition;
|
||||
readonly parsedFileOf?: (filePath: string) => ParsedFile | undefined;
|
||||
readonly sourceTextOf?: (filePath: string) => string | undefined;
|
||||
}): boolean {
|
||||
if (ctx.candidate.filePath === ctx.callerParsed.filePath) return true;
|
||||
// Top-level method — the autoload shape the fallback exists for.
|
||||
if (ctx.candidate.ownerId === undefined) return true;
|
||||
// A self-rebinding block anywhere in the caller makes "the class is never
|
||||
// named here" no proof of impossibility (see `SELF_REBINDING_CALL`). The
|
||||
// pipeline always supplies the source; a missing text is an unanswered
|
||||
// question and keeps the labeled edge as well.
|
||||
const text = ctx.sourceTextOf?.(ctx.callerParsed.filePath);
|
||||
if (text === undefined || SELF_REBINDING_CALL.test(text)) return true;
|
||||
// Only a CLASS body makes a bare cross-file call impossible without naming
|
||||
// it (see the header). A module owner, or an owner we cannot type, is not a
|
||||
// refusal.
|
||||
if (ownerLabelOf(ctx.candidate, ctx.parsedFileOf) !== 'Class') return true;
|
||||
|
||||
const constants = namespaceConstantsOf(ctx.candidate);
|
||||
// Owned but with no nameable namespace (an anonymous or lower-cased owner):
|
||||
// nothing to check, so do not refuse on an unanswered question.
|
||||
if (constants.length === 0) return true;
|
||||
|
||||
// Any inheritance or mixin surface in the caller can reach the class
|
||||
// transitively (see the header) — not decidable here, so not refused.
|
||||
for (const site of ctx.callerParsed.referenceSites) {
|
||||
if (site.kind === 'inherits') return true;
|
||||
}
|
||||
for (const imp of ctx.callerParsed.parsedImports) {
|
||||
if (imp.targetRaw.startsWith(HERITAGE_MARKER_PREFIX)) return true;
|
||||
}
|
||||
// A file that defines a module is a mixin whose methods run inside some
|
||||
// including class (see the header). Ruby labels `module` bodies `Trait`.
|
||||
for (const def of ctx.callerParsed.localDefs) {
|
||||
if (def.type === 'Trait') return true;
|
||||
// A file that REOPENS `class Invoice` names the owner even without an
|
||||
// inherits site or a reference capture — the declaration itself is the
|
||||
// mention.
|
||||
if (def.type === 'Class') {
|
||||
const declared = (def.qualifiedName ?? '')
|
||||
.split(/::|\.|#/)
|
||||
.map((s) => s.trim())
|
||||
.filter((s) => s !== '')
|
||||
.at(-1);
|
||||
if (declared !== undefined && constants.includes(declared)) return true;
|
||||
}
|
||||
}
|
||||
|
||||
for (const imp of ctx.callerParsed.parsedImports) {
|
||||
for (const constant of constants) {
|
||||
if (requireReachesConstant(imp.targetRaw, constant)) return true;
|
||||
// `include Billing::Invoice` arrives as an import whose LOCAL name is the
|
||||
// constant rather than a path. Not every variant carries one.
|
||||
if ('localName' in imp && imp.localName === constant) return true;
|
||||
}
|
||||
}
|
||||
// A bare mention of the constant anywhere in the caller (`Billing::Invoice`,
|
||||
// `Invoice.new`) is enough to make the namespace present in this file. The
|
||||
// qualified spelling is matched SEGMENT-wise on `::` / `.`: `InvoiceService`
|
||||
// is not a mention of `Invoice`, and a substring test made it one.
|
||||
for (const site of ctx.callerParsed.referenceSites) {
|
||||
for (const constant of constants) {
|
||||
if (site.name === constant) return true;
|
||||
if (
|
||||
site.rawQualifiedName !== undefined &&
|
||||
site.rawQualifiedName.split(/::|\./).some((segment) => segment === constant)
|
||||
) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
|
@ -10,6 +10,7 @@ import type { GraphNodeLookup } from '../../scope-resolution/graph-bridge/node-l
|
|||
import type { KnowledgeGraph } from '../../../graph/types.js';
|
||||
import { generateId } from '../../../../lib/utils.js';
|
||||
import { decodeMarker } from '../../utils/heritage-marker.js';
|
||||
import { rubyIsGlobalNameFallbackPlausible } from './name-fallback-visibility.js';
|
||||
|
||||
/**
|
||||
* #1991: resolve a BARE mixin reference (`include Loggable`) to a nested module by
|
||||
|
|
@ -287,4 +288,5 @@ export const rubyScopeResolver: ScopeResolver = {
|
|||
fieldFallbackOnMethodLookup: true,
|
||||
propagatesReturnTypesAcrossImports: true,
|
||||
allowGlobalFreeCallFallback: true,
|
||||
isGlobalNameFallbackPlausible: rubyIsGlobalNameFallbackPlausible,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,183 @@
|
|||
/**
|
||||
* Rust's veto on the global-name fallback — see
|
||||
* `ScopeResolver.isGlobalNameFallbackPlausible`.
|
||||
*
|
||||
* Rust has NO ambient namespace. A bare `helper()` resolves only against names
|
||||
* in scope, and for an item declared in another module the only way in is a
|
||||
* `use` path (or a fully-qualified `crate::a::b::helper()` call, which is not a
|
||||
* bare free call and never reaches this tier — it carries a qualified name and
|
||||
* is resolved earlier by `resolveQualifiedFreeCall`).
|
||||
*
|
||||
* This hook checks import evidence, not Rust item visibility. A child module
|
||||
* can use private ancestor items, and visibility restrictions such as
|
||||
* `pub(crate)` require more context than `SymbolDefinition` carries. A matching
|
||||
* import therefore keeps a labeled guess rather than proving accessibility.
|
||||
*
|
||||
* Module paths are matched against the candidate's FILE path (extension
|
||||
* stripped, and `mod`/`lib`/`main` stem dropped, since `a/b/mod.rs` IS module
|
||||
* `a::b`). `crate::` names the root; `self::` and `super::` resolve relative
|
||||
* to the caller's module before comparison.
|
||||
*/
|
||||
|
||||
import type { ParsedFile, Scope, ScopeId, SymbolDefinition } from 'gitnexus-shared';
|
||||
import {
|
||||
modulePathReaches,
|
||||
stripExtension,
|
||||
} from '../../scope-resolution/utils/name-fallback-visibility.js';
|
||||
|
||||
/** File-stems that name their PARENT directory as the module, not themselves. */
|
||||
const RUST_DIRECTORY_MODULE_STEMS: ReadonlySet<string> = new Set(['mod', 'lib', 'main']);
|
||||
|
||||
/** Directories that hold a crate's root and contribute no module segment, so
|
||||
* `src/net/http.rs` is module `net::http` and not `src::net::http`. */
|
||||
const RUST_CRATE_ROOT_DIRS: ReadonlySet<string> = new Set(['src', 'tests', 'benches', 'examples']);
|
||||
|
||||
/** Path prefixes of a `use` that name a root rather than a module segment. */
|
||||
const RUST_USE_ROOT_PREFIXES: ReadonlySet<string> = new Set(['crate', '$crate']);
|
||||
|
||||
// One scope lookup per immutable parsed-file snapshot, not per fallback site.
|
||||
// Weak keys release both the snapshot and its index at the end of ingestion.
|
||||
const scopeLookupByFile = new WeakMap<ParsedFile, ReadonlyMap<ScopeId, Scope>>();
|
||||
|
||||
/**
|
||||
* The module path a Rust file provides, as a `/`-joined path.
|
||||
*
|
||||
* Two normalizations, both needed for a file path and a `use` path to line up
|
||||
* on their trailing segments: the `mod`/`lib`/`main` stem names its parent
|
||||
* directory, and a leading crate-root directory (`src/`) is not a module.
|
||||
*/
|
||||
function rustModulePathOf(filePath: string): string {
|
||||
const withoutExtension = stripExtension(filePath);
|
||||
const segments = withoutExtension.split('/').filter((s) => s !== '');
|
||||
const stem = segments[segments.length - 1];
|
||||
if (stem !== undefined && RUST_DIRECTORY_MODULE_STEMS.has(stem)) segments.pop();
|
||||
// Only the crate-root folder is non-semantic. A nested `src/` is module
|
||||
// `src` (`src/src/helper.rs` → `crate::src::helper`), not another root.
|
||||
if (segments.length > 0 && RUST_CRATE_ROOT_DIRS.has(segments[0]!)) segments.shift();
|
||||
return segments.join('/');
|
||||
}
|
||||
|
||||
/**
|
||||
* Directory that owns the crate-root folder (`src`/`tests`/…). Empty when the
|
||||
* file sits at the analyzed root (`src/lib.rs`) so a single-crate tree is not
|
||||
* refused on a missing workspace prefix.
|
||||
*/
|
||||
function rustCrateRootOf(filePath: string): string {
|
||||
const segments = stripExtension(filePath)
|
||||
.split('/')
|
||||
.filter((s) => s !== '');
|
||||
const stem = segments[segments.length - 1];
|
||||
if (stem !== undefined && RUST_DIRECTORY_MODULE_STEMS.has(stem)) segments.pop();
|
||||
const rootIdx = segments.findIndex((s) => RUST_CRATE_ROOT_DIRS.has(s));
|
||||
if (rootIdx <= 0) return '';
|
||||
return segments.slice(0, rootIdx).join('/');
|
||||
}
|
||||
|
||||
/** Resolve explicit relative prefixes against the caller's module path. */
|
||||
function rustUsePathOf(targetRaw: string, callerFilePath: string): string {
|
||||
const segments = targetRaw.split('::').filter((s) => s !== '');
|
||||
if (segments[0] === 'self' || segments[0] === 'super') {
|
||||
const base = rustModulePathOf(callerFilePath).split('/').filter(Boolean);
|
||||
if (segments[0] === 'self') segments.shift();
|
||||
while (segments[0] === 'super') {
|
||||
base.pop();
|
||||
segments.shift();
|
||||
}
|
||||
return [...base, ...segments].join('::');
|
||||
}
|
||||
while (segments.length > 0 && RUST_USE_ROOT_PREFIXES.has(segments[0]!)) segments.shift();
|
||||
return segments.join('::');
|
||||
}
|
||||
|
||||
export function rustIsGlobalNameFallbackPlausible(ctx: {
|
||||
readonly callerParsed: ParsedFile;
|
||||
readonly candidate: SymbolDefinition;
|
||||
readonly site: {
|
||||
readonly name: string;
|
||||
readonly rawQualifiedName?: string;
|
||||
readonly inScope?: ScopeId;
|
||||
};
|
||||
}): boolean {
|
||||
if (ctx.candidate.filePath === ctx.callerParsed.filePath) return true;
|
||||
// A PATH-QUALIFIED call (`User::new(...)`, `crate::a::helper()`) reaches this
|
||||
// tier when the qualifier could not be followed, carrying only its tail name.
|
||||
// It is not a bare-name guess: the source named the path, so the module rule
|
||||
// below would refuse an edge the code spells out.
|
||||
if (ctx.site.rawQualifiedName !== undefined) return true;
|
||||
|
||||
const candidateModule = rustModulePathOf(ctx.candidate.filePath);
|
||||
// A candidate whose file maps to no module path (a crate root reduced to '')
|
||||
// is not something this rule can speak about; allow the labeled edge rather
|
||||
// than refuse on an unanswered question.
|
||||
if (candidateModule === '') return true;
|
||||
|
||||
const candidateName = rustSimpleNameOf(ctx.candidate);
|
||||
// Imports are lexical evidence, not a file-wide allowlist. Legacy/synthetic
|
||||
// imports without a scope receipt retain the previous conservative behavior.
|
||||
let visibleScopes: Set<ScopeId> | undefined;
|
||||
if (ctx.site.inScope !== undefined) {
|
||||
let scopes = scopeLookupByFile.get(ctx.callerParsed);
|
||||
if (scopes === undefined) {
|
||||
scopes = new Map(ctx.callerParsed.scopes.map((scope) => [scope.id, scope]));
|
||||
scopeLookupByFile.set(ctx.callerParsed, scopes);
|
||||
}
|
||||
visibleScopes = new Set();
|
||||
let current: ScopeId | null = ctx.site.inScope;
|
||||
while (current !== null && !visibleScopes.has(current)) {
|
||||
visibleScopes.add(current);
|
||||
const scope = scopes.get(current);
|
||||
if (scope === undefined || scope.kind === 'Namespace') break;
|
||||
current = scope.parent;
|
||||
}
|
||||
}
|
||||
for (const imp of ctx.callerParsed.parsedImports) {
|
||||
if (
|
||||
imp.declaredAtScope !== undefined &&
|
||||
visibleScopes !== undefined &&
|
||||
!visibleScopes.has(imp.declaredAtScope)
|
||||
)
|
||||
continue;
|
||||
// `crate::` is the caller's crate. A same trailing module in another
|
||||
// workspace crate is a different item and cannot authorize the guess.
|
||||
if (imp.targetRaw === 'crate' || imp.targetRaw.startsWith('crate::')) {
|
||||
const callerRoot = rustCrateRootOf(ctx.callerParsed.filePath);
|
||||
const candidateRoot = rustCrateRootOf(ctx.candidate.filePath);
|
||||
if (callerRoot !== '' && candidateRoot !== '' && callerRoot !== candidateRoot) continue;
|
||||
}
|
||||
const usePath = rustUsePathOf(imp.targetRaw, ctx.callerParsed.filePath);
|
||||
// Only a glob introduces every bare item of a module. A named import must
|
||||
// match both the candidate's original name and the call's local spelling.
|
||||
if (imp.kind === 'wildcard') {
|
||||
if (modulePathReaches(usePath, candidateModule)) return true;
|
||||
continue;
|
||||
}
|
||||
if (!('localName' in imp) || imp.localName !== ctx.site.name) continue;
|
||||
// Otherwise the path names ONE item inside a module (`use crate::a::other`).
|
||||
// Its PARENT is the candidate's module only if that item IS the candidate:
|
||||
// importing `other` says nothing about a `helper` in `a`, and the bare
|
||||
// parent-path match used to accept every item of `a` on its strength.
|
||||
// An alias authorizes only the local spelling checked above.
|
||||
if (importedNameOf(imp) !== candidateName) continue;
|
||||
if (modulePathReaches(usePath, candidateModule)) return true;
|
||||
const parent = usePath.slice(0, Math.max(0, usePath.lastIndexOf('::')));
|
||||
if (parent !== '' && modulePathReaches(parent, candidateModule)) return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/** The identifier a `use` binds, as written at its source (`importedName`). */
|
||||
function importedNameOf(imp: ParsedFile['parsedImports'][number]): string | undefined {
|
||||
return 'importedName' in imp ? imp.importedName : undefined;
|
||||
}
|
||||
|
||||
/**
|
||||
* The identifier a Rust declaration contributes to its module: the FIRST
|
||||
* segment of `qualifiedName` after any module prefix — `User` for `User.new`
|
||||
* (an associated function is reached through its type, so it is the type the
|
||||
* `use` must name), the bare name for a free function.
|
||||
*/
|
||||
function rustSimpleNameOf(candidate: SymbolDefinition): string {
|
||||
const qualified = candidate.qualifiedName ?? '';
|
||||
const segments = qualified.split(/::|\./).filter((s) => s !== '');
|
||||
return segments[0] ?? '';
|
||||
}
|
||||
|
|
@ -19,6 +19,7 @@ import type { GraphNodeLookup } from '../../scope-resolution/graph-bridge/node-l
|
|||
import type { HeritageTypeArgumentSink } from '../../scope-resolution/utils/generic-instantiation.js';
|
||||
import type { KnowledgeGraph } from '../../../graph/types.js';
|
||||
import { generateId } from '../../../../lib/utils.js';
|
||||
import { rustIsGlobalNameFallbackPlausible } from './name-fallback-visibility.js';
|
||||
|
||||
/**
|
||||
* Emit Rust `S IMPLEMENTS T` edges from `impl T for S` trait implementations.
|
||||
|
|
@ -192,4 +193,6 @@ export const rustScopeResolver: ScopeResolver = {
|
|||
hoistTypeBindingsToModule: true,
|
||||
propagatesReturnTypesAcrossImports: true,
|
||||
allowGlobalFreeCallFallback: true,
|
||||
importsBindAtLexicalScope: true,
|
||||
isGlobalNameFallbackPlausible: rustIsGlobalNameFallbackPlausible,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,67 @@
|
|||
/**
|
||||
* Swift's veto on the global-name fallback — see
|
||||
* `ScopeResolver.isGlobalNameFallbackPlausible`.
|
||||
*
|
||||
* Swift's default access level is `internal`: visible throughout the MODULE and
|
||||
* nowhere else. Swift needs no per-file import inside a module, which is why
|
||||
* the global fallback is enabled for it at all — but that whole-module
|
||||
* visibility stops hard at the module boundary. A candidate in a DIFFERENT
|
||||
* module is reachable only if the caller wrote `import <ThatModule>`, and even
|
||||
* then only if the declaration is `public`.
|
||||
*
|
||||
* A module is approximated by its source directory, the layout every Swift
|
||||
* package configuration discovers: `Sources/<Target>/…` (also under `Package/`).
|
||||
* `src/<Target>/…` is also recognized by the package configuration loader.
|
||||
* Files outside these layouts have unknown module identity.
|
||||
*
|
||||
* The `private` / `fileprivate` half of the rule is NOT implemented, because
|
||||
* neither marker is recoverable from the parse model this hook sees —
|
||||
* `SymbolDefinition` carries no access level and `ParsedFile` no modifiers.
|
||||
* Those candidates keep the labeled low-confidence edge, which is the
|
||||
* "cannot decide, so do not refuse" direction the hook contract asks for.
|
||||
*/
|
||||
|
||||
import type { ParsedFile, SymbolDefinition } from 'gitnexus-shared';
|
||||
import { modulePathReaches } from '../../scope-resolution/utils/name-fallback-visibility.js';
|
||||
|
||||
/** Keep aligned with loadSwiftPackageConfig: other layouts are unconfigured. */
|
||||
const SWIFT_TARGET_ROOTS: ReadonlySet<string> = new Set(['Sources', 'src']);
|
||||
|
||||
/**
|
||||
* The module (target) a Swift file belongs to.
|
||||
*
|
||||
* `Sources/Core/User.swift` → `Core`. Arbitrary Xcode folders are not module
|
||||
* boundaries; without a recognized target layout leave the answer unknown.
|
||||
*/
|
||||
function swiftModuleOf(filePath: string): string {
|
||||
const segments = filePath.split('/').filter((s) => s !== '');
|
||||
for (let i = 0; i < segments.length - 2; i++) {
|
||||
if (SWIFT_TARGET_ROOTS.has(segments[i]!)) {
|
||||
// Keep the path through the target so `Sources/Core` and
|
||||
// `Package/Sources/Core` stay distinct modules. `import Core` still
|
||||
// reaches either via trailing-segment containment.
|
||||
return segments.slice(0, i + 2).join('/');
|
||||
}
|
||||
}
|
||||
return '';
|
||||
}
|
||||
|
||||
export function swiftIsGlobalNameFallbackPlausible(ctx: {
|
||||
readonly callerParsed: ParsedFile;
|
||||
readonly candidate: SymbolDefinition;
|
||||
}): boolean {
|
||||
if (ctx.candidate.filePath === ctx.callerParsed.filePath) return true;
|
||||
|
||||
const callerModule = swiftModuleOf(ctx.callerParsed.filePath);
|
||||
const candidateModule = swiftModuleOf(ctx.candidate.filePath);
|
||||
// Same module: whole-module `internal` visibility, no import needed.
|
||||
if (callerModule === candidateModule) return true;
|
||||
// A file the layout heuristic cannot place is not something this rule can
|
||||
// speak about — allow rather than refuse on an unanswered question.
|
||||
if (callerModule === '' || candidateModule === '') return true;
|
||||
|
||||
for (const imp of ctx.callerParsed.parsedImports) {
|
||||
if (modulePathReaches(imp.targetRaw, candidateModule)) return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
|
@ -66,6 +66,7 @@ import {
|
|||
mirrorSwiftSiblingTypeBindings,
|
||||
type SwiftResolveContext,
|
||||
} from './index.js';
|
||||
import { swiftIsGlobalNameFallbackPlausible } from './name-fallback-visibility.js';
|
||||
|
||||
const ZERO_RANGE = { startLine: 0, startCol: 0, endLine: 0, endCol: 0 } as const;
|
||||
|
||||
|
|
@ -136,6 +137,7 @@ const swiftScopeResolver: ScopeResolver = {
|
|||
// global free-call fallback (as Python/Go/Ruby/COBOL do for the same
|
||||
// no-`new` constructor + cross-file free-call shape).
|
||||
allowGlobalFreeCallFallback: true,
|
||||
isGlobalNameFallbackPlausible: swiftIsGlobalNameFallbackPlausible,
|
||||
|
||||
// Swift's call graph models `Type(...)` as a reference to the type
|
||||
// itself, not its `init` — both the legacy DAG and this test suite link
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ import {
|
|||
syntheticCapture,
|
||||
type SyntaxNode,
|
||||
} from '../../utils/ast-helpers.js';
|
||||
import { collectEsmExportEvidence, esmExportVerdict } from '../../ts-js-export-marker.js';
|
||||
import { splitImportStatement } from './import-decomposer.js';
|
||||
import { getTsParser, getTsScopeQuery, tsCachedTreeMatchesGrammar } from './query.js';
|
||||
import { recordCacheHit, recordCacheMiss } from './cache-stats.js';
|
||||
|
|
@ -388,6 +389,8 @@ export function emitTsScopeCaptures(
|
|||
}
|
||||
|
||||
const rawMatches = getTsScopeQuery(filePath).matches(tree.rootNode);
|
||||
// Export evidence, read once per file (see `ts-js-export-marker.ts`).
|
||||
const exportEvidence = collectEsmExportEvidence(tree.rootNode, filePath);
|
||||
const out: CaptureMatch[] = [];
|
||||
|
||||
for (const m of rawMatches) {
|
||||
|
|
@ -561,6 +564,13 @@ export function emitTsScopeCaptures(
|
|||
fnNode,
|
||||
deriveDefaultExportHocName(filePath),
|
||||
);
|
||||
// This declaration's name is synthetic, so the later query-name
|
||||
// marker cannot see it. The HOC predicate already proves the export.
|
||||
grouped['@declaration.is-exported'] = syntheticCapture(
|
||||
'@declaration.is-exported',
|
||||
fnNode,
|
||||
'true',
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -660,6 +670,20 @@ export function emitTsScopeCaptures(
|
|||
// instead of re-parsing the receiver's source text. Self-gating: a
|
||||
// non-call match, an absent receiver, or a chain with no nameable base
|
||||
// all leave `grouped` untouched.
|
||||
// `@declaration.is-exported`: a verdict for every declaration the file's
|
||||
// export surface can decide (see `ts-js-export-marker.ts`); nothing where
|
||||
// it cannot, because absence is the honest answer there.
|
||||
const declNameNode = groupedNodes['@declaration.name'];
|
||||
if (exportEvidence !== undefined && declNameNode !== undefined) {
|
||||
const verdict = esmExportVerdict(declNameNode, exportEvidence);
|
||||
if (verdict !== undefined) {
|
||||
grouped['@declaration.is-exported'] = syntheticCapture(
|
||||
'@declaration.is-exported',
|
||||
declNameNode,
|
||||
verdict ? 'true' : 'false',
|
||||
);
|
||||
}
|
||||
}
|
||||
synthesizeReceiverChainCapture(grouped, groupedNodes['@reference.receiver']);
|
||||
out.push(grouped);
|
||||
|
||||
|
|
|
|||
|
|
@ -1346,7 +1346,13 @@ export const TYPESCRIPT_SCOPE_QUERY = `
|
|||
* (\`<Foo>...</Foo>\`) emit; the closing tag is intentionally NOT captured —
|
||||
* each JSX element should emit exactly one CALLS edge per use site.
|
||||
*/
|
||||
const TSX_JSX_QUERY_SUFFIX = `
|
||||
/**
|
||||
* Exported alongside `TYPESCRIPT_SCOPE_QUERY` so
|
||||
* `value-ref-dispatchability.test.ts` checks the whole query a `.tsx` file is
|
||||
* analyzed with. Checking the base alone would miss a `value-ref` rule added
|
||||
* here. Not part of the provider surface — use `getTsScopeQuery`.
|
||||
*/
|
||||
export const TSX_JSX_QUERY_SUFFIX = `
|
||||
;; <Foo />
|
||||
((jsx_self_closing_element
|
||||
name: (identifier) @reference.name) @reference.call.free
|
||||
|
|
|
|||
|
|
@ -132,6 +132,15 @@ const typescriptScopeResolver: ScopeResolver = {
|
|||
fieldFallbackOnMethodLookup: false,
|
||||
propagatesReturnTypesAcrossImports: true,
|
||||
|
||||
// ECMAScript: `export * from './a'; export * from './b'` with a name declared
|
||||
// in both exports NEITHER — the finalize pass refuses the binding instead of
|
||||
// taking the first-listed source (see `exclusiveWildcardReexports`).
|
||||
exclusiveWildcardReexports: true,
|
||||
// `import { x }` never reaches a class member: named imports and named
|
||||
// re-exports bind to module-level declarations only (a class method sharing
|
||||
// a name with a top-level value must not win the callable preference).
|
||||
namedImportsBindTopLevelOnly: true,
|
||||
|
||||
// TypeScript uses `.values()` / `.keys()` method-call syntax for collection
|
||||
// views -- no property-style accessors like C#'s `Dictionary<K,V>.Values` --
|
||||
// so `elementTypeOf` answers only the `index` route and lets the regular
|
||||
|
|
|
|||
|
|
@ -318,8 +318,8 @@ function parseJsonc(raw: string): Record<string, unknown> {
|
|||
return JSON.parse(withoutComments) as Record<string, unknown>;
|
||||
}
|
||||
|
||||
function repoRelative(repoRoot: string, absDir: string): string {
|
||||
const rel = path.relative(repoRoot, absDir).split(path.sep).join('/');
|
||||
function repoRelative(repoRoot: string, absDir: string, pathApi: typeof path = path): string {
|
||||
const rel = pathApi.relative(repoRoot, absDir).split(pathApi.sep).join('/');
|
||||
return rel === '.' || rel === '' ? '' : rel;
|
||||
}
|
||||
|
||||
|
|
@ -329,11 +329,34 @@ function repoRelative(repoRoot: string, absDir: string): string {
|
|||
* `path.resolve` swallows the wildcard into a path segment, so it is stripped
|
||||
* before resolving and re-appended after — the `*` is a substitution marker,
|
||||
* not a directory named `*`.
|
||||
*
|
||||
* `pathApi` is injectable so the win32 separator branch is unit-testable from a
|
||||
* POSIX runner; production callers always use the platform-bound `path`.
|
||||
*/
|
||||
function rebaseTarget(repoRoot: string, absTarget: string): string {
|
||||
function rebaseTarget(repoRoot: string, absTarget: string, pathApi: typeof path = path): string {
|
||||
// `/repo/src/*` must come back as `src/*`, not `src*`: stripping only the
|
||||
// star leaves a trailing slash that `path.relative` then eats.
|
||||
const suffix = absTarget.endsWith('/*') ? '/*' : absTarget.endsWith('*') ? '*' : '';
|
||||
const base = suffix === '' ? absTarget : absTarget.slice(0, -suffix.length);
|
||||
return `${repoRelative(repoRoot, base)}${suffix}`;
|
||||
//
|
||||
// The target arrives from `path.resolve`, so on Windows it is `C:\repo\src\*`
|
||||
// and an `endsWith('/*')` check never matches. It fell through to the bare
|
||||
// `*` branch, `path.relative` ate the trailing backslash, and every alias
|
||||
// target came back as `src*` — which `substituteStar` turns into `srclib/x`,
|
||||
// so nothing an alias reached was ever resolved on Windows. Normalise the
|
||||
// separator before looking at the suffix.
|
||||
const normalized = absTarget.split(pathApi.sep).join('/');
|
||||
const suffix = normalized.endsWith('/*') ? '/*' : normalized.endsWith('*') ? '*' : '';
|
||||
const base = suffix === '' ? normalized : normalized.slice(0, -suffix.length);
|
||||
const prefix = repoRelative(repoRoot, base, pathApi);
|
||||
// A target naming the repo ROOT (`"*": ["./*"]` under `baseUrl: "."`) leaves
|
||||
// an empty prefix, and `${''}${'/*'}` is `/*`. `substituteStar` turns that
|
||||
// into `/lib/date`, but `resolveFile` matches repo-relative keys and never
|
||||
// strips a leading slash, so `lib/date.ts` misses and the alias goes
|
||||
// external. The bare `*` is the encoding that substitutes correctly — and it
|
||||
// is what the pre-#3203 Windows path emitted by accident, so this keeps the
|
||||
// separator fix from narrowing what already resolved there.
|
||||
if (prefix === '' && suffix === '/*') return '*';
|
||||
return `${prefix}${suffix}`;
|
||||
}
|
||||
|
||||
/** Test seam for {@link rebaseTarget} (see `test/unit/tsconfig-rebase-target.test.ts`). */
|
||||
export const _rebaseTargetForTests = rebaseTarget;
|
||||
|
|
|
|||
|
|
@ -117,6 +117,9 @@ const vueScopeResolver: ScopeResolver = {
|
|||
// Vue uses explicit imports for all external symbols; no global free-
|
||||
// call fallback needed (would produce spurious edges for built-ins).
|
||||
allowGlobalFreeCallFallback: false,
|
||||
// Vue SFC scripts are TypeScript/JavaScript: a named import binds a module-level
|
||||
// declaration, never a class member (see the TS resolver).
|
||||
namedImportsBindTopLevelOnly: true,
|
||||
|
||||
/**
|
||||
* Expand the scope-resolution file universe for Vue by performing a
|
||||
|
|
|
|||
|
|
@ -20,7 +20,13 @@ import { requireVendoredGrammar } from '../../../tree-sitter/vendored-grammars.j
|
|||
* container and import bindings — `emitZigScopeCaptures` filters those
|
||||
* groups out so a name binds exactly once.
|
||||
*/
|
||||
const ZIG_SCOPE_QUERY = `
|
||||
/**
|
||||
* Exported for `value-ref-dispatchability.test.ts`, which reads every language's
|
||||
* scope query to enforce the keyed/unkeyed partition that
|
||||
* `callableValueReferenceBoundaries`' dispatch exclusion depends on. Not part of
|
||||
* the provider surface — nothing else should import it.
|
||||
*/
|
||||
export const ZIG_SCOPE_QUERY = `
|
||||
;; Scopes
|
||||
(source_file) @scope.module
|
||||
(struct_declaration) @scope.class
|
||||
|
|
@ -359,6 +365,60 @@ const ZIG_SCOPE_QUERY = `
|
|||
"const" . (identifier) @type-binding.name
|
||||
(call_expression) @type-binding.type .) @type-binding.alias
|
||||
|
||||
;; References — VALUE positions (#3399): a callable named where a value is
|
||||
;; expected rather than where a callee is. Zig's JS bridge is built entirely
|
||||
;; out of this shape —
|
||||
;;
|
||||
;; pub const namespaceURI = bridge.accessor(Element.getNamespaceUri, null, .{});
|
||||
;;
|
||||
;; — 2,047 such declarations across 257 files in lightpanda-io/browser, the
|
||||
;; project's whole JS↔Zig surface, and NONE of them reached the graph: Zig
|
||||
;; emitted no \`value-ref\` capture at all, so a public DOM accessor's only
|
||||
;; recorded callers were the two internal ones and \`impact\` called that \`exact\`.
|
||||
;;
|
||||
;; These become reference-class USES edges through the existing
|
||||
;; \`mapReferenceKindToEdgeType\` mapping — a registration is not an invocation
|
||||
;; (Kythe \`ref\` vs \`ref/call\`; Joern \`METHOD_REF\`) — resolved by the
|
||||
;; property-dispatch pass, which keeps ONLY callable targets. That callable gate
|
||||
;; is what makes these deliberately broad rules safe: \`js.Bridge(Element)\` and
|
||||
;; \`register(count)\` match too, and emit nothing, exactly as TypeScript's
|
||||
;; \`{ port: DEFAULT_PORT }\` does.
|
||||
;;
|
||||
;; No \`@reference.property-key\` is attached: Zig has no object-literal key to
|
||||
;; dispatch through, so these register a reference and never synthesize CALLS.
|
||||
;; The terminal invoke — \`Accessor.init\` → a struct field → \`Factory.zig\`'s
|
||||
;; \`inline for\`/\`@typeInfo\` → \`@call(.auto, func, args)\` — needs comptime
|
||||
;; evaluation and is deliberately NOT modelled; \`impact\` reports the shortfall
|
||||
;; as \`epistemic: "lower-bound"\` instead of pretending to certainty.
|
||||
|
||||
;; Call ARGUMENTS. In tree-sitter-zig arguments are direct children of
|
||||
;; \`call_expression\`, NOT wrapped in an \`arguments\` node (only builtins have
|
||||
;; one), so the callee has to be consumed explicitly by \`function:\` — without
|
||||
;; that binding the same rule also matches the callee of \`foo(bar)\` and mints a
|
||||
;; USES edge duplicating the call.
|
||||
(call_expression
|
||||
function: (_)
|
||||
(identifier) @reference.name @reference.value-ref)
|
||||
|
||||
;; Qualified argument — \`bridge.accessor(Element.getNamespaceUri, …)\`. The
|
||||
;; RECEIVER is captured alongside the member so the site carries the owner it
|
||||
;; was written with; \`@reference.name\` stays the member, which is the name the
|
||||
;; scope walk resolves.
|
||||
(call_expression
|
||||
function: (_)
|
||||
(field_expression
|
||||
object: (_) @reference.receiver
|
||||
member: (identifier) @reference.name) @reference.value-ref)
|
||||
|
||||
;; Const binding initialiser — \`pub const defaultHandler = onReset;\`. Both
|
||||
;; anchors are load-bearing: the leading \`.\` pins the bound name to the first
|
||||
;; named child (see the declaration rules above), and the trailing \`.\` keeps the
|
||||
;; initializer as the LAST child, so a \`const x: T = y\` annotation shape cannot
|
||||
;; put the TYPE in value position.
|
||||
(variable_declaration
|
||||
"const" . (identifier)
|
||||
(identifier) @reference.name @reference.value-ref .)
|
||||
|
||||
;; References — free calls: foo(...)
|
||||
(call_expression
|
||||
function: (identifier) @reference.name) @reference.call.free
|
||||
|
|
|
|||
|
|
@ -17,6 +17,14 @@
|
|||
*
|
||||
* Runs after `propagateImportedReturnTypes`, so return bindings hoisted from
|
||||
* other files are visible when a subject is a call.
|
||||
*
|
||||
* This hook also carries `bindZigThisAliases` (`this-alias-bindings.ts`), which
|
||||
* is a different job — binding `const Self = @This();` to its container — but
|
||||
* needs the same thing this pass is already paying for: the file's parsed tree,
|
||||
* post-finalize. Giving it a pass of its own would re-parse every Zig file in
|
||||
* the repo whenever the tree cache is cold. That is the whole reason it is
|
||||
* here; the two do not otherwise interact, for the reason recorded at the call
|
||||
* site.
|
||||
*/
|
||||
|
||||
import type { ParsedFile, Scope, ScopeId, TypeRef } from 'gitnexus-shared';
|
||||
|
|
@ -32,6 +40,7 @@ import {
|
|||
isClassLike,
|
||||
} from '../../scope-resolution/scope/walkers.js';
|
||||
import { isZigKeywordDeclaration, zigUnwrapValue } from './captures.js';
|
||||
import { bindZigThisAliases } from './this-alias-bindings.js';
|
||||
import { normalizeZigTypeName } from './interpret.js';
|
||||
|
||||
type ZigTree = ReturnType<ReturnType<typeof getZigParser>['parse']>;
|
||||
|
|
@ -89,6 +98,23 @@ export function populateZigRangeBindings(
|
|||
}
|
||||
const scopes = parsed.scopes;
|
||||
if (scopes.length === 0) continue;
|
||||
|
||||
// `const Self = @This();` — bind the alias to its container. It sits in this
|
||||
// loop for ONE reason: the tree. A pass of its own would re-parse every Zig
|
||||
// file in the repo whenever the tree cache is cold.
|
||||
//
|
||||
// Its position relative to the payload walk below is NOT load-bearing, and
|
||||
// saying otherwise would be wrong in a checkable way: the payload walk types
|
||||
// a subject through `findReceiverTypeBinding`, which reads `typeBindings`
|
||||
// and the namespace/workspace type channels — never `bindingAugmentations`,
|
||||
// where this writes. Measured on `for (Self.items) |it|`: `it` is bound
|
||||
// neither before nor after. Nor is that a gap this should close by also
|
||||
// writing a typeBinding — NO container name has one, the file stem included,
|
||||
// so a payload subject written `Type.member` resolves for no spelling at
|
||||
// all, and giving the alias an entry would make it behave unlike the very
|
||||
// container it names.
|
||||
bindZigThisAliases(parsed, tree.rootNode, indexes);
|
||||
|
||||
const resolver = new ZigSubjectTypeResolver(scopes, indexes, classScopeByDefId);
|
||||
|
||||
// Pre-order: an outer payload is bound before an inner construct reads it
|
||||
|
|
|
|||
|
|
@ -5,8 +5,9 @@
|
|||
* Thin wiring: Zig has no inheritance (default MRO linearization over an
|
||||
* empty heritage set), no `super`, and is statically typed (field-fallback
|
||||
* heuristic off per the contract guidance). Import resolution reuses the
|
||||
* same `resolveZigImportInternal` the legacy import-resolver config wraps,
|
||||
* with `build.zig.zon` `.path` deps threaded through `loadResolutionConfig`.
|
||||
* same `resolveZigImportInternal` the legacy import-resolver config wraps, with
|
||||
* the repo's Zig build packages threaded through `loadResolutionConfig` and the
|
||||
* one governing each file selected per-file by `zigPackageFor`.
|
||||
*/
|
||||
|
||||
import type { ParsedFile } from 'gitnexus-shared';
|
||||
|
|
@ -14,7 +15,11 @@ import { SupportedLanguages } from 'gitnexus-shared';
|
|||
import { buildMro, defaultLinearize } from '../../scope-resolution/passes/mro.js';
|
||||
import { populateClassOwnedMembers } from '../../scope-resolution/scope/walkers.js';
|
||||
import type { ScopeResolver } from '../../scope-resolution/contract/scope-resolver.js';
|
||||
import { loadZigBuildConfig, type ZigBuildZonConfig } from '../../language-config.js';
|
||||
import {
|
||||
loadZigWorkspaceIndex,
|
||||
zigPackageFor,
|
||||
type ZigWorkspaceIndex,
|
||||
} from '../../language-config.js';
|
||||
import { resolveZigImportInternal } from '../../import-resolvers/zig.js';
|
||||
import { zigProvider } from '../zig.js';
|
||||
import { expandZigWildcardNames, zigArityCompatibility, zigMergeBindings } from './index.js';
|
||||
|
|
@ -46,14 +51,23 @@ export const zigScopeResolver: ScopeResolver = {
|
|||
// import; a one-hop split at the last dot resolved none of them.
|
||||
resolveNamespaceChains: true,
|
||||
|
||||
loadResolutionConfig: (repoPath: string) => loadZigBuildConfig(repoPath),
|
||||
// The whole workspace, not just the root package. A Zig module's import table
|
||||
// is declared by the `build.zig` of the package the file belongs to, so a repo
|
||||
// laying its packages out as `packages/<name>/build.zig` has as many import
|
||||
// tables as packages — and reading only the root one leaves every bare
|
||||
// `@import("<module>")` in such a repo unresolved. Same shape, same reason, as
|
||||
// `loadTsconfigIndex` for a TypeScript monorepo.
|
||||
loadResolutionConfig: (repoPath: string) => loadZigWorkspaceIndex(repoPath),
|
||||
|
||||
resolveImportTarget: (targetRaw, fromFile, allFilePaths, resolutionConfig) =>
|
||||
resolveZigImportInternal(
|
||||
fromFile,
|
||||
targetRaw,
|
||||
allFilePaths,
|
||||
(resolutionConfig as ZigBuildZonConfig | null | undefined) ?? null,
|
||||
// The package governing THIS file — `zigPackageFor` is the `tsconfigFor`
|
||||
// analogue. `resolveZigImportInternal` is handed one package's config and
|
||||
// is unchanged by this: which config it receives is the only difference.
|
||||
zigPackageFor(resolutionConfig as ZigWorkspaceIndex | null | undefined, fromFile),
|
||||
),
|
||||
|
||||
// `pub usingnamespace @import("x.zig");` — target decls become local decls.
|
||||
|
|
|
|||
191
gitnexus/src/core/ingestion/languages/zig/this-alias-bindings.ts
Normal file
191
gitnexus/src/core/ingestion/languages/zig/this-alias-bindings.ts
Normal file
|
|
@ -0,0 +1,191 @@
|
|||
/**
|
||||
* Bind a Zig `const X = @This();` alias to the container it names (#3219
|
||||
* review round 8).
|
||||
*
|
||||
* `@This()` IS the enclosing container, and Zig code says so constantly: the
|
||||
* single most common spelling is `const Self = @This();`, followed by
|
||||
* `Alias.member` wherever the explicit form is wanted (`Self.width(self)`, a
|
||||
* registration `bridge.accessor(Self.width, …)`, a nested type `Self.Node`).
|
||||
* A compiler resolves `Self` and the container's own name to the same type.
|
||||
* This index did not, for one specific reason:
|
||||
*
|
||||
* - A container-level alias (`const Self = @This();` inside `struct {…}`)
|
||||
* mints a `Variable` beside the `Struct`, so `Self` binds to a VALUE. Every
|
||||
* class-like lookup filters on `isClassLike` and walks straight past it.
|
||||
* - A FILE-level alias in a file-as-struct mints nothing at all —
|
||||
* `isZigFileThisAlias` suppresses the Const deliberately, so it cannot
|
||||
* shadow the type for `x: *Page`. The name is then bound to nothing, while
|
||||
* the container itself is bound under the FILE STEM.
|
||||
*
|
||||
* So `Self.width` resolved only when the alias happened to be spelled like its
|
||||
* container. Measured on the three Zig corpora on hand: 73 of ghostty's 185
|
||||
* `@This()` files, 93 of tigerbeetle's 94 and 8 of mach's 42 spell it
|
||||
* differently, carrying 302 `Alias.member` references between them, 96 of those
|
||||
* calls. Those were not wrong edges — they were no edges, and a caller list
|
||||
* missing them is exactly the false confidence #3399 is about.
|
||||
*
|
||||
* WHAT THIS ADDS, precisely: one binding of the alias NAME to the container's
|
||||
* own definition, appended to `indexes.bindingAugmentations` (the sanctioned
|
||||
* post-finalize channel, invariant I8 — `indexes.bindings` is frozen). The
|
||||
* augmentation channel is consulted by `lookupBindingsAt` only AFTER a scope's
|
||||
* own `Scope.bindings`, so this can never outrank a real local declaration: the
|
||||
* `Variable` the container-level alias already mints still answers first for
|
||||
* anything that wants a value, and the container answers for anything that
|
||||
* wants a type. Nothing is replaced and nothing is removed.
|
||||
*
|
||||
* WHAT IT DELIBERATELY DOES NOT DO. Only aliases declared DIRECTLY in a
|
||||
* container body or at file level are bound, which is the same set
|
||||
* `collectZigThisAliases` recognizes for the type-rewrite path. A function-local
|
||||
* `const Self = @This();` also names the enclosing container, but it belongs in
|
||||
* that function's scope, not the container's, and binding it here would make it
|
||||
* visible to sibling functions that never declared it.
|
||||
*/
|
||||
|
||||
import type { ParsedFile, Scope, ScopeId, SymbolDefinition } from 'gitnexus-shared';
|
||||
import type { BindingRef } from 'gitnexus-shared';
|
||||
import type { ScopeResolutionIndexes } from '../../model/scope-resolution-indexes.js';
|
||||
import type { SyntaxNode } from '../../utils/ast-helpers.js';
|
||||
import { isClassLike } from '../../scope-resolution/scope/walkers.js';
|
||||
import { isZigKeywordDeclaration, ZIG_CONTAINER_TYPES } from './captures.js';
|
||||
|
||||
/** `const X = @This();` — the declaration shape, wherever it sits. */
|
||||
function thisAliasName(node: SyntaxNode): string | undefined {
|
||||
if (node.type !== 'variable_declaration' || !isZigKeywordDeclaration(node)) return undefined;
|
||||
const named = node.namedChildren.filter((c): c is SyntaxNode => c !== null);
|
||||
if (named.length !== 2 || named[0]!.type !== 'identifier') return undefined;
|
||||
const value = named[1]!;
|
||||
if (value.type !== 'builtin_function' || value.namedChild(0)?.text !== '@This') return undefined;
|
||||
return named[0]!.text;
|
||||
}
|
||||
|
||||
/** The class-like definition a Class scope is the body of. */
|
||||
function containerDefOf(scope: Scope): SymbolDefinition | undefined {
|
||||
return scope.ownedDefs.find((d) => isClassLike(d.type));
|
||||
}
|
||||
|
||||
/**
|
||||
* The Class scope of the FILE-AS-STRUCT, if this file is one.
|
||||
*
|
||||
* Identified by range rather than by name: it is the only Class scope that both
|
||||
* hangs directly off the module scope AND spans the same lines as it. A
|
||||
* namespace-only file with a top-level `pub const Counter = struct {…}` also
|
||||
* produces a Class scope under the module scope, and it also carries the file
|
||||
* stem when the file is `Counter.zig` — matching on the name would bind that
|
||||
* file's `@This()` alias to `Counter`, which is not what `@This()` means there.
|
||||
*/
|
||||
function fileStructScope(scopes: readonly Scope[], moduleScope: Scope): Scope | undefined {
|
||||
return scopes.find(
|
||||
(s) =>
|
||||
s.kind === 'Class' &&
|
||||
s.parent === moduleScope.id &&
|
||||
s.range.startLine === moduleScope.range.startLine &&
|
||||
s.range.endLine === moduleScope.range.endLine,
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Innermost Class scope containing `node`.
|
||||
*
|
||||
* Compared on (line, column) rather than line alone, because a Zig container
|
||||
* can nest inside another on ONE line — `const A = struct { const S = @This();
|
||||
* const B = struct { const T = @This(); }; };` gives both scopes the same start
|
||||
* line, and picking between them by line would be a coin toss that binds an
|
||||
* alias to the wrong container. A wrong edge is the one outcome this whole
|
||||
* change set treats as worse than no edge.
|
||||
*/
|
||||
function enclosingClassScope(scopes: readonly Scope[], node: SyntaxNode): Scope | undefined {
|
||||
const line = node.startPosition.row + 1;
|
||||
const column = node.startPosition.column;
|
||||
const startsAtOrBefore = (l: number, c: number): boolean =>
|
||||
l < line || (l === line && c <= column);
|
||||
const endsAtOrAfter = (l: number, c: number): boolean => l > line || (l === line && c >= column);
|
||||
let best: Scope | undefined;
|
||||
for (const s of scopes) {
|
||||
if (s.kind !== 'Class') continue;
|
||||
if (!startsAtOrBefore(s.range.startLine, s.range.startCol)) continue;
|
||||
if (!endsAtOrAfter(s.range.endLine, s.range.endCol)) continue;
|
||||
if (
|
||||
best === undefined ||
|
||||
s.range.startLine > best.range.startLine ||
|
||||
(s.range.startLine === best.range.startLine && s.range.startCol > best.range.startCol)
|
||||
) {
|
||||
best = s;
|
||||
}
|
||||
}
|
||||
return best;
|
||||
}
|
||||
|
||||
/**
|
||||
* Append `alias -> def` at `scopeId`, skipping the append when THIS def is
|
||||
* already bound there. Idempotence, not precedence: a duplicate would be
|
||||
* harmless for lookup (`lookupBindingsAt` dedupes by `def.nodeId`) but would
|
||||
* make the channel's contents depend on how many times the hook ran. Other
|
||||
* bindings under the same name are left alone — the channel is append-only per
|
||||
* I8, and the whole point of the augmentation tier is that a scope's own
|
||||
* `Scope.bindings` are consulted first and still win.
|
||||
*/
|
||||
function appendBinding(
|
||||
indexes: ScopeResolutionIndexes,
|
||||
scopeId: ScopeId,
|
||||
alias: string,
|
||||
def: SymbolDefinition,
|
||||
): void {
|
||||
const channel = indexes.bindingAugmentations as Map<ScopeId, Map<string, BindingRef[]>>;
|
||||
let byName = channel.get(scopeId);
|
||||
if (byName === undefined) {
|
||||
byName = new Map<string, BindingRef[]>();
|
||||
channel.set(scopeId, byName);
|
||||
}
|
||||
const bucket = byName.get(alias);
|
||||
if (bucket === undefined) {
|
||||
byName.set(alias, [{ def, origin: 'local' }]);
|
||||
return;
|
||||
}
|
||||
if (bucket.some((ref) => ref.def.nodeId === def.nodeId)) return;
|
||||
bucket.push({ def, origin: 'local' });
|
||||
}
|
||||
|
||||
/**
|
||||
* Bind every `@This()` alias declared in `parsed` at container or file level.
|
||||
*
|
||||
* Called per file from `populateZigRangeBindings`, which already holds the
|
||||
* parsed tree — a second pass over `parsedFiles` would re-parse every file when
|
||||
* the tree cache is cold. That is the only thing the two share. Ordering
|
||||
* against the payload bindings that follow does not matter, twice over: the
|
||||
* payload walk types its subjects through `findReceiverTypeBinding`, which
|
||||
* never reads the channel written here, and a `@This()` alias is a
|
||||
* container-private name no other file can import, so nothing outside this file
|
||||
* reads it either.
|
||||
*/
|
||||
export function bindZigThisAliases(
|
||||
parsed: ParsedFile,
|
||||
root: SyntaxNode,
|
||||
indexes: ScopeResolutionIndexes,
|
||||
): void {
|
||||
const moduleScope = parsed.scopes.find((s) => s.kind === 'Module');
|
||||
if (moduleScope === undefined) return;
|
||||
const fileStruct = fileStructScope(parsed.scopes, moduleScope);
|
||||
|
||||
const visit = (node: SyntaxNode): void => {
|
||||
const alias = thisAliasName(node);
|
||||
if (alias !== undefined) {
|
||||
const parent = node.parent;
|
||||
if (parent?.type === 'source_file') {
|
||||
// The file-as-struct's own name. Bound at the MODULE scope, which is
|
||||
// where the container is already bound under the file stem, so the
|
||||
// alias and the stem are visible to exactly the same sites.
|
||||
const def = fileStruct === undefined ? undefined : containerDefOf(fileStruct);
|
||||
if (def !== undefined) appendBinding(indexes, moduleScope.id, alias, def);
|
||||
} else if (parent !== null && ZIG_CONTAINER_TYPES.has(parent.type)) {
|
||||
const scope = enclosingClassScope(parsed.scopes, node);
|
||||
const def = scope === undefined ? undefined : containerDefOf(scope);
|
||||
if (scope !== undefined && def !== undefined) appendBinding(indexes, scope.id, alias, def);
|
||||
}
|
||||
}
|
||||
for (let i = 0; i < node.namedChildCount; i++) {
|
||||
const child = node.namedChild(i);
|
||||
if (child !== null) visit(child);
|
||||
}
|
||||
};
|
||||
visit(root);
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
import type { ParsedFile, ReferenceSite } from 'gitnexus-shared';
|
||||
import { getTreeSitterBufferSize } from '../../constants.js';
|
||||
import type { ZigBuildZonConfig } from '../../language-config.js';
|
||||
import { zigPackageFor, type ZigWorkspaceIndex } from '../../language-config.js';
|
||||
import { resolveZigImportInternal } from '../../import-resolvers/zig.js';
|
||||
import {
|
||||
buildZigBoolConstMap,
|
||||
|
|
@ -51,7 +51,11 @@ export function populateZigWorkspaceStaticGating(
|
|||
tree,
|
||||
parsed.filePath,
|
||||
knownPaths,
|
||||
ctx.resolutionConfig as ZigBuildZonConfig | null | undefined,
|
||||
// `resolutionConfig` is the whole Zig workspace; the package governing
|
||||
// THIS file is what `resolveZigImportInternal` takes. Selected here rather
|
||||
// than hoisted out of the loop because the answer is per-file: two files
|
||||
// of this pass can belong to different packages.
|
||||
zigPackageFor(ctx.resolutionConfig as ZigWorkspaceIndex | null | undefined, parsed.filePath),
|
||||
);
|
||||
if (aliases.size === 0) continue;
|
||||
const ranges = collectZigStaticGatedRanges(
|
||||
|
|
@ -76,7 +80,7 @@ function collectImportAliases(
|
|||
tree: ZigTree,
|
||||
fromFile: string,
|
||||
knownPaths: ReadonlySet<string>,
|
||||
resolutionConfig?: ZigBuildZonConfig | null,
|
||||
packageConfig: ReturnType<typeof zigPackageFor>,
|
||||
): ZigImportAliasMap {
|
||||
const candidates = new Map<string, string>();
|
||||
const declarationCounts = new Map<string, number>();
|
||||
|
|
@ -91,7 +95,7 @@ function collectImportAliases(
|
|||
const raw = builtin?.descendantsOfType('string').at(0)?.text;
|
||||
if (raw === undefined) continue;
|
||||
const specifier = raw.replace(/^['"]|['"]$/g, '');
|
||||
const target = resolveZigImportInternal(fromFile, specifier, knownPaths, resolutionConfig);
|
||||
const target = resolveZigImportInternal(fromFile, specifier, knownPaths, packageConfig);
|
||||
if (target !== null) candidates.set(binding, target);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -16,6 +16,8 @@
|
|||
*/
|
||||
|
||||
import { createKnowledgeGraph } from '../graph/graph.js';
|
||||
import type { KnowledgeGraph } from '../graph/types.js';
|
||||
import { GLOBAL_NAME_FALLBACK_REASON } from '../graph/edge-reasons.js';
|
||||
import { GraphEmitSink, type GraphEmitManifest } from '../lbug/graph-emit-sink.js';
|
||||
import { type PipelineProgress } from 'gitnexus-shared';
|
||||
import { PipelineResult } from '../../types/pipeline.js';
|
||||
|
|
@ -410,6 +412,11 @@ export const runPipelineFromRepo = async (
|
|||
graphEmitSink?.close();
|
||||
}
|
||||
|
||||
// Resolved-call index for the name-fallback census: read through the SINK,
|
||||
// whose field-wise scan includes every streamed edge, not through `graph`,
|
||||
// which under streaming holds none of them.
|
||||
const resolvedCalleeNamesByCaller = collectResolvedCalleeNames(graphEmitSink ?? graph, graph);
|
||||
|
||||
// Extract final results for the PipelineResult contract
|
||||
const {
|
||||
totalFiles,
|
||||
|
|
@ -473,6 +480,7 @@ export const runPipelineFromRepo = async (
|
|||
communityResult,
|
||||
processResult,
|
||||
resolutionOutcomes,
|
||||
resolvedCalleeNamesByCaller,
|
||||
undecidedSatisfaction,
|
||||
usedWorkerPool,
|
||||
reparsedFileCount,
|
||||
|
|
@ -518,3 +526,29 @@ export const runPipelineFromRepo = async (
|
|||
|
||||
return result;
|
||||
};
|
||||
|
||||
/**
|
||||
* Caller node id → the simple names of every callee it has a CALLS edge to.
|
||||
*
|
||||
* `edges` may be the streaming sink or the raw graph; `nodes` is always the raw
|
||||
* graph, which holds every node in both modes (only relationships stream). One
|
||||
* O(E) field-wise pass, allocation-free per edge except for the per-caller set.
|
||||
*/
|
||||
export function collectResolvedCalleeNames(
|
||||
edges: Pick<KnowledgeGraph, 'forEachRelationshipFields'>,
|
||||
nodes: Pick<KnowledgeGraph, 'getNode'>,
|
||||
): ReadonlyMap<string, ReadonlySet<string>> {
|
||||
const out = new Map<string, Set<string>>();
|
||||
edges.forEachRelationshipFields((sourceId, targetId, type, _confidence, reason) => {
|
||||
if (type !== 'CALLS' || reason === GLOBAL_NAME_FALLBACK_REASON) return;
|
||||
const name = nodes.getNode(targetId)?.properties.name;
|
||||
if (typeof name !== 'string' || name === '') return;
|
||||
let names = out.get(sourceId);
|
||||
if (names === undefined) {
|
||||
names = new Set<string>();
|
||||
out.set(sourceId, names);
|
||||
}
|
||||
names.add(name);
|
||||
});
|
||||
return out;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -707,6 +707,10 @@ function buildDefFromDeclarationMatch(
|
|||
const isExplicit = parseBooleanCapture(match['@declaration.is-explicit']);
|
||||
const isDeleted = parseBooleanCapture(match['@declaration.is-deleted']);
|
||||
const isSynthetic = parseBooleanCapture(match['@declaration.is-synthetic']);
|
||||
// Tri-state on purpose: only a producer that saw the file's export surface
|
||||
// emits the marker, and both `true` and `false` are verdicts (see
|
||||
// `SymbolDefinition.isExported`). Absent stays absent.
|
||||
const isExported = parseBooleanCapture(match['@declaration.is-exported']);
|
||||
|
||||
return {
|
||||
nodeId: makeDefId(filePath, anchor.range, type, nameCap.text),
|
||||
|
|
@ -725,6 +729,7 @@ function buildDefFromDeclarationMatch(
|
|||
...(isExplicit === true ? { isExplicit: true } : {}),
|
||||
...(isDeleted === true ? { isDeleted: true } : {}),
|
||||
...(isSynthetic === true ? { isSynthetic: true } : {}),
|
||||
...(isExported !== undefined ? { isExported } : {}),
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -1037,8 +1042,7 @@ function pass3CollectImports(
|
|||
if (provider.interpretImport === undefined) return;
|
||||
// Hoisted: the capability is a property of the language, identical for every
|
||||
// match in the file. A provider that declares its imports do not execute
|
||||
// where they are written (C/C++ `#include`, Rust `use`, COBOL `COPY`) skips
|
||||
// the position walk entirely — position cannot defer something that never
|
||||
// where they are written skips the execution-deferral walk — position cannot defer something that never
|
||||
// runs, and marking one deferred would hide a real cycle. Absent reads as
|
||||
// `true`, so an undeclared provider is unchanged. See
|
||||
// `LanguageProvider.importsExecuteWhereWritten`.
|
||||
|
|
@ -1049,14 +1053,22 @@ function pass3CollectImports(
|
|||
const parsed = provider.interpretImport(match);
|
||||
if (parsed === null) continue;
|
||||
// The statement's own position, resolved to the innermost scope holding
|
||||
// it. An unlocatable anchor leaves the import unmarked, which reads as
|
||||
// it. Provenance is retained independently of execution timing. An
|
||||
// unlocatable anchor leaves the import unmarked, which reads as
|
||||
// "runs at initialization" — the fail-safe direction, since it can only
|
||||
// make `check --cycles` over-report.
|
||||
const inScopeId = positionCanDefer
|
||||
? positionIndex.atPosition(filePath, anchor.range.startLine, anchor.range.startCol)
|
||||
: undefined;
|
||||
const deferred = inScopeId !== undefined && runsOnlyWhenCalled(scopeTree, inScopeId);
|
||||
parsedImports.push(deferred ? { ...parsed, runsOnlyWhenCalled: true } : parsed);
|
||||
const inScopeId = positionIndex.atPosition(
|
||||
filePath,
|
||||
anchor.range.startLine,
|
||||
anchor.range.startCol,
|
||||
);
|
||||
const deferred =
|
||||
positionCanDefer && inScopeId !== undefined && runsOnlyWhenCalled(scopeTree, inScopeId);
|
||||
parsedImports.push({
|
||||
...parsed,
|
||||
...(inScopeId !== undefined ? { declaredAtScope: inScopeId } : {}),
|
||||
...(deferred ? { runsOnlyWhenCalled: true } : {}),
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -82,13 +82,14 @@
|
|||
* `handledSites` IFF a `tryEmitEdge` call returned `true` for it.
|
||||
* Sites a pass touched but couldn't resolve do NOT get marked —
|
||||
* they still get a chance from the shared resolver. Exception:
|
||||
* the free-call fallback marks the site unconditionally after
|
||||
* attempting emission (even on dedup-collapse), because the
|
||||
* per-(caller, target) collapse semantics require multiple call
|
||||
* sites in the same caller body not produce multiple edges.
|
||||
* `preEmitInheritanceEdges` also pre-marks every `inherits` site so
|
||||
* the generic bridge cannot remap class heritage into method-owned
|
||||
* EXTENDS edges via `resolveCallerGraphId`.
|
||||
* the free-call fallback marks the site after it decides the site,
|
||||
* including when it emits no edge — dedup-collapse, a visibility
|
||||
* veto (`fallback-refused`), or a selected callable that is deleted
|
||||
* / invisible. The later generic pass must not recreate an edge
|
||||
* that pass just refused. `preEmitInheritanceEdges` also pre-marks
|
||||
* every `inherits` site so the generic bridge cannot remap class
|
||||
* heritage into method-owned EXTENDS edges via
|
||||
* `resolveCallerGraphId`.
|
||||
*
|
||||
* - **I3 — `propagateImportedReturnTypes` mutation timing + ordering.**
|
||||
* The pass mutates `Scope.typeBindings` (a plain `new Map(...)` from
|
||||
|
|
@ -248,8 +249,8 @@
|
|||
* ## Semantic-model source of truth
|
||||
*
|
||||
* `ParsedFile` (from `gitnexus-shared/src/scope-resolution/parsed-file.ts`)
|
||||
* is the single semantic model consumed by both the legacy DAG and the
|
||||
* scope-resolution pipeline. Scope-resolution passes MUST NOT build a
|
||||
* is the single semantic model consumed by the scope-resolution pipeline.
|
||||
* Scope-resolution passes MUST NOT build a
|
||||
* parallel parse representation; if a pass needs AST-level facts that
|
||||
* `ParsedFile` doesn't expose, it should reuse the orchestrator's
|
||||
* `treeCache` (see `RunScopeResolutionInput.treeCache`) rather than
|
||||
|
|
@ -257,23 +258,20 @@
|
|||
*
|
||||
* ## Same-graph guarantee
|
||||
*
|
||||
* Edges emitted by `runScopeResolution` and edges emitted by the legacy
|
||||
* DAG are indistinguishable to downstream consumers:
|
||||
* All language resolvers emit edges through `runScopeResolution` using the
|
||||
* shared graph contract:
|
||||
* - Node identity: same `generateId(...)` helper, same qualified-name
|
||||
* keyspace, same File/Folder/Method/Class node labels.
|
||||
* - Edge vocabulary: `'import-resolved' | 'global' | 'local-call' |
|
||||
* 'same-file' | 'interface-dispatch' | 'read' | 'write'` — both
|
||||
* paths emit the same reasons (see
|
||||
* `gitnexus/src/core/ingestion/call-processor.ts` for the legacy
|
||||
* emitter and `passes/receiver-bound-calls.ts` /
|
||||
* 'same-file' | 'interface-dispatch' | 'read' | 'write' |
|
||||
* 'global-name-fallback'` (see `passes/receiver-bound-calls.ts` /
|
||||
* `passes/free-call-fallback.ts` for the scope-resolution emitters).
|
||||
* - Overload disambiguation: both paths use
|
||||
* - Overload disambiguation: resolvers use
|
||||
* `generateId('Method', ...)` suffixed with `parameterTypes` when a
|
||||
* method has overloads — see `graph-bridge/ids.ts`.
|
||||
*
|
||||
* The CI parity workflow (`.github/workflows/ci-scope-parity.yml`)
|
||||
* runs both paths on every migrated language's fixture corpus and
|
||||
* fails if the graph outputs diverge.
|
||||
* Resolver fixture coverage lives in `ci-tests.yml` (the separate
|
||||
* `ci-scope-parity.yml` gate was removed in RING4-1 #942).
|
||||
*
|
||||
* Plan that introduced most of these invariants:
|
||||
* `docs/plans/2026-04-20-001-refactor-emit-pipeline-generalization-plan.md`.
|
||||
|
|
@ -865,6 +863,88 @@ export interface ScopeResolver {
|
|||
*/
|
||||
readonly allowGlobalFreeCallFallback?: boolean;
|
||||
|
||||
/** Opt in to binding imports at their extracted lexical scope, rather than
|
||||
* publishing every file's imports at module scope. */
|
||||
readonly importsBindAtLexicalScope?: boolean;
|
||||
|
||||
/**
|
||||
* Two `wildcard` re-exports that both DECLARE a name make it AMBIGUOUS in
|
||||
* this language — ECMAScript `export *` semantics, where the module simply
|
||||
* does not export the name and any binding is a guess. Opt-in: for a
|
||||
* language whose wildcard import is `#include`, `require` or a package
|
||||
* fan-out, the same name in two files is an overload set or a redeclaration,
|
||||
* and refusing it would delete real edges (C++ arity-narrowed overloads
|
||||
* across two headers). Forwarded to `FinalizeHooks.wildcardCollisionIsAmbiguous`.
|
||||
*/
|
||||
readonly exclusiveWildcardReexports?: boolean;
|
||||
|
||||
/**
|
||||
* A named import or named re-export can only bind to a MODULE-LEVEL
|
||||
* declaration of the target file — ECMAScript semantics, where
|
||||
* `import { x }` never reaches a class member. Opt-in: languages that bind
|
||||
* module-level members by bare name (static members, module functions)
|
||||
* leave it off. Forwarded to `FinalizeHooks.namedImportsBindTopLevelOnly`.
|
||||
*/
|
||||
readonly namedImportsBindTopLevelOnly?: boolean;
|
||||
|
||||
/**
|
||||
* Veto for a single `allowGlobalFreeCallFallback` guess.
|
||||
*
|
||||
* The fallback picks a callable because its SIMPLE NAME is unique in the
|
||||
* workspace — it consults no import and no scope chain. For most languages a
|
||||
* large share of those guesses are not merely unlikely but IMPOSSIBLE: Go
|
||||
* cannot call an unexported identifier from another package, ESM cannot see a
|
||||
* name it did not import, Rust cannot reach an item with no `use` path. This
|
||||
* hook is where a language states those rules, so the shared pass can drop
|
||||
* the edge instead of publishing a guess that the language forbids.
|
||||
*
|
||||
* Return `false` to REFUSE (no edge, recorded as `fallback-refused`). Return
|
||||
* `true`, or leave the hook undefined, to emit the labeled
|
||||
* `global-name-fallback` edge. **Only answer `false` when the call is
|
||||
* impossible, not when it is merely unproven** — a wrongly-refused candidate
|
||||
* is a lost real edge, whereas a wrongly-allowed one is at least labeled and
|
||||
* excluded from flows.
|
||||
*
|
||||
* Deliberately NOT folded into `isCallableVisibleFromCaller`: that hook also
|
||||
* gates precise dispatch paths (implicit-this, member calls), so a rule
|
||||
* written for the name-guess tier would silently suppress resolved edges too.
|
||||
*
|
||||
* `parsedFileOf` reaches the CANDIDATE's parse result — a language whose rule
|
||||
* depends on declaration-side facts not carried by `SymbolDefinition` (for
|
||||
* example Rust's `pub` form) needs it. `isExported` is the tri-state export
|
||||
* marker when the language supplies one; this hook still needs the parse for
|
||||
* visibility facts that marker does not represent. It returns `undefined`
|
||||
* for a path outside this pass's file set; treat that as "cannot decide"
|
||||
* and allow.
|
||||
*/
|
||||
readonly isGlobalNameFallbackPlausible?: (ctx: {
|
||||
readonly callerParsed: ParsedFile;
|
||||
readonly candidate: SymbolDefinition;
|
||||
readonly parsedFileOf: (filePath: string) => ParsedFile | undefined;
|
||||
/**
|
||||
* Raw source of any parsed file, for languages whose visibility rule needs
|
||||
* a declaration the parse does not carry (Go's package clause: a test file's
|
||||
* `package foo_test` is a different package from its directory's `foo`).
|
||||
* Absent when the pipeline has no contents at hand; hooks must then answer
|
||||
* from paths alone and, when undecidable, allow.
|
||||
*/
|
||||
readonly sourceTextOf?: (filePath: string) => string | undefined;
|
||||
/**
|
||||
* The call site, so a language can tell a BARE name from a PATH-QUALIFIED
|
||||
* one. Both reach this tier — a qualified call whose qualifier the resolver
|
||||
* could not follow falls through to the bare-name search with only its tail
|
||||
* name — but they are not the same claim. Rust's `User::new(...)` named its
|
||||
* type in source, so refusing it for lacking a `use` of the module would
|
||||
* delete an edge the source spells out.
|
||||
*/
|
||||
readonly site: {
|
||||
readonly name: string;
|
||||
readonly rawQualifiedName?: string;
|
||||
/** Lexical call-site scope; absent only for legacy/synthetic hook callers. */
|
||||
readonly inScope?: ScopeId;
|
||||
};
|
||||
}) => boolean;
|
||||
|
||||
/**
|
||||
* In this language every `Method` belongs to a class instance, so a
|
||||
* FREE (receiver-less) call may resolve to a `Method` only when the
|
||||
|
|
|
|||
|
|
@ -505,9 +505,25 @@ function resolveDefGraphIdUncached(
|
|||
if (qualifiedHit !== undefined) return qualifiedHit;
|
||||
}
|
||||
const simpleName = qn.lastIndexOf('.') === -1 ? qn : qn.slice(qn.lastIndexOf('.') + 1);
|
||||
// FAIL CLOSED before the label-agnostic simple key when a FUNCTION-LOCAL
|
||||
// callable of this name exists in the file. The guards above cover a def
|
||||
// that is itself a callable; a NON-callable def (`export const selected =
|
||||
// factory()`, a `Variable` with no graph node of its own) used to fall
|
||||
// through here and alias onto `wrapper.selected`, the function-local one
|
||||
// (#3182 review). Whatever the def's label, a bare name matching a local
|
||||
// callable is the aliasing this key cannot tell apart, and a missing edge
|
||||
// is the correct failure direction.
|
||||
for (const localLabel of LOCAL_CALLABLE_LABELS) {
|
||||
if (nodeLookup.get(localNameKey(filePath, localLabel, simpleName)) !== undefined) {
|
||||
return undefined;
|
||||
}
|
||||
}
|
||||
return nodeLookup.get(simpleKey(filePath, simpleName));
|
||||
}
|
||||
|
||||
/** Labels the structure phase registers function-local declarations under. */
|
||||
const LOCAL_CALLABLE_LABELS: readonly NodeLabel[] = ['Function', 'Method'];
|
||||
|
||||
/** Derive the simple (unqualified) name of a def from its `qualifiedName`. */
|
||||
export function simpleQualifiedName(def: SymbolDefinition): string | undefined {
|
||||
const q = def.qualifiedName;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,212 @@
|
|||
/**
|
||||
* Per-language census of global-name fallback decisions: how many call sites
|
||||
* used a unique-name guess, and how many candidates visibility rules refused.
|
||||
* Sites are counted before edge coalescing: a precisely bound site can prove
|
||||
* the same caller/target dependency, so this is not a count of heuristic edges.
|
||||
*
|
||||
* Both halves are needed and neither is meaningful alone. A guess count with no
|
||||
* refusal count cannot distinguish a language with genuinely few impossible
|
||||
* candidates from one whose hook is missing; a refusal count with no guess count
|
||||
* cannot distinguish a working guard from one that rejects everything. The pair
|
||||
* is what makes the guard auditable on a real repository, which is the whole
|
||||
* point of recording it — before this, guessed edges were emitted with the same
|
||||
* reason and confidence as import-resolved ones and the number was unknowable.
|
||||
*
|
||||
* Structural sibling of `unresolved-receivers.ts`'s summary, and persisted the
|
||||
* same way (`RepoMeta.nameFallbackEdges`).
|
||||
*/
|
||||
|
||||
import { getLanguageFromFilename } from 'gitnexus-shared';
|
||||
import { logger } from '../../logger.js';
|
||||
import type { ResolutionOutcome } from './resolution-outcome.js';
|
||||
|
||||
/**
|
||||
* Distinct caller-file/callee-name pairs per language, from the caller→callee-name index the pipeline
|
||||
* builds while its streaming sink is live (so it is complete under `--force`),
|
||||
* bucketed by the CALLER's file language. Gives `NameFallbackSummary.byLanguage`
|
||||
* its denominator: a guess count is only readable as a share of the calls.
|
||||
*/
|
||||
export function countCallsByLanguage(
|
||||
index: ReadonlyMap<string, ReadonlySet<string>> | undefined,
|
||||
nodes: { getNode(id: string): { properties: Record<string, unknown> } | undefined } | undefined,
|
||||
): Readonly<Record<string, number>> | undefined {
|
||||
if (index === undefined || nodes === undefined) return undefined;
|
||||
const counts = new Map<string, number>();
|
||||
const namesByFile = new Map<string, Set<string>>();
|
||||
for (const [callerId, callees] of index) {
|
||||
const filePath = nodes.getNode(callerId)?.properties?.filePath;
|
||||
if (typeof filePath !== 'string') continue;
|
||||
let names = namesByFile.get(filePath);
|
||||
if (names === undefined) {
|
||||
names = new Set<string>();
|
||||
namesByFile.set(filePath, names);
|
||||
}
|
||||
for (const name of callees) names.add(name);
|
||||
}
|
||||
for (const [filePath, names] of namesByFile) {
|
||||
const language = getLanguageFromFilename(filePath) ?? 'unknown';
|
||||
counts.set(language, (counts.get(language) ?? 0) + names.size);
|
||||
}
|
||||
if (counts.size === 0) return undefined;
|
||||
const out: Record<string, number> = {};
|
||||
for (const [language, count] of [...counts.entries()].sort(([a], [b]) =>
|
||||
a < b ? -1 : a > b ? 1 : 0,
|
||||
)) {
|
||||
out[language] = count;
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
/** Unattributed bucket for a pass that recorded no language. */
|
||||
const UNKNOWN_LANGUAGE = 'unknown';
|
||||
|
||||
export interface NameFallbackLanguageCounts {
|
||||
/** Call sites resolved by a unique-name guess, before edge coalescing. */
|
||||
readonly guessed: number;
|
||||
/**
|
||||
* Distinct (caller file, callee name) pairs among those sites — the unit
|
||||
* `callsByLanguage` counts in, so `guessedPairs / callsByLanguage[lang]` is a
|
||||
* ratio bounded by 1. Absent on a summary persisted before this field existed.
|
||||
*/
|
||||
readonly guessedPairs?: number;
|
||||
/** Candidates this language's `isGlobalNameFallbackPlausible` hook refused. */
|
||||
readonly refused: number;
|
||||
}
|
||||
|
||||
export interface NameFallbackSummary {
|
||||
/** Language → guessed/refused counts. Languages with neither are absent. */
|
||||
readonly byLanguage: Readonly<Record<string, NameFallbackLanguageCounts>>;
|
||||
/** Guessed call sites, repo-wide. */
|
||||
readonly totalGuessed: number;
|
||||
/** Distinct (caller file, callee name) pairs among the guessed sites. */
|
||||
readonly distinctGuessedPairs?: number;
|
||||
readonly totalRefused: number;
|
||||
/**
|
||||
* Barrel names refused because two `export *` sources both declared them
|
||||
* (`reexport-ambiguous`). Not a guess and not per-language — a name the
|
||||
* finalize pass declined to bind at all — but it belongs in the same census:
|
||||
* it is the other place the resolver used to publish an arbitrary winner as
|
||||
* `import-resolved`.
|
||||
*/
|
||||
readonly totalAmbiguousReexports: number;
|
||||
/**
|
||||
* The refused barrel names themselves (`file:name`), sorted, capped at
|
||||
* `MAX_AMBIGUOUS_NAMES`. A count alone cannot say whether a refusal landed on
|
||||
* a name anyone calls; the list can be joined against the ledger's `byName`.
|
||||
*/
|
||||
readonly ambiguousReexportNames?: readonly string[];
|
||||
/**
|
||||
* Distinct caller-file/callee-name pairs per language (through any path), so `guessedPairs` can be
|
||||
* read as a SHARE of a language's call graph rather than a bare count. Absent
|
||||
* when the caller did not supply the totals.
|
||||
*/
|
||||
readonly callsByLanguage?: Readonly<Record<string, number>>;
|
||||
}
|
||||
|
||||
/** Bound on the persisted ambiguous-name list; the total beside it stays exact. */
|
||||
export const MAX_AMBIGUOUS_NAMES = 200;
|
||||
|
||||
/**
|
||||
* Build the summary, or `undefined` when the run neither guessed nor refused —
|
||||
* a repository with no opt-in language stores no key at all, so the artifact
|
||||
* stays absent rather than recording a row of zeroes.
|
||||
*/
|
||||
export function summarizeNameFallback(
|
||||
outcomes: readonly ResolutionOutcome[],
|
||||
callsByLanguage?: Readonly<Record<string, number>>,
|
||||
): NameFallbackSummary | undefined {
|
||||
const guessed = new Map<string, number>();
|
||||
const guessedPairsByLanguage = new Map<string, number>();
|
||||
const refused = new Map<string, number>();
|
||||
const ambiguousNames = new Set<string>();
|
||||
// Two units, both kept. `guessed` counts call SITES, not final graph edges:
|
||||
// a precise site may prove the same dependency during edge coalescing.
|
||||
// Preserve the unit earlier summaries hold. `guessedPairs` dedupes by (caller file,
|
||||
// callee name), the unit `callsByLanguage` is counted in: ten guessed `foo()`
|
||||
// calls in one file are one pair against a denominator that counts `foo`
|
||||
// once, so the guessy RATIO uses pairs and is bounded by 1. Changing the unit
|
||||
// of `guessed` itself silently read as a large improvement across engines.
|
||||
const guessedPairs = new Set<string>();
|
||||
let totalGuessed = 0;
|
||||
let totalRefused = 0;
|
||||
let totalAmbiguousReexports = 0;
|
||||
|
||||
for (const outcome of outcomes) {
|
||||
if (outcome.kind === 'fallback-guessed') {
|
||||
const language = outcome.language ?? UNKNOWN_LANGUAGE;
|
||||
guessed.set(language, (guessed.get(language) ?? 0) + 1);
|
||||
totalGuessed++;
|
||||
const pair = `${outcome.filePath}\u0000${outcome.name}`;
|
||||
if (!guessedPairs.has(pair)) {
|
||||
guessedPairs.add(pair);
|
||||
guessedPairsByLanguage.set(language, (guessedPairsByLanguage.get(language) ?? 0) + 1);
|
||||
}
|
||||
} else if (outcome.kind === 'fallback-refused') {
|
||||
const language = outcome.language ?? UNKNOWN_LANGUAGE;
|
||||
refused.set(language, (refused.get(language) ?? 0) + 1);
|
||||
totalRefused++;
|
||||
} else if (outcome.kind === 'reexport-ambiguous') {
|
||||
totalAmbiguousReexports++;
|
||||
ambiguousNames.add(`${outcome.filePath}:${outcome.name}`);
|
||||
}
|
||||
}
|
||||
if (totalGuessed === 0 && totalRefused === 0 && totalAmbiguousReexports === 0) return undefined;
|
||||
|
||||
const byLanguage: Record<string, NameFallbackLanguageCounts> = {};
|
||||
for (const language of new Set([...guessed.keys(), ...refused.keys()])) {
|
||||
byLanguage[language] = {
|
||||
guessed: guessed.get(language) ?? 0,
|
||||
guessedPairs: guessedPairsByLanguage.get(language) ?? 0,
|
||||
refused: refused.get(language) ?? 0,
|
||||
};
|
||||
}
|
||||
const sortedNames = [...ambiguousNames].sort();
|
||||
return {
|
||||
byLanguage,
|
||||
totalGuessed,
|
||||
distinctGuessedPairs: guessedPairs.size,
|
||||
totalRefused,
|
||||
totalAmbiguousReexports,
|
||||
...(sortedNames.length > 0
|
||||
? { ambiguousReexportNames: sortedNames.slice(0, MAX_AMBIGUOUS_NAMES) }
|
||||
: {}),
|
||||
...(callsByLanguage !== undefined ? { callsByLanguage } : {}),
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* One-line readout for the analyze summary. `undefined` when there is nothing to
|
||||
* report, so a run on a repository with no opt-in language prints no line.
|
||||
*/
|
||||
export function formatNameFallbackSummary(
|
||||
summary: NameFallbackSummary | undefined,
|
||||
): string | undefined {
|
||||
if (summary === undefined) return undefined;
|
||||
const perLanguage = Object.entries(summary.byLanguage)
|
||||
.sort(([, a], [, b]) => b.guessed + b.refused - (a.guessed + a.refused))
|
||||
.map(([language, counts]) => `${language} ${counts.guessed}/${counts.refused}`)
|
||||
.join(', ');
|
||||
const ambiguous =
|
||||
summary.totalAmbiguousReexports > 0
|
||||
? `; ${summary.totalAmbiguousReexports} barrel name(s) refused as ambiguous \`export *\``
|
||||
: '';
|
||||
const languages = perLanguage === '' ? 'none' : perLanguage;
|
||||
const pairs =
|
||||
summary.distinctGuessedPairs !== undefined
|
||||
? ` (${summary.distinctGuessedPairs} distinct caller-file/name pairs)`
|
||||
: '';
|
||||
const siteUnit = summary.totalGuessed === 1 ? 'call site' : 'call sites';
|
||||
return `name-fallback resolution: ${summary.totalGuessed} ${siteUnit}${pairs}, ${summary.totalRefused} refused as impossible (guessed/refused by language: ${languages})${ambiguous}`;
|
||||
}
|
||||
|
||||
/**
|
||||
* Print the readout as part of the analyze summary. Unconditional (not behind a
|
||||
* debug env var, unlike the receiver-drop diagnostic): a reader deciding how far
|
||||
* to trust this index's call graph needs to know how much of it is guessed, and
|
||||
* a number nobody sees is the state this work exists to end.
|
||||
*/
|
||||
export function logNameFallbackSummary(summary: NameFallbackSummary | undefined): void {
|
||||
const line = formatNameFallbackSummary(summary);
|
||||
if (line === undefined) return;
|
||||
logger.info(line);
|
||||
}
|
||||
|
|
@ -36,6 +36,7 @@ import type {
|
|||
ResolutionOutcomeRecorder,
|
||||
ResolutionSuppressionReason,
|
||||
} from '../resolution-outcome.js';
|
||||
import { GLOBAL_NAME_FALLBACK_REASON } from '../../../graph/edge-reasons.js';
|
||||
import { resolveCallerGraphId, resolveDefGraphId } from '../graph-bridge/ids.js';
|
||||
import type { CalleeIdSink } from '../graph-bridge/callee-id-sink.js';
|
||||
import {
|
||||
|
|
@ -43,7 +44,9 @@ import {
|
|||
findAllCallableBindingsInScope,
|
||||
findCallableBindingInScope,
|
||||
findCallableBindingsAndAdlBlocker,
|
||||
findClassBindingInScope,
|
||||
findEnclosingClassDef,
|
||||
isClassFileImportGrounded,
|
||||
resolveInheritanceBaseInScope,
|
||||
type CallableBindingCandidate,
|
||||
} from '../scope/walkers.js';
|
||||
|
|
@ -64,6 +67,15 @@ export function emitFreeCallFallback(
|
|||
workspaceIndex: WorkspaceResolutionIndex,
|
||||
options: {
|
||||
readonly allowGlobalFallback?: boolean;
|
||||
/** Language whose pass this is, carried onto the fallback outcome records
|
||||
* so the analyze summary can report guesses/refusals PER LANGUAGE. A
|
||||
* repo-wide total hides which language's rules are the loose ones. */
|
||||
readonly language?: string;
|
||||
/** Per-language veto on a name guess — see
|
||||
* `ScopeResolver.isGlobalNameFallbackPlausible`. */
|
||||
readonly isGlobalNameFallbackPlausible?: ScopeResolver['isGlobalNameFallbackPlausible'];
|
||||
/** Raw source lookup handed to `isGlobalNameFallbackPlausible` (optional). */
|
||||
readonly sourceTextOf?: (filePath: string) => string | undefined;
|
||||
/** When true, `Type(...)` constructor calls link to the Class def
|
||||
* itself rather than its explicit Constructor. Swift opts in. */
|
||||
readonly constructorCallTargetsClass?: boolean;
|
||||
|
|
@ -138,6 +150,14 @@ export function emitFreeCallFallback(
|
|||
let allFilePathsMemo: ReadonlySet<string> | undefined;
|
||||
const allFilePaths = (): ReadonlySet<string> =>
|
||||
(allFilePathsMemo ??= new Set(parsedFiles.map((p) => p.filePath)));
|
||||
// Candidate-side parse lookup for `isGlobalNameFallbackPlausible`. Built
|
||||
// lazily and once, on the same terms as `allFilePaths` above: a language
|
||||
// without the hook never pays for the index.
|
||||
let parsedByPathMemo: ReadonlyMap<string, ParsedFile> | undefined;
|
||||
const parsedFileByPath = (): ((filePath: string) => ParsedFile | undefined) => {
|
||||
parsedByPathMemo ??= new Map(parsedFiles.map((p) => [p.filePath, p]));
|
||||
return (filePath) => parsedByPathMemo!.get(filePath);
|
||||
};
|
||||
// Per-pass memo of pickUniqueGlobalCallable's post-filter candidate list,
|
||||
// keyed (simpleName, callerFilePath). Only created when no per-caller
|
||||
// visibility filter applies (the list is then a pure function of name+file —
|
||||
|
|
@ -183,7 +203,17 @@ export function emitFreeCallFallback(
|
|||
};
|
||||
|
||||
for (const parsed of parsedFiles) {
|
||||
type PendingRel = { rel: Parameters<KnowledgeGraph['addRelationship']>[0]; gatedAll: boolean };
|
||||
type PendingRel = {
|
||||
rel: Parameters<KnowledgeGraph['addRelationship']>[0];
|
||||
gatedAll: boolean;
|
||||
/**
|
||||
* The confidence/reason a PRECISELY resolved site (a real binding, not a
|
||||
* unique-name guess) proved for this edge; `undefined` while every site
|
||||
* collapsed into it so far was a guess. Decided at flush, not by the
|
||||
* first site the walk met.
|
||||
*/
|
||||
precise: { confidence: number; reason: string } | undefined;
|
||||
};
|
||||
const pending = new Map<string, PendingRel>();
|
||||
const bindingCandidatesByScope =
|
||||
options.freeCallsRequireInstanceOwnership === true
|
||||
|
|
@ -199,13 +229,48 @@ export function emitFreeCallFallback(
|
|||
// to the Class node itself (implicit constructor). Legacy emits
|
||||
// the same two targets; see test expectations.
|
||||
let fnDef: SymbolDefinition | undefined;
|
||||
// Guess flag starts here so the constructor unique-class pick can mark
|
||||
// the same class of guess as `pickUniqueGlobalCallable` below. The
|
||||
// veto/label path keys off this flag; declaring it after that pick left
|
||||
// constructor-form unique-name hits labeled `import-resolved` at 0.85.
|
||||
let fnDefFromGlobalNameFallback = false;
|
||||
// Language visibility vetoes the constructed TYPE (Class/Struct), not a
|
||||
// Constructor child — Go refuses any `qualifiedName` containing `.`.
|
||||
let globalFallbackVetoTarget: SymbolDefinition | undefined;
|
||||
if (site.callForm === 'constructor') {
|
||||
const classDef = resolveInheritanceBaseInScope(
|
||||
// Lexical / written-qualifier first. A bare unique type with no
|
||||
// import/#include evidence is a guess (JS `new UniqueWidget()`,
|
||||
// Go unexported `uniqueWidget{}`). A unique type whose file is
|
||||
// imported, whose import resolved to this def, or whose name
|
||||
// was imported is precise — C++ `#include "user.h"` and Rust
|
||||
// `use`/`pub use` often mint no lexical class binding. An
|
||||
// imported sibling file of a different name is not evidence.
|
||||
let classDef = resolveInheritanceBaseInScope(
|
||||
site.inScope,
|
||||
site.name,
|
||||
scopes,
|
||||
site.rawQualifiedName,
|
||||
undefined,
|
||||
{ uniqueQualifiedNameFallback: site.rawQualifiedName !== undefined },
|
||||
);
|
||||
if (classDef === undefined) {
|
||||
classDef =
|
||||
findClassBindingInScope(site.inScope, site.name, scopes, undefined, {
|
||||
uniqueQualifiedNameFallback: true,
|
||||
}) ??
|
||||
(options.allowGlobalFallback === true
|
||||
? pickUniqueGlobalClass(site.name, globalClassesBySimpleName)
|
||||
: undefined);
|
||||
if (
|
||||
classDef !== undefined &&
|
||||
classDef.type !== 'Interface' &&
|
||||
site.rawQualifiedName === undefined &&
|
||||
!isClassFileImportGrounded(site.inScope, classDef, scopes, site.name)
|
||||
) {
|
||||
fnDefFromGlobalNameFallback = true;
|
||||
globalFallbackVetoTarget = classDef;
|
||||
}
|
||||
}
|
||||
if (classDef !== undefined && classDef.type !== 'Interface') {
|
||||
// Most languages link `Type(...)` to the explicit Constructor def
|
||||
// when one exists (else the Class). Languages that model the call
|
||||
|
|
@ -215,21 +280,6 @@ export function emitFreeCallFallback(
|
|||
options.constructorCallTargetsClass === true
|
||||
? classDef
|
||||
: pickConstructorOrClass(classDef, workspaceIndex, scopes, site.arity);
|
||||
} else if (options.allowGlobalFallback === true) {
|
||||
// The constructed type may live in a sibling/imported file that is
|
||||
// not in the call-site's lexical scope-chain bindings. Fall back to
|
||||
// a unique workspace-wide Class def by simple name (gated on the
|
||||
// same global-fallback opt-in as free calls). Then target the
|
||||
// Class or its Constructor per the language's preference.
|
||||
const globalClass = pickUniqueGlobalClass(site.name, globalClassesBySimpleName);
|
||||
if (globalClass !== undefined) {
|
||||
fnDef =
|
||||
globalClass.type === 'Interface'
|
||||
? undefined
|
||||
: options.constructorCallTargetsClass === true
|
||||
? globalClass
|
||||
: pickConstructorOrClass(globalClass, workspaceIndex, scopes, site.arity);
|
||||
}
|
||||
}
|
||||
}
|
||||
// Module-qualified free call (`mod::fn()`): the source named the module
|
||||
|
|
@ -543,10 +593,17 @@ export function emitFreeCallFallback(
|
|||
}
|
||||
}
|
||||
}
|
||||
// V1: pickUniqueGlobalCallable ignores import context — resolves to any
|
||||
// globally-unique callable. False cross-package edges are possible when
|
||||
// the caller does not import the target package. Same-package calls are
|
||||
// usually caught by nearest-scope lookup before reaching here.
|
||||
// Name-guess tier: pickUniqueGlobalCallable consults no import context —
|
||||
// it resolves to any globally-unique callable. Same-package calls are
|
||||
// usually caught by nearest-scope lookup before reaching here, so what
|
||||
// lands in this tier is disproportionately cross-module, and a
|
||||
// cross-module name match is a guess.
|
||||
//
|
||||
// Two things make that honest rather than a lie. The language's
|
||||
// `isGlobalNameFallbackPlausible` hook refuses candidates its own
|
||||
// visibility rules forbid (below), and every edge that survives is
|
||||
// emitted with `GLOBAL_NAME_FALLBACK_REASON` at 0.5 rather than
|
||||
// masquerading as `import-resolved` at 0.85 (see the emit site).
|
||||
if (fnDef === undefined && options.allowGlobalFallback === true) {
|
||||
fnDef = pickUniqueGlobalCallable(
|
||||
site.name,
|
||||
|
|
@ -570,6 +627,53 @@ export function emitFreeCallFallback(
|
|||
scopeDefsCache,
|
||||
options.conversionOnlyArgTypePrefixes,
|
||||
);
|
||||
fnDefFromGlobalNameFallback = fnDef !== undefined;
|
||||
if (fnDef !== undefined) globalFallbackVetoTarget = fnDef;
|
||||
}
|
||||
if (fnDefFromGlobalNameFallback && fnDef !== undefined) {
|
||||
// An explicit named import cannot bind a declaration proven private
|
||||
// to another module. In particular, a rejected named import must not
|
||||
// reappear as a name guess to a class member or nested function.
|
||||
// Unknown export evidence (e.g. dynamic module exports) keeps the
|
||||
// existing fallback behavior.
|
||||
const vetoCandidate = globalFallbackVetoTarget ?? fnDef;
|
||||
const importsPrivateDeclaration =
|
||||
vetoCandidate.filePath !== parsed.filePath &&
|
||||
vetoCandidate.isExported === false &&
|
||||
parsed.parsedImports.some(
|
||||
(imported) =>
|
||||
(imported.kind === 'named' || imported.kind === 'alias') &&
|
||||
imported.localName === site.name,
|
||||
);
|
||||
if (
|
||||
importsPrivateDeclaration ||
|
||||
options.isGlobalNameFallbackPlausible?.({
|
||||
callerParsed: parsed,
|
||||
candidate: vetoCandidate,
|
||||
parsedFileOf: parsedFileByPath(),
|
||||
sourceTextOf: options.sourceTextOf,
|
||||
site: {
|
||||
name: site.name,
|
||||
rawQualifiedName: site.rawQualifiedName,
|
||||
inScope: site.inScope,
|
||||
},
|
||||
}) === false
|
||||
) {
|
||||
// The language proved this call impossible. Mark the site handled so
|
||||
// `emit-references` does not substitute its own looser guess for the
|
||||
// edge we just refused — the point is no edge, not a different one.
|
||||
options.recordResolutionOutcome?.({
|
||||
kind: 'fallback-refused',
|
||||
candidateId: fnDef.nodeId,
|
||||
language: options.language,
|
||||
phase: 'free-call-fallback',
|
||||
filePath: parsed.filePath,
|
||||
name: site.name,
|
||||
range: site.atRange,
|
||||
});
|
||||
handledSites.add(siteKey(parsed.filePath, site));
|
||||
continue;
|
||||
}
|
||||
}
|
||||
if (fnDef === undefined) continue;
|
||||
if (fnDef.isDeleted === true) {
|
||||
|
|
@ -617,40 +721,78 @@ export function emitFreeCallFallback(
|
|||
site.atRange.startCol,
|
||||
tgtGraphId,
|
||||
);
|
||||
if (fnDefFromGlobalNameFallback) {
|
||||
options.recordResolutionOutcome?.({
|
||||
kind: 'fallback-guessed',
|
||||
targetId: fnDef.nodeId,
|
||||
language: options.language,
|
||||
phase: 'free-call-fallback',
|
||||
filePath: parsed.filePath,
|
||||
name: site.name,
|
||||
range: site.atRange,
|
||||
});
|
||||
}
|
||||
const relId = `rel:CALLS:${callerGraphId}->${tgtGraphId}`;
|
||||
// One edge per (caller, callee): `staticGated` is the AND over every site
|
||||
// that collapses into it, so a callee reached from one live site and one
|
||||
// dead site stays live whichever site the walk meets first. Emission is
|
||||
// deferred to the end of this file's sites for that reason.
|
||||
const preciseHere = fnDefFromGlobalNameFallback
|
||||
? undefined
|
||||
: {
|
||||
confidence: 0.85,
|
||||
// Match legacy DAG's reason convention so consumers that
|
||||
// assert `reason === 'import-resolved'` keep working. The
|
||||
// construction-site marker is opt-in for the same reason.
|
||||
reason: constructionSiteReason(
|
||||
fnDef.filePath !== parsed.filePath ? 'import-resolved' : 'local-call',
|
||||
site,
|
||||
options.markConstructionSites,
|
||||
),
|
||||
};
|
||||
const pendingRel = pending.get(relId);
|
||||
if (pendingRel !== undefined) {
|
||||
if (site.staticGated !== true) pendingRel.gatedAll = false;
|
||||
// The edge's label is decided at flush time from EVERY site that
|
||||
// collapsed into it, not from whichever the walk met first. One site
|
||||
// resolved through a real binding PROVES the dependency; a guessed
|
||||
// site for the same pair is then redundant evidence, not a taint.
|
||||
if (pendingRel.precise === undefined) pendingRel.precise = preciseHere;
|
||||
continue;
|
||||
}
|
||||
if (seen.has(relId)) continue;
|
||||
seen.add(relId);
|
||||
pending.set(relId, {
|
||||
gatedAll: site.staticGated === true,
|
||||
precise: preciseHere,
|
||||
rel: {
|
||||
id: relId,
|
||||
sourceId: callerGraphId,
|
||||
targetId: tgtGraphId,
|
||||
type: 'CALLS',
|
||||
confidence: 0.85,
|
||||
// Match legacy DAG's reason convention so consumers that
|
||||
// assert `reason === 'import-resolved'` keep working. The
|
||||
// construction-site marker is opt-in for the same reason.
|
||||
reason: constructionSiteReason(
|
||||
fnDef.filePath !== parsed.filePath ? 'import-resolved' : 'local-call',
|
||||
site,
|
||||
options.markConstructionSites,
|
||||
),
|
||||
// Guess values as placeholders; decided at flush from `precise`.
|
||||
confidence: 0.5,
|
||||
reason: GLOBAL_NAME_FALLBACK_REASON,
|
||||
},
|
||||
});
|
||||
emitted++;
|
||||
}
|
||||
for (const { rel, gatedAll } of pending.values()) {
|
||||
graph.addRelationship(gatedAll ? { ...rel, staticGated: true } : rel);
|
||||
for (const { rel, gatedAll, precise } of pending.values()) {
|
||||
// A name guess is not an import resolution and must not be spelled like
|
||||
// one. It used to be emitted at 0.85 / `'import-resolved'`, which made
|
||||
// it indistinguishable from an edge a real import produced — so every
|
||||
// consumer that wanted to discount guesses had no field to do it with.
|
||||
// 0.5 is the deliberate "coin flip" value, and the reason is what the
|
||||
// process/community walks and the MCP tools actually key on, because
|
||||
// 0.5 sits exactly ON their thresholds (see graph/edge-reasons.ts).
|
||||
// An edge is a guess only when EVERY site that collapsed into it was one;
|
||||
// a single precisely resolved site proves it, whatever order the walk
|
||||
// met the sites in. Independent of `gatedAll`.
|
||||
const labeled =
|
||||
precise !== undefined
|
||||
? { ...rel, confidence: precise.confidence, reason: precise.reason }
|
||||
: rel;
|
||||
graph.addRelationship(gatedAll ? { ...labeled, staticGated: true } : labeled);
|
||||
}
|
||||
}
|
||||
return emitted;
|
||||
|
|
|
|||
|
|
@ -120,19 +120,10 @@ export function followChainPostFinalize(
|
|||
* typeBindings — the in-extractor pass-4 ran before propagation and
|
||||
* missed any chain whose terminal lived in a foreign file.
|
||||
*
|
||||
* Scope-chain concern (verified 2026-04-21): `pythonImportOwningScope`
|
||||
* documents that function-local `from x import y` binds `y` to the
|
||||
* inner function scope, which would make a module-only write miss
|
||||
* non-module importers. In practice `finalize-algorithm` hoists those
|
||||
* bindings into `indexes.bindings[moduleScope]` regardless of where
|
||||
* the `import` statement appears — the integration fixture
|
||||
* `python-function-local-import-chain` exercises a chained
|
||||
* receiver-bound call `u = get_user(); u.save()` inside a function
|
||||
* body and emits the expected `do_work → User.save` edge. The
|
||||
* module-scope write is sufficient today. If finalize routing ever
|
||||
* changes to honor the hook's per-scope contract, this pass must
|
||||
* iterate `indexes.bindings` over every scope and mirror into the
|
||||
* binding-owning scope's `typeBindings`, not just the module's.
|
||||
* Finalize can retain lexical import ownership. Mirror into each binding's
|
||||
* owning scope, never hoist local import-derived types into the file scope.
|
||||
* Module ordering remains SCC-based; non-module chains are followed after
|
||||
* all import bindings have been mirrored.
|
||||
*/
|
||||
export function propagateImportedReturnTypes(
|
||||
parsedFiles: readonly ParsedFile[],
|
||||
|
|
@ -140,6 +131,7 @@ export function propagateImportedReturnTypes(
|
|||
index: WorkspaceResolutionIndex,
|
||||
): void {
|
||||
const moduleScopeByFile = index.moduleScopeByFile;
|
||||
const scopesByFile = new Map(parsedFiles.map((file) => [file.filePath, file.scopes]));
|
||||
|
||||
// Walk SCCs in reverse-topological order (`indexes.sccs` is leaves-
|
||||
// first per `tarjanSccs`). For each file we mirror import bindings
|
||||
|
|
@ -167,42 +159,44 @@ export function propagateImportedReturnTypes(
|
|||
// import-derived typeBinding mirror. Both helpers fast-path when
|
||||
// no augmentations exist for the scope, so the common case is
|
||||
// allocation-free. See I8.
|
||||
for (const localName of namesAtScope(importerModule.id, indexes)) {
|
||||
// Skip if importer already has a typeBinding for this name —
|
||||
// an explicit local annotation must win over import-derived.
|
||||
if (importerModule.typeBindings.has(localName)) continue;
|
||||
for (const importerScope of scopesByFile.get(filePath) ?? [importerModule]) {
|
||||
for (const localName of namesAtScope(importerScope.id, indexes)) {
|
||||
// Skip if importer already has a typeBinding for this name —
|
||||
// an explicit local annotation must win over import-derived.
|
||||
if (importerScope.typeBindings.has(localName)) continue;
|
||||
|
||||
const refs = lookupBindingsAt(importerModule.id, localName, indexes);
|
||||
for (const ref of refs) {
|
||||
if (ref.origin !== 'import' && ref.origin !== 'reexport' && ref.origin !== 'wildcard')
|
||||
continue;
|
||||
const sourceModule = moduleScopeByFile.get(ref.def.filePath);
|
||||
if (sourceModule === undefined) continue;
|
||||
const refs = lookupBindingsAt(importerScope.id, localName, indexes);
|
||||
for (const ref of refs) {
|
||||
if (ref.origin !== 'import' && ref.origin !== 'reexport' && ref.origin !== 'wildcard')
|
||||
continue;
|
||||
const sourceModule = moduleScopeByFile.get(ref.def.filePath);
|
||||
if (sourceModule === undefined) continue;
|
||||
|
||||
// The source file's typeBinding is keyed by the def's simple
|
||||
// name (e.g. `get_user`), not the importer's local alias.
|
||||
const qn = ref.def.qualifiedName;
|
||||
if (qn === undefined) continue;
|
||||
const dot = qn.lastIndexOf('.');
|
||||
const sourceName = dot === -1 ? qn : qn.slice(dot + 1);
|
||||
// The source file's typeBinding is keyed by the def's simple
|
||||
// name (e.g. `get_user`), not the importer's local alias.
|
||||
const qn = ref.def.qualifiedName;
|
||||
if (qn === undefined) continue;
|
||||
const dot = qn.lastIndexOf('.');
|
||||
const sourceName = dot === -1 ? qn : qn.slice(dot + 1);
|
||||
|
||||
const sourceTypeRef = sourceModule.typeBindings.get(sourceName);
|
||||
if (sourceTypeRef === undefined) continue;
|
||||
const sourceTypeRef = sourceModule.typeBindings.get(sourceName);
|
||||
if (sourceTypeRef === undefined) continue;
|
||||
|
||||
// Chain-follow inside the source module so we mirror the
|
||||
// terminal type, not an intermediate intra-source reference.
|
||||
const terminal = followChainPostFinalize(sourceTypeRef, sourceModule.id, indexes);
|
||||
// Chain-follow inside the source module so we mirror the
|
||||
// terminal type, not an intermediate intra-source reference.
|
||||
const terminal = followChainPostFinalize(sourceTypeRef, sourceModule.id, indexes);
|
||||
|
||||
// Mutating typeBindings is safe because draftToScope
|
||||
// produced a non-frozen Map (Contract Invariant I3/I8).
|
||||
(importerModule.typeBindings as Map<string, TypeRef>).set(localName, terminal);
|
||||
// First-write-wins for the local alias: if the same
|
||||
// `localName` was registered multiple times via
|
||||
// `mergeBindings` (rare; happens with conflicting
|
||||
// re-exports), only the first ref with a usable
|
||||
// typeBinding source is mirrored. Conflict resolution
|
||||
// among multiple sources is the merger's job, not ours.
|
||||
break;
|
||||
// Mutating typeBindings is safe because draftToScope
|
||||
// produced a non-frozen Map (Contract Invariant I3/I8).
|
||||
(importerScope.typeBindings as Map<string, TypeRef>).set(localName, terminal);
|
||||
// First-write-wins for the local alias: if the same
|
||||
// `localName` was registered multiple times via
|
||||
// `mergeBindings` (rare; happens with conflicting
|
||||
// re-exports), only the first ref with a usable
|
||||
// typeBinding source is mirrored. Conflict resolution
|
||||
// among multiple sources is the merger's job, not ours.
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -17,9 +17,11 @@
|
|||
* registries only consult pre-finalize local bindings — imported names live
|
||||
* in finalized bindings (the same reason free calls need
|
||||
* `emitFreeCallFallback`) — so `resolveReferenceSites` skips `value-ref`
|
||||
* sites and this pass resolves them post-finalize via
|
||||
* `findCallableBindingInScope` (Function/Method/Constructor only — the
|
||||
* callable gate that keeps `{ port: DEFAULT_PORT }` from emitting anything).
|
||||
* sites and this pass resolves them post-finalize (see
|
||||
* `resolveValueRefTarget` — Function/Method/Constructor only, the callable
|
||||
* gate that keeps `{ port: DEFAULT_PORT }` from emitting anything, and
|
||||
* receiver-aware so a qualified reference binds the owner it was written
|
||||
* with).
|
||||
*
|
||||
* Precision posture (mirrors `emitInterfaceDispatchFor`):
|
||||
* - reason `'property-dispatch'` keeps synthesized CALLS auditable;
|
||||
|
|
@ -36,13 +38,29 @@
|
|||
* emits the capture participates) and generic member-call sites.
|
||||
*/
|
||||
|
||||
import type { ParsedFile, SymbolDefinition } from 'gitnexus-shared';
|
||||
import type {
|
||||
BindingRef,
|
||||
ParsedFile,
|
||||
ReferenceSite,
|
||||
ScopeId,
|
||||
SymbolDefinition,
|
||||
} from 'gitnexus-shared';
|
||||
import type { KnowledgeGraph } from '../../../graph/types.js';
|
||||
import type { ScopeResolutionIndexes } from '../../model/scope-resolution-indexes.js';
|
||||
import { tryEmitEdge, type CalleeIdCaptureCtx } from '../graph-bridge/edges.js';
|
||||
import type { GraphNodeLookup } from '../graph-bridge/node-lookup.js';
|
||||
import type { CalleeIdSink } from '../graph-bridge/callee-id-sink.js';
|
||||
import { findCallableBindingInScope } from '../scope/walkers.js';
|
||||
import {
|
||||
findCallableBindingInScope,
|
||||
findClassBindingInScope,
|
||||
findOwnedMember,
|
||||
isNamespaceNameShadowed,
|
||||
isOwnerNameShadowedBySomethingElse,
|
||||
lookupBindingsAt,
|
||||
} from '../scope/walkers.js';
|
||||
import { VALUE_REF_EDGE_REASON } from '../value-ref-edges.js';
|
||||
import type { SemanticModel } from '../../model/semantic-model.js';
|
||||
import { CALL_TARGET_TYPES } from '../../model/symbol-table.js';
|
||||
|
||||
/**
|
||||
* Keys registered by more than this many distinct functions are skipped —
|
||||
|
|
@ -65,12 +83,282 @@ export const MAX_PROPERTY_DISPATCH_FANOUT = (() => {
|
|||
/** Below the 0.85 resolved baseline; same discount idea as interface-dispatch. */
|
||||
export const PROPERTY_DISPATCH_CONFIDENCE = 0.7;
|
||||
|
||||
/**
|
||||
* Resolve a `value-ref` site to the callable it names.
|
||||
*
|
||||
* Two shapes, and the difference matters:
|
||||
*
|
||||
* - BARE (`{ handler: onClick }`, `register(onTick)`) — the name is resolved
|
||||
* up the lexical chain, which is what an unqualified name means. Be exact
|
||||
* about what that walk does, because it is not a plain lexical lookup:
|
||||
* `findCallableBindingInScope` applies the callable predicate WHILE walking,
|
||||
* so a scope binding the name to a parameter or a local contributes nothing
|
||||
* and the walk continues outward. A nearer non-callable binding is stepped
|
||||
* over — the same shape the qualified path guards against below, unguarded
|
||||
* here. Pre-existing (#2437) and out of scope for #3399; reachable in JS/TS
|
||||
* (`function outer(handler) { return { h: handler }; }` beside a top-level
|
||||
* `function handler`), and narrow in Zig, which rejects a local shadowing a
|
||||
* container declaration.
|
||||
*
|
||||
* - QUALIFIED (`bridge.accessor(Element.getNamespaceUri, …)`) — the source
|
||||
* WROTE the owner, so the lexical chain is the wrong instrument. It gives
|
||||
* local bindings precedence (`walkScopeChain`), so a nested container
|
||||
* holding its own `getNamespaceUri` answers first and the registration is
|
||||
* attached to a DIFFERENT function than the one written. That is a wrong
|
||||
* edge, not a missing one — strictly worse for a tool whose value is that
|
||||
* its edges can be trusted — and it is reachable in any language that
|
||||
* allows a same-named callable in a nested container, Zig included.
|
||||
*
|
||||
* So a qualified site resolves through its receiver: name the owner, then take
|
||||
* the member off that owner. An owner is either a MODULE or a CLASS-like
|
||||
* container — `utils.compare` and `Element.getNamespaceUri` are the same shape
|
||||
* written against the two kinds of namespace a language has, and the member-call
|
||||
* path already resolves both (receiver-bound-calls Case 1 / Case 2). Both are
|
||||
* tried here, MODULE FIRST: see `findNamespaceValueRefTarget` for why a module
|
||||
* receiver cannot simply be declined, and the comment on the call below for why
|
||||
* the container channel must not go first.
|
||||
*
|
||||
* If neither channel names the owner, or the owner is named but owns no such
|
||||
* callable, this DECLINES rather than falling back to the lexical walk.
|
||||
*
|
||||
* Be precise about what declining costs, because it is more than one reference:
|
||||
* a site that emits NO edge leaves no evidence for `impact`'s value-reference
|
||||
* probe to read, so the target keeps `epistemic: "exact"` — silence, not a
|
||||
* hedge. That is why the module channel above exists rather than being waved
|
||||
* through as "just a decline". What remains declined is the case where the
|
||||
* written receiver names nothing this index knows at all (a Zig `@This()` alias
|
||||
* whose name differs from its container's, an owner from outside the workspace):
|
||||
* there the alternative is not a hedge either, it is a confident edge to a
|
||||
* lexically-nearer function that the source did not name, and a wrong edge is
|
||||
* strictly worse than a missing one for a tool whose value is that its edges can
|
||||
* be trusted.
|
||||
*
|
||||
* `CALL_TARGET_TYPES`, not a hand-rolled label set: `findOwnedMember` also
|
||||
* answers with FIELDS, and a field named like the member would otherwise
|
||||
* register as if it were the callable.
|
||||
*
|
||||
* Exported for `bench/value-ref-resolution/measure.mjs`, which gates both the
|
||||
* resolved-target SET and the per-site cost of the four channels above across a
|
||||
* 4x file-count step. It is the per-site half of the pass, so timing it in
|
||||
* isolation is what makes a workspace-size dependency visible; timing
|
||||
* `emitPropertyDispatchCalls` would fold that signal into edge emission, and
|
||||
* re-implementing the channel order in the bench would pin the bench's idea of
|
||||
* this function rather than this function.
|
||||
*/
|
||||
export function resolveValueRefTarget(
|
||||
site: ReferenceSite,
|
||||
filePath: string,
|
||||
scopes: ScopeResolutionIndexes,
|
||||
model: SemanticModel,
|
||||
publishesImportedNames: boolean,
|
||||
): SymbolDefinition | undefined {
|
||||
const receiverName = site.explicitReceiver?.name;
|
||||
if (receiverName === undefined) {
|
||||
return findCallableBindingInScope(site.inScope, site.name, scopes);
|
||||
}
|
||||
// NAMESPACE FIRST, and the order is load-bearing. `findClassBindingInScope`
|
||||
// does not stop at the scope chain: when its `isClassLike` walk misses — and a
|
||||
// namespace handle binds a Module, so it always misses — it falls back to
|
||||
// `scopes.qualifiedNames`, a WORKSPACE-wide index, and answers with the unique
|
||||
// def of that name anywhere in the repo. Trying it first therefore lets a
|
||||
// same-named container in a file this one never imported preempt the `@import`
|
||||
// this file actually wrote:
|
||||
//
|
||||
// const dom_utils = @import("dom_utils.zig"); // namespace-only module
|
||||
// … bridge.accessor(dom_utils.compare, …) // → decoy.zig's compare
|
||||
//
|
||||
// The shadow guard below cannot catch it: the import binds at MODULE scope,
|
||||
// which the guard treats as the floor. An import written in this file is the
|
||||
// strongest statement about what the name means here, so it outranks a global
|
||||
// guess — and when the handle is not an import of this file, this answers
|
||||
// nothing and the container channel runs exactly as before.
|
||||
const viaNamespace = findNamespaceValueRefTarget(
|
||||
site,
|
||||
filePath,
|
||||
receiverName,
|
||||
scopes,
|
||||
publishesImportedNames,
|
||||
);
|
||||
if (viaNamespace !== undefined) {
|
||||
// `'owned'` is NOT "no answer" — it is "this receiver is a namespace handle
|
||||
// this file wrote, and it names no callable member". The two must not be
|
||||
// conflated, because falling through from the second one reaches
|
||||
// `findClassBindingInScope`, whose miss path answers from the WORKSPACE-wide
|
||||
// qualified-name index: a same-named container in a file this one never
|
||||
// imported then supplies the member the written module does not have. That
|
||||
// is a confident edge into an unrelated file, and the owner-shadow guard
|
||||
// below does not stop it — a plain `const utils = @import("utils.zig");`
|
||||
// records a namespace IMPORT EDGE, not a module-scope binding, so the guard
|
||||
// sees nothing bound under the name and reads the container as unshadowed.
|
||||
// Verified with a fixture rather than argued: `dom_utils.onlyOnDecoy`, where
|
||||
// `dom_utils.zig` has no such member and `decoy.zig` declares a same-named
|
||||
// struct that does, minted `JsApi → onlyOnDecoy` before this line existed.
|
||||
//
|
||||
// The file said which module it meant. If that module does not expose the
|
||||
// name as a callable, the honest answer is no edge.
|
||||
return viaNamespace === 'owned' ? undefined : viaNamespace;
|
||||
}
|
||||
|
||||
const owner = findClassBindingInScope(site.inScope, receiverName, scopes);
|
||||
if (owner !== undefined) {
|
||||
// The container lookup is a CLASS-ONLY walk: `walkScopeChain` filters by
|
||||
// `isClassLike`, so it steps over a nearer binding that is a value and keeps
|
||||
// climbing — and past the scope chain entirely, into a qualified-name
|
||||
// fallback that answers with the unique workspace definition of the name.
|
||||
// `fn f(Ticker: u8) { register(Ticker.fire) }` in a file that neither
|
||||
// declares nor imports `Ticker` therefore resolves to some other file's
|
||||
// `Ticker` container. That is the wrong-edge failure R1-2 exists to prevent,
|
||||
// arriving through the class channel instead of the lexical one, and a
|
||||
// registration pointing at a function the source never named is worse than
|
||||
// no registration at all.
|
||||
//
|
||||
// So the name has to still MEAN that container at this site. The namespace
|
||||
// channel below asks the same question through `isNamespaceNameShadowed`;
|
||||
// a container needs the variant that exempts the container ITSELF, because
|
||||
// `fn make() { const Local = struct {…}; register(Local.go); }` binds the
|
||||
// name locally to the very def we resolved, and reading that as its own
|
||||
// shadow would suppress the resolutions this path exists to make.
|
||||
if (isOwnerNameShadowedBySomethingElse(receiverName, owner, site.inScope, scopes))
|
||||
return undefined;
|
||||
const member = findOwnedMember(owner.nodeId, site.name, model);
|
||||
if (member === undefined || !CALL_TARGET_TYPES.has(member.type)) return undefined;
|
||||
return member;
|
||||
}
|
||||
return undefined;
|
||||
}
|
||||
|
||||
/**
|
||||
* The second kind of owner: a namespace handle.
|
||||
*
|
||||
* `const utils = @import("utils.zig"); register(utils.compare);` — `utils` is a
|
||||
* MODULE, not a class, so `findClassBindingInScope` answers nothing and the
|
||||
* class path above declines. Declining here would be a silent hole rather than
|
||||
* a conservative one: no USES edge is emitted, so
|
||||
* `callableValueReferenceBoundaries` measures a real zero and `impact` on
|
||||
* `compare` republishes `exact` — the very claim this feature exists to stop
|
||||
* making. Nothing downstream can hedge on evidence that was never recorded.
|
||||
*
|
||||
* So resolve it, through the SAME channel the member-CALL path already trusts
|
||||
* for `utils.compare()` (receiver-bound-calls Case 1): the file's namespace
|
||||
* import edges name the target module, and the target module's own local
|
||||
* module-scope bindings name its members. `utils.compare` and `utils.compare()`
|
||||
* disagreeing about what `utils` is would be the anomaly.
|
||||
*
|
||||
* The same three guards Case 1 applies, for the same reasons:
|
||||
* - a LOCAL declaration shadowing the handle suppresses the resolution
|
||||
* (`isNamespaceNameShadowed`) — `fn f(utils: Decoy) { register(utils.compare) }`
|
||||
* names the parameter's member, and resolving through the import would be a
|
||||
* wrong edge rather than a missing one;
|
||||
* - a locally declared member wins, and a name the target file merely IMPORTED
|
||||
* counts only when the provider says its imports ARE its exports
|
||||
* (`ScopeResolver.namespaceExportsIncludeImportedNames`). That opt-in is not
|
||||
* a detail to skip: a Zig HUB — a file made only of re-exports, ghostty's
|
||||
* `src/terminal/`, tigerbeetle's `stdx` — declares nothing, so requiring a
|
||||
* local declaration declines every member reached through one. `hub.fn()`
|
||||
* resolves and `register(hub.fn)` would not, and one name would mean two
|
||||
* things depending on whether a `(` followed it. In languages that do not
|
||||
* opt in, a module's imports are not its exports and this stays closed;
|
||||
* - two distinct defs under one name resolve NOTHING. Never guess a namespace
|
||||
* member — the whole point of reading the written receiver is precision.
|
||||
*
|
||||
* `CALL_TARGET_TYPES` gates the answer for the same reason the class path needs
|
||||
* it: `utils.DEFAULT_PORT` is a module-scope binding too, and a registration
|
||||
* table full of constants must keep emitting nothing.
|
||||
*/
|
||||
function findNamespaceValueRefTarget(
|
||||
site: ReferenceSite,
|
||||
filePath: string,
|
||||
receiverName: string,
|
||||
scopes: ScopeResolutionIndexes,
|
||||
publishesImportedNames: boolean,
|
||||
): SymbolDefinition | 'owned' | undefined {
|
||||
const moduleScopeId = scopes.moduleScopes.get(filePath);
|
||||
if (moduleScopeId === undefined) return undefined;
|
||||
const targetFiles: string[] = [];
|
||||
for (const edge of scopes.imports.get(moduleScopeId) ?? []) {
|
||||
if (edge.kind !== 'namespace' || edge.localName !== receiverName) continue;
|
||||
if (edge.targetFile === null) continue;
|
||||
if (!targetFiles.includes(edge.targetFile)) targetFiles.push(edge.targetFile);
|
||||
}
|
||||
if (targetFiles.length === 0) return undefined;
|
||||
if (isNamespaceNameShadowed(receiverName, site.inScope, scopes)) return undefined;
|
||||
|
||||
/** The unique callable `select` finds across every target file, or nothing. */
|
||||
const uniqueMember = (
|
||||
select: (moduleScope: ScopeId) => readonly BindingRef[],
|
||||
): SymbolDefinition | undefined | 'ambiguous' => {
|
||||
let picked: SymbolDefinition | undefined;
|
||||
for (const targetFile of targetFiles) {
|
||||
const targetScopeId = scopes.moduleScopes.get(targetFile);
|
||||
if (targetScopeId === undefined) continue;
|
||||
for (const ref of select(targetScopeId)) {
|
||||
if (!CALL_TARGET_TYPES.has(ref.def.type)) continue;
|
||||
if (picked !== undefined && picked.nodeId !== ref.def.nodeId) return 'ambiguous';
|
||||
picked = ref.def;
|
||||
}
|
||||
}
|
||||
return picked;
|
||||
};
|
||||
|
||||
// A locally declared member first — same precedence `findExportedDef` states
|
||||
// and `walkScopeChain` applies: what the target file DECLARED beats what it
|
||||
// merely re-published.
|
||||
const localRefs = (scope: ScopeId): readonly BindingRef[] =>
|
||||
(scopes.bindings.get(scope)?.get(site.name) ?? []).filter((ref) => ref.origin === 'local');
|
||||
const local = uniqueMember(localRefs);
|
||||
if (local === 'ambiguous') return 'owned';
|
||||
if (local !== undefined) return local;
|
||||
if (!publishesImportedNames) return 'owned';
|
||||
|
||||
// PRECEDENCE IS DECIDED BEFORE THE TYPE GATE, not by it. `uniqueMember`
|
||||
// applies `CALL_TARGET_TYPES` while it selects, so a target file declaring a
|
||||
// NON-callable under this name answers `undefined` above and would otherwise
|
||||
// fall through to the published channel — publishing a re-exported callable
|
||||
// under a name the module's own declaration owns. `findExportedDef` does not
|
||||
// do that: it returns any local def it finds and lets its caller's type gate
|
||||
// reject it, so `findExportedDefIncludingImportedNames` never reaches the
|
||||
// imported names for a name the file declares. Same rule here, so `x.f` and
|
||||
// `x.f()` cannot disagree about which module owns the name.
|
||||
//
|
||||
// Not reachable through valid Zig today — a container cannot declare a name
|
||||
// twice, so one target file cannot hold both spellings, and Zig is the only
|
||||
// provider that sets `namespaceExportsIncludeImportedNames`. It becomes
|
||||
// reachable the moment a second provider opts in, or a receiver binds more
|
||||
// than one target file; the guard is one `some` and the alternative failure
|
||||
// is a confident edge into the wrong module.
|
||||
const declaredLocally = targetFiles.some((targetFile) => {
|
||||
const targetScopeId = scopes.moduleScopes.get(targetFile);
|
||||
return targetScopeId !== undefined && localRefs(targetScopeId).length > 0;
|
||||
});
|
||||
if (declaredLocally) return 'owned';
|
||||
|
||||
// Then a name the target file publishes but did not declare — the hub case.
|
||||
// `lookupBindingsAt`, not `scopes.bindings`, because a hub's module scope owns
|
||||
// no local binding for these names and the finalized/augmented channel is the
|
||||
// only place they exist; the same read `findExportedDefIncludingImportedNames`
|
||||
// does for the CALL form.
|
||||
const published = uniqueMember((scope) =>
|
||||
lookupBindingsAt(scope, site.name, scopes).filter(
|
||||
(ref) => ref.origin === 'import' || ref.origin === 'namespace' || ref.origin === 'reexport',
|
||||
),
|
||||
);
|
||||
return published === 'ambiguous' || published === undefined ? 'owned' : published;
|
||||
}
|
||||
|
||||
export function emitPropertyDispatchCalls(
|
||||
graph: KnowledgeGraph,
|
||||
scopes: ScopeResolutionIndexes,
|
||||
parsedFiles: readonly ParsedFile[],
|
||||
nodeLookup: GraphNodeLookup,
|
||||
model: SemanticModel,
|
||||
calleeIdSink?: CalleeIdSink,
|
||||
/**
|
||||
* `ScopeResolver.namespaceExportsIncludeImportedNames`, forwarded rather than
|
||||
* re-derived. The pass names no language; it asks the provider the same
|
||||
* question `receiver-bound-calls` asks before resolving a namespace member,
|
||||
* so the CALL and the REGISTRATION forms of `hub.fn` cannot disagree.
|
||||
*/
|
||||
publishesImportedNames = false,
|
||||
): {
|
||||
usesEmitted: number;
|
||||
callsEmitted: number;
|
||||
|
|
@ -86,18 +374,16 @@ export function emitPropertyDispatchCalls(
|
|||
for (const parsed of parsedFiles) {
|
||||
for (const site of parsed.referenceSites) {
|
||||
if (site.kind !== 'value-ref') continue;
|
||||
const def = findCallableBindingInScope(site.inScope, site.name, scopes);
|
||||
const def = resolveValueRefTarget(
|
||||
site,
|
||||
parsed.filePath,
|
||||
scopes,
|
||||
model,
|
||||
publishesImportedNames,
|
||||
);
|
||||
if (def === undefined) continue;
|
||||
|
||||
const ok = tryEmitEdge(
|
||||
graph,
|
||||
scopes,
|
||||
nodeLookup,
|
||||
site,
|
||||
def,
|
||||
'scope-resolution: value-ref',
|
||||
seen,
|
||||
);
|
||||
const ok = tryEmitEdge(graph, scopes, nodeLookup, site, def, VALUE_REF_EDGE_REASON, seen);
|
||||
if (ok) usesEmitted++;
|
||||
|
||||
if (site.propertyKey === undefined) continue;
|
||||
|
|
|
|||
|
|
@ -726,6 +726,7 @@ export function runScopeResolution(
|
|||
const resolutionConfig = input.resolutionConfig;
|
||||
const finalized = finalizeScopeModel(parsedFiles, {
|
||||
hooks: {
|
||||
importsBindAtLexicalScope: provider.importsBindAtLexicalScope === true,
|
||||
resolveImportTarget: (targetRaw, fromFile, _workspaceIndex, parsedImport) =>
|
||||
provider.resolveImportTarget(targetRaw, fromFile, allFilePaths, resolutionConfig, {
|
||||
parsedFiles,
|
||||
|
|
@ -737,9 +738,23 @@ export function runScopeResolution(
|
|||
provider.expandsWildcardTo?.(targetModuleScope, parsedFiles) ?? [],
|
||||
mergeBindings: (existing, incoming, scopeId) =>
|
||||
provider.mergeBindings(existing, incoming, scopeId),
|
||||
wildcardCollisionIsAmbiguous: provider.exclusiveWildcardReexports === true,
|
||||
namedImportsBindTopLevelOnly: provider.namedImportsBindTopLevelOnly === true,
|
||||
},
|
||||
});
|
||||
logHeapProbe('sr-post-finalize', `lang=${provider.language}`);
|
||||
// `export *` collisions the shared finalize refused to bind (WS1 C2). Recorded
|
||||
// as outcomes so the refusal is auditable next to the name-fallback census —
|
||||
// a silently unresolved importer is indistinguishable from a resolver gap.
|
||||
for (const refused of finalized.stats.ambiguousWildcardExports) {
|
||||
recordResolutionOutcome({
|
||||
kind: 'reexport-ambiguous',
|
||||
candidateIds: refused.candidateDefIds,
|
||||
phase: 'finalize',
|
||||
filePath: refused.filePath,
|
||||
name: refused.name,
|
||||
});
|
||||
}
|
||||
// One store and ONE writer rule for heritage instantiations (#2912), shared by
|
||||
// the pre-pass below and by the language hook further down — a heritage shape
|
||||
// the pre-pass cannot express (Rust `impl T for S`, Dart `implements`) records
|
||||
|
|
@ -1085,6 +1100,12 @@ export function runScopeResolution(
|
|||
workspaceIndex,
|
||||
{
|
||||
allowGlobalFallback: provider.allowGlobalFreeCallFallback === true,
|
||||
language: provider.language,
|
||||
isGlobalNameFallbackPlausible: provider.isGlobalNameFallbackPlausible,
|
||||
sourceTextOf:
|
||||
provider.isGlobalNameFallbackPlausible !== undefined
|
||||
? (filePath: string) => getFileContents().get(filePath)
|
||||
: undefined,
|
||||
constructorCallTargetsClass: provider.constructorCallTargetsClass === true,
|
||||
markConstructionSites: provider.markConstructionSites === true,
|
||||
isFileLocalDef: provider.isFileLocalDef,
|
||||
|
|
@ -1210,7 +1231,12 @@ export function runScopeResolution(
|
|||
indexes,
|
||||
emitParsedFiles,
|
||||
postHeritageNodeLookup,
|
||||
readonlyModel,
|
||||
calleeIdAccumulator,
|
||||
// Same provider hook the receiver-bound pass consults for a namespace
|
||||
// member (Case 1). Without it a hub module's re-exported callable
|
||||
// resolves when CALLED and declines when REGISTERED.
|
||||
provider.namespaceExportsIncludeImportedNames === true,
|
||||
);
|
||||
if (propertyDispatch.skippedKeys > 0) {
|
||||
// Never drop dispatch coverage silently: a hook table larger than the
|
||||
|
|
|
|||
|
|
@ -108,6 +108,60 @@ export type ResolutionOutcome =
|
|||
* every real codebase and taught readers to ignore it.
|
||||
*/
|
||||
readonly receiverOrigin?: ReceiverOrigin;
|
||||
}
|
||||
/**
|
||||
* The global-name fallback fired: a callable was chosen because its SIMPLE
|
||||
* NAME is unique in the workspace, with no import or scope chain leading to
|
||||
* it. A labeled low-confidence edge WAS emitted.
|
||||
*
|
||||
* Separate from `resolved` because it is not a resolution, and separate from
|
||||
* `suppressed` because an edge exists. Counting it is the only way a reader
|
||||
* can tell how much of a language's call graph rests on name uniqueness — the
|
||||
* number that was previously invisible because these edges were emitted with
|
||||
* the same reason and confidence as import-resolved ones.
|
||||
*/
|
||||
| {
|
||||
readonly kind: 'fallback-guessed';
|
||||
readonly targetId: string;
|
||||
readonly language?: string;
|
||||
readonly phase: string;
|
||||
readonly filePath: string;
|
||||
readonly name: string;
|
||||
readonly range: Range;
|
||||
}
|
||||
/**
|
||||
* A global-name-fallback candidate was REFUSED by the language's plausibility
|
||||
* hook: the language's own visibility rules make that call impossible, so no
|
||||
* edge was emitted.
|
||||
*
|
||||
* The counterpart of `fallback-guessed`, and the pair is what makes the
|
||||
* refusal auditable — a refusal count with no guess count cannot distinguish
|
||||
* "the guard works" from "the guard rejects everything".
|
||||
*/
|
||||
| {
|
||||
readonly kind: 'fallback-refused';
|
||||
readonly candidateId: string;
|
||||
readonly language?: string;
|
||||
readonly phase: string;
|
||||
readonly filePath: string;
|
||||
readonly name: string;
|
||||
readonly range: Range;
|
||||
}
|
||||
/**
|
||||
* A barrel re-exported `name` through two or more `export *` sources that
|
||||
* each declare it, so the language names no winner. The shared finalize pass
|
||||
* REFUSED the binding (see `FinalizeStats.ambiguousWildcardExports`) instead
|
||||
* of publishing the first-listed source as `import-resolved`; every importer
|
||||
* of `name` through `filePath` stays unresolved. No `range`: the collision
|
||||
* belongs to the file's export surface, not to one statement.
|
||||
*/
|
||||
| {
|
||||
readonly kind: 'reexport-ambiguous';
|
||||
readonly candidateIds: readonly string[];
|
||||
readonly phase: string;
|
||||
/** The barrel file whose `export *` sources collide. */
|
||||
readonly filePath: string;
|
||||
readonly name: string;
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -353,6 +353,82 @@ export function isNamespaceNameShadowed(
|
|||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Does something between `inScope` and its module scope bind `name` to
|
||||
* ANYTHING other than `def`?
|
||||
*
|
||||
* `isNamespaceNameShadowed` asks the same question for a namespace handle,
|
||||
* where any local binding of the name is by definition not the import. A
|
||||
* CONTAINER receiver needs the extra clause: the container may itself be the
|
||||
* local declaration (`fn make() { const Local = struct {…}; … Local.go … }`),
|
||||
* and reading that as its own shadow would suppress exactly the resolutions it
|
||||
* is meant to permit — the #2723 mistake, one channel over.
|
||||
*
|
||||
* So a scope that binds the name answers immediately, and the answer is "not
|
||||
* shadowed" only when one of that scope's bindings IS `def`. A name bound in a
|
||||
* nearer scope to something else — a parameter, a local, a type binding — wins
|
||||
* the lexical race, which is the whole point: `findClassBindingInScope` filters
|
||||
* the chain by `isClassLike` and therefore cannot see that it lost it.
|
||||
*
|
||||
* The MODULE scope is inspected too, unlike `isNamespaceNameShadowed`, and the
|
||||
* exemption is what makes that safe. That guard stops one rung short because a
|
||||
* namespace import writes its own name into the module scope and would read as
|
||||
* its own shadow (#2723); here the owner is compared by identity, so the binding
|
||||
* that IS the owner exempts itself and only a binding to something ELSE answers
|
||||
* `true`. Stopping short would leave the exact hole this walk exists to close:
|
||||
* `findClassBindingInScope` steps over a module-scope binding that is not
|
||||
* class-like and then answers from a WORKSPACE-wide qualified-name index, so
|
||||
* `const Gauge = @import("other.zig").SOME_CONST;` in a file that never imports
|
||||
* `Gauge.zig` would still resolve `Gauge.read` to that file's container.
|
||||
* `lookupBindingsAt` is used at that scope and only there, because an imported
|
||||
* alias lives in the finalized channel rather than in `scope.bindings`.
|
||||
*
|
||||
* Fail-closed like its sibling: a missing scope or a parent cycle answers
|
||||
* `true`, because suppressing a resolution costs a missing edge while trusting a
|
||||
* corrupt chain costs a wrong one.
|
||||
*/
|
||||
export function isOwnerNameShadowedBySomethingElse(
|
||||
name: string,
|
||||
def: SymbolDefinition,
|
||||
inScope: ScopeId,
|
||||
scopes: ScopeResolutionIndexes,
|
||||
): boolean {
|
||||
let currentId: ScopeId | null = inScope;
|
||||
const visited = new Set<ScopeId>();
|
||||
while (currentId !== null) {
|
||||
if (visited.has(currentId)) return true;
|
||||
visited.add(currentId);
|
||||
const scope = scopes.scopeTree.getScope(currentId);
|
||||
if (scope === undefined) return true;
|
||||
if (scope.kind !== 'Object') {
|
||||
const isModule = scope.kind === 'Module';
|
||||
const imported = isModule ? lookupBindingsAt(currentId, name, scopes) : [];
|
||||
const bindsHere =
|
||||
scope.bindings.has(name) ||
|
||||
scope.typeBindings.has(name) ||
|
||||
scope.lexicalNames?.has(name) === true ||
|
||||
imported.length > 0 ||
|
||||
scope.ownedDefs.some((d) => {
|
||||
const qualifiedName = d.qualifiedName;
|
||||
if (qualifiedName === undefined) return false;
|
||||
const dot = qualifiedName.lastIndexOf('.');
|
||||
return (dot === -1 ? qualifiedName : qualifiedName.slice(dot + 1)) === name;
|
||||
});
|
||||
if (bindsHere) {
|
||||
if ((scope.bindings.get(name) ?? []).some((b) => b.def.nodeId === def.nodeId)) return false;
|
||||
if (scope.ownedDefs.some((d) => d.nodeId === def.nodeId)) return false;
|
||||
if (imported.some((b) => b.def.nodeId === def.nodeId)) return false;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
// The module scope is the last rung, not a rung to skip: nothing above it
|
||||
// can shadow a name for this file.
|
||||
if (scope.kind === 'Module') return false;
|
||||
currentId = scope.parent;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
export function findReceiverTypeBinding(
|
||||
startScope: ScopeId,
|
||||
receiverName: string,
|
||||
|
|
@ -706,6 +782,20 @@ function soleBoundBaseName(bound: string): string | undefined {
|
|||
return base.length === 0 ? undefined : base;
|
||||
}
|
||||
|
||||
export type ClassBindingLookup = {
|
||||
/**
|
||||
* When false, skip the workspace-unique QualifiedNameIndex hit (and the
|
||||
* dotted-tail variant). Default true — Go inheritance still needs that
|
||||
* hit because namespace-style imports often create no scope binding.
|
||||
*
|
||||
* Constructor-form free calls pass false so a unique type name is not
|
||||
* treated as a precise in-scope binding. Those sites belong to
|
||||
* `pickUniqueGlobalClass`, which labels the edge as a guess and runs
|
||||
* `isGlobalNameFallbackPlausible`.
|
||||
*/
|
||||
readonly uniqueQualifiedNameFallback?: boolean;
|
||||
};
|
||||
|
||||
export function findClassBindingInScope(
|
||||
startScope: ScopeId,
|
||||
receiverName: string,
|
||||
|
|
@ -722,6 +812,7 @@ export function findClassBindingInScope(
|
|||
* selection. Only receiver-chain base and step resolution passes this.
|
||||
*/
|
||||
stripDecoration?: DecorationStripper,
|
||||
lookup?: ClassBindingLookup,
|
||||
): SymbolDefinition | undefined {
|
||||
// A TYPE PARAMETER is not a class, and it is checked before every route below
|
||||
// rather than inside one of them because each route would otherwise reach a
|
||||
|
|
@ -730,7 +821,13 @@ export function findClassBindingInScope(
|
|||
// fallback after stripping. The declaration that introduced the parameter is
|
||||
// the only thing that knows, and it knows for all three.
|
||||
if (bindsTypeParameter(startScope, receiverName, scopes)) {
|
||||
return resolveThroughTypeParameterBound(startScope, receiverName, scopes, stripDecoration);
|
||||
return resolveThroughTypeParameterBound(
|
||||
startScope,
|
||||
receiverName,
|
||||
scopes,
|
||||
stripDecoration,
|
||||
lookup,
|
||||
);
|
||||
}
|
||||
|
||||
const local = walkScopeChain(startScope, receiverName, scopes, (def) => isClassLike(def.type));
|
||||
|
|
@ -739,21 +836,25 @@ export function findClassBindingInScope(
|
|||
// Fallback for languages (Go) where namespace-style imports don't
|
||||
// create scope bindings: resolve via QualifiedNameIndex. Only fires
|
||||
// when the scope-chain walk found nothing; single-match wins.
|
||||
const qnames = scopes.qualifiedNames.get(receiverName);
|
||||
if (qnames.length === 1) {
|
||||
const def = scopes.defs.get(qnames[0]!);
|
||||
if (def !== undefined && isClassLike(def.type)) return def;
|
||||
}
|
||||
// Second fallback: dotted names like "models.User" — try the simple
|
||||
// name (tail after last dot) for languages where defs are indexed by
|
||||
// simple name (Go). Only when the dotted lookup fails.
|
||||
if (receiverName.includes('.')) {
|
||||
const simple = receiverName.slice(receiverName.lastIndexOf('.') + 1);
|
||||
if (simple.length > 0 && simple !== receiverName) {
|
||||
const simpleIds = scopes.qualifiedNames.get(simple);
|
||||
if (simpleIds.length === 1) {
|
||||
const def = scopes.defs.get(simpleIds[0]!);
|
||||
if (def !== undefined && isClassLike(def.type)) return def;
|
||||
// Constructor-form free calls opt out — a unique type name is a guess,
|
||||
// not proof the type is in scope (see `ClassBindingLookup`).
|
||||
if (lookup?.uniqueQualifiedNameFallback !== false) {
|
||||
const qnames = scopes.qualifiedNames.get(receiverName);
|
||||
if (qnames.length === 1) {
|
||||
const def = scopes.defs.get(qnames[0]!);
|
||||
if (def !== undefined && isClassLike(def.type)) return def;
|
||||
}
|
||||
// Second fallback: dotted names like "models.User" — try the simple
|
||||
// name (tail after last dot) for languages where defs are indexed by
|
||||
// simple name (Go). Only when the dotted lookup fails.
|
||||
if (receiverName.includes('.')) {
|
||||
const simple = receiverName.slice(receiverName.lastIndexOf('.') + 1);
|
||||
if (simple.length > 0 && simple !== receiverName) {
|
||||
const simpleIds = scopes.qualifiedNames.get(simple);
|
||||
if (simpleIds.length === 1) {
|
||||
const def = scopes.defs.get(simpleIds[0]!);
|
||||
if (def !== undefined && isClassLike(def.type)) return def;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -799,6 +900,7 @@ function resolveThroughTypeParameterBound(
|
|||
parameterName: string,
|
||||
scopes: ScopeResolutionIndexes,
|
||||
stripDecoration?: DecorationStripper,
|
||||
lookup?: ClassBindingLookup,
|
||||
): SymbolDefinition | undefined {
|
||||
const bound = typeParameterAt(startScope, parameterName, scopes)?.bound;
|
||||
if (bound === undefined) return undefined;
|
||||
|
|
@ -806,7 +908,7 @@ function resolveThroughTypeParameterBound(
|
|||
if (baseName === undefined || baseName === parameterName) return undefined;
|
||||
// A bound naming another parameter terminates here rather than recursing.
|
||||
if (bindsTypeParameter(startScope, baseName, scopes)) return undefined;
|
||||
return findClassBindingInScope(startScope, baseName, scopes, stripDecoration);
|
||||
return findClassBindingInScope(startScope, baseName, scopes, stripDecoration, lookup);
|
||||
}
|
||||
|
||||
function normalizeTemplateArgToken(value: string): string {
|
||||
|
|
@ -1207,6 +1309,7 @@ export function resolveInheritanceBaseInScope(
|
|||
scopes: ScopeResolutionIndexes,
|
||||
rawQualifiedName?: string,
|
||||
enclosingClassDef?: SymbolDefinition,
|
||||
lookup?: ClassBindingLookup,
|
||||
): SymbolDefinition | undefined {
|
||||
// #1982: when the source wrote a qualified base (`Other::Inner`), resolve it
|
||||
// against the full-path QualifiedNameIndex FIRST, so a same-tail nested base
|
||||
|
|
@ -1226,7 +1329,7 @@ export function resolveInheritanceBaseInScope(
|
|||
if (qualified !== undefined) return qualified;
|
||||
}
|
||||
return (
|
||||
findClassBindingInScope(startScope, baseName, scopes) ??
|
||||
findClassBindingInScope(startScope, baseName, scopes, undefined, lookup) ??
|
||||
resolveAmbiguousInheritanceBaseViaImports(startScope, baseName, scopes)
|
||||
);
|
||||
}
|
||||
|
|
@ -1452,6 +1555,43 @@ function dirnameOf(filePath: string): string {
|
|||
return idx === -1 ? '' : filePath.slice(0, idx);
|
||||
}
|
||||
|
||||
/**
|
||||
* True when the caller can see `classDef` through import evidence, not
|
||||
* merely because the class name is workspace-unique.
|
||||
*
|
||||
* Exact imported file (`#include "user.h"`) and a finalize-resolved
|
||||
* `targetDefId` (named `use` / `pub use` followed to the def) are
|
||||
* precise. An import that *names* this class (`targetExportedName`)
|
||||
* is also precise — a barrel's `targetFile` is the re-exporting module,
|
||||
* not the defining file. A sibling-file import of a *different* name
|
||||
* is not: `use crate::a::bar` does not make `Foo` in `a/foo.rs` visible.
|
||||
*
|
||||
* Directory-only matching is intentionally omitted. The same-directory
|
||||
* tier on `resolveAmbiguousInheritanceBaseViaImports` is for picking
|
||||
* among *ambiguous* names (C# namespace `using`); it is not proof a
|
||||
* unique constructor type is in scope.
|
||||
*/
|
||||
export function isClassFileImportGrounded(
|
||||
startScope: ScopeId,
|
||||
classDef: Pick<SymbolDefinition, 'filePath' | 'nodeId'>,
|
||||
scopes: ScopeResolutionIndexes,
|
||||
importedName: string,
|
||||
): boolean {
|
||||
const callerModule = moduleScopeIdOf(startScope, scopes);
|
||||
const callerFile = scopes.scopeTree.getScope(startScope)?.filePath;
|
||||
if (callerFile !== undefined && classDef.filePath === callerFile) return true;
|
||||
if (callerModule === null) return false;
|
||||
const importEdges = scopes.imports.get(callerModule);
|
||||
if (importEdges === undefined || importEdges.length === 0) return false;
|
||||
for (const edge of importEdges) {
|
||||
if (edge.targetDefId !== undefined && edge.targetDefId === classDef.nodeId) return true;
|
||||
if (edge.targetFile === null) continue;
|
||||
if (edge.targetFile === classDef.filePath) return true;
|
||||
if (importedName.length > 0 && edge.targetExportedName === importedName) return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Predicate for value-receiver bridge: the labels for which
|
||||
* `reconcileOwnership` registers methods/fields under the def's
|
||||
|
|
|
|||
|
|
@ -0,0 +1,97 @@
|
|||
/**
|
||||
* Language-agnostic primitives for `ScopeResolver.isGlobalNameFallbackPlausible`
|
||||
* implementations.
|
||||
*
|
||||
* The hook itself is per-language — the RULES here are not. What every
|
||||
* implementation needs is the same small set of path arithmetic: which
|
||||
* directory a file sits in, and whether a module path a caller wrote can name
|
||||
* a given file or directory. Those questions are about paths, not about any
|
||||
* language, so they live in shared code (see AGENTS.md: shared ingestion must
|
||||
* not name languages) and the language files supply only the semantics.
|
||||
*/
|
||||
|
||||
import type { ParsedFile } from 'gitnexus-shared';
|
||||
|
||||
/** POSIX-style parent directory. `''` for a file at the repo root. */
|
||||
export function directoryOf(filePath: string): string {
|
||||
const slash = filePath.lastIndexOf('/');
|
||||
return slash === -1 ? '' : filePath.slice(0, slash);
|
||||
}
|
||||
|
||||
/**
|
||||
* Split a module path into segments, accepting the three separators languages
|
||||
* spell module nesting with: `/` (Go, Node), `::` (Rust, C++) and `.` (JVM,
|
||||
* Python). Empty segments and `.` are dropped, so a leading `./` contributes
|
||||
* nothing. Named root prefixes are NOT stripped here — `crate::a` yields
|
||||
* `['crate', 'a']`; a language whose paths carry one (Rust's `crate::` /
|
||||
* `super::`) removes it before calling, see `rustUsePathOf`.
|
||||
*
|
||||
* `.` is only treated as a separator when the path contains no `/`: a Node
|
||||
* specifier like `./util/parse.js` must not split on the extension dot.
|
||||
*/
|
||||
export function moduleSegments(modulePath: string): readonly string[] {
|
||||
const bySlashOrColon = modulePath.split(/\/|::/).filter((s) => s !== '' && s !== '.');
|
||||
if (modulePath.includes('/')) return bySlashOrColon;
|
||||
return bySlashOrColon.flatMap((s) => s.split('.').filter((p) => p !== ''));
|
||||
}
|
||||
|
||||
/**
|
||||
* Does a module path a caller wrote reach `targetPath`?
|
||||
*
|
||||
* True when either side's segments are a SUFFIX of the other's. Both directions
|
||||
* are needed and neither alone is sufficient:
|
||||
*
|
||||
* - The written path is usually longer than the repo-relative one, because it
|
||||
* carries a module/package prefix that is not a directory
|
||||
* (`github.com/org/svc/internal/models` → `internal/models`).
|
||||
* - The repo-relative path is longer when the manifest that defines the module
|
||||
* root sits in a subdirectory of the analyzed tree (`svc/go.mod`, so
|
||||
* `svc/internal/models` is written `mod/internal/models`).
|
||||
*
|
||||
* So the match is on ALIGNED TRAILING SEGMENTS, and it succeeds when either the
|
||||
* shorter side is fully contained in the longer, or at least two segments align.
|
||||
* Both conditions are needed: full containment covers a one-segment package
|
||||
* (`mod/models` reaching `models`), while the two-segment floor covers the case
|
||||
* where neither side contains the other because each carries a different root
|
||||
* (`mod/internal/models` vs `svc/internal/models`). A SINGLE aligned segment
|
||||
* with neither side contained is not enough — `handlers` appearing at the end of
|
||||
* two unrelated trees says nothing.
|
||||
*
|
||||
* Tolerance is the SAFE direction here: this predicate is consulted to decide
|
||||
* whether to REFUSE an edge, so over-matching loses a refusal (the edge stays,
|
||||
* labeled and excluded from flows) while under-matching loses a real edge.
|
||||
*/
|
||||
export function modulePathReaches(writtenPath: string, targetPath: string): boolean {
|
||||
const written = moduleSegments(writtenPath);
|
||||
const target = moduleSegments(targetPath);
|
||||
if (written.length === 0 || target.length === 0) return false;
|
||||
const shorter = Math.min(written.length, target.length);
|
||||
let aligned = 0;
|
||||
while (
|
||||
aligned < shorter &&
|
||||
written[written.length - 1 - aligned] === target[target.length - 1 - aligned]
|
||||
) {
|
||||
aligned++;
|
||||
}
|
||||
return aligned === shorter || aligned >= 2;
|
||||
}
|
||||
|
||||
/** Every module path this file's import statements named, in source order. */
|
||||
function importedModulePaths(parsed: ParsedFile): readonly string[] {
|
||||
return parsed.parsedImports.map((imp) => imp.targetRaw);
|
||||
}
|
||||
|
||||
/** True when any of the caller's imports reaches `targetPath`. */
|
||||
export function anyImportReaches(parsed: ParsedFile, targetPath: string): boolean {
|
||||
for (const written of importedModulePaths(parsed)) {
|
||||
if (modulePathReaches(written, targetPath)) return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/** Strip a trailing file extension. `a/b.rs` → `a/b`; `a/b` → `a/b`. */
|
||||
export function stripExtension(filePath: string): string {
|
||||
const slash = filePath.lastIndexOf('/');
|
||||
const dot = filePath.lastIndexOf('.');
|
||||
return dot > slash ? filePath.slice(0, dot) : filePath;
|
||||
}
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
/**
|
||||
* The `reason` text stamped on the USES edge a `value-ref` site emits.
|
||||
*
|
||||
* A leaf module on purpose. Two modules need this string and they sit on
|
||||
* opposite sides of the product: `passes/property-dispatch.ts` writes it at
|
||||
* analysis time, and `mcp/local/local-backend.ts` reads it back at query time
|
||||
* to decide whether an answer is `exact`. Re-typing the literal in the reader
|
||||
* would make the epistemic signal fail SILENTLY the day the writer's text is
|
||||
* reworded — the query would simply match nothing and every answer would go
|
||||
* back to claiming certainty, which is the exact defect (#3399) this constant
|
||||
* exists to close. Importing `property-dispatch.ts` for it instead would drag
|
||||
* the whole scope-resolution emit graph into the MCP backend for one string.
|
||||
*/
|
||||
export const VALUE_REF_EDGE_REASON = 'scope-resolution: value-ref';
|
||||
345
gitnexus/src/core/ingestion/ts-js-export-marker.ts
Normal file
345
gitnexus/src/core/ingestion/ts-js-export-marker.ts
Normal file
|
|
@ -0,0 +1,345 @@
|
|||
/**
|
||||
* Export evidence for ECMAScript declarations — the `@declaration.is-exported`
|
||||
* marker both the TypeScript and the JavaScript capture emitters synthesize.
|
||||
*
|
||||
* `SymbolDefinition.isExported` is tri-state, and this is where the three
|
||||
* states are decided for TS/JS:
|
||||
*
|
||||
* - `true` — the declaration sits under an `export_statement` (`export
|
||||
* function f`, `export const x`, `export default class`), or the
|
||||
* file names it in an `export { f }` / `export { f as g }` clause
|
||||
* or an `export default f` / `export = f` statement.
|
||||
* - `false` — an ESM-shaped file (no CommonJS export assignment) that does
|
||||
* neither. The declaration is module-private: `export *` cannot
|
||||
* republish it and it must not be counted as a wildcard provider.
|
||||
* - no verdict — the file exports through CommonJS (`module.exports = …`,
|
||||
* `exports.x = …`, top-level `this.x = …`) or is an ambient
|
||||
* `.d.ts`, where "not under `export`" says nothing about what the
|
||||
* module publishes. Nothing is emitted, and the reader keeps its
|
||||
* prior behavior. One CommonJS shape IS decidable and gets `true`:
|
||||
* a method or property declared directly in the object literal
|
||||
* assigned to `module.exports` (`module.exports = { alpha() {} }`)
|
||||
* is that module's export of `alpha`.
|
||||
*
|
||||
* Only a declaration reached from the top level through DECLARATION nodes can
|
||||
* be a module export. The walk therefore stops with `false` at the first
|
||||
* nesting boundary — a class body, an interface/enum body, a function body, an
|
||||
* object literal that is not the `module.exports` value: `export class C {
|
||||
* m() {} }` exports `C`, not `m`; `function w() { function s() {} }` exports
|
||||
* nothing even when the file has `export { s }` for a different `s`.
|
||||
*
|
||||
* The ancestor walk here is deliberately NOT `tsExportChecker`
|
||||
* (`export-detection.ts`): that checker's text fallback (`text.startsWith('export ')`)
|
||||
* fires on the `program` node of any file whose first token is `export`, which
|
||||
* would mark every declaration in such a file exported.
|
||||
*/
|
||||
|
||||
import type { SyntaxNode } from './utils/ast-helpers.js';
|
||||
|
||||
export interface EsmExportEvidence {
|
||||
/** Local names published by `export { … }`, `export default <id>`, `export = <id>`. */
|
||||
readonly namedLocals: ReadonlySet<string>;
|
||||
/** The file exports through a CommonJS assignment: a plain "not under
|
||||
* `export`" is no verdict there. */
|
||||
readonly commonJs: boolean;
|
||||
}
|
||||
|
||||
/** Read binding patterns, never initializer expressions or property keys. */
|
||||
function bindsReceiver(node: SyntaxNode | null, name: string): boolean {
|
||||
if (node === null) return false;
|
||||
if (node.type === 'identifier' || node.type === 'shorthand_property_identifier_pattern') {
|
||||
return node.text === name;
|
||||
}
|
||||
if (node.type === 'variable_declarator')
|
||||
return bindsReceiver(node.childForFieldName('name'), name);
|
||||
if (node.type === 'assignment_pattern')
|
||||
return bindsReceiver(node.childForFieldName('left'), name);
|
||||
if (node.type === 'pair_pattern') return bindsReceiver(node.childForFieldName('value'), name);
|
||||
if (node.type === 'import_specifier') {
|
||||
return bindsReceiver(node.childForFieldName('alias') ?? node.childForFieldName('name'), name);
|
||||
}
|
||||
if (node.type === 'required_parameter' || node.type === 'optional_parameter') {
|
||||
return bindsReceiver(node.childForFieldName('pattern'), name);
|
||||
}
|
||||
return (
|
||||
[
|
||||
'formal_parameters',
|
||||
'object_pattern',
|
||||
'array_pattern',
|
||||
'rest_pattern',
|
||||
'import_clause',
|
||||
'named_imports',
|
||||
'namespace_import',
|
||||
].includes(node.type) && node.namedChildren.some((child) => bindsReceiver(child, name))
|
||||
);
|
||||
}
|
||||
|
||||
/** A locally bound `module`/`exports` is not Node's export receiver. */
|
||||
function isExportReceiverShadowed(node: SyntaxNode, name: string): boolean {
|
||||
for (let scope = node.parent; scope !== null; scope = scope.parent) {
|
||||
if (
|
||||
['function_expression', 'generator_function', 'class'].includes(scope.type) &&
|
||||
scope.childForFieldName('name')?.text === name
|
||||
)
|
||||
return true;
|
||||
if (
|
||||
bindsReceiver(scope.childForFieldName('parameters'), name) ||
|
||||
bindsReceiver(scope.childForFieldName('parameter'), name)
|
||||
)
|
||||
return true;
|
||||
if (scope.type === 'for_in_statement' || scope.type === 'for_of_statement') {
|
||||
if (bindsReceiver(scope.childForFieldName('left'), name)) return true;
|
||||
}
|
||||
if (scope.type === 'for_statement') {
|
||||
const initializer = scope.childForFieldName('initializer');
|
||||
if (
|
||||
initializer !== null &&
|
||||
(initializer.type === 'lexical_declaration' ||
|
||||
initializer.type === 'variable_declaration') &&
|
||||
initializer.namedChildren.some((child) => bindsReceiver(child, name))
|
||||
)
|
||||
return true;
|
||||
}
|
||||
if (scope.type !== 'program' && scope.type !== 'statement_block') continue;
|
||||
for (const statement of scope.namedChildren) {
|
||||
const declaration =
|
||||
statement.type === 'export_statement'
|
||||
? statement.childForFieldName('declaration')
|
||||
: statement;
|
||||
if (declaration === null) continue;
|
||||
if (
|
||||
declaration.type === 'import_statement' &&
|
||||
declaration.namedChildren.some(
|
||||
(child) => child.type === 'import_clause' && bindsReceiver(child, name),
|
||||
)
|
||||
)
|
||||
return true;
|
||||
if (
|
||||
declaration.type === 'lexical_declaration' ||
|
||||
declaration.type === 'variable_declaration'
|
||||
) {
|
||||
if (declaration.namedChildren.some((child) => bindsReceiver(child, name))) return true;
|
||||
} else if (
|
||||
['function_declaration', 'class_declaration'].includes(declaration.type) &&
|
||||
declaration.childForFieldName('name')?.text === name
|
||||
)
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/** Static dot and bracket spellings of the same CommonJS export object. */
|
||||
function isModuleExportsReference(node: SyntaxNode): boolean {
|
||||
const object = node.childForFieldName('object');
|
||||
if (
|
||||
object?.type !== 'identifier' ||
|
||||
object.text !== 'module' ||
|
||||
isExportReceiverShadowed(node, 'module')
|
||||
)
|
||||
return false;
|
||||
if (node.type === 'member_expression') {
|
||||
return node.childForFieldName('property')?.text === 'exports';
|
||||
}
|
||||
if (node.type !== 'subscript_expression') return false;
|
||||
const index = node.childForFieldName('index');
|
||||
return index?.type === 'string' && (index.text === "'exports'" || index.text === '"exports"');
|
||||
}
|
||||
|
||||
/**
|
||||
* Does the file touch a CommonJS export object anywhere — `module.exports` or
|
||||
* `exports.x` / `exports[x]` — as an actual expression? Read from AST nodes,
|
||||
* not source text, so a comment or string mentioning `module.exports` does not
|
||||
* disable the file's verdicts.
|
||||
*/
|
||||
function hasCommonJsExportSurface(root: SyntaxNode): boolean {
|
||||
for (const member of root.descendantsOfType('member_expression')) {
|
||||
const object = member.childForFieldName('object');
|
||||
if (object === null) continue;
|
||||
if (
|
||||
object.type === 'identifier' &&
|
||||
object.text === 'exports' &&
|
||||
!isExportReceiverShadowed(member, 'exports')
|
||||
)
|
||||
return true;
|
||||
if (isModuleExportsReference(member)) return true;
|
||||
}
|
||||
for (const sub of root.descendantsOfType('subscript_expression')) {
|
||||
const object = sub.childForFieldName('object');
|
||||
if (
|
||||
object?.type === 'identifier' &&
|
||||
object.text === 'exports' &&
|
||||
!isExportReceiverShadowed(sub, 'exports')
|
||||
)
|
||||
return true;
|
||||
if (isModuleExportsReference(sub)) return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Top-level control-flow wrappers around `this.x =` / `this['x'] =`.
|
||||
* Recurse through these only — a function or class body is a different `this`.
|
||||
*/
|
||||
const TOP_LEVEL_THIS_WALK: ReadonlySet<string> = new Set([
|
||||
'if_statement',
|
||||
'else_clause',
|
||||
'for_statement',
|
||||
'for_in_statement',
|
||||
'for_of_statement',
|
||||
'while_statement',
|
||||
'do_statement',
|
||||
'switch_statement',
|
||||
'switch_body',
|
||||
'switch_case',
|
||||
'switch_default',
|
||||
'try_statement',
|
||||
'catch_clause',
|
||||
'finally_clause',
|
||||
'labeled_statement',
|
||||
'statement_block',
|
||||
]);
|
||||
|
||||
/** Module-wrapper `this.x =` / `this['x'] =` as a statement. */
|
||||
function isThisExportAssignment(stmt: SyntaxNode): boolean {
|
||||
if (stmt.type !== 'expression_statement') return false;
|
||||
const assignment = stmt.namedChildren[0];
|
||||
const left =
|
||||
assignment?.type === 'assignment_expression' ? assignment.childForFieldName('left') : null;
|
||||
return (
|
||||
left !== null &&
|
||||
(left.type === 'member_expression' || left.type === 'subscript_expression') &&
|
||||
left.childForFieldName('object')?.type === 'this'
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* A top-level `this` export, including `if (enabled) this.api = api` and the
|
||||
* braced form. Does not walk into function or class bodies.
|
||||
*/
|
||||
function hasTopLevelThisExportAssignment(stmt: SyntaxNode): boolean {
|
||||
if (isThisExportAssignment(stmt)) return true;
|
||||
if (!TOP_LEVEL_THIS_WALK.has(stmt.type)) return false;
|
||||
return stmt.namedChildren.some(hasTopLevelThisExportAssignment);
|
||||
}
|
||||
|
||||
/** Node types below which a declaration is nested, not module-level. */
|
||||
const NESTING_BOUNDARIES: ReadonlySet<string> = new Set([
|
||||
'class_body',
|
||||
'interface_body',
|
||||
'enum_body',
|
||||
'object_type',
|
||||
'statement_block',
|
||||
'arrow_function',
|
||||
'function_expression',
|
||||
'function_declaration',
|
||||
'generator_function',
|
||||
'generator_function_declaration',
|
||||
'method_definition',
|
||||
// `export namespace NS { export function f() {} }` / `declare module 'x' {
|
||||
// export function q(): void }`: an `export` inside these bodies is an export
|
||||
// of the namespace/ambient module, not of the file.
|
||||
'internal_module',
|
||||
'module',
|
||||
'ambient_declaration',
|
||||
]);
|
||||
|
||||
/**
|
||||
* Scan a file's top level once. `undefined` means the file's export surface
|
||||
* cannot be read at all (ambient `.d.ts`), so no marker should be emitted.
|
||||
*/
|
||||
export function collectEsmExportEvidence(
|
||||
root: SyntaxNode,
|
||||
filePath: string,
|
||||
): EsmExportEvidence | undefined {
|
||||
if (filePath.endsWith('.d.ts')) return undefined;
|
||||
const namedLocals = new Set<string>();
|
||||
// Any CommonJS export surface anywhere in the file — a direct `module.exports
|
||||
// = …`, an alias (`const m = module.exports; m.x = …`), an `exports.x` — means
|
||||
// "not under `export`" says nothing.
|
||||
let commonJs = hasCommonJsExportSurface(root);
|
||||
for (const stmt of root.namedChildren) {
|
||||
if (stmt.type === 'export_statement') {
|
||||
// `export { a } from './x'` / `export type { T } from './t'` re-export
|
||||
// ANOTHER module's names: they say nothing about a local `a`, and adding
|
||||
// them here marked a private local of the same name exported.
|
||||
if (stmt.childForFieldName('source') !== null) continue;
|
||||
for (const child of stmt.namedChildren) {
|
||||
if (child.type === 'export_clause') {
|
||||
for (const spec of child.namedChildren) {
|
||||
if (spec.type !== 'export_specifier') continue;
|
||||
const name = spec.childForFieldName('name')?.text;
|
||||
if (name !== undefined && name !== '') namedLocals.add(name);
|
||||
}
|
||||
} else if (child.type === 'identifier') {
|
||||
// `export default f;` and TS `export = f;`.
|
||||
namedLocals.add(child.text);
|
||||
}
|
||||
}
|
||||
} else if (hasTopLevelThisExportAssignment(stmt)) {
|
||||
commonJs = true;
|
||||
}
|
||||
}
|
||||
return { namedLocals, commonJs };
|
||||
}
|
||||
|
||||
/** Is `object` the value of a top-level `module.exports = { … }` assignment? */
|
||||
function isModuleExportsObject(object: SyntaxNode): boolean {
|
||||
const assignment = object.parent;
|
||||
if (assignment === null || assignment.type !== 'assignment_expression') return false;
|
||||
if (assignment.childForFieldName('right')?.id !== object.id) return false;
|
||||
const left = assignment.childForFieldName('left');
|
||||
if (left === null || !isModuleExportsReference(left)) return false;
|
||||
return (
|
||||
assignment.parent?.type === 'expression_statement' &&
|
||||
assignment.parent.parent?.type === 'program'
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* The export verdict for a declaration whose NAME node is `nameNode`:
|
||||
* `true` / `false` as documented in the header, `undefined` when this file's
|
||||
* export surface cannot decide it (CommonJS, other than the `module.exports`
|
||||
* object literal itself).
|
||||
*/
|
||||
export function esmExportVerdict(
|
||||
nameNode: SyntaxNode,
|
||||
evidence: EsmExportEvidence,
|
||||
): boolean | undefined {
|
||||
// The name node's own declaration node is where the walk starts; the
|
||||
// declaration itself (a `method_definition`, a `function_declaration`) must
|
||||
// not count as its own nesting boundary.
|
||||
let current: SyntaxNode | null = nameNode.parent;
|
||||
// An `export` keyword is only a FILE-level export when the walk reaches the
|
||||
// program without crossing a nesting boundary — one inside a namespace or
|
||||
// ambient-module body is that container's export (see NESTING_BOUNDARIES).
|
||||
let underExport = false;
|
||||
let functionScopedVariable = false;
|
||||
while (current !== null && current.type !== 'program') {
|
||||
if (current.type === 'variable_declaration') functionScopedVariable = true;
|
||||
if (current.type === 'export_statement') {
|
||||
underExport = true;
|
||||
current = current.parent;
|
||||
continue;
|
||||
}
|
||||
if (current.type === 'object') {
|
||||
// `module.exports = { alpha() {} }`: the literal's own members are the
|
||||
// module's exports. Any other object literal is a nesting boundary.
|
||||
if (isModuleExportsObject(current) && nameNode.parent?.parent?.id === current.id) return true;
|
||||
return evidence.commonJs ? undefined : false;
|
||||
}
|
||||
if (NESTING_BOUNDARIES.has(current.type) && current.id !== nameNode.parent?.id) {
|
||||
// `var` crosses blocks but never a function/namespace boundary. A
|
||||
// module-scoped `var` can therefore be exported by a later clause.
|
||||
if (current.type === 'statement_block' && functionScopedVariable) {
|
||||
current = current.parent;
|
||||
continue;
|
||||
}
|
||||
return evidence.commonJs ? undefined : false;
|
||||
}
|
||||
current = current.parent;
|
||||
}
|
||||
if (underExport) return true;
|
||||
if (evidence.commonJs) return undefined;
|
||||
return evidence.namedLocals.has(nameNode.text);
|
||||
}
|
||||
|
|
@ -70,7 +70,7 @@
|
|||
* replaced, so the obvious rewrite is not the one that shipped.
|
||||
* 3. The remaining ~90 ms was object allocation itself, irreducible while the
|
||||
* read API returns objects — so the five whole-graph scans moved to
|
||||
* `forEachRelationshipFields`, which passes the four fields they actually
|
||||
* `forEachRelationshipFields`, which passes the five fields they actually
|
||||
* read as primitives and allocates nothing. See
|
||||
* {@link GraphEmitSink.forEachRelationshipFields}.
|
||||
*
|
||||
|
|
@ -282,14 +282,19 @@ export class GraphEmitSink implements KnowledgeGraph, GraphEmitControl {
|
|||
* safe because `buildRelRow` never persists `rel.id` and no consumer keys on
|
||||
* it (audited).
|
||||
*
|
||||
* The dropped `reason`/`step` are safe too, but for a different reason worth
|
||||
* stating: the PERSISTED row keeps their true values, because `buildRelRow` is
|
||||
* handed the original relationship on the way through. Only in-memory reads
|
||||
* see the `'streamed'` placeholder, and the in-pipeline consumers of streamed
|
||||
* edges read neither field. So e.g. the `ACCESSES reason: 'read'|'write'`
|
||||
* distinction that MCP queries rely on survives in the database. A future
|
||||
* in-pipeline consumer needing `reason` or `step` on a streamed edge must add
|
||||
* the column, not trust the placeholder.
|
||||
* `reason` IS now retained, as an interned index — the in-pipeline consumer
|
||||
* this JSDoc anticipated arrived. Process tracing and large-graph community
|
||||
* detection must exclude global-name-fallback edges, which are emitted at
|
||||
* exactly their confidence threshold (0.5) and so cannot be separated by
|
||||
* confidence alone. Interning keeps the cost at one small integer per edge
|
||||
* (the reason vocabulary is a fixed set of literals), not one string.
|
||||
*
|
||||
* `id` and `step` remain dropped. The PERSISTED row keeps `step`'s true value,
|
||||
* because `buildRelRow` is handed the original relationship on the way
|
||||
* through; only in-memory OBJECT reads see the `'streamed'`-era placeholder,
|
||||
* and no in-pipeline consumer of streamed edges reads `step`. A future
|
||||
* in-pipeline consumer needing `step` must add the column, not trust the
|
||||
* placeholder.
|
||||
*
|
||||
* Node ids are interned; the strings are shared by reference with the node
|
||||
* map's, so interning adds bookkeeping, not new text.
|
||||
|
|
@ -300,6 +305,12 @@ export class GraphEmitSink implements KnowledgeGraph, GraphEmitControl {
|
|||
private readonly tgtIx: number[] = [];
|
||||
private readonly relTypes: RelationshipType[] = [];
|
||||
private readonly confidences: number[] = [];
|
||||
/** Interned reason strings, and the per-edge index into them. The vocabulary
|
||||
* is a fixed set of emitter literals, so this is O(vocabulary) text plus one
|
||||
* small integer per edge. */
|
||||
private readonly reasonIds = new Map<string, number>();
|
||||
private readonly reasonByIx: string[] = [];
|
||||
private readonly reasonIx: number[] = [];
|
||||
private finalized = false;
|
||||
/**
|
||||
* Streaming is OFF until {@link beginStreaming} is called by `parse`.
|
||||
|
|
@ -472,6 +483,16 @@ export class GraphEmitSink implements KnowledgeGraph, GraphEmitControl {
|
|||
this.tgtIx.push(tgtIx);
|
||||
this.relTypes.push(relationship.type);
|
||||
this.confidences.push(relationship.confidence);
|
||||
this.reasonIx.push(this.internReason(relationship.reason));
|
||||
}
|
||||
|
||||
private internReason(reason: string): number {
|
||||
const existing = this.reasonIds.get(reason);
|
||||
if (existing !== undefined) return existing;
|
||||
const ix = this.reasonByIx.length;
|
||||
this.reasonByIx.push(reason);
|
||||
this.reasonIds.set(reason, ix);
|
||||
return ix;
|
||||
}
|
||||
|
||||
/** Flush + close every writer and return the COPY manifest. Every fd is
|
||||
|
|
@ -599,7 +620,13 @@ export class GraphEmitSink implements KnowledgeGraph, GraphEmitControl {
|
|||
* with the object-based graph despite holding relationships columnar.
|
||||
*/
|
||||
forEachRelationshipFields(
|
||||
fn: (sourceId: string, targetId: string, type: RelationshipType, confidence: number) => void,
|
||||
fn: (
|
||||
sourceId: string,
|
||||
targetId: string,
|
||||
type: RelationshipType,
|
||||
confidence: number,
|
||||
reason: string,
|
||||
) => void,
|
||||
): void {
|
||||
this.real.forEachRelationshipFields(fn);
|
||||
for (let ix = 0; ix < this.srcIx.length; ix++) {
|
||||
|
|
@ -608,6 +635,7 @@ export class GraphEmitSink implements KnowledgeGraph, GraphEmitControl {
|
|||
this.nodeIdByIx[this.tgtIx[ix]],
|
||||
this.relTypes[ix],
|
||||
this.confidences[ix],
|
||||
this.reasonByIx[this.reasonIx[ix]],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -299,7 +299,13 @@ export class PdgEmitSink implements KnowledgeGraph {
|
|||
this.real.forEachRelationship(fn);
|
||||
}
|
||||
forEachRelationshipFields(
|
||||
fn: (sourceId: string, targetId: string, type: RelationshipType, confidence: number) => void,
|
||||
fn: (
|
||||
sourceId: string,
|
||||
targetId: string,
|
||||
type: RelationshipType,
|
||||
confidence: number,
|
||||
reason: string,
|
||||
) => void,
|
||||
): void {
|
||||
this.real.forEachRelationshipFields(fn);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,6 +17,12 @@ import { constants as fsConstants } from 'node:fs';
|
|||
import { randomUUID } from 'node:crypto';
|
||||
import { retryRename } from '../storage/fs-atomic.js';
|
||||
import { acquireIndexLock } from '../storage/index-lock.js';
|
||||
import { invalidateNodeWorkspacePackages } from './ingestion/import-resolvers/node-workspace-packages.js';
|
||||
import {
|
||||
logNameFallbackSummary,
|
||||
summarizeNameFallback,
|
||||
countCallsByLanguage,
|
||||
} from './ingestion/scope-resolution/name-fallback-summary.js';
|
||||
import { runPipelineFromRepo } from './ingestion/pipeline.js';
|
||||
import {
|
||||
logUnresolvedReceiverFiles,
|
||||
|
|
@ -1076,6 +1082,9 @@ export async function runFullAnalysis(
|
|||
// Scope the degraded-parse log throttle to this run (module-level counter
|
||||
// would otherwise stay saturated on a reused process).
|
||||
resetDegradedParseCounter();
|
||||
// The workspace-package memo is per process: this run must see the tree as it
|
||||
// is now, not as the previous run in a long-lived watch/server process saw it.
|
||||
invalidateNodeWorkspacePackages(repoPath);
|
||||
|
||||
const log = (msg: string) => callbacks.onLog?.(stripControlCharacters(msg));
|
||||
const acquireOpts = {
|
||||
|
|
@ -3861,6 +3870,14 @@ async function runFullAnalysisInner(
|
|||
|
||||
const resolutionOutcomes = pipelineResult.resolutionOutcomes ?? [];
|
||||
logUnresolvedReceiverFiles(resolutionOutcomes);
|
||||
// Census of guessed call sites (before edge coalescing), refused candidates
|
||||
// and ambiguous `export *` names. The legacy `nameFallbackEdges` metadata
|
||||
// key stores site counts, not the final population of heuristic edges.
|
||||
const nameFallbackSummary = summarizeNameFallback(
|
||||
resolutionOutcomes,
|
||||
countCallsByLanguage(pipelineResult.resolvedCalleeNamesByCaller, pipelineResult.graph),
|
||||
);
|
||||
logNameFallbackSummary(nameFallbackSummary);
|
||||
|
||||
// Annotated so the capabilities stamp below is compile-checked against
|
||||
// RepoMeta's status unions (tri-review 4669518496 P1/U3) — an unannotated
|
||||
|
|
@ -3977,6 +3994,7 @@ async function runFullAnalysisInner(
|
|||
// Git-only: non-git repos never take the incremental path.
|
||||
schemaFingerprint: hasGitDir(repoPath) ? SCHEMA_FINGERPRINT : undefined,
|
||||
unresolvedReceiverMembers: summarizeUnresolvedReceivers(resolutionOutcomes),
|
||||
nameFallbackEdges: nameFallbackSummary,
|
||||
scopeExtractionFailures: summarizeScopeExtractionFailures(
|
||||
pipelineResult.scopeExtractionFailures,
|
||||
),
|
||||
|
|
|
|||
|
|
@ -129,6 +129,7 @@ import type { UnresolvedReceiverSummary } from '../../core/ingestion/scope-resol
|
|||
import type { UndecidedSatisfactionSummary } from '../../core/ingestion/scope-resolution/undecided-satisfaction.js';
|
||||
import { scopeExtractionFailureTotal } from '../../core/ingestion/scope-resolution/scope-extraction-failures.js';
|
||||
import { lookupCount } from '../../core/ingestion/scope-resolution/summary-maps.js';
|
||||
import { VALUE_REF_EDGE_REASON } from '../../core/ingestion/scope-resolution/value-ref-edges.js';
|
||||
import {
|
||||
DEFERRED_IMPORT_REASON_SUFFIX,
|
||||
TYPE_ONLY_IMPORT_REASON_SUFFIX,
|
||||
|
|
@ -711,6 +712,39 @@ export interface EpistemicCauses {
|
|||
* "nothing was undecided", and a re-index is what tells the two apart.
|
||||
*/
|
||||
readonly undecidedSatisfaction: number;
|
||||
/**
|
||||
* Symbols that name this callable in VALUE position rather than calling it
|
||||
* (#3399) — a registration table (`bridge.accessor(Element.getNamespaceUri,
|
||||
* …)`), a callback argument, a function pointer stored in a field.
|
||||
*
|
||||
* Unit: SYMBOLS — distinct referrers, the same unit and the same reason as
|
||||
* `dispatchBoundary`: the reference edge is per-site but the walk's question
|
||||
* is "who else might reach this", and a referrer that names the callable
|
||||
* twice is still one place the value escapes from.
|
||||
*
|
||||
* Kept separate from `dispatchBoundary` even though both describe dispatch
|
||||
* the walk cannot follow. That slot counts implementations and
|
||||
* interface-level consumers found by the heritage probe; these are neither,
|
||||
* and folding them in would tell a consumer branching on the numbers that an
|
||||
* interface boundary exists where there is none. The distinction is also the
|
||||
* actionable one: a dispatch boundary is irreducible, whereas a callable
|
||||
* value CAN often be followed once the language models the store/load that
|
||||
* carries it.
|
||||
*
|
||||
* The reference itself IS modelled — that is what makes it countable. What is
|
||||
* missing is the invocation through the value: it happens later, through a
|
||||
* struct field, a registry lookup, or comptime reflection, and no CALLS edge
|
||||
* connects the eventual call site back to this symbol.
|
||||
*
|
||||
* Zero when the property-dispatch pass DID synthesize that invocation
|
||||
* (`x.<key>()` through a registered object-literal key): the walk followed
|
||||
* the registration, so nothing was missed and the result stays `exact`.
|
||||
*
|
||||
* Also zero — WITH a boundary note — when the probe itself could not run.
|
||||
* The note is the signal there; the count is not, which is why a reader must
|
||||
* branch on `epistemic` first and read the causes as explanation.
|
||||
*/
|
||||
readonly callableValueReferences: number;
|
||||
}
|
||||
|
||||
function epistemicFrom(dropped: {
|
||||
|
|
@ -720,6 +754,7 @@ function epistemicFrom(dropped: {
|
|||
undecided: number;
|
||||
dispatch: number;
|
||||
scopeExtraction: number;
|
||||
callableValueReferences: number;
|
||||
}): {
|
||||
epistemic: 'exact' | 'lower-bound';
|
||||
boundaries?: string[];
|
||||
|
|
@ -738,6 +773,7 @@ function epistemicFrom(dropped: {
|
|||
dispatchBoundary: dropped.dispatch,
|
||||
externalBoundary: dropped.external,
|
||||
undecidedSatisfaction: 0,
|
||||
callableValueReferences: dropped.callableValueReferences,
|
||||
},
|
||||
}
|
||||
: { epistemic: 'exact' }
|
||||
|
|
@ -754,6 +790,7 @@ function epistemicFrom(dropped: {
|
|||
dispatchBoundary: dropped.dispatch,
|
||||
externalBoundary: dropped.external,
|
||||
undecidedSatisfaction: dropped.undecided,
|
||||
callableValueReferences: dropped.callableValueReferences,
|
||||
},
|
||||
};
|
||||
}
|
||||
|
|
@ -853,6 +890,153 @@ function undecidedSatisfactionBoundaries(
|
|||
return { notes, undecided };
|
||||
}
|
||||
|
||||
/**
|
||||
* Boundary evidence for callables named in VALUE position (#3399).
|
||||
*
|
||||
* `bridge.accessor(Element.getNamespaceUri, null, .{})`, `{ onClick: handler }`,
|
||||
* `qsort(xs, n, sz, compareItems)` — each REGISTERS a function somewhere
|
||||
* instead of calling it. The registration is modelled (`value-ref` → a USES
|
||||
* edge, Kythe `ref` / Joern `METHOD_REF`); the invocation through the stored
|
||||
* value is not, because it happens later through a struct field, a registry
|
||||
* lookup or comptime reflection.
|
||||
*
|
||||
* That gap is precisely the first half of `tools.ts`'s definition of
|
||||
* `lower-bound` — the walk provably missed callers — and it was previously
|
||||
* reported as `exact`. (The second half, a probe that could not run, is what
|
||||
* the failure branch below publishes; the contract states both because this
|
||||
* function can produce either.) A
|
||||
* public DOM accessor bound into a JS bridge table came back LOW/exact with two
|
||||
* internal callers, which is worse than no answer: `lower-bound` invites the
|
||||
* reader to look further, `exact` tells them not to bother.
|
||||
*
|
||||
* Counted as DISTINCT REFERRERS rather than sites: the question the count
|
||||
* serves is "how many places does this value escape from", and a table that
|
||||
* registers the same callable twice is still one table.
|
||||
*
|
||||
* NOT every value reference is a gap. Where the property-dispatch pass
|
||||
* synthesized the invocation side, the walk followed it and the answer stays
|
||||
* `exact` — see the second probe below.
|
||||
*
|
||||
* Three failure modes, three different answers, none of them silence:
|
||||
* - the query cannot run → hedge, count 0 (a probe that did not answer
|
||||
* is not evidence of completeness);
|
||||
* - the query returns nothing → no hedge (a real, measured zero);
|
||||
* - the reference was followed → no hedge (nothing was missed).
|
||||
*
|
||||
* The probe reads the edge's `reason`, which is why writer and reader share
|
||||
* {@link VALUE_REF_EDGE_REASON}. Language-neutral by construction — every
|
||||
* provider that emits a `value-ref` capture participates, and one that emits
|
||||
* none simply gets no rows.
|
||||
*/
|
||||
async function callableValueReferenceBoundaries(
|
||||
lbugPath: string,
|
||||
symId: string,
|
||||
): Promise<{ notes: string[]; referrers: number }> {
|
||||
// `COUNT(DISTINCT …)`, not a capped row list. A `LIMIT n` here would make the
|
||||
// published cause silently understate a target with more than n
|
||||
// registrations — and this number is documented as "how many symbols", so a
|
||||
// reader comparing its magnitude against `receiverTyping` would be comparing
|
||||
// a truth to a ceiling. Aggregating in the database keeps the work bounded
|
||||
// without capping the answer; scalar `sym.id` equality plus an implicit
|
||||
// group-by is the shape `countByType` below already relies on.
|
||||
//
|
||||
// `null`, not `[]`, on failure: see below — an empty result set and an
|
||||
// unanswerable query must not be the same value.
|
||||
const rows = await executeParameterized(
|
||||
lbugPath,
|
||||
`MATCH (other)-[r:CodeRelation]->(sym)
|
||||
WHERE sym.id = $symId AND r.type = 'USES' AND r.reason = $reason
|
||||
RETURN COUNT(DISTINCT other.id) AS cnt`,
|
||||
{ symId, reason: VALUE_REF_EDGE_REASON },
|
||||
).catch(() => null);
|
||||
|
||||
// A probe that could not run must never read as certainty — the same rule the
|
||||
// `loadMeta` read above states, and the whole reason this function exists.
|
||||
// Returning zero here would publish `exact` on the strength of a query that
|
||||
// never answered.
|
||||
if (rows === null) {
|
||||
return {
|
||||
referrers: 0,
|
||||
notes: [
|
||||
'The callable-value-reference probe could not be run against this index, so whether ' +
|
||||
'this symbol is registered somewhere as a value is unknown. Treat the caller list as ' +
|
||||
'incomplete until it can be re-checked.',
|
||||
],
|
||||
};
|
||||
}
|
||||
const referrers = rows.length > 0 ? Number((rows[0] as any).cnt ?? (rows[0] as any)[0] ?? 0) : 0;
|
||||
if (!Number.isFinite(referrers) || referrers <= 0) return { notes: [], referrers: 0 };
|
||||
|
||||
// Registrations whose invocation side the analyzer ALREADY synthesized are
|
||||
// not a gap. `emitPropertyDispatchCalls` sweep 2 connects `x.<key>()` member
|
||||
// calls to every function registered under `<key>` and stamps those edges
|
||||
// `property-dispatch`; where that happened, the walk did not "provably miss"
|
||||
// the caller and `lower-bound` would be noise sprayed over an answer the
|
||||
// analyzer actually computed. Zig — the case this was built for — never sets
|
||||
// a property key (no object-literal key to dispatch through), so it is never
|
||||
// excluded here; the exclusion exists to keep TypeScript/JavaScript hook
|
||||
// tables that ARE followed from being downgraded.
|
||||
//
|
||||
// SYMBOL-LEVEL, NOT PER-EDGE, and that is only sound because of an invariant
|
||||
// that lives nowhere near this line. The graph does not record which
|
||||
// registration produced which synthesized call, so if one symbol could carry
|
||||
// both a followed and an unfollowed registration, this would zero the note
|
||||
// over a gap the analyzer provably did not close — #3399 returning through a
|
||||
// side door. Today no symbol can:
|
||||
//
|
||||
// - sweep 2 synthesizes CALLS only for a registration whose site carried a
|
||||
// `propertyKey` (sweep 1 skips the index when it is undefined);
|
||||
// - every JS/TS `@reference.value-ref` rule also captures
|
||||
// `@reference.property-key` — both are object-literal shapes;
|
||||
// - no Zig `@reference.value-ref` rule captures one.
|
||||
//
|
||||
// So a dispatchable registration is always a JS/TS one, an undispatchable
|
||||
// registration is always a Zig one, and the two never meet on one symbol.
|
||||
// `test/unit/scope-resolution/value-ref-dispatchability.test.ts` FAILS the day
|
||||
// that stops holding — a JS/TS rule for a bare callback argument
|
||||
// (`register(handler)`), a Zig rule that grows a key. When it does, the
|
||||
// choice to make here is between (a) splitting the edge `reason` into
|
||||
// dispatchable / undispatchable so this probe can count them apart, and
|
||||
// (b) hedging any symbol with an undispatchable registration regardless of
|
||||
// dispatch. (a) is precise and costs a graph-content change; (b) is cheap and
|
||||
// over-hedges. What is NOT acceptable is leaving this as-is, because a signal
|
||||
// that quietly stops firing is the defect this whole feature removes.
|
||||
//
|
||||
// Given the invariant, the residual today is only the coarseness of the
|
||||
// exclusion within JS/TS, and hedging every property-value registration in
|
||||
// every JS/TS codebase is worse: a signal that fires on everything stops
|
||||
// carrying information, and the fan-out cap warning still sits behind it.
|
||||
const dispatched = await executeParameterized(
|
||||
lbugPath,
|
||||
`MATCH (other)-[r:CodeRelation]->(sym)
|
||||
WHERE sym.id = $symId AND r.type = 'CALLS' AND r.reason = 'property-dispatch'
|
||||
RETURN COUNT(r) AS cnt`,
|
||||
{ symId },
|
||||
).catch(() => null);
|
||||
// Failure here is NOT a reason to skip the hedge: we already know a value
|
||||
// reference exists, and being unable to prove it was followed leaves the
|
||||
// conservative answer standing.
|
||||
const dispatchedCount =
|
||||
dispatched === null || dispatched.length === 0
|
||||
? 0
|
||||
: Number((dispatched[0] as any).cnt ?? (dispatched[0] as any)[0] ?? 0);
|
||||
if (Number.isFinite(dispatchedCount) && dispatchedCount > 0) {
|
||||
return { notes: [], referrers: 0 };
|
||||
}
|
||||
|
||||
const one = referrers === 1;
|
||||
return {
|
||||
referrers,
|
||||
notes: [
|
||||
`${referrers} ${one ? 'symbol references' : 'symbols reference'} this callable as a VALUE ` +
|
||||
`rather than calling it (a registration table, a callback argument, a stored function ` +
|
||||
`pointer). The reference is recorded, but the call made THROUGH that value is not: it is ` +
|
||||
`dispatched later from wherever the value is stored. Callers reached that way are absent ` +
|
||||
`from this result — actual impact may be higher.`,
|
||||
],
|
||||
};
|
||||
}
|
||||
|
||||
interface RepoHandle {
|
||||
id: string; // unique key = repo name (basename)
|
||||
name: string;
|
||||
|
|
@ -6998,6 +7182,19 @@ export class LocalBackend {
|
|||
direction === 'downstream'
|
||||
? Promise.resolve(undefined)
|
||||
: queryConvexDispatchMetadata(repo.lbugPath, symId, symName, symType);
|
||||
// #3399 — callables named in value position. Upstream only: the question
|
||||
// "who can reach this symbol" is the one a registration makes unanswerable.
|
||||
// A downstream walk asks what THIS symbol reaches, which a reference INTO
|
||||
// it does not affect.
|
||||
//
|
||||
// Issued alongside the heritage probe rather than after it, and read into
|
||||
// `droppedBoundaries` below, so it hedges even when that probe finds
|
||||
// nothing AND when it throws — a value reference is an independent reason
|
||||
// a count is short, exactly as the receiver drops above are.
|
||||
const valueRefPromise =
|
||||
direction === 'downstream'
|
||||
? Promise.resolve({ notes: [] as string[], referrers: 0 })
|
||||
: callableValueReferenceBoundaries(repo.lbugPath, symId);
|
||||
const interfaceRowsPromise = executeParameterized(
|
||||
repo.lbugPath,
|
||||
`MATCH (x)-[r:CodeRelation]->(iface)
|
||||
|
|
@ -7018,12 +7215,14 @@ export class LocalBackend {
|
|||
: []),
|
||||
]);
|
||||
const convexDispatch = await convexDispatchPromise;
|
||||
const valueRefDrops = await valueRefPromise;
|
||||
const droppedBoundaries = {
|
||||
...receiverDrops,
|
||||
notes: [
|
||||
...receiverDrops.notes,
|
||||
...scopeExtractionDrops.notes,
|
||||
...undecidedDrops.notes,
|
||||
...valueRefDrops.notes,
|
||||
...(convexDispatch === undefined ? [] : [convexDispatch.boundary]),
|
||||
],
|
||||
undecided: undecidedDrops.undecided,
|
||||
|
|
@ -7032,6 +7231,7 @@ export class LocalBackend {
|
|||
// inventing one from the presence of a note.
|
||||
dispatch: 0,
|
||||
scopeExtraction: scopeExtractionDrops.files,
|
||||
callableValueReferences: valueRefDrops.referrers,
|
||||
};
|
||||
try {
|
||||
// Discover the interface / abstract supertypes on the target's boundary.
|
||||
|
|
@ -7123,6 +7323,7 @@ export class LocalBackend {
|
|||
dispatchBoundary: droppedBoundaries.dispatch + dispatchBoundarySymbols,
|
||||
externalBoundary: droppedBoundaries.external,
|
||||
undecidedSatisfaction: droppedBoundaries.undecided,
|
||||
callableValueReferences: droppedBoundaries.callableValueReferences,
|
||||
},
|
||||
};
|
||||
} catch {
|
||||
|
|
|
|||
|
|
@ -291,14 +291,15 @@ Handles disambiguation: if multiple symbols share the same name, returns ranked
|
|||
NOTE: ACCESSES edges (field read/write tracking) are included in context results with reason 'read' or 'write'. CALLS edges resolve through field access chains and method-call chains (e.g., user.address.getCity().save() produces CALLS edges at each step).
|
||||
|
||||
COMPLETENESS OF incoming: alongside symbol/incoming/outgoing the result carries the same epistemic envelope impact() returns:
|
||||
- epistemic: 'exact' | 'lower-bound' — 'lower-bound' means callers exist that this view provably does not list.
|
||||
- epistemic: 'exact' | 'lower-bound' — 'lower-bound' means incoming is a FLOOR: either the walk provably missed callers, or a probe that would have established completeness could not run. Do not read it as proof that an omitted caller exists — read boundaries for which of the two it is.
|
||||
- boundaries: string[] — one plain-language sentence per reason. Prose for humans; branch on causes instead.
|
||||
- causes: { scopeExtractionFiles, receiverTyping, dispatchBoundary, externalBoundary, undecidedSatisfaction } — machine-readable WHY. Every field counts MISSING THINGS, never sentences:
|
||||
- causes: { scopeExtractionFiles, receiverTyping, dispatchBoundary, externalBoundary, undecidedSatisfaction, callableValueReferences } — machine-readable WHY. Every field counts MISSING THINGS, never sentences:
|
||||
- causes.scopeExtractionFiles (unit: files) > 0 — scope extraction still failed after the fallback pass, so scope-resolution edges from those files are absent. A value of 0 does not prove completeness when epistemic is 'lower-bound' because an older or unverified index has no measured file count. Re-run \`gitnexus analyze --force\`; if the reason persists, inspect the extraction warnings.
|
||||
- causes.receiverTyping (unit: call sites) > 0 — RESOLVER GAP: the analyzer dropped that many call sites on this name because it could not type the receiver, so they are missing from incoming. Do not read an absent caller as proof none exists.
|
||||
- causes.externalBoundary (unit: call sites) > 0 — the calls left the indexed program (System.out.println, fetch(...)). NOT a defect: no in-graph node could have been reached. An epistemic:'exact' result can carry this.
|
||||
- causes.dispatchBoundary (unit: symbols) > 0 — DI or interface dispatch: that many symbols sit on or beyond a boundary static analysis cannot cross. Irreducible. A symbol count, not a site count — per-site multiplicity is not retained for these edges — so compare its magnitude with receiverTyping, not its exact value. A framework runtime-proxy boundary can make epistemic lower-bound while this value remains 0 because endpoint metadata proves the gap but cannot count omitted symbols.
|
||||
- causes.undecidedSatisfaction (unit: unjudged interface/type pairs) > 0 — the analyzer could not decide whether a type satisfies an interface, so no IMPLEMENTS edge exists and no dispatch boundary was left for the walk to notice. Usually fixable by making the missing dependency available to analysis.
|
||||
- causes.callableValueReferences (unit: symbols) > 0 — that many symbols name this callable as a VALUE instead of calling it (a Zig registration table or const initialiser, a JS/TS object-literal property value). A bare callback argument in JS/TS is not captured today and is not counted, so a 0 does not rule that shape out; nor does it, on an index built before the language emitted these captures — re-analyze first. The reference is in the graph as a USES edge; the call made THROUGH the value is not, because it is dispatched later from wherever the value was stored. incoming.calls is therefore a floor. Follow the USES edges to find the registration, then the code that reads it. It is 0 when the analyzer DID synthesize the dispatch through a registered property key. That exclusion is per SYMBOL, not per registration: a target with BOTH a followed registration and an unfollowed escape reads 0 here, so a 0 means 'no unfollowed registration was proven', not 'this symbol escapes nowhere'. A 0 alongside epistemic 'lower-bound' can also mean the probe itself could not run — read boundaries for which.
|
||||
|
||||
REQUIRES RE-INDEX: causes.scopeExtractionFiles, causes.receiverTyping, causes.externalBoundary, causes.undecidedSatisfaction, and framework runtime-proxy boundary detection depend on index-time metadata that only a current analyzer writes. Against an older index the metadata can be absent, which is indistinguishable from "nothing was dropped" unless the schema probe detects the stale index — re-run \`gitnexus analyze\` before trusting a zero or an apparently exact result.
|
||||
|
||||
|
|
@ -488,15 +489,16 @@ Output includes:
|
|||
- affected_processes: which execution flows break and at which step
|
||||
- affected_modules: which functional areas are hit (direct vs indirect; classification-unavailable when that secondary query fails)
|
||||
- byDepth: affected symbols grouped by traversal depth (paginated by limit/offset; omitted when summaryOnly:true — use byDepthCounts for totals per depth, pagination object when truncated). Each item includes a processes:[{id,label,processType,step}] field listing the execution flows that symbol participates in. Empty when the symbol has no process membership. Can ALSO be empty when partial:true is set — either the process-aggregation pass hit its cap before detecting affected processes, or per-symbol enrichment was capped on a very large page. When partial:true, do NOT treat processes:[] as proof of no participation; cross-check the top-level affected_processes list. An item carries staticGated:true only when the edge that reached it is provably unreachable at compile time from the indexed source (today: Zig calls inside an 'if (CONST_FALSE)' body or the else of 'if (CONST_TRUE)'); the field is absent when the edge is live or the language does not model it. Traversal and risk do NOT filter or rank on it: it is metadata for the caller to weigh.
|
||||
- epistemic: 'exact' | 'lower-bound' — whether impactedCount is the whole story. 'lower-bound' means the walk provably missed callers, so the count is a floor. Absent only on skipped probes (ambiguous-candidate lists, group fan-out).
|
||||
- epistemic: 'exact' | 'lower-bound' — whether impactedCount is the whole story. 'lower-bound' means the count is a FLOOR: either the walk provably missed callers, or a probe that would have established completeness could not run (a failed callable-value-reference query says so in boundaries). It is not itself proof that an omitted caller exists — branch on causes and read boundaries. Absent only on skipped probes (ambiguous-candidate lists, group fan-out).
|
||||
- boundaries: string[] — one plain-language sentence per reason the count is short. Prose for humans; branch on causes instead.
|
||||
- causes: { scopeExtractionFiles, receiverTyping, dispatchBoundary, externalBoundary, undecidedSatisfaction } — the machine-readable split of WHY, so an agent gating its own edits can tell a fixable analyzer gap from an irreducible one. Every field counts MISSING THINGS, never sentences:
|
||||
- causes: { scopeExtractionFiles, receiverTyping, dispatchBoundary, externalBoundary, undecidedSatisfaction, callableValueReferences } — the machine-readable split of WHY, so an agent gating its own edits can tell a fixable analyzer gap from an irreducible one. Every field counts MISSING THINGS, never sentences:
|
||||
- causes.scopeExtractionFiles (unit: files) > 0 — scope extraction still failed after the fallback pass, so scope-resolution edges from those files are absent. A value of 0 does not prove completeness when epistemic is 'lower-bound' because an older or unverified index has no measured file count. Re-run \`gitnexus analyze --force\`; if the reason persists, inspect the extraction warnings.
|
||||
- causes.receiverTyping (unit: call sites) > 0 — the RESOLVER GAP signal: the analyzer dropped that many call sites because it could not establish the receiver's type (unresolved constructor, factory, chained expression). Those callers are absent from byDepth. Treat the result as incomplete: grep the symbol name before deleting or renaming.
|
||||
- causes.externalBoundary (unit: call sites) > 0 — those calls left the indexed program (System.out.println, fetch(...), os.environ.*). NOT a defect and NOT a reason the count is short: there is no in-graph node any edge could have reached. An epistemic:'exact' result can carry this.
|
||||
- causes.dispatchBoundary (unit: symbols) > 0 — DI or interface dispatch: that many symbols sit on or beyond a boundary a static walk cannot cross. Irreducible. A symbol count, not a site count — per-site multiplicity is not retained for these edges — so compare its magnitude with receiverTyping, not its exact value. A framework runtime-proxy boundary can make epistemic lower-bound while this value remains 0 because endpoint metadata proves the gap but cannot count omitted symbols.
|
||||
|
||||
- causes.undecidedSatisfaction (unit: unjudged interface/type pairs) > 0 — the analyzer could not DECIDE whether a type satisfies an interface (a type in a required signature named a package it could not resolve), so no IMPLEMENTS edge exists and no dispatch boundary was left for the walk to notice. Distinct from every cause above, which count decided facts that could not be attributed; this one counts questions never answered. It is the only cause that shortens a result WITHOUT leaving a trace in the graph, so an unhedged zero on a symbol reached only through such an interface would otherwise read as 'nobody calls this'. Usually fixable: it most often means a dependency is missing from the analyzed tree.
|
||||
- causes.callableValueReferences (unit: symbols) > 0 — that many symbols name this callable as a VALUE rather than calling it: 'bridge.accessor(Element.getNamespaceUri, ...)' and 'pub const h = onReset;' in Zig, '{ onClick: handler }' in JS/TS. Those are the shapes actually captured today — a bare callback argument in JS/TS ('qsort'-style, 'setTimeout(tick)') is NOT one of them and is not counted, so a 0 here does not rule that shape out. The registration IS modelled (a USES edge); the invocation through the stored value is NOT, because it happens later via a struct field, a registry lookup or comptime reflection. So impactedCount is a floor and a LOW risk verdict on such a symbol is a floor too. Unlike dispatchBoundary this is often reducible — it usually means the language provider does not yet follow that store/load — but until it is, do NOT read an empty or small caller set as 'safe to change'. It is an exact count, not a capped sample. It is 0 when the analyzer DID synthesize the dispatch through a registered property key, and epistemic stays 'exact' on that account. That exclusion is symbol-level, not edge-level — the graph does not record which registration produced which synthesized call — so a symbol with a mix of followed and unfollowed registrations also reads 0: treat a 0 as 'no unfollowed registration was proven', not as proof the value escapes nowhere. A 0 alongside epistemic 'lower-bound' can instead mean the probe could not run at all, so read boundaries to tell those apart. Read from the graph, so it needs no index-time metadata BEYOND the edges being there: an index built by an analyzer that did not yet emit this language's value-ref captures has none, and reports 0. Re-analyze before reading a 0 as measured.
|
||||
|
||||
REQUIRES RE-INDEX: causes.scopeExtractionFiles, causes.receiverTyping, causes.externalBoundary, causes.undecidedSatisfaction, and framework runtime-proxy boundary detection depend on index-time metadata that only a current analyzer writes. Against an older index the metadata can be absent, which is indistinguishable from "nothing was dropped" unless the schema probe detects the stale index — re-run \`gitnexus analyze\` before trusting a zero or an apparently exact result.
|
||||
|
||||
|
|
|
|||
|
|
@ -749,7 +749,21 @@ import { copyV8CacheIfPresent, tryLoadV8Cache, writeV8CacheFile } from './v8-sid
|
|||
// v97: Objective-C macro-marker preprocessing recognizes comment-prefixed
|
||||
// directives and rejects invalid numeric marker prefixes. A warm v96 cache can
|
||||
// replay error-recovered facts from the previous normalization behavior.
|
||||
const SCHEMA_BUMP = 97;
|
||||
// v98 (#3219): `ZIG_SCOPE_QUERY` gained three `@reference.value-ref` rules —
|
||||
// bare call argument, qualified call argument (with `@reference.receiver`), and
|
||||
// const-binding initialiser — so a Zig callable named in VALUE position now
|
||||
// produces a `value-ref` entry in `ParsedFile.referenceSites` where it produced
|
||||
// none before. These captures are PARSE-TIME facts, so a warm pre-v98 cache
|
||||
// replays unchanged `.zig` files with zero value-ref sites, `--force` included
|
||||
// (shards are content-addressed): `emitPropertyDispatchCalls` then emits no
|
||||
// USES edge, `callableValueReferenceBoundaries` measures a real zero, and
|
||||
// `impact` on a registered accessor republishes `epistemic: "exact"` — the exact
|
||||
// #3399 defect this change exists to close, silently un-fixed.
|
||||
// v99: ParsedImport retains declaredAtScope and export evidence changes in
|
||||
// #3190. Old durable ParsedFiles lack the facts needed for scoped binding;
|
||||
// invalidate both stores so warm indexing actually applies the correction.
|
||||
// origin/main took 98 for #3219; 99 is the next free value.
|
||||
const SCHEMA_BUMP = 99;
|
||||
const GITNEXUS_PKG_VERSION = (() => {
|
||||
try {
|
||||
// package.json sits at gitnexus/package.json — two levels up from
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@
|
|||
import fs from 'fs/promises';
|
||||
import path from 'path';
|
||||
import type { UnresolvedReceiverSummary } from '../core/ingestion/scope-resolution/unresolved-receivers.js';
|
||||
import type { NameFallbackSummary } from '../core/ingestion/scope-resolution/name-fallback-summary.js';
|
||||
import type { UndecidedSatisfactionSummary } from '../core/ingestion/scope-resolution/undecided-satisfaction.js';
|
||||
import type { ScopeExtractionFailureSummary } from '../core/ingestion/scope-resolution/scope-extraction-failures.js';
|
||||
|
||||
|
|
@ -311,6 +312,15 @@ export interface RepoMeta {
|
|||
* reads as absent, and both correctly mean "no hedge available from here".
|
||||
*/
|
||||
undecidedInterfaceSatisfaction?: UndecidedSatisfactionSummary;
|
||||
/**
|
||||
* Census of name-guessed call sites before edge coalescing, the impossible
|
||||
* candidates the run refused, and the ambiguous
|
||||
* `export *` names it declined to publish. Absent on indexes built before the
|
||||
* census existed. The legacy key does not imply final edge counts: a precise
|
||||
* site may prove a dependency shared with a guessed site.
|
||||
* See `scope-resolution/name-fallback-summary.ts`.
|
||||
*/
|
||||
nameFallbackEdges?: NameFallbackSummary;
|
||||
/**
|
||||
* SHA-256 of every file's content at the time of the last successful
|
||||
* indexing run. The next run computes current hashes and diffs against
|
||||
|
|
|
|||
|
|
@ -33,6 +33,14 @@ export interface PipelineResult {
|
|||
* produced; graph edge semantics are unchanged.
|
||||
*/
|
||||
resolutionOutcomes: readonly ResolutionOutcome[];
|
||||
/**
|
||||
* Caller node id → simple names of every callee it has a CALLS edge to, read
|
||||
* through the streaming sink when one was active (the raw graph holds no
|
||||
* streamed edge). Denominator for the name-fallback census
|
||||
* (`countCallsByLanguage`), so a guess count can be read as a share of the
|
||||
* call graph. Absent only when scope resolution did not run.
|
||||
*/
|
||||
resolvedCalleeNamesByCaller?: ReadonlyMap<string, ReadonlySet<string>>;
|
||||
/**
|
||||
* Interfaces whose structural-satisfaction check could not be completed
|
||||
* (#2873). Empty for languages with no structural detection.
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@
|
|||
},
|
||||
"go-constructor-type-inference/cmd/main.go": {
|
||||
"captureGroups": 19,
|
||||
"digest": "4f2e8bb6dbca59bcb82fc2efd43899b7a92816af28811cfc1858f0ce7ba9f6fe"
|
||||
"digest": "8dff73176d5890d7ede1d8b9cd9f8555518a1dcc11fbf02190beb474c0f9e47e"
|
||||
},
|
||||
"go-constructor-type-inference/models/repo.go": {
|
||||
"captureGroups": 8,
|
||||
|
|
@ -252,8 +252,8 @@
|
|||
"digest": "ad4cfabcd53397ab664ba4bb05df4e1a803455b5c255a19e2ed283c6523a1660"
|
||||
},
|
||||
"go-method-enrichment/app.go": {
|
||||
"captureGroups": 15,
|
||||
"digest": "35929a31f6921feb074f50385aa91879e93f25b88d7f50774fddcfbb7b4e8539"
|
||||
"captureGroups": 16,
|
||||
"digest": "b2ab0936ab28e22d0333119838c929ec6e3d460cc0be8d27aa4d178b9f6452d3"
|
||||
},
|
||||
"go-mixed-chain/cmd/main.go": {
|
||||
"captureGroups": 22,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
package main
|
||||
|
||||
import "animal"
|
||||
// This fixture exercises method enrichment and a valid same-package free call.
|
||||
// A different package with a normal import cannot refer to Dog or Classify bare.
|
||||
package animal
|
||||
|
||||
func main() {
|
||||
dog := Dog{}
|
||||
sound := dog.Speak()
|
||||
category := Classify("dog")
|
||||
_, _ = sound, category
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ pub usingnamespace @import("mixin.zig");
|
|||
pub const Interfaces = .{
|
||||
@import("webapi/AbortController.zig"),
|
||||
@import("webapi/AbortSignal.zig"),
|
||||
@import("webapi/Element.zig"),
|
||||
};
|
||||
|
||||
pub fn main() void {
|
||||
|
|
|
|||
224
gitnexus/test/fixtures/lang-resolution/zig-idioms/src/webapi/Element.zig
vendored
Normal file
224
gitnexus/test/fixtures/lang-resolution/zig-idioms/src/webapi/Element.zig
vendored
Normal file
|
|
@ -0,0 +1,224 @@
|
|||
// The JS-API binding-table idiom, as Lightpanda writes it (#3399).
|
||||
//
|
||||
// Every accessor below hands a Zig function to `bridge.accessor` AS A VALUE:
|
||||
// the function is REGISTERED here, never called here. The eventual invocation
|
||||
// runs through comptime reflection (`@call(.auto, func, args)` over a
|
||||
// `func: anytype` field), which no static walk can follow — that terminal hop
|
||||
// is out of scope. What was NOT acceptable is dropping the reference entirely:
|
||||
// `impact` then reported the accessor as having only its two in-file callers
|
||||
// and called that answer `exact`.
|
||||
//
|
||||
// A file-as-struct, like every webapi module in the real tree.
|
||||
const Element = @This();
|
||||
|
||||
// A NAMESPACE-only module (no `@This()`), imported under a handle. The bridge
|
||||
// table below registers one of its functions the same way it registers this
|
||||
// file's own methods.
|
||||
const dom_utils = @import("dom_utils.zig");
|
||||
|
||||
// A hub module that re-exports `dom_utils`' members without declaring any.
|
||||
const hub = @import("hub.zig");
|
||||
|
||||
// A MODULE-LEVEL binding whose name collides with the container `Gauge.zig`
|
||||
// declares, bound to something that is NOT a container. This file never imports
|
||||
// `Gauge.zig`. `findClassBindingInScope` filters the scope chain by
|
||||
// `isClassLike`, so it walks past this binding, and its workspace-wide
|
||||
// qualified-name fallback answers with the other file's struct — while the
|
||||
// shadow guard used to permit exactly this, treating the module scope as a floor
|
||||
// it need not inspect.
|
||||
//
|
||||
// The name is bound by IMPORT rather than by a local `const Gauge: u8 = 3`,
|
||||
// and that detail is the difference between a live case and a self-defeating
|
||||
// one: a local declaration would also claim the workspace qualified name
|
||||
// `Gauge`, leaving two candidates, and the fallback refuses to guess between
|
||||
// two. An imported alias claims nothing, so the fallback stays unique and fires.
|
||||
const Gauge = @import("dom_utils.zig").DEFAULT_NS;
|
||||
|
||||
_namespace: u8 = 0,
|
||||
|
||||
// ── Registered accessors ────────────────────────────────────────────────────
|
||||
|
||||
pub fn getNamespaceUri(self: *Element) u8 {
|
||||
return self._namespace;
|
||||
}
|
||||
|
||||
// An ordinary in-file caller. The point of the defect is that the REGISTRATION
|
||||
// was missing, not that the symbol looked like a leaf: a plausible-but-short
|
||||
// caller list is exactly what makes `epistemic: "exact"` dangerous.
|
||||
pub fn lookupNamespaceUri(self: *Element) u8 {
|
||||
return self.getNamespaceUri();
|
||||
}
|
||||
|
||||
// ── The control ─────────────────────────────────────────────────────────────
|
||||
|
||||
// Called normally and registered NOWHERE. Its edges must not move: a change
|
||||
// that hedges or re-links every method would be indistinguishable from one
|
||||
// that models value references, and only the second is correct.
|
||||
pub fn getTagNameLower(self: *Element) u8 {
|
||||
return self._namespace;
|
||||
}
|
||||
|
||||
pub fn describe(self: *Element) u8 {
|
||||
return self.getTagNameLower();
|
||||
}
|
||||
|
||||
// ── Owner discrimination ────────────────────────────────────────────────────
|
||||
|
||||
// Shadowed below by a same-named sibling inside `JsApi`. The registration
|
||||
// writes `Element.getLocalName`, so THIS is the one it must bind.
|
||||
pub fn getLocalName(self: *Element) u8 {
|
||||
return self._namespace;
|
||||
}
|
||||
|
||||
fn tick(self: *Element) u8 {
|
||||
return self._namespace;
|
||||
}
|
||||
|
||||
// ── The binding table ───────────────────────────────────────────────────────
|
||||
|
||||
pub const JsApi = struct {
|
||||
pub const bridge = Bridge(Element);
|
||||
|
||||
// QUALIFIED value reference — the accessor names its container explicitly.
|
||||
// This is the exact line from Element.zig:2296 that #3399 was filed over.
|
||||
pub const namespaceURI = bridge.accessor(Element.getNamespaceUri, null, .{});
|
||||
|
||||
// BARE value reference to a sibling declared in this same container.
|
||||
pub const tagName = bridge.accessor(_tagName, null, .{});
|
||||
|
||||
fn _tagName(self: *Element) u8 {
|
||||
return self.getTagNameLower();
|
||||
}
|
||||
|
||||
// A sibling with the SAME simple name as the file-struct method above.
|
||||
// `walkScopeChain` gives a local binding precedence over the enclosing
|
||||
// scope, so a registration resolved by TAIL NAME alone binds here — the
|
||||
// wrong function, silently. Resolving `Element.getLocalName` through its
|
||||
// written owner is what keeps them apart.
|
||||
fn getLocalName(self: *Element) u8 {
|
||||
return 0;
|
||||
}
|
||||
|
||||
pub const localName = bridge.accessor(Element.getLocalName, null, .{});
|
||||
|
||||
// A receiver this index cannot resolve. There is a file-level `tick`, and
|
||||
// tail-name resolution would happily bind it even though the source says
|
||||
// the function belongs to something else entirely. Declining is the only
|
||||
// safe answer: a missing reference is recoverable, a confident wrong edge
|
||||
// is not.
|
||||
pub const ticker = bridge.accessor(unresolvable_ns.tick, null, .{});
|
||||
|
||||
// QUALIFIED value reference through a MODULE handle rather than a container.
|
||||
// `dom_utils` is a namespace, not a class, so the class-owner lookup answers
|
||||
// nothing here — and declining would be silent rather than safe: with no
|
||||
// USES edge, `impact` on `compare` measures a real zero and reports `exact`,
|
||||
// which is the claim this whole change exists to stop making.
|
||||
pub const comparator = bridge.accessor(dom_utils.compare, null, .{});
|
||||
|
||||
// A namespace member that is NOT callable. Module receivers get the same
|
||||
// callable gate as container receivers — a registration table full of
|
||||
// constants must keep emitting nothing.
|
||||
pub const defaultNs = bridge.accessor(dom_utils.DEFAULT_NS, null, .{});
|
||||
|
||||
// The receiver IS a known namespace import, but `dom_utils.zig` declares no
|
||||
// `onlyOnDecoy` — so the namespace channel declines and the container
|
||||
// channel runs, reaching `decoy.zig`'s same-named struct through the
|
||||
// workspace-wide qualified-name index. A registration must NOT be minted
|
||||
// there: the file wrote which module it meant.
|
||||
pub const decoyed = bridge.accessor(dom_utils.onlyOnDecoy, null, .{});
|
||||
|
||||
// Through a HUB, whose published names are all imported ones. The CALL form
|
||||
// resolves — `namespaceExportsIncludeImportedNames` is what makes a Zig hub
|
||||
// work at all — so the REGISTRATION form has to resolve to the same def, or
|
||||
// one name means two things depending on whether it is followed by `(`.
|
||||
pub const scaled = bridge.accessor(hub.scale, null, .{});
|
||||
|
||||
// …and the callable gate still applies through the hub.
|
||||
pub const hubNs = bridge.accessor(hub.DEFAULT_NS, null, .{});
|
||||
|
||||
// `Gauge` names this file's `const Gauge: u8`, not `Gauge.zig`'s container.
|
||||
pub const level = bridge.accessor(Gauge.read, null, .{});
|
||||
};
|
||||
|
||||
// The CALL form of the same hub member, so the two are pinned side by side.
|
||||
pub fn callsThroughTheHub(v: u8) u8 {
|
||||
return hub.scale(v);
|
||||
}
|
||||
|
||||
// A LOCAL declaration shadowing the module handle. `dom_utils` here is a `u8`
|
||||
// parameter with no member of its own; resolving `dom_utils.normalize` through
|
||||
// the file-level import would attach the registration to a module the source
|
||||
// did not name at this site — a wrong edge, the failure the same guard prevents
|
||||
// on the member-CALL path.
|
||||
pub fn shadowsTheModuleHandle(dom_utils: u8) u8 {
|
||||
register(dom_utils.normalize);
|
||||
return dom_utils;
|
||||
}
|
||||
|
||||
// A LOCAL declaration shadowing a CONTAINER name — the class-owner half of the
|
||||
// same failure. `Ticker` here is a `u8` parameter, and this file neither
|
||||
// declares nor imports the `Ticker` container that `Ticker.zig` defines.
|
||||
// `findClassBindingInScope` filters the scope chain by `isClassLike`, so it
|
||||
// walks straight past the parameter and its qualified-name fallback answers
|
||||
// with a struct from a file this one never named. Resolving `Ticker.fire`
|
||||
// through that is a confident edge to a function the source did not write.
|
||||
pub fn shadowsAContainerName(Ticker: u8) u8 {
|
||||
register(Ticker.fire);
|
||||
return Ticker;
|
||||
}
|
||||
|
||||
// The positive half of the same guard: here the LOCAL declaration IS the
|
||||
// container the registration names. A shadow test that only asked "is this name
|
||||
// bound nearer than the module scope" would answer yes and decline — reading the
|
||||
// declaration as its own shadow — and this whole class of local container would
|
||||
// stop registering anything.
|
||||
pub fn registersALocalContainer() u8 {
|
||||
const Local = struct {
|
||||
pub fn go() u8 {
|
||||
return 3;
|
||||
}
|
||||
};
|
||||
return bridge.accessor(Local.go, null, .{});
|
||||
}
|
||||
|
||||
// ── Const binding initialiser ───────────────────────────────────────────────
|
||||
|
||||
fn onReset(self: *Element) u8 {
|
||||
return self._namespace;
|
||||
}
|
||||
|
||||
// A `const` whose initialiser IS a function value. Second value position, same
|
||||
// class of drop.
|
||||
pub const defaultHandler = onReset;
|
||||
|
||||
// ── comptime anytype sink ───────────────────────────────────────────────────
|
||||
|
||||
var registered: ?*const fn (*Element) u8 = null;
|
||||
|
||||
// Takes a callable by value into a `comptime … anytype` parameter and STORES
|
||||
// it. Nothing in this file calls `f`.
|
||||
pub fn register(comptime f: anytype) void {
|
||||
registered = f;
|
||||
}
|
||||
|
||||
fn onTick(self: *Element) u8 {
|
||||
return self._namespace;
|
||||
}
|
||||
|
||||
pub fn boot() void {
|
||||
// `onTick` is never called in this file — it is handed over as a value and
|
||||
// invoked later through `registered`.
|
||||
register(onTick);
|
||||
}
|
||||
|
||||
fn Bridge(comptime T: type) type {
|
||||
_ = T;
|
||||
return struct {
|
||||
pub fn accessor(comptime getter: anytype, comptime setter: anytype, comptime opts: anytype) u8 {
|
||||
_ = getter;
|
||||
_ = setter;
|
||||
_ = opts;
|
||||
return 0;
|
||||
}
|
||||
};
|
||||
}
|
||||
10
gitnexus/test/fixtures/lang-resolution/zig-idioms/src/webapi/Gauge.zig
vendored
Normal file
10
gitnexus/test/fixtures/lang-resolution/zig-idioms/src/webapi/Gauge.zig
vendored
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
// The unique workspace definition of the name `Gauge`. `Element.zig` never
|
||||
// imports it, and declares a module-local `const Gauge` of its own — see
|
||||
// `readsThroughAShadowedContainerName` there.
|
||||
const Gauge = @This();
|
||||
|
||||
_level: u8 = 0,
|
||||
|
||||
pub fn read(self: *Gauge) u8 {
|
||||
return self._level;
|
||||
}
|
||||
13
gitnexus/test/fixtures/lang-resolution/zig-idioms/src/webapi/Ticker.zig
vendored
Normal file
13
gitnexus/test/fixtures/lang-resolution/zig-idioms/src/webapi/Ticker.zig
vendored
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
// A file-struct in a module `Element.zig` never imports.
|
||||
//
|
||||
// Its only job is to be the unique workspace definition of the name `Ticker`,
|
||||
// so that `findClassBindingInScope`'s qualified-name fallback can reach it from
|
||||
// a file that has no binding for that name at all. See the
|
||||
// `shadowsAContainerName` case in `Element.zig`.
|
||||
const Ticker = @This();
|
||||
|
||||
_ticks: u8 = 0,
|
||||
|
||||
pub fn fire(self: *Ticker) u8 {
|
||||
return self._ticks;
|
||||
}
|
||||
70
gitnexus/test/fixtures/lang-resolution/zig-idioms/src/webapi/Widget.zig
vendored
Normal file
70
gitnexus/test/fixtures/lang-resolution/zig-idioms/src/webapi/Widget.zig
vendored
Normal file
|
|
@ -0,0 +1,70 @@
|
|||
// A file-as-struct whose `@This()` alias is spelled `Self`, NOT `Widget`.
|
||||
//
|
||||
// This is the ordinary Zig idiom, and the case #3219 originally declined. The
|
||||
// container this file mints is named after the FILE STEM (`Widget`), so before
|
||||
// `bindZigThisAliases` the name `Self` meant nothing class-like here: a
|
||||
// file-level `@This()` alias mints no Const at all (`isZigFileThisAlias`
|
||||
// suppresses it so it cannot shadow the type for `w: *Widget`), and a
|
||||
// container-level one mints a Variable that every `isClassLike` walk steps
|
||||
// over. Every qualified reference through the alias — a CALL as much as a
|
||||
// REGISTRATION — resolved to nothing.
|
||||
//
|
||||
// Counted on the corpora on hand when this was fixed: 73 of ghostty's 185
|
||||
// `@This()` files, 93 of tigerbeetle's 94 and 8 of mach's 42 spell the alias
|
||||
// differently from the file stem, carrying 302 `Alias.member` references, 96
|
||||
// of them calls.
|
||||
//
|
||||
// `Element.zig` next door is the OTHER half of the control: it writes
|
||||
// `const Element = @This();` in `Element.zig`, so its qualified references
|
||||
// resolved through the stem binding and must keep resolving exactly as before.
|
||||
const Self = @This();
|
||||
|
||||
_w: u8 = 0,
|
||||
|
||||
pub fn width(self: *Self) u8 {
|
||||
return self._w;
|
||||
}
|
||||
|
||||
// A qualified CALL through the alias — the explicit spelling Zig allows beside
|
||||
// `self.width()`, and the shape `Alias.member` takes 96 times in the corpora
|
||||
// above.
|
||||
pub fn describeWidth(self: *Self) u8 {
|
||||
return Self.width(self);
|
||||
}
|
||||
|
||||
pub const WidgetApi = struct {
|
||||
pub const binder = Binder(Self);
|
||||
// A qualified REGISTRATION through the alias: the #3399 shape, written the
|
||||
// way most Zig files spell their own type.
|
||||
pub const w = binder.accessor(Self.width, null, .{});
|
||||
};
|
||||
|
||||
// A NESTED container with its own differently-spelled alias. The file-level and
|
||||
// container-level aliases take different code paths — one binds at the module
|
||||
// scope against the file-struct, the other at the container's own scope — so
|
||||
// both are exercised.
|
||||
pub const Metrics = struct {
|
||||
const Me = @This();
|
||||
|
||||
_n: u8 = 0,
|
||||
|
||||
pub fn read(self: *Me) u8 {
|
||||
return self._n;
|
||||
}
|
||||
|
||||
pub fn readTwice(self: *Me) u8 {
|
||||
return Me.read(self) +% Me.read(self);
|
||||
}
|
||||
};
|
||||
|
||||
fn Binder(comptime T: type) type {
|
||||
_ = T;
|
||||
return struct {
|
||||
pub fn accessor(comptime g: anytype, comptime s: anytype, comptime o: anytype) u8 {
|
||||
_ = g;
|
||||
_ = s;
|
||||
_ = o;
|
||||
return 0;
|
||||
}
|
||||
};
|
||||
}
|
||||
24
gitnexus/test/fixtures/lang-resolution/zig-idioms/src/webapi/decoy.zig
vendored
Normal file
24
gitnexus/test/fixtures/lang-resolution/zig-idioms/src/webapi/decoy.zig
vendored
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
// A container whose NAME collides with `Element.zig`'s `dom_utils` import
|
||||
// handle, in a file `Element.zig` never imports.
|
||||
//
|
||||
// `findClassBindingInScope` does not stop at the scope chain: when its
|
||||
// `isClassLike` walk misses — and a namespace import binds a Module, not a
|
||||
// class — it falls back to `scopes.qualifiedNames`, a WORKSPACE-wide index, and
|
||||
// answers with the unique def of that name. This struct is that unique def. A
|
||||
// registration written `dom_utils.compare` in `Element.zig` must still bind
|
||||
// `dom_utils.zig`'s function, not this one: the file said which module it meant.
|
||||
pub const dom_utils = struct {
|
||||
pub fn compare(a: u8, b: u8) u8 {
|
||||
return if (a < b) a else b;
|
||||
}
|
||||
|
||||
// A callable that exists ONLY here. `dom_utils.zig` has no member of this
|
||||
// name, so a registration written `dom_utils.onlyOnDecoy` declines in the
|
||||
// namespace channel and falls through to the container channel — where the
|
||||
// workspace-wide qualified-name fallback answers with this struct. The
|
||||
// owner-shadow guard is the only thing standing between that and a
|
||||
// confident edge into a file `Element.zig` never imported.
|
||||
pub fn onlyOnDecoy(v: u8) u8 {
|
||||
return v;
|
||||
}
|
||||
};
|
||||
24
gitnexus/test/fixtures/lang-resolution/zig-idioms/src/webapi/dom_utils.zig
vendored
Normal file
24
gitnexus/test/fixtures/lang-resolution/zig-idioms/src/webapi/dom_utils.zig
vendored
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
// A NAMESPACE-only module: no `const X = @This()`, so this file declares no
|
||||
// container symbol of its own. Its members are reachable only through an
|
||||
// `@import` handle — the second kind of owner a qualified name can have, and
|
||||
// the one `findClassBindingInScope` cannot answer for.
|
||||
//
|
||||
// Lightpanda's `libdom.zig` / `parser.zig` helpers are written exactly this
|
||||
// way, and they are registered into the same bridge tables as the file-struct
|
||||
// methods next door.
|
||||
|
||||
pub const DEFAULT_NS: u8 = 7;
|
||||
|
||||
pub fn compare(a: u8, b: u8) u8 {
|
||||
return if (a > b) a else b;
|
||||
}
|
||||
|
||||
pub fn normalize(v: u8) u8 {
|
||||
return v;
|
||||
}
|
||||
|
||||
// Republished by `hub.zig`, and by nothing else — so an assertion about the
|
||||
// hub cannot be satisfied by an edge some other case emitted.
|
||||
pub fn scale(v: u8) u8 {
|
||||
return v +% 1;
|
||||
}
|
||||
10
gitnexus/test/fixtures/lang-resolution/zig-idioms/src/webapi/hub.zig
vendored
Normal file
10
gitnexus/test/fixtures/lang-resolution/zig-idioms/src/webapi/hub.zig
vendored
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
// A HUB module: a file made only of re-exports, the shape
|
||||
// `ScopeResolver.namespaceExportsIncludeImportedNames` exists for (ghostty's
|
||||
// `src/terminal/`, tigerbeetle's `stdx`). It declares nothing of its own —
|
||||
// every name it publishes is a name it imported.
|
||||
//
|
||||
// A consumer writes `hub.scale(x)` to CALL through it, and
|
||||
// `bridge.accessor(hub.scale, …)` to REGISTER through it. Those are the same
|
||||
// name resolved by the same rule, so they must not disagree.
|
||||
pub const scale = @import("dom_utils.zig").scale;
|
||||
pub const DEFAULT_NS = @import("dom_utils.zig").DEFAULT_NS;
|
||||
19
gitnexus/test/fixtures/lang-resolution/zig-monorepo/README.md
vendored
Normal file
19
gitnexus/test/fixtures/lang-resolution/zig-monorepo/README.md
vendored
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
A Zig MONOREPO: several build packages, and no `build.zig` at the repo root.
|
||||
|
||||
This is the layout the root-only config loader could not see at all. With no
|
||||
root `build.zig` / `build.zig.zon`, `loadZigBuildConfig` answered `null`, and
|
||||
every bare `@import("<module>")` below went unresolved — so cross-file symbol
|
||||
resolution in a repo like this degraded to relative imports only.
|
||||
|
||||
The three packages are not interchangeable:
|
||||
|
||||
- `core` declares module `core` and is imported by `app`.
|
||||
- `app` declares module `app` and depends on `core` through a
|
||||
`build.zig.zon` `.path = "../core"` — a spelling relative to the PACKAGE,
|
||||
which has to be rebased to repo-relative `packages/core` before it can be
|
||||
matched against indexed files.
|
||||
- `tool` is the discriminating control. It binds the SAME alias `core` to its
|
||||
OWN `src/core.zig`. A workspace that flattened every package's modules into
|
||||
one repo-wide map would resolve `tool`'s `@import("core")` to `core`'s root
|
||||
— a confident edge into a package `tool` never depends on. Only per-package
|
||||
scoping (`zigPackageFor`, the `tsconfigFor` analogue) keeps them apart.
|
||||
7
gitnexus/test/fixtures/lang-resolution/zig-monorepo/packages/app/build.zig
vendored
Normal file
7
gitnexus/test/fixtures/lang-resolution/zig-monorepo/packages/app/build.zig
vendored
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
const std = @import("std");
|
||||
|
||||
pub fn build(b: *std.Build) void {
|
||||
const core_dep = b.dependency("core", .{});
|
||||
const app = b.addModule("app", .{ .root_source_file = b.path("src/main.zig") });
|
||||
app.addImport("core", core_dep.module("core"));
|
||||
}
|
||||
19
gitnexus/test/fixtures/lang-resolution/zig-monorepo/packages/app/build.zig.zon
vendored
Normal file
19
gitnexus/test/fixtures/lang-resolution/zig-monorepo/packages/app/build.zig.zon
vendored
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
.{
|
||||
.name = "app",
|
||||
.version = "0.1.0",
|
||||
.dependencies = .{
|
||||
.core = .{
|
||||
.path = "../core",
|
||||
},
|
||||
// ABSOLUTE, so it points outside the repository whichever package
|
||||
// declares it. It sits in a NESTED package on purpose: that is the
|
||||
// branch where the package prefix used to hide it. `packages/app/` +
|
||||
// `/src` reads as the relative, in-repo `packages/app/src` — a real
|
||||
// directory in this fixture — so the absolute dep silently became the
|
||||
// package's own source tree instead of being rejected.
|
||||
.escapes = .{
|
||||
.path = "/src",
|
||||
},
|
||||
},
|
||||
.paths = .{""},
|
||||
}
|
||||
18
gitnexus/test/fixtures/lang-resolution/zig-monorepo/packages/app/src/main.zig
vendored
Normal file
18
gitnexus/test/fixtures/lang-resolution/zig-monorepo/packages/app/src/main.zig
vendored
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
// `core` is a PACKAGE dependency, declared by this package's build.zig.zon and
|
||||
// wired in by its build.zig — not a relative path. Resolving it needs the
|
||||
// package's own config, which lives two directories below the repo root.
|
||||
const core = @import("core");
|
||||
const util = @import("util.zig");
|
||||
|
||||
pub fn run(attempt: u8) u8 {
|
||||
return core.retryBudget(attempt);
|
||||
}
|
||||
|
||||
pub fn configured() u8 {
|
||||
var cfg = core.Config{};
|
||||
return cfg.load();
|
||||
}
|
||||
|
||||
pub fn delegated(attempt: u8) u8 {
|
||||
return util.clamp(attempt);
|
||||
}
|
||||
8
gitnexus/test/fixtures/lang-resolution/zig-monorepo/packages/app/src/util.zig
vendored
Normal file
8
gitnexus/test/fixtures/lang-resolution/zig-monorepo/packages/app/src/util.zig
vendored
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
// A second file of the same package reaching the same dependency: membership in
|
||||
// a build module is the root plus what it reaches, so a file that is not itself
|
||||
// a module root must resolve the alias too.
|
||||
const core = @import("core");
|
||||
|
||||
pub fn clamp(attempt: u8) u8 {
|
||||
return core.retryBudget(attempt);
|
||||
}
|
||||
5
gitnexus/test/fixtures/lang-resolution/zig-monorepo/packages/core/build.zig
vendored
Normal file
5
gitnexus/test/fixtures/lang-resolution/zig-monorepo/packages/core/build.zig
vendored
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
const std = @import("std");
|
||||
|
||||
pub fn build(b: *std.Build) void {
|
||||
_ = b.addModule("core", .{ .root_source_file = b.path("src/root.zig") });
|
||||
}
|
||||
13
gitnexus/test/fixtures/lang-resolution/zig-monorepo/packages/core/src/root.zig
vendored
Normal file
13
gitnexus/test/fixtures/lang-resolution/zig-monorepo/packages/core/src/root.zig
vendored
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
pub const DEFAULT_RETRIES: u8 = 3;
|
||||
|
||||
pub fn retryBudget(attempt: u8) u8 {
|
||||
return DEFAULT_RETRIES - attempt;
|
||||
}
|
||||
|
||||
pub const Config = struct {
|
||||
retries: u8 = DEFAULT_RETRIES,
|
||||
|
||||
pub fn load(self: *Config) u8 {
|
||||
return self.retries;
|
||||
}
|
||||
};
|
||||
8
gitnexus/test/fixtures/lang-resolution/zig-monorepo/packages/tool/build.zig
vendored
Normal file
8
gitnexus/test/fixtures/lang-resolution/zig-monorepo/packages/tool/build.zig
vendored
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
const std = @import("std");
|
||||
|
||||
pub fn build(b: *std.Build) void {
|
||||
const tool = b.addModule("tool", .{ .root_source_file = b.path("src/main.zig") });
|
||||
// The SAME alias as `app` binds, pointing somewhere else entirely.
|
||||
const own_core = b.createModule(.{ .root_source_file = b.path("src/core.zig") });
|
||||
tool.addImport("core", own_core);
|
||||
}
|
||||
5
gitnexus/test/fixtures/lang-resolution/zig-monorepo/packages/tool/src/core.zig
vendored
Normal file
5
gitnexus/test/fixtures/lang-resolution/zig-monorepo/packages/tool/src/core.zig
vendored
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
// `tool`'s own `core`, unrelated to `packages/core`. Same module name, and that
|
||||
// is the point: the name is only meaningful inside the package that binds it.
|
||||
pub fn retryBudget(attempt: u8) u8 {
|
||||
return attempt;
|
||||
}
|
||||
7
gitnexus/test/fixtures/lang-resolution/zig-monorepo/packages/tool/src/main.zig
vendored
Normal file
7
gitnexus/test/fixtures/lang-resolution/zig-monorepo/packages/tool/src/main.zig
vendored
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
// Resolving this through a repo-wide module map would reach
|
||||
// `packages/core/src/root.zig` — a package `tool` does not depend on.
|
||||
const core = @import("core");
|
||||
|
||||
pub fn measure(attempt: u8) u8 {
|
||||
return core.retryBudget(attempt);
|
||||
}
|
||||
|
|
@ -0,0 +1,231 @@
|
|||
/**
|
||||
* Integration test: a callable named in VALUE position makes `impact` a lower
|
||||
* bound (#3399).
|
||||
*
|
||||
* The rejected behaviour, in one sentence: `Element.getNamespaceUri` — the DOM
|
||||
* `Element.namespaceURI` accessor — is bound into a JS bridge table as
|
||||
* `bridge.accessor(Element.getNamespaceUri, null, .{})`, and `impact` answered
|
||||
* "2 callers, LOW risk, epistemic: exact". Everything about that answer except
|
||||
* the number 2 was wrong, and `exact` is the part that made it unusable: it
|
||||
* tells the reader not to look further.
|
||||
*
|
||||
* The seed below is the shape that matters, not the language. A registration
|
||||
* edge (`USES`, reason `scope-resolution: value-ref`) says a function was
|
||||
* handed somewhere as a value. Where the value goes next — a struct field, a
|
||||
* registry lookup, comptime reflection — is not modelled, so no CALLS edge
|
||||
* connects the eventual invocation back to the target. `tools.ts` defines
|
||||
* `lower-bound` as "the walk provably missed callers", and that is exactly this
|
||||
* situation.
|
||||
*
|
||||
* WHY the assertions are what they are:
|
||||
* - `impactedCount` must NOT move. Hedging is not inventing callers; a fix
|
||||
* that made the number go up would be a different (and unearned) claim.
|
||||
* - a plain CALLS-only target in the SAME index must stay `exact`, or the
|
||||
* hedge is noise sprayed over every query and carries no information.
|
||||
* - the cause has its own slot rather than being folded into
|
||||
* `dispatchBoundary`: an agent branching on the numbers would otherwise be
|
||||
* told an interface boundary exists where there is none, and would draw the
|
||||
* opposite conclusion about whether the gap is reducible.
|
||||
*/
|
||||
import { it, expect, beforeAll, vi } from 'vitest';
|
||||
import path from 'node:path';
|
||||
import { LocalBackend } from '../../src/mcp/local/local-backend.js';
|
||||
import { withTestLbugDB } from '../helpers/test-indexed-db.js';
|
||||
import { VALUE_REF_EDGE_REASON } from '../../src/core/ingestion/scope-resolution/value-ref-edges.js';
|
||||
|
||||
/**
|
||||
* Fail ONLY the value-reference probe, leaving every other query on the real
|
||||
* database. Keyed on the bound `$reason` param rather than the query text, so
|
||||
* it cannot accidentally match a different query that happens to mention USES.
|
||||
*/
|
||||
let failValueRefProbe = false;
|
||||
|
||||
vi.mock('../../src/core/lbug/pool-adapter.js', async (importOriginal) => {
|
||||
const actual = await importOriginal<typeof import('../../src/core/lbug/pool-adapter.js')>();
|
||||
return {
|
||||
...actual,
|
||||
executeParameterized: (...args: any[]) => {
|
||||
const params = args[2] as { reason?: string } | undefined;
|
||||
if (failValueRefProbe && params?.reason === 'scope-resolution: value-ref') {
|
||||
return Promise.reject(new Error('simulated: index unreadable'));
|
||||
}
|
||||
return (actual as any).executeParameterized(...args);
|
||||
},
|
||||
};
|
||||
});
|
||||
|
||||
vi.mock('../../src/storage/repo-manager.js', async (importOriginal) => {
|
||||
const actual = await importOriginal<typeof import('../../src/storage/repo-manager.js')>();
|
||||
return {
|
||||
...actual,
|
||||
listRegisteredRepos: vi.fn().mockResolvedValue([]),
|
||||
cleanupOldKuzuFiles: vi.fn().mockResolvedValue({ found: false, needsReindex: false }),
|
||||
findSiblingClones: vi.fn().mockResolvedValue([]),
|
||||
};
|
||||
});
|
||||
const { listRegisteredRepos, saveMeta } = await import('../../src/storage/repo-manager.js');
|
||||
|
||||
const SEED = [
|
||||
// The registered accessor, with one ordinary in-file caller so the walk has
|
||||
// something real to report. This mirrors Element.zig: `getNamespaceUri` genuinely
|
||||
// has internal callers, and it is the REGISTRATION that the answer omits.
|
||||
`CREATE (:Method {id: 'Method:webapi/Element.zig:Element.getNamespaceUri', name: 'getNamespaceUri', filePath: 'webapi/Element.zig', startLine: 439, endLine: 442, isExported: true, content: '', description: ''})`,
|
||||
`CREATE (:Method {id: 'Method:webapi/Element.zig:Element.lookupPrefixForElement', name: 'lookupPrefixForElement', filePath: 'webapi/Element.zig', startLine: 490, endLine: 520, isExported: true, content: '', description: ''})`,
|
||||
`MATCH (a:Method {id:'Method:webapi/Element.zig:Element.lookupPrefixForElement'}), (b:Method {id:'Method:webapi/Element.zig:Element.getNamespaceUri'}) CREATE (a)-[:CodeRelation {type:'CALLS', confidence:0.85, reason:'scope-resolution: local-call', step:0}]->(b)`,
|
||||
|
||||
// The binding table entry: `pub const namespaceURI = bridge.accessor(Element.getNamespaceUri, null, .{});`
|
||||
// A registration, NOT an invocation — hence USES, not CALLS (Kythe `ref` vs
|
||||
// `ref/call`; Joern METHOD_REF).
|
||||
`CREATE (:Struct {id: 'Struct:webapi/Element.zig:Element.JsApi', name: 'JsApi', filePath: 'webapi/Element.zig', startLine: 2281, endLine: 2400, content: '', description: ''})`,
|
||||
`MATCH (a:Struct {id:'Struct:webapi/Element.zig:Element.JsApi'}), (b:Method {id:'Method:webapi/Element.zig:Element.getNamespaceUri'}) CREATE (a)-[:CodeRelation {type:'USES', confidence:0.85, reason:'${VALUE_REF_EDGE_REASON}', step:0}]->(b)`,
|
||||
|
||||
// Control: same file, same shape of caller, but nothing registers it as a
|
||||
// value. This is `getTagNameLower` — it must come back `exact`.
|
||||
`CREATE (:Method {id: 'Method:webapi/Element.zig:Element.getTagNameLower', name: 'getTagNameLower', filePath: 'webapi/Element.zig', startLine: 400, endLine: 410, isExported: true, content: '', description: ''})`,
|
||||
`MATCH (a:Method {id:'Method:webapi/Element.zig:Element.lookupPrefixForElement'}), (b:Method {id:'Method:webapi/Element.zig:Element.getTagNameLower'}) CREATE (a)-[:CodeRelation {type:'CALLS', confidence:0.85, reason:'scope-resolution: local-call', step:0}]->(b)`,
|
||||
|
||||
// Second control: an ordinary USES edge that is NOT a value registration (a
|
||||
// type reference). The probe keys on the reason, so this must not hedge —
|
||||
// otherwise every type mention in the repo would downgrade its target.
|
||||
`CREATE (:Method {id: 'Method:webapi/Element.zig:Element.getInnerText', name: 'getInnerText', filePath: 'webapi/Element.zig', startLine: 600, endLine: 610, isExported: true, content: '', description: ''})`,
|
||||
`MATCH (a:Struct {id:'Struct:webapi/Element.zig:Element.JsApi'}), (b:Method {id:'Method:webapi/Element.zig:Element.getInnerText'}) CREATE (a)-[:CodeRelation {type:'USES', confidence:0.85, reason:'scope-resolution: type-reference', step:0}]->(b)`,
|
||||
|
||||
// Third control: a registration whose invocation the analyzer DID synthesize.
|
||||
// `emitPropertyDispatchCalls` sweep 2 connects `x.<key>()` member calls to
|
||||
// every function registered under `<key>` and stamps those edges
|
||||
// `property-dispatch`. Where that happened the walk followed the
|
||||
// registration, so hedging would be noise over an answer that was actually
|
||||
// computed. This is the JS/TS hook-table shape, not the Zig one — Zig has no
|
||||
// object-literal key to dispatch through and so is never excluded.
|
||||
`CREATE (:Function {id: 'Function:hooks/registry.js:onClick', name: 'onClick', filePath: 'hooks/registry.js', startLine: 5, endLine: 8, isExported: true, content: '', description: ''})`,
|
||||
`CREATE (:Function {id: 'Function:hooks/registry.js:registerAll', name: 'registerAll', filePath: 'hooks/registry.js', startLine: 1, endLine: 3, isExported: true, content: '', description: ''})`,
|
||||
`CREATE (:Function {id: 'Function:hooks/consumer.js:runHandlers', name: 'runHandlers', filePath: 'hooks/consumer.js', startLine: 1, endLine: 6, isExported: true, content: '', description: ''})`,
|
||||
`MATCH (a:Function {id:'Function:hooks/registry.js:registerAll'}), (b:Function {id:'Function:hooks/registry.js:onClick'}) CREATE (a)-[:CodeRelation {type:'USES', confidence:0.85, reason:'${VALUE_REF_EDGE_REASON}', step:0}]->(b)`,
|
||||
`MATCH (a:Function {id:'Function:hooks/consumer.js:runHandlers'}), (b:Function {id:'Function:hooks/registry.js:onClick'}) CREATE (a)-[:CodeRelation {type:'CALLS', confidence:0.7, reason:'property-dispatch', step:0}]->(b)`,
|
||||
];
|
||||
|
||||
withTestLbugDB(
|
||||
'impact-callable-value-references',
|
||||
(handle) => {
|
||||
let backend: LocalBackend;
|
||||
beforeAll(() => {
|
||||
backend = (handle as any)._backend;
|
||||
});
|
||||
|
||||
it('downgrades a registered accessor to lower-bound without inventing callers', async () => {
|
||||
const result: any = await backend.callTool('impact', {
|
||||
target: 'getNamespaceUri',
|
||||
direction: 'upstream',
|
||||
});
|
||||
expect(result).not.toHaveProperty('error');
|
||||
// Pinned, not implied: hedging must not INVENT callers. The seed gives
|
||||
// this symbol exactly two inbound edges — one CALLS, one value-ref USES —
|
||||
// and both are traversed. If a later change made the hedge also widen the
|
||||
// walk, every other assertion here would still pass.
|
||||
expect(result.impactedCount).toBe(2);
|
||||
// The registration is a real inbound edge, so it IS traversed and counted
|
||||
// — but the call THROUGH the registered value is not, which is why the
|
||||
// count still cannot be the whole story.
|
||||
expect(result.epistemic).toBe('lower-bound');
|
||||
expect(result.causes.callableValueReferences).toBe(1);
|
||||
// Its own slot: an agent must not read this as an interface boundary.
|
||||
expect(result.causes.dispatchBoundary).toBe(0);
|
||||
expect(result.boundaries.join(' ')).toContain('as a VALUE');
|
||||
});
|
||||
|
||||
it('leaves a symbol with only ordinary calls exact', async () => {
|
||||
const result: any = await backend.callTool('impact', {
|
||||
target: 'getTagNameLower',
|
||||
direction: 'upstream',
|
||||
});
|
||||
expect(result).not.toHaveProperty('error');
|
||||
expect(result.epistemic).toBe('exact');
|
||||
});
|
||||
|
||||
it('does not hedge on a USES edge that is not a value registration', async () => {
|
||||
const result: any = await backend.callTool('impact', {
|
||||
target: 'getInnerText',
|
||||
direction: 'upstream',
|
||||
});
|
||||
expect(result).not.toHaveProperty('error');
|
||||
// A type reference is a use, not an escape: nothing can be invoked
|
||||
// through it, so the answer stays complete.
|
||||
expect(result.epistemic).toBe('exact');
|
||||
});
|
||||
|
||||
it('hedges context() for the same reason it hedges impact()', async () => {
|
||||
const result: any = await backend.callTool('context', { name: 'getNamespaceUri' });
|
||||
expect(result).not.toHaveProperty('error');
|
||||
expect(result.epistemic).toBe('lower-bound');
|
||||
expect(result.causes.callableValueReferences).toBe(1);
|
||||
});
|
||||
|
||||
it('stays exact when the analyzer already synthesized the dispatch', async () => {
|
||||
// `onClick` is registered as a value AND reached by a synthesized
|
||||
// property-dispatch CALLS edge. The walk did not "provably miss" that
|
||||
// caller, so `lower-bound` would be wrong — and a signal that fires on
|
||||
// every hook table in every JS codebase carries no information.
|
||||
const result: any = await backend.callTool('impact', {
|
||||
target: 'onClick',
|
||||
direction: 'upstream',
|
||||
});
|
||||
expect(result).not.toHaveProperty('error');
|
||||
expect(result.epistemic).toBe('exact');
|
||||
});
|
||||
|
||||
it('hedges — never reports exact — when the probe itself cannot run', async () => {
|
||||
// The failure mode this whole feature exists to remove is silence reading
|
||||
// as certainty. A probe that threw has not established that the symbol is
|
||||
// unregistered; swallowing the error into a zero would publish `exact` on
|
||||
// the strength of a question that was never answered.
|
||||
failValueRefProbe = true;
|
||||
try {
|
||||
const result: any = await backend.callTool('impact', {
|
||||
target: 'getTagNameLower', // the control: exact when the probe works
|
||||
direction: 'upstream',
|
||||
});
|
||||
expect(result).not.toHaveProperty('error');
|
||||
expect(result.epistemic).toBe('lower-bound');
|
||||
expect(result.boundaries.join(' ')).toContain('could not be run');
|
||||
// No count is claimed — the note is the signal, and inventing a
|
||||
// magnitude from a failed query would be the same error inverted.
|
||||
expect(result.causes.callableValueReferences).toBe(0);
|
||||
} finally {
|
||||
failValueRefProbe = false;
|
||||
}
|
||||
});
|
||||
|
||||
it('stays exact downstream — a reference INTO a symbol says nothing about what it reaches', async () => {
|
||||
const result: any = await backend.callTool('impact', {
|
||||
target: 'getNamespaceUri',
|
||||
direction: 'downstream',
|
||||
});
|
||||
expect(result).not.toHaveProperty('error');
|
||||
expect(result.epistemic).toBe('exact');
|
||||
});
|
||||
},
|
||||
{
|
||||
seed: SEED,
|
||||
poolAdapter: true,
|
||||
afterSetup: async (h) => {
|
||||
// Without a completeness receipt EVERY answer is hedged ("scope-extraction
|
||||
// completeness was not recorded"), which would make the controls below
|
||||
// pass for the wrong reason and prove nothing about this probe.
|
||||
// `saveMeta` is the only writer production uses.
|
||||
await saveMeta(path.dirname(h.dbPath), { scopeExtractionReceipt: 1 } as any);
|
||||
vi.mocked(listRegisteredRepos).mockResolvedValue([
|
||||
{
|
||||
name: 'test-repo',
|
||||
path: '/test/repo',
|
||||
storagePath: h.tmpHandle.dbPath,
|
||||
indexedAt: new Date().toISOString(),
|
||||
lastCommit: 'abc123',
|
||||
stats: { files: 1, nodes: 5, communities: 0, processes: 0 },
|
||||
},
|
||||
] as any);
|
||||
const backend = new LocalBackend();
|
||||
await backend.init();
|
||||
(h as any)._backend = backend;
|
||||
},
|
||||
},
|
||||
);
|
||||
|
|
@ -0,0 +1,136 @@
|
|||
/**
|
||||
* C2 — the grafana `Button` shape: a workspace barrel `export *`s a components
|
||||
* index, which re-exports NAMED bindings (with inline `type` modifiers) from a
|
||||
* DIRECTORY index, which `export *`s the real file, whose `Button` is a
|
||||
* `React.forwardRef` const. Measured on grafana@871af0720: `Button` resolved 8
|
||||
* of 475 ledger entries while siblings through plain hops resolved at scale.
|
||||
*/
|
||||
import { describe, it, expect, beforeAll, afterAll } from 'vitest';
|
||||
import path from 'path';
|
||||
import fs from 'node:fs';
|
||||
import os from 'node:os';
|
||||
import {
|
||||
getRelationships,
|
||||
getResolutionOutcomes,
|
||||
runPipelineFromRepo,
|
||||
writeFixtureRepo,
|
||||
type PipelineResult,
|
||||
} from './helpers.js';
|
||||
|
||||
describe('named re-export through a directory index that wildcards (grafana Button shape)', () => {
|
||||
let result: PipelineResult;
|
||||
let repoDir: string | undefined;
|
||||
|
||||
beforeAll(async () => {
|
||||
repoDir = fs.mkdtempSync(path.join(os.tmpdir(), 'gn-c2-dir-index-'));
|
||||
writeFixtureRepo(repoDir, {
|
||||
'package.json': '{ "name": "root", "private": true, "workspaces": ["packages/*"] }\n',
|
||||
'packages/ui/package.json':
|
||||
'{ "name": "@x/ui", "version": "1.0.0", "main": "src/index.ts" }\n',
|
||||
'packages/ui/src/index.ts': `export * from './components';\nexport * from './themes';\n`,
|
||||
// Inline `type` modifiers on the same statement as value re-exports.
|
||||
'packages/ui/src/components/index.ts': `export { Stack } from './Layout/Stack';
|
||||
export { Button, LinkButton, type ButtonVariant, ButtonGroup, type ButtonProps, clearButtonStyles } from './Button';
|
||||
`,
|
||||
// Directory index: wildcard + one named re-export.
|
||||
'packages/ui/src/components/Button/index.ts': `export * from './Button';\nexport { ButtonGroup } from './ButtonGroup';\n`,
|
||||
'packages/ui/src/components/Button/Button.tsx': `import React from 'react';
|
||||
export type ButtonVariant = 'primary' | 'secondary';
|
||||
export interface ButtonProps { variant?: ButtonVariant; label: string }
|
||||
export const Button = React.forwardRef<HTMLButtonElement, ButtonProps>((props, ref) => {
|
||||
return null;
|
||||
});
|
||||
export const LinkButton = React.forwardRef<HTMLAnchorElement, ButtonProps>((props, ref) => {
|
||||
return null;
|
||||
});
|
||||
export const clearButtonStyles = (theme: string) => {
|
||||
return theme;
|
||||
};
|
||||
`,
|
||||
'packages/ui/src/components/Button/ButtonGroup.tsx': `export function ButtonGroup(children: string) {
|
||||
return children;
|
||||
}
|
||||
`,
|
||||
'packages/ui/src/components/Layout/Stack.tsx': `export function Stack(children: string) {
|
||||
return children;
|
||||
}
|
||||
`,
|
||||
'packages/ui/src/themes/index.ts': `export * from './hooks';\n`,
|
||||
'packages/ui/src/themes/hooks/index.ts': `export * from './useStyles2';\n`,
|
||||
'packages/ui/src/themes/hooks/useStyles2.ts': `export function useStyles2(fn: (t: string) => string) {
|
||||
return fn('theme');
|
||||
}
|
||||
`,
|
||||
'packages/app/package.json':
|
||||
'{ "name": "@x/app", "version": "1.0.0", "main": "src/main.tsx", "dependencies": { "@x/ui": "1.0.0" } }\n',
|
||||
'packages/app/tsconfig.json': `{ "compilerOptions": { "jsx": "react-jsx" } }\n`,
|
||||
'packages/app/src/main.tsx': `import { Button, LinkButton, ButtonGroup, clearButtonStyles, Stack, useStyles2 } from '@x/ui';
|
||||
|
||||
export function render() {
|
||||
const styles = useStyles2((t) => t);
|
||||
clearButtonStyles(styles);
|
||||
ButtonGroup('x');
|
||||
Stack('y');
|
||||
const a = <Button label="a" />;
|
||||
const b = <LinkButton label="b" />;
|
||||
return [a, b];
|
||||
}
|
||||
`,
|
||||
});
|
||||
result = await runPipelineFromRepo(repoDir, () => {});
|
||||
}, 120_000);
|
||||
|
||||
afterAll(() => {
|
||||
if (repoDir !== undefined)
|
||||
fs.rmSync(repoDir, { recursive: true, force: true, maxRetries: 5, retryDelay: 50 });
|
||||
});
|
||||
|
||||
const callsFromMain = () =>
|
||||
getRelationships(result, 'CALLS').filter((e) =>
|
||||
e.sourceFilePath.includes('packages/app/src/main.tsx'),
|
||||
);
|
||||
|
||||
it('resolves the plain named hop (Stack) and the deep wildcard chain (useStyles2)', () => {
|
||||
const targets = callsFromMain().map((e) => e.target);
|
||||
expect(targets.some((t) => t.includes('Stack'))).toBe(true);
|
||||
expect(targets.some((t) => t.includes('useStyles2'))).toBe(true);
|
||||
});
|
||||
|
||||
it('resolves value names on a statement that also carries inline `type` modifiers', () => {
|
||||
const targets = callsFromMain().map((e) => e.target);
|
||||
expect(targets.some((t) => t.includes('clearButtonStyles'))).toBe(true);
|
||||
expect(targets.some((t) => t.includes('ButtonGroup'))).toBe(true);
|
||||
});
|
||||
|
||||
it('resolves a forwardRef const component used as JSX through the dir-index wildcard', () => {
|
||||
const targets = callsFromMain().map((e) => e.target);
|
||||
// Exact name — `/Button$/` also matched `LinkButton`, which made the
|
||||
// assertion below imply this one and would have let zero `Button` edges pass.
|
||||
expect(targets).toContain('Button');
|
||||
expect(targets.some((t) => t.includes('LinkButton'))).toBe(true);
|
||||
});
|
||||
|
||||
it('refuses nothing on this shape (no ambiguity, no fallback)', () => {
|
||||
const outcomes = getResolutionOutcomes(result);
|
||||
expect(outcomes.filter((o) => o.kind === 'reexport-ambiguous')).toEqual([]);
|
||||
expect(outcomes.filter((o) => o.kind === 'fallback-guessed')).toEqual([]);
|
||||
});
|
||||
|
||||
// The bug this fixture regresses against wasn't "no edge" — it was an edge
|
||||
// to the WRONG node. `export const Button = React.forwardRef(...)` emits a
|
||||
// `Variable` def for the lexical declaration alongside the `Function` def
|
||||
// for the arrow; before the wildcard fan-out used the same
|
||||
// callable-preferred index the named-reexport path already used, whichever
|
||||
// def `localDefs` happened to iterate first could win the closure slot. An
|
||||
// edge landing on `Variable` would still show up in a `target` name match
|
||||
// (both defs share the simple name) while pointing at the wrong graph node
|
||||
// — so the label, not just the name, is the assertion that actually catches
|
||||
// a regression here.
|
||||
it('every arrow-const winner through the wildcard chain is the Function def, not the Variable shadow', () => {
|
||||
const calls = callsFromMain();
|
||||
for (const name of ['Button', 'LinkButton', 'clearButtonStyles']) {
|
||||
const labels = calls.filter((edge) => edge.target === name).map((edge) => edge.targetLabel);
|
||||
expect(labels, name).toEqual(['Function']);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
@ -0,0 +1,107 @@
|
|||
import { describe, it, expect } from 'vitest';
|
||||
import path from 'path';
|
||||
import fs from 'node:fs';
|
||||
import os from 'node:os';
|
||||
import { getRelationships, runPipelineFromRepo, writeFixtureRepo } from './helpers.js';
|
||||
|
||||
/**
|
||||
* `namedImportsBindTopLevelOnly` (ECMAScript): `import { beta }` can never reach a
|
||||
* class member. Before the hook, `findExportByName`'s callable preference let
|
||||
* `Foo.beta()` outrank the top-level `const beta = 42` — or bind on its own when no
|
||||
* top-level `beta` existed — and the import produced a confident CALLS edge to a
|
||||
* symbol the module cannot export. Incorrect context is worse than missing: the
|
||||
* Variable shadow must win and emit no edge; the member must never bind.
|
||||
*/
|
||||
const impl = `export const beta = 42;\nexport function alpha(s: string) { return s; }\nexport class Foo { beta() { return 1; } }\n`;
|
||||
const memberOnly = `export function alpha(s: string) { return s; }\nexport class Foo { beta() { return 1; } }\n`;
|
||||
|
||||
async function run(name: string, files: Record<string, string>) {
|
||||
const dir = fs.mkdtempSync(path.join(os.tmpdir(), `gn-named-member-${name}-`));
|
||||
try {
|
||||
writeFixtureRepo(dir, files);
|
||||
const result = await runPipelineFromRepo(dir, () => {});
|
||||
return getRelationships(result, 'CALLS')
|
||||
.filter((e) => e.sourceFilePath.includes('src/main'))
|
||||
.map((e) => e.target)
|
||||
.sort();
|
||||
} finally {
|
||||
fs.rmSync(dir, { recursive: true, force: true, maxRetries: 5, retryDelay: 50 });
|
||||
}
|
||||
}
|
||||
|
||||
describe.each(['ts', 'js'])(
|
||||
'named imports bind module-level declarations only (%s)',
|
||||
(extension) => {
|
||||
// Keep identical scenarios while actually selecting each language's parser
|
||||
// and separately registered resolver.
|
||||
const fixture = (files: Record<string, string>) =>
|
||||
Object.fromEntries(
|
||||
Object.entries(files).map(([file, content]) => [
|
||||
file.replace(/\.ts$/, `.${extension}`),
|
||||
extension === 'js' ? content.replaceAll(': string', '') : content,
|
||||
]),
|
||||
);
|
||||
it('direct named import: a class method sharing a top-level value name emits no edge', async () => {
|
||||
const targets = await run(
|
||||
`direct-${extension}`,
|
||||
fixture({
|
||||
'package.json': '{ "name": "root", "private": true }\n',
|
||||
'src/Impl.ts': impl,
|
||||
'src/main.ts': `import { alpha, beta } from './Impl';\nexport function render() { alpha('a'); beta(); }\n`,
|
||||
}),
|
||||
);
|
||||
expect(targets).toEqual(['alpha']);
|
||||
}, 60000);
|
||||
|
||||
it('direct named import: a class method with NO top-level declaration does not bind', async () => {
|
||||
const targets = await run(
|
||||
`member-only-${extension}`,
|
||||
fixture({
|
||||
'package.json': '{ "name": "root", "private": true }\n',
|
||||
'src/Impl.ts': memberOnly,
|
||||
'src/main.ts': `import { alpha, beta } from './Impl';\nexport function render() { alpha('a'); beta(); }\n`,
|
||||
}),
|
||||
);
|
||||
expect(targets).toEqual(['alpha']);
|
||||
}, 60000);
|
||||
|
||||
it('named re-export through a barrel: same rule', async () => {
|
||||
const targets = await run(
|
||||
`barrel-${extension}`,
|
||||
fixture({
|
||||
'package.json': '{ "name": "root", "private": true }\n',
|
||||
'src/Impl.ts': impl,
|
||||
'src/index.ts': `export { alpha, beta } from './Impl';\n`,
|
||||
'src/main.ts': `import { alpha, beta } from './index';\nexport function render() { alpha('a'); beta(); }\n`,
|
||||
}),
|
||||
);
|
||||
expect(targets).toEqual(['alpha']);
|
||||
}, 60000);
|
||||
|
||||
it('control: a top-level arrow-const behind the same barrel still binds', async () => {
|
||||
const targets = await run(
|
||||
`control-${extension}`,
|
||||
fixture({
|
||||
'package.json': '{ "name": "root", "private": true }\n',
|
||||
'src/Impl.ts': `export const beta = () => 1;\nexport function alpha(s: string) { return s; }\n`,
|
||||
'src/index.ts': `export { alpha, beta } from './Impl';\n`,
|
||||
'src/main.ts': `import { alpha, beta } from './index';\nexport function render() { alpha('a'); beta(); }\n`,
|
||||
}),
|
||||
);
|
||||
expect(targets).toEqual(['alpha', 'beta']);
|
||||
}, 60000);
|
||||
|
||||
it('an aliased private import cannot guess a different module-private declaration', async () => {
|
||||
const targets = await run(
|
||||
`alias-${extension}`,
|
||||
fixture({
|
||||
'package.json': '{ "name": "root", "private": true }\n',
|
||||
'src/Impl.ts': 'export class Foo { beta() {} }\nfunction renamed() {}\n',
|
||||
'src/main.ts':
|
||||
"import { beta as renamed } from './Impl';\nexport function render() { renamed(); }\n",
|
||||
}),
|
||||
);
|
||||
expect(targets).toEqual([]);
|
||||
}, 60000);
|
||||
},
|
||||
);
|
||||
|
|
@ -0,0 +1,56 @@
|
|||
/**
|
||||
* C6 — ECMAScript precedence: an explicit named export shadows a star
|
||||
* collision. Only star-vs-star is ambiguous; `export { collide } from './a'`
|
||||
* next to `export * from './a'; export * from './b'` binds `a`'s `collide`
|
||||
* and must NOT be refused.
|
||||
*/
|
||||
import { describe, it, expect, beforeAll, afterAll } from 'vitest';
|
||||
import path from 'path';
|
||||
import fs from 'node:fs';
|
||||
import os from 'node:os';
|
||||
import {
|
||||
getRelationships,
|
||||
getResolutionOutcomes,
|
||||
runPipelineFromRepo,
|
||||
writeFixtureRepo,
|
||||
type PipelineResult,
|
||||
} from './helpers.js';
|
||||
|
||||
describe('named export shadows a star collision', () => {
|
||||
let result: PipelineResult;
|
||||
let dir: string;
|
||||
beforeAll(async () => {
|
||||
dir = fs.mkdtempSync(path.join(os.tmpdir(), 'gn-c6-prec-'));
|
||||
writeFixtureRepo(dir, {
|
||||
'package.json': '{ "name": "root", "private": true, "workspaces": ["packages/*"] }\n',
|
||||
'packages/ui/package.json':
|
||||
'{ "name": "@x/ui", "version": "1.0.0", "main": "src/index.ts" }\n',
|
||||
'packages/ui/src/index.ts': `export { collide } from './a';\nexport * from './a';\nexport * from './b';\n`,
|
||||
'packages/ui/src/a.ts': `export function collide() { return 'a'; }\nexport function onlyA() { return 1; }\n`,
|
||||
'packages/ui/src/b.ts': `export function collide() { return 'b'; }\nexport function onlyB() { return 2; }\n`,
|
||||
'packages/app/package.json':
|
||||
'{ "name": "@x/app", "version": "1.0.0", "main": "src/main.ts", "dependencies": { "@x/ui": "1.0.0" } }\n',
|
||||
'packages/app/src/main.ts': `import { collide, onlyA, onlyB } from '@x/ui';\nexport function run() { collide(); onlyA(); onlyB(); }\n`,
|
||||
});
|
||||
result = await runPipelineFromRepo(dir, () => {});
|
||||
}, 120_000);
|
||||
afterAll(() => fs.rmSync(dir, { recursive: true, force: true, maxRetries: 5, retryDelay: 50 }));
|
||||
|
||||
it('binds the named export (a.ts) and does not refuse it', () => {
|
||||
const edges = getRelationships(result, 'CALLS').filter(
|
||||
(e) => e.sourceFilePath.includes('main.ts') && e.target === 'collide',
|
||||
);
|
||||
expect(edges.length).toBe(1);
|
||||
expect(edges[0]!.targetFilePath).toContain('packages/ui/src/a.ts');
|
||||
expect(getResolutionOutcomes(result).filter((o) => o.kind === 'reexport-ambiguous')).toEqual(
|
||||
[],
|
||||
);
|
||||
});
|
||||
it('still resolves the non-colliding star names', () => {
|
||||
const targets = getRelationships(result, 'CALLS')
|
||||
.filter((e) => e.sourceFilePath.includes('main.ts'))
|
||||
.map((e) => e.target)
|
||||
.sort();
|
||||
expect(targets).toEqual(['collide', 'onlyA', 'onlyB']);
|
||||
});
|
||||
});
|
||||
|
|
@ -0,0 +1,141 @@
|
|||
/**
|
||||
* Pipeline-level reproductions from magyargergo's review of #3182, each of
|
||||
* which produced an incorrect or missing CALLS edge at 6d3ac0d8:
|
||||
*
|
||||
* 1. finalize-algorithm.ts:1374 — a function NESTED in another function behind
|
||||
* an `export *` barrel displaced the real exported value of the same name
|
||||
* (0.85 edge to `wrapper.selected`, which is private to `wrapper`).
|
||||
* 2. javascript/scope-resolver.ts:105 — `module.exports = { alpha() {} }` +
|
||||
* `const { alpha } = require('./lib')`: the Method IS the module's export,
|
||||
* and `namedImportsBindTopLevelOnly` sent the exact import to a name guess
|
||||
* (and to nothing at all once another module declared its own `alpha`).
|
||||
* 3. finalize-algorithm.ts:1049 — `export class Unrelated { clash() {} }` in
|
||||
* the barrel made `clash` a local name and switched the star-vs-star
|
||||
* collision check off.
|
||||
* 4. free-call-fallback.ts:710 — `alpha(); precise();` vs `precise(); alpha();`
|
||||
* after `import { alpha as precise }` gave different edges for one
|
||||
* dependency. A precisely resolved site proves the edge in either order.
|
||||
*/
|
||||
import { describe, it, expect } from 'vitest';
|
||||
import path from 'path';
|
||||
import fs from 'node:fs';
|
||||
import os from 'node:os';
|
||||
import {
|
||||
getRelationships,
|
||||
getResolutionOutcomes,
|
||||
runPipelineFromRepo,
|
||||
writeFixtureRepo,
|
||||
} from './helpers.js';
|
||||
|
||||
async function run(name: string, files: Record<string, string>) {
|
||||
const dir = fs.mkdtempSync(path.join(os.tmpdir(), `gn-3182-${name}-`));
|
||||
try {
|
||||
writeFixtureRepo(dir, files);
|
||||
const result = await runPipelineFromRepo(dir, () => {});
|
||||
const calls = getRelationships(result, 'CALLS')
|
||||
.filter(
|
||||
(e) => e.sourceFilePath.endsWith('caller.ts') || e.sourceFilePath.endsWith('caller.js'),
|
||||
)
|
||||
.map((e) => ({
|
||||
target: e.target,
|
||||
targetId: e.rel.targetId,
|
||||
targetFile: path.basename(e.targetFilePath),
|
||||
confidence: e.rel.confidence,
|
||||
reason: e.rel.reason,
|
||||
}))
|
||||
.sort((a, b) => a.target.localeCompare(b.target) || a.targetFile.localeCompare(b.targetFile));
|
||||
return { calls, outcomes: getResolutionOutcomes(result) };
|
||||
} finally {
|
||||
fs.rmSync(dir, { recursive: true, force: true, maxRetries: 5, retryDelay: 50 });
|
||||
}
|
||||
}
|
||||
|
||||
describe('#3182 review reproductions', () => {
|
||||
it('1. a nested function behind `export *` does not displace the exported value of the same name', async () => {
|
||||
const { calls } = await run('nested', {
|
||||
'package.json': '{ "name": "r", "private": true }\n',
|
||||
'lib.ts': `export function factory() { return () => 1; }\nexport const selected = factory();\nfunction wrapper() { function selected() {} return selected; }\nexport { wrapper };\n`,
|
||||
'index.ts': `export * from './lib';\n`,
|
||||
'caller.ts': `import { selected } from './index';\nexport function go() { return selected(); }\n`,
|
||||
});
|
||||
// `selected` is a `const` value (arrow returned by a call) — the graph
|
||||
// has no Function node for it, so the honest outcome is NO edge to a
|
||||
// callable named `selected`; above all, none to `wrapper`'s private one.
|
||||
expect(calls.filter((c) => c.target === 'selected')).toEqual([]);
|
||||
}, 120000);
|
||||
|
||||
it.each(['module.exports', "module['exports']", 'module["exports"]'])(
|
||||
'2. a CommonJS `%s = { alpha() {} }` member binds an exact destructured require',
|
||||
async (exportObject) => {
|
||||
const files = {
|
||||
'package.json': '{ "name": "r", "private": true }\n',
|
||||
'lib.js': `${exportObject} = { alpha() { return 1; } };\n`,
|
||||
'caller.js': `const { alpha } = require('./lib');\nfunction run() { return alpha(); }\nmodule.exports = { run };\n`,
|
||||
};
|
||||
const single = await run('cjs1', files);
|
||||
expect(single.calls).toEqual([
|
||||
{
|
||||
target: 'alpha',
|
||||
targetId: 'Method:lib.js:alpha#0',
|
||||
targetFile: 'lib.js',
|
||||
confidence: 0.85,
|
||||
reason: 'import-resolved',
|
||||
},
|
||||
]);
|
||||
// A second module declaring its own `alpha` must not turn the exact import
|
||||
// into an ambiguous guess that disappears.
|
||||
const dup = await run('cjs2', {
|
||||
...files,
|
||||
'other.js': `function alpha() { return 2; }\nmodule.exports = { alpha };\n`,
|
||||
});
|
||||
expect(dup.calls).toEqual([
|
||||
{
|
||||
target: 'alpha',
|
||||
targetId: 'Method:lib.js:alpha#0',
|
||||
targetFile: 'lib.js',
|
||||
confidence: 0.85,
|
||||
reason: 'import-resolved',
|
||||
},
|
||||
]);
|
||||
},
|
||||
120000,
|
||||
);
|
||||
|
||||
it('3. a class member in the barrel does not shadow a star-vs-star collision', async () => {
|
||||
const { calls, outcomes } = await run('shadow', {
|
||||
'package.json': '{ "name": "r", "private": true }\n',
|
||||
'a.ts': `export function clash() { return 'a'; }\n`,
|
||||
'b.ts': `export function clash() { return 'b'; }\n`,
|
||||
'index.ts': `export * from './a';\nexport * from './b';\nexport class Unrelated { clash() { return 0; } }\n`,
|
||||
'caller.ts': `import { clash } from './index';\nexport function go() { return clash(); }\n`,
|
||||
});
|
||||
expect(calls.filter((c) => c.target === 'clash')).toEqual([]);
|
||||
expect(outcomes.some((o) => o.kind === 'reexport-ambiguous' && o.name === 'clash')).toBe(true);
|
||||
}, 120000);
|
||||
|
||||
it('4. `alpha(); precise();` and `precise(); alpha();` yield the same import-resolved edge', async () => {
|
||||
const base = {
|
||||
'package.json': '{ "name": "r", "private": true }\n',
|
||||
'lib.ts': `export function alpha() { return 1; }\n`,
|
||||
};
|
||||
const guessFirst = await run('order1', {
|
||||
...base,
|
||||
'caller.ts': `import { alpha as precise } from './lib';\nexport function go() { alpha(); precise(); }\n`,
|
||||
});
|
||||
const preciseFirst = await run('order2', {
|
||||
...base,
|
||||
'caller.ts': `import { alpha as precise } from './lib';\nexport function go() { precise(); alpha(); }\n`,
|
||||
});
|
||||
const expected = [
|
||||
{
|
||||
target: 'alpha',
|
||||
targetId: 'Function:lib.ts:alpha',
|
||||
targetFile: 'lib.ts',
|
||||
confidence: 0.85,
|
||||
reason: 'import-resolved',
|
||||
},
|
||||
];
|
||||
expect(guessFirst.calls).toEqual(expected);
|
||||
expect(preciseFirst.calls).toEqual(expected);
|
||||
}, 120000);
|
||||
});
|
||||
|
|
@ -0,0 +1,94 @@
|
|||
import { describe, it, expect } from 'vitest';
|
||||
import path from 'path';
|
||||
import fs from 'node:fs';
|
||||
import os from 'node:os';
|
||||
import { getRelationships, runPipelineFromRepo, writeFixtureRepo } from './helpers.js';
|
||||
|
||||
const base = {
|
||||
'package.json': '{ "name": "root", "private": true, "workspaces": ["packages/*"] }\n',
|
||||
'packages/ui/package.json': '{ "name": "@x/ui", "version": "1.0.0", "main": "src/index.ts" }\n',
|
||||
'packages/ui/src/index.ts': `export * from './components';\n`,
|
||||
'packages/ui/src/components/index.ts': `export { alpha, beta } from './Impl';\n`,
|
||||
'packages/ui/src/components/Impl/index.ts': `export * from './Impl';\n`,
|
||||
'packages/app/package.json':
|
||||
'{ "name": "@x/app", "version": "1.0.0", "main": "src/main.ts", "dependencies": { "@x/ui": "1.0.0" } }\n',
|
||||
'packages/app/src/main.ts': `import { alpha, beta } from '@x/ui';\nexport function render() { alpha('a'); beta('b'); }\n`,
|
||||
};
|
||||
async function run(name: string, extra: Record<string, string>, remove: string[] = []) {
|
||||
const dir = fs.mkdtempSync(path.join(os.tmpdir(), `gn-c2b-${name}-`));
|
||||
const files: Record<string, string> = { ...base, ...extra };
|
||||
for (const r of remove) delete files[r];
|
||||
try {
|
||||
writeFixtureRepo(dir, files);
|
||||
const result = await runPipelineFromRepo(dir, () => {});
|
||||
return getRelationships(result, 'CALLS')
|
||||
.filter((e) => e.sourceFilePath.includes('packages/app/src/main'))
|
||||
.map((e) => e.target)
|
||||
.sort();
|
||||
} finally {
|
||||
fs.rmSync(dir, { recursive: true, force: true, maxRetries: 5, retryDelay: 50 });
|
||||
}
|
||||
}
|
||||
describe('C2 probe 2', () => {
|
||||
it('E: impl is a .tsx file with plain function exports', async () => {
|
||||
expect(
|
||||
await run('e', {
|
||||
'packages/ui/src/components/Impl/Impl.tsx': `export function alpha(s: string) { return s; }\nexport function beta(s: string) { return s; }\n`,
|
||||
}),
|
||||
).toEqual(['alpha', 'beta']);
|
||||
}, 60000);
|
||||
it('F: impl is .ts with ARROW CONST exports', async () => {
|
||||
expect(
|
||||
await run('f', {
|
||||
'packages/ui/src/components/Impl/Impl.ts': `export const alpha = (s: string) => { return s; };\nexport const beta = (s: string) => { return s; };\n`,
|
||||
}),
|
||||
).toEqual(['alpha', 'beta']);
|
||||
}, 60000);
|
||||
it('G: impl is .ts with a React import + forwardRef generic const alongside plain fns', async () => {
|
||||
expect(
|
||||
await run('g', {
|
||||
'packages/ui/src/components/Impl/Impl.ts': `import React from 'react';\nexport const Widget = React.forwardRef<HTMLButtonElement, { label: string }>((props, ref) => { return null; });\nexport function alpha(s: string) { return s; }\nexport function beta(s: string) { return s; }\n`,
|
||||
}),
|
||||
).toEqual(['alpha', 'beta']);
|
||||
}, 60000);
|
||||
it('H: main is .tsx and ALSO uses a JSX element', async () => {
|
||||
expect(
|
||||
await run(
|
||||
'h',
|
||||
{
|
||||
'packages/ui/src/components/Impl/Impl.ts': `export function alpha(s: string) { return s; }\nexport function beta(s: string) { return s; }\nexport function Widget(p: { label: string }) { return null; }\n`,
|
||||
'packages/ui/src/components/index.ts': `export { alpha, beta, Widget } from './Impl';\n`,
|
||||
'packages/app/src/main.tsx': `import { alpha, beta, Widget } from '@x/ui';\nexport function render() { alpha('a'); beta('b'); return <Widget label="x" />; }\n`,
|
||||
},
|
||||
['packages/app/src/main.ts'],
|
||||
),
|
||||
).toEqual(['Widget', 'alpha', 'beta']);
|
||||
}, 60000);
|
||||
it('B1: a class METHOD sharing a top-level const name never wins the wildcard fan-out', async () => {
|
||||
// `export *` can only publish module-level declarations. `Foo.render` is
|
||||
// callable and outranked the value shadow in the callable-preferred index,
|
||||
// binding `import { render }` to a symbol it can never reach. The safe
|
||||
// outcome is the pre-existing one: a value shadow yields NO CALLS edge.
|
||||
expect(
|
||||
await run('b1', {
|
||||
'packages/ui/src/components/Impl/Impl.ts': `export const alpha = (s: string) => { return s; };\nexport const beta = 42;\nexport class Foo { beta() { return 1; } }\n`,
|
||||
}),
|
||||
).toEqual(['alpha']);
|
||||
}, 60000);
|
||||
it('B1 control: the arrow const still wins over its own Variable shadow', async () => {
|
||||
expect(
|
||||
await run('b1c', {
|
||||
'packages/ui/src/components/Impl/Impl.ts': `export const alpha = (s: string) => { return s; };\nexport const beta = (s: string) => { return s; };\nexport class Foo { alpha() { return 1; } }\n`,
|
||||
}),
|
||||
).toEqual(['alpha', 'beta']);
|
||||
}, 60000);
|
||||
it('I: dir index has wildcard AND a named re-export from a sibling', async () => {
|
||||
expect(
|
||||
await run('i', {
|
||||
'packages/ui/src/components/Impl/index.ts': `export * from './Impl';\nexport { beta } from './Beta';\n`,
|
||||
'packages/ui/src/components/Impl/Impl.ts': `export function alpha(s: string) { return s; }\n`,
|
||||
'packages/ui/src/components/Impl/Beta.ts': `export function beta(s: string) { return s; }\n`,
|
||||
}),
|
||||
).toEqual(['alpha', 'beta']);
|
||||
}, 60000);
|
||||
});
|
||||
203
gitnexus/test/integration/resolvers/barrel-workspace-hop.test.ts
Normal file
203
gitnexus/test/integration/resolvers/barrel-workspace-hop.test.ts
Normal file
|
|
@ -0,0 +1,203 @@
|
|||
/**
|
||||
* The workspace-package barrel hop.
|
||||
*
|
||||
* A call imported from a workspace package (`@x/ui`) resolves through the
|
||||
* package's `main`, through three re-export forms, and through a barrel chain
|
||||
* three levels deep; a call imported through a tsconfig `paths` alias resolves
|
||||
* too. Those resolutions are pinned here against regression, together with the
|
||||
* one shape the resolver must REFUSE: two `export *` sources publishing the
|
||||
* same name (a star-vs-star collision) is recorded as `reexport-ambiguous`
|
||||
* naming both candidates, and the name appears in the run's census.
|
||||
*/
|
||||
|
||||
import { describe, it, expect, beforeAll, afterAll } from 'vitest';
|
||||
import path from 'path';
|
||||
import fs from 'node:fs';
|
||||
import os from 'node:os';
|
||||
import {
|
||||
getRelationships,
|
||||
runPipelineFromRepo,
|
||||
writeFixtureRepo,
|
||||
type PipelineResult,
|
||||
} from './helpers.js';
|
||||
import { summarizeNameFallback } from '../../../src/core/ingestion/scope-resolution/name-fallback-summary.js';
|
||||
|
||||
describe('workspace-package barrel hop', () => {
|
||||
let result: PipelineResult;
|
||||
let repoDir: string | undefined;
|
||||
|
||||
beforeAll(async () => {
|
||||
repoDir = fs.mkdtempSync(path.join(os.tmpdir(), 'gn-ws1c-barrel-'));
|
||||
writeFixtureRepo(repoDir, {
|
||||
'package.json': '{ "name": "root", "private": true, "workspaces": ["packages/*"] }\n',
|
||||
'packages/ui/package.json':
|
||||
'{ "name": "@x/ui", "version": "1.0.0", "main": "src/index.ts" }\n',
|
||||
// Three re-export forms in one barrel, plus a nested barrel chain.
|
||||
'packages/ui/src/index.ts': `export { Button } from './components/Button/Button';
|
||||
export * from './components/Stack';
|
||||
export type { ButtonProps } from './components/Button/Button';
|
||||
export * from './themes';
|
||||
`,
|
||||
'packages/ui/src/components/Button/Button.tsx': `export interface ButtonProps { label: string }
|
||||
export function Button(props: ButtonProps) {
|
||||
return props.label;
|
||||
}
|
||||
`,
|
||||
'packages/ui/src/components/Stack/index.ts': `export * from './Stack';\n`,
|
||||
'packages/ui/src/components/Stack/Stack.tsx': `export function Stack(children: string) {
|
||||
return children;
|
||||
}
|
||||
`,
|
||||
// themes -> hooks -> useStyles2: three barrels deep.
|
||||
'packages/ui/src/themes/index.ts': `export * from './hooks';\n`,
|
||||
'packages/ui/src/themes/hooks/index.ts': `export * from './useStyles2';\n`,
|
||||
'packages/ui/src/themes/hooks/useStyles2.ts': `export function useStyles2(fn: (t: string) => string) {
|
||||
return fn('theme');
|
||||
}
|
||||
`,
|
||||
'packages/app/package.json':
|
||||
'{ "name": "@x/app", "version": "1.0.0", "main": "src/main.tsx", "dependencies": { "@x/ui": "1.0.0" } }\n',
|
||||
'packages/app/tsconfig.json': `{
|
||||
"compilerOptions": {
|
||||
"jsx": "react-jsx",
|
||||
"baseUrl": "src",
|
||||
"paths": { "app/core/*": ["core/*"] }
|
||||
}
|
||||
}
|
||||
`,
|
||||
'packages/app/src/core/utils/format.ts': `export function formatTitle(raw: string) {
|
||||
return raw.trim();
|
||||
}
|
||||
`,
|
||||
// Calls AND JSX through the same imported names.
|
||||
'packages/app/src/features/Panel.tsx': `import { Button, Stack, useStyles2 } from '@x/ui';
|
||||
import { formatTitle } from 'app/core/utils/format';
|
||||
|
||||
export function Panel() {
|
||||
const styles = useStyles2((t) => t);
|
||||
const title = formatTitle(' hi ');
|
||||
const label = Button({ label: title });
|
||||
const stacked = Stack(label);
|
||||
return <Stack><Button label={styles + stacked} /></Stack>;
|
||||
}
|
||||
`,
|
||||
});
|
||||
result = await runPipelineFromRepo(repoDir, () => {});
|
||||
}, 180000);
|
||||
|
||||
afterAll(() => {
|
||||
if (repoDir !== undefined) {
|
||||
fs.rmSync(repoDir, { recursive: true, force: true, maxRetries: 5, retryDelay: 50 });
|
||||
}
|
||||
});
|
||||
|
||||
it('resolves a call through the package barrel to its real definition file', () => {
|
||||
const edge = getRelationships(result, 'CALLS').find(
|
||||
(c) => c.source === 'Panel' && c.target === 'Button',
|
||||
);
|
||||
expect(edge?.targetFilePath).toBe('packages/ui/src/components/Button/Button.tsx');
|
||||
});
|
||||
|
||||
it('resolves through an `export *` re-export', () => {
|
||||
const edge = getRelationships(result, 'CALLS').find(
|
||||
(c) => c.source === 'Panel' && c.target === 'Stack',
|
||||
);
|
||||
expect(edge?.targetFilePath).toBe('packages/ui/src/components/Stack/Stack.tsx');
|
||||
});
|
||||
|
||||
it('resolves through a barrel chain three levels deep', () => {
|
||||
const edge = getRelationships(result, 'CALLS').find(
|
||||
(c) => c.source === 'Panel' && c.target === 'useStyles2',
|
||||
);
|
||||
expect(edge?.targetFilePath).toBe('packages/ui/src/themes/hooks/useStyles2.ts');
|
||||
});
|
||||
|
||||
it('resolves through a tsconfig `paths` alias', () => {
|
||||
const edge = getRelationships(result, 'CALLS').find(
|
||||
(c) => c.source === 'Panel' && c.target === 'formatTitle',
|
||||
);
|
||||
expect(edge?.targetFilePath).toBe('packages/app/src/core/utils/format.ts');
|
||||
});
|
||||
});
|
||||
|
||||
/**
|
||||
* `export * from './a'; export * from './b'` where both files declare `collide`
|
||||
* is ambiguous: the language names no winner (ECMAScript excludes the name from
|
||||
* the module's exports). The resolver used to pick the first-listed source and
|
||||
* publish the edge as `import-resolved` at 0.85 — a definite target for a call
|
||||
* that has none, the "incorrect context is worse than missing context" failure
|
||||
* in its purest form.
|
||||
*
|
||||
* Fixed in the shared finalize pass (`collectAmbiguousWildcards`): the name is
|
||||
* refused in BOTH places it used to win — the barrel's re-export closure and
|
||||
* the barrel's own wildcard-expanded module scope — and reported through
|
||||
* `FinalizeStats.ambiguousWildcardExports`, which the pipeline records as a
|
||||
* `reexport-ambiguous` resolution outcome. The importer stays unresolved —
|
||||
* a missing edge, never a wrong one.
|
||||
*/
|
||||
describe('ambiguous `export *` collision is refused, not guessed', () => {
|
||||
let result: PipelineResult;
|
||||
let repoDir: string | undefined;
|
||||
|
||||
beforeAll(async () => {
|
||||
repoDir = fs.mkdtempSync(path.join(os.tmpdir(), 'gn-ws1c-ambig-'));
|
||||
writeFixtureRepo(repoDir, {
|
||||
'package.json': '{ "name": "root", "private": true, "workspaces": ["packages/*"] }\n',
|
||||
'packages/ui/package.json':
|
||||
'{ "name": "@x/ui", "version": "1.0.0", "main": "src/index.ts" }\n',
|
||||
'packages/ui/src/index.ts': `export * from './a';\nexport * from './b';\nexport * from './c';\n`,
|
||||
'packages/ui/src/a.ts': `export function collide() { return 'a'; }\nexport function onlyA() { return 1; }\n`,
|
||||
'packages/ui/src/b.ts': `export function collide() { return 'b'; }\n`,
|
||||
'packages/ui/src/c.ts': `export function onlyC() { return 3; }\n`,
|
||||
'packages/app/package.json':
|
||||
'{ "name": "@x/app", "version": "1.0.0", "main": "src/m.ts", "dependencies": { "@x/ui": "1.0.0" } }\n',
|
||||
'packages/app/src/m.ts': `import { collide, onlyA, onlyC } from '@x/ui';
|
||||
export function useIt() { onlyA(); onlyC(); return collide(); }
|
||||
`,
|
||||
});
|
||||
result = await runPipelineFromRepo(repoDir, () => {});
|
||||
}, 180000);
|
||||
|
||||
afterAll(() => {
|
||||
if (repoDir !== undefined) {
|
||||
fs.rmSync(repoDir, { recursive: true, force: true, maxRetries: 5, retryDelay: 50 });
|
||||
}
|
||||
});
|
||||
|
||||
it('emits NO CALLS edge for the colliding name', () => {
|
||||
const edges = getRelationships(result, 'CALLS').filter(
|
||||
(c) => c.source === 'useIt' && c.target === 'collide',
|
||||
);
|
||||
expect(edges).toEqual([]);
|
||||
});
|
||||
|
||||
it('still resolves the names that do NOT collide through the same barrel', () => {
|
||||
const targets = getRelationships(result, 'CALLS')
|
||||
.filter((c) => c.source === 'useIt')
|
||||
.map((c) => c.target)
|
||||
.sort();
|
||||
expect(targets).toEqual(['onlyA', 'onlyC']);
|
||||
});
|
||||
|
||||
it('records the refusal as a `reexport-ambiguous` outcome naming both candidates', () => {
|
||||
const refused = result.resolutionOutcomes.filter(
|
||||
(o) => o.kind === 'reexport-ambiguous' && o.name === 'collide',
|
||||
);
|
||||
expect(refused).toHaveLength(1);
|
||||
const [outcome] = refused;
|
||||
expect(outcome!.kind === 'reexport-ambiguous' && outcome!.filePath).toBe(
|
||||
'packages/ui/src/index.ts',
|
||||
);
|
||||
expect(outcome!.kind === 'reexport-ambiguous' ? outcome!.candidateIds.length : 0).toBe(2);
|
||||
});
|
||||
|
||||
// The census persists the refused barrel name itself, not just a count. This
|
||||
// is the real star-vs-star collision the pipeline produced (not a hand-built
|
||||
// `ResolutionOutcome`), closing the loop from the `reexport-ambiguous`
|
||||
// outcome through to the persisted name list.
|
||||
it('the barrel census names the refused collision in `ambiguousReexportNames`', () => {
|
||||
const summary = summarizeNameFallback(result.resolutionOutcomes);
|
||||
expect(summary?.totalAmbiguousReexports).toBe(1);
|
||||
expect(summary?.ambiguousReexportNames).toEqual(['packages/ui/src/index.ts:collide']);
|
||||
});
|
||||
});
|
||||
|
|
@ -0,0 +1,140 @@
|
|||
/**
|
||||
* Go — external test packages (`package foo_test`) through the REAL pipeline
|
||||
* (tree-sitter extraction + import resolution + `populateGoPackageSiblings`),
|
||||
* not just the isolated `populateGoPackageSiblings` unit in
|
||||
* `test/unit/scope-resolution/go/go-test-file-siblings.test.ts`.
|
||||
*
|
||||
* The fix (`gitnexus/src/core/ingestion/languages/go/package-siblings.ts`):
|
||||
* an external test package (`package foo_test`, e.g. `a_ext_test.go`) no
|
||||
* longer gets BARE-name sibling bindings from `foo` at all — Go itself
|
||||
* requires `foo.NewThing`, not `NewThing()`, inside `package foo_test`. The
|
||||
* QUALIFIED form still resolves — it was never routed through
|
||||
* `populateGoPackageSiblings` in the first place, it goes through the
|
||||
* ordinary import resolver (`import "…/pkg"` + a member call), which this
|
||||
* fix does not touch.
|
||||
*
|
||||
* Also pins: an INTERNAL test file (`package foo`, e.g. `a_test.go`) keeps
|
||||
* its bare-name sibling bindings (unchanged).
|
||||
*
|
||||
* The same boundary is enforced on the heuristic channel too (#3190, not
|
||||
* this commit): the Go name-fallback hook classifies files by package
|
||||
* (internal test / external `foo_test` / non-test), not by directory, so
|
||||
* neither binding gets even a 0.5-confidence `global-name-fallback` edge
|
||||
* (asserted at the bottom).
|
||||
*/
|
||||
import { describe, it, expect, beforeAll } from 'vitest';
|
||||
import fs from 'node:fs';
|
||||
import os from 'node:os';
|
||||
import path from 'node:path';
|
||||
import { getRelationships, writeFixtureRepo, type PipelineResult } from './helpers.js';
|
||||
import { runPipelineFromRepo } from '../../../src/core/ingestion/pipeline.js';
|
||||
|
||||
describe('Go external vs internal test packages — qualified vs bare NewThing (real pipeline)', () => {
|
||||
let result: PipelineResult;
|
||||
let dir: string;
|
||||
|
||||
beforeAll(async () => {
|
||||
dir = fs.mkdtempSync(path.join(os.tmpdir(), 'gn-go-exttest-'));
|
||||
writeFixtureRepo(dir, {
|
||||
'go.mod': 'module example.com/extpkg\n\ngo 1.21\n',
|
||||
'pkg/a.go': [
|
||||
'package a',
|
||||
'',
|
||||
'func NewThing() int {',
|
||||
'\treturn 1',
|
||||
'}',
|
||||
'',
|
||||
'func UsesTestHelper() int {',
|
||||
'\treturn onlyInInternalTest()',
|
||||
'}',
|
||||
'',
|
||||
].join('\n'),
|
||||
// Internal test: same package (`a`). Bare `NewThing()` and a
|
||||
// test-only declaration other internal-test files can see.
|
||||
'pkg/a_test.go': [
|
||||
'package a',
|
||||
'',
|
||||
'func onlyInInternalTest() int {',
|
||||
'\treturn 2',
|
||||
'}',
|
||||
'',
|
||||
'func CallBareFromInternalTest() int {',
|
||||
'\treturn NewThing()',
|
||||
'}',
|
||||
'',
|
||||
].join('\n'),
|
||||
// External test: `package a_test`, a DIFFERENT package that must
|
||||
// import `pkg` explicitly to reach it — exactly like any other
|
||||
// consumer of the package.
|
||||
'pkg/a_ext_test.go': [
|
||||
'package a_test',
|
||||
'',
|
||||
'import "example.com/extpkg/pkg"',
|
||||
'',
|
||||
'func CallQualifiedFromExternalTest() int {',
|
||||
'\treturn pkg.NewThing()',
|
||||
'}',
|
||||
'',
|
||||
'func CallBareFromExternalTest() int {',
|
||||
'\treturn NewThing()',
|
||||
'}',
|
||||
'',
|
||||
].join('\n'),
|
||||
});
|
||||
result = await runPipelineFromRepo(dir, () => {});
|
||||
}, 60000);
|
||||
|
||||
it('an internal test file (still package `a`) resolves the bare call — unchanged behavior', () => {
|
||||
const edges = getRelationships(result, 'CALLS').filter(
|
||||
(e) => e.source === 'CallBareFromInternalTest',
|
||||
);
|
||||
expect(edges.map((e) => e.target)).toEqual(['NewThing']);
|
||||
// Confident — no heuristic-fallback reason on this edge.
|
||||
expect(edges[0]!.rel.reason).not.toBe('global-name-fallback');
|
||||
});
|
||||
|
||||
it('an external test package resolves the QUALIFIED call (pkg.NewThing) through the ordinary import resolver', () => {
|
||||
const edges = getRelationships(result, 'CALLS').filter(
|
||||
(e) => e.source === 'CallQualifiedFromExternalTest',
|
||||
);
|
||||
expect(edges.map((e) => e.target)).toEqual(['NewThing']);
|
||||
expect(edges[0]!.rel.reason).not.toBe('global-name-fallback');
|
||||
});
|
||||
|
||||
it("an external test package does NOT get a CONFIDENT bare-name edge from `foo`'s package-sibling channel", () => {
|
||||
const edges = getRelationships(result, 'CALLS').filter(
|
||||
(e) => e.source === 'CallBareFromExternalTest',
|
||||
);
|
||||
const toNewThing = edges.filter((e) => e.target === 'NewThing');
|
||||
// No binding at all: the confident package-sibling channel refuses the
|
||||
// cross-package bare name, and the name-fallback hook refuses it too.
|
||||
expect(toNewThing).toEqual([]);
|
||||
});
|
||||
|
||||
it('a non-test file gets NO edge to a test-only declaration — confident or heuristic', () => {
|
||||
const edges = getRelationships(result, 'CALLS').filter((e) => e.source === 'UsesTestHelper');
|
||||
const toHelper = edges.filter((e) => e.target === 'onlyInInternalTest');
|
||||
expect(toHelper).toEqual([]);
|
||||
});
|
||||
|
||||
/**
|
||||
* Regression guard for the name-fallback channel. `goIsGlobalNameFallbackPlausible`
|
||||
* once treated "same directory" as "same package"; a directory can hold three Go
|
||||
* packages at once (`foo`, external `foo_test`, and `foo`'s own `_test.go` files),
|
||||
* so both bindings below used to come back as 0.5-confidence `global-name-fallback`
|
||||
* edges. The hook now classifies caller and candidate by package (via the package
|
||||
* clause when sources are available) and refuses non-test → test-only and bare
|
||||
* cross-package names outright. The two tests below pin "no edge at all".
|
||||
*/
|
||||
it('a non-test file calling a test-only helper by bare name should get NO edge at all, not even a heuristic one', () => {
|
||||
const edges = getRelationships(result, 'CALLS').filter((e) => e.source === 'UsesTestHelper');
|
||||
expect(edges.map((e) => e.target)).not.toContain('onlyInInternalTest');
|
||||
});
|
||||
|
||||
it("an external test package's bare NewThing() should get NO edge at all — Go rejects the call outright, so no confidence tier should bind it", () => {
|
||||
const edges = getRelationships(result, 'CALLS').filter(
|
||||
(e) => e.source === 'CallBareFromExternalTest',
|
||||
);
|
||||
expect(edges.map((e) => e.target)).not.toContain('NewThing');
|
||||
});
|
||||
});
|
||||
207
gitnexus/test/integration/resolvers/name-fallback-edges.test.ts
Normal file
207
gitnexus/test/integration/resolvers/name-fallback-edges.test.ts
Normal file
|
|
@ -0,0 +1,207 @@
|
|||
/**
|
||||
* End-to-end behaviour of the global-name fallback after WS1-A.
|
||||
*
|
||||
* Two things used to be true at once and both were wrong:
|
||||
*
|
||||
* 1. A call to a name that happens to be unique in the repository acquired a
|
||||
* CALLS edge even when the language forbids the call outright — Go's
|
||||
* unexported identifiers being the clearest case.
|
||||
* 2. Every such edge was emitted with `confidence: 0.85` and
|
||||
* `reason: 'import-resolved'`, i.e. spelled exactly like an edge a real
|
||||
* import produced, so no consumer could discount it.
|
||||
*
|
||||
* These tests pin both. The Go arm proves the impossible edge is now REFUSED,
|
||||
* with a same-file call confirming ordinary local resolution is preserved.
|
||||
* That control does not exercise the global-name tier. The Ruby arm proves a
|
||||
* surviving guess is LABELED, since Ruby deliberately keeps the tier for
|
||||
* autoload. The last test is the regression that matters most: no edge from
|
||||
* this tier may ever again carry `import-resolved`.
|
||||
*/
|
||||
|
||||
import { describe, it, expect, beforeAll, afterAll } from 'vitest';
|
||||
import path from 'path';
|
||||
import fs from 'node:fs';
|
||||
import os from 'node:os';
|
||||
import {
|
||||
getRelationships,
|
||||
getResolutionOutcomes,
|
||||
runPipelineFromRepo,
|
||||
writeFixtureRepo,
|
||||
type PipelineResult,
|
||||
} from './helpers.js';
|
||||
import { GLOBAL_NAME_FALLBACK_REASON } from '../../../src/core/graph/edge-reasons.js';
|
||||
|
||||
const rmRepo = (dir: string | undefined): void => {
|
||||
if (dir !== undefined) {
|
||||
fs.rmSync(dir, { recursive: true, force: true, maxRetries: 5, retryDelay: 50 });
|
||||
}
|
||||
};
|
||||
|
||||
describe('Go: an unexported identifier is not callable from another package', () => {
|
||||
let result: PipelineResult;
|
||||
let repoDir: string | undefined;
|
||||
|
||||
beforeAll(async () => {
|
||||
repoDir = fs.mkdtempSync(path.join(os.tmpdir(), 'gn-ws1-go-fallback-'));
|
||||
writeFixtureRepo(repoDir, {
|
||||
'go.mod': 'module example.com/mod\n\ngo 1.22\n',
|
||||
// Package `a` owns `uniqueHelperXyz`. The name is unique repo-wide, which
|
||||
// is the ONLY reason the old fallback matched it from package `b`.
|
||||
'a/helper.go': `package a
|
||||
|
||||
func uniqueHelperXyz() int {
|
||||
return 41
|
||||
}
|
||||
|
||||
func UseItLocally() int {
|
||||
return uniqueHelperXyz() + 1
|
||||
}
|
||||
`,
|
||||
// Package `b` cannot see `uniqueHelperXyz` under any spelling: Go's
|
||||
// lower-case initial makes it package-private, so no import helps.
|
||||
'b/caller.go': `package b
|
||||
|
||||
func CallItRemotely() int {
|
||||
return uniqueHelperXyz() + 1
|
||||
}
|
||||
`,
|
||||
});
|
||||
result = await runPipelineFromRepo(repoDir, () => {});
|
||||
}, 120000);
|
||||
|
||||
afterAll(() => rmRepo(repoDir));
|
||||
|
||||
it('keeps ordinary same-file resolution as a control', () => {
|
||||
const calls = getRelationships(result, 'CALLS');
|
||||
const local = calls.find((c) => c.source === 'UseItLocally' && c.target === 'uniqueHelperXyz');
|
||||
expect(local).toBeDefined();
|
||||
expect(local!.rel.reason).not.toBe(GLOBAL_NAME_FALLBACK_REASON);
|
||||
});
|
||||
|
||||
it('emits NO caller edge from the other package', () => {
|
||||
const calls = getRelationships(result, 'CALLS');
|
||||
const crossPackage = calls.filter(
|
||||
(c) => c.source === 'CallItRemotely' && c.target === 'uniqueHelperXyz',
|
||||
);
|
||||
expect(crossPackage).toEqual([]);
|
||||
});
|
||||
|
||||
it('records the drop as a refusal rather than losing it silently', () => {
|
||||
const refusals = getResolutionOutcomes(result).filter(
|
||||
(o) => o.kind === 'fallback-refused' && o.name === 'uniqueHelperXyz',
|
||||
);
|
||||
expect(refusals.length).toBeGreaterThan(0);
|
||||
expect(refusals.every((o) => o.kind === 'fallback-refused' && o.language === 'go')).toBe(true);
|
||||
});
|
||||
|
||||
it('lists no cross-package caller for the unexported helper at all', () => {
|
||||
// The shape an `impact --direction upstream` answer is built from: every
|
||||
// CALLS edge whose target is the helper. Package `b` must not appear.
|
||||
const callers = getRelationships(result, 'CALLS')
|
||||
.filter((c) => c.target === 'uniqueHelperXyz')
|
||||
.map((c) => c.sourceFilePath);
|
||||
expect(callers.some((filePath) => filePath.includes('b/caller.go'))).toBe(false);
|
||||
expect(callers.some((filePath) => filePath.includes('a/helper.go'))).toBe(true);
|
||||
});
|
||||
});
|
||||
|
||||
describe('Go/JS: constructor-form unique-name guesses are labeled, not import-resolved', () => {
|
||||
it('refuses an unexported Go composite literal from another package', async () => {
|
||||
const repoDir = fs.mkdtempSync(path.join(os.tmpdir(), 'gn-ws1-go-ctor-'));
|
||||
try {
|
||||
writeFixtureRepo(repoDir, {
|
||||
'go.mod': 'module example.com/mod\n\ngo 1.22\n',
|
||||
'a/t.go': `package a
|
||||
|
||||
type uniqueWidget struct{}
|
||||
`,
|
||||
'b/c.go': `package b
|
||||
|
||||
func F() { _ = uniqueWidget{} }
|
||||
`,
|
||||
});
|
||||
const result = await runPipelineFromRepo(repoDir, () => {});
|
||||
const cross = getRelationships(result, 'CALLS').filter(
|
||||
(c) => c.source === 'F' && c.target === 'uniqueWidget',
|
||||
);
|
||||
expect(cross).toEqual([]);
|
||||
const refusals = getResolutionOutcomes(result).filter(
|
||||
(o) => o.kind === 'fallback-refused' && o.name === 'uniqueWidget',
|
||||
);
|
||||
expect(refusals.length).toBeGreaterThan(0);
|
||||
} finally {
|
||||
rmRepo(repoDir);
|
||||
}
|
||||
}, 120000);
|
||||
|
||||
it('labels a JS `new UniqueWidget()` guess instead of import-resolved', async () => {
|
||||
const repoDir = fs.mkdtempSync(path.join(os.tmpdir(), 'gn-ws1-js-ctor-'));
|
||||
try {
|
||||
writeFixtureRepo(repoDir, {
|
||||
'package.json': '{ "name": "ctor-fallback", "private": true }\n',
|
||||
'b/widget.js': `export class UniqueWidget {}\n`,
|
||||
'a/consumer.js': `export function make() { return new UniqueWidget(); }\n`,
|
||||
});
|
||||
const result = await runPipelineFromRepo(repoDir, () => {});
|
||||
const edge = getRelationships(result, 'CALLS').find(
|
||||
(c) => c.source === 'make' && c.target === 'UniqueWidget',
|
||||
);
|
||||
expect(edge).toBeDefined();
|
||||
expect(edge!.rel.reason).toBe(GLOBAL_NAME_FALLBACK_REASON);
|
||||
expect(edge!.rel.confidence).toBe(0.5);
|
||||
} finally {
|
||||
rmRepo(repoDir);
|
||||
}
|
||||
}, 120000);
|
||||
});
|
||||
|
||||
describe('Ruby: a surviving name guess is labeled as a guess', () => {
|
||||
let result: PipelineResult;
|
||||
let repoDir: string | undefined;
|
||||
|
||||
beforeAll(async () => {
|
||||
repoDir = fs.mkdtempSync(path.join(os.tmpdir(), 'gn-ws1-ruby-fallback-'));
|
||||
writeFixtureRepo(repoDir, {
|
||||
// A top-level method in one file, called from another with no `require` —
|
||||
// the autoload shape Ruby keeps the fallback for. The edge is a guess and
|
||||
// is allowed to exist, but it must say so.
|
||||
'app/a.rb': `def unique_helper_xyz
|
||||
41
|
||||
end
|
||||
`,
|
||||
'app/b.rb': `def call_it
|
||||
unique_helper_xyz()
|
||||
end
|
||||
`,
|
||||
});
|
||||
result = await runPipelineFromRepo(repoDir, () => {});
|
||||
}, 120000);
|
||||
|
||||
afterAll(() => rmRepo(repoDir));
|
||||
|
||||
it('emits the edge with the guess reason and 0.5 confidence', () => {
|
||||
const edge = getRelationships(result, 'CALLS').find(
|
||||
(c) => c.source === 'call_it' && c.target === 'unique_helper_xyz',
|
||||
);
|
||||
expect(edge).toBeDefined();
|
||||
expect(edge!.rel.reason).toBe(GLOBAL_NAME_FALLBACK_REASON);
|
||||
expect(edge!.rel.confidence).toBe(0.5);
|
||||
});
|
||||
|
||||
it('counts the guess so a reader can see how much of the graph is guessed', () => {
|
||||
const guesses = getResolutionOutcomes(result).filter(
|
||||
(o) => o.kind === 'fallback-guessed' && o.name === 'unique_helper_xyz',
|
||||
);
|
||||
expect(guesses.length).toBeGreaterThan(0);
|
||||
expect(guesses.every((o) => o.kind === 'fallback-guessed' && o.language === 'ruby')).toBe(true);
|
||||
});
|
||||
|
||||
it('REGRESSION: no guessed edge is spelled like an import-resolved one', () => {
|
||||
// The specific lie this work removed. Asserted over the whole graph, not
|
||||
// just the one edge, so a future emitter cannot reintroduce it elsewhere.
|
||||
const mislabeled = getRelationships(result, 'CALLS').filter(
|
||||
(c) => c.rel.reason === 'import-resolved',
|
||||
);
|
||||
expect(mislabeled).toEqual([]);
|
||||
});
|
||||
});
|
||||
|
|
@ -0,0 +1,73 @@
|
|||
import { describe, expect, it } from 'vitest';
|
||||
import fs from 'node:fs';
|
||||
import os from 'node:os';
|
||||
import path from 'node:path';
|
||||
import { getRelationships, runPipelineFromRepo, writeFixtureRepo } from './helpers.js';
|
||||
|
||||
async function callsFor(
|
||||
source: string,
|
||||
targetSource = 'pub fn uniqueScopeHelper() {}\n',
|
||||
targetName = 'uniqueScopeHelper',
|
||||
) {
|
||||
const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'gn-rust-import-scope-'));
|
||||
try {
|
||||
writeFixtureRepo(dir, {
|
||||
'Cargo.toml': '[package]\nname = "scope-test"\nversion = "0.1.0"\nedition = "2021"\n',
|
||||
'src/lib.rs': source,
|
||||
'src/target.rs': targetSource,
|
||||
});
|
||||
const result = await runPipelineFromRepo(dir, () => {});
|
||||
return getRelationships(result, 'CALLS').filter((edge) => edge.target === targetName);
|
||||
} finally {
|
||||
fs.rmSync(dir, { recursive: true, force: true, maxRetries: 5, retryDelay: 50 });
|
||||
}
|
||||
}
|
||||
|
||||
describe('Rust import scope through full ingestion', () => {
|
||||
it('preserves method calls on the result of a function-local imported factory', async () => {
|
||||
const calls = await callsFor(
|
||||
`
|
||||
mod target;
|
||||
pub fn allowed() {
|
||||
use crate::target::make_user;
|
||||
let user = make_user();
|
||||
user.save();
|
||||
}
|
||||
`,
|
||||
'pub struct User {}\nimpl User { pub fn save(&self) {} }\npub fn make_user() -> User { User {} }\n',
|
||||
'save',
|
||||
);
|
||||
expect(calls.filter((edge) => edge.source === 'allowed')).toHaveLength(1);
|
||||
});
|
||||
|
||||
it('an import in one inline module cannot bind or authorize calls in its sibling', async () => {
|
||||
const calls = await callsFor(`
|
||||
mod target;
|
||||
mod importing {
|
||||
use crate::target::uniqueScopeHelper;
|
||||
pub fn allowed() { uniqueScopeHelper(); }
|
||||
}
|
||||
mod sibling {
|
||||
pub fn denied() { uniqueScopeHelper(); }
|
||||
}
|
||||
`);
|
||||
expect(calls.filter((edge) => edge.source === 'allowed')).toHaveLength(1);
|
||||
expect(calls.filter((edge) => edge.source === 'allowed')[0]!.rel.reason).toBe(
|
||||
'import-resolved',
|
||||
);
|
||||
expect(calls.filter((edge) => edge.source === 'denied')).toEqual([]);
|
||||
});
|
||||
|
||||
it('function-local alias imports remain usable inside that function, not its sibling', async () => {
|
||||
const calls = await callsFor(`
|
||||
mod target;
|
||||
pub fn allowed() {
|
||||
use crate::target::uniqueScopeHelper as localHelper;
|
||||
localHelper();
|
||||
}
|
||||
pub fn denied() { localHelper(); }
|
||||
`);
|
||||
expect(calls.filter((edge) => edge.source === 'allowed')).toHaveLength(1);
|
||||
expect(calls.filter((edge) => edge.source === 'denied')).toEqual([]);
|
||||
});
|
||||
});
|
||||
|
|
@ -229,6 +229,328 @@ describe.skipIf(!zigAvailable)('Zig idioms (zig-idioms fixture)', () => {
|
|||
expect(calls).toContain('main → incr');
|
||||
});
|
||||
|
||||
/**
|
||||
* #3399 — a callable named in VALUE position.
|
||||
*
|
||||
* `src/webapi/Element.zig` is the JS-API binding-table idiom verbatim:
|
||||
* `pub const namespaceURI = bridge.accessor(Element.getNamespaceUri, null, .{});`
|
||||
* registers a Zig function with the JS bridge instead of calling it. Zig
|
||||
* emitted NO `value-ref` capture at all, so every one of those references was
|
||||
* dropped — 2,047 of them across 257 files in lightpanda-io/browser, the whole
|
||||
* JS<->Zig surface — and `impact` on a public DOM accessor answered with its
|
||||
* two in-file callers and the verdict `epistemic: "exact"`.
|
||||
*
|
||||
* These assert USES and not CALLS on purpose. A registration is not an
|
||||
* invocation (Kythe `ref` vs `ref/call`; Joern METHOD_REF), and the call that
|
||||
* eventually happens goes through comptime reflection this analyzer cannot
|
||||
* follow. The claim being pinned is the reference, not the dispatch.
|
||||
*/
|
||||
describe('callable values (#3399)', () => {
|
||||
let uses: string[];
|
||||
let valueRefs: string[];
|
||||
let valueRefTargetIds: string[];
|
||||
beforeAll(() => {
|
||||
const edges = getRelationships(result, 'USES');
|
||||
uses = edgeSet(edges);
|
||||
valueRefTargetIds = edges
|
||||
.filter((e) => e.rel.reason === 'scope-resolution: value-ref')
|
||||
.map((e) => e.rel.targetId)
|
||||
.sort();
|
||||
// The reason text is spelled out rather than imported from
|
||||
// `VALUE_REF_EDGE_REASON`, deliberately and as `typescript-value-refs.test.ts`
|
||||
// already does: `impact`'s epistemic probe matches this exact string in
|
||||
// the stored graph, so a change to the constant's VALUE (as opposed to
|
||||
// its name) must fail a test rather than quietly agree with itself on
|
||||
// both sides.
|
||||
valueRefs = edgeSet(edges.filter((e) => e.rel.reason === 'scope-resolution: value-ref'));
|
||||
});
|
||||
|
||||
it('records a QUALIFIED function value handed to a call (`bridge.accessor(Element.getNamespaceUri, …)`)', () => {
|
||||
expect(valueRefs).toContain('JsApi → getNamespaceUri');
|
||||
});
|
||||
|
||||
it('records a BARE function value handed to a call (`bridge.accessor(_tagName, …)`)', () => {
|
||||
expect(valueRefs).toContain('JsApi → _tagName');
|
||||
});
|
||||
|
||||
it('records a function value in a const initialiser (`pub const defaultHandler = onReset;`)', () => {
|
||||
expect(valueRefs).toContain('Element → onReset');
|
||||
});
|
||||
|
||||
it('records a function passed into a `comptime f: anytype` parameter and stored', () => {
|
||||
// The shape the non-goal is about: `register(onTick)` stores the value in
|
||||
// a module-level field and nothing in the file ever calls `onTick`. The
|
||||
// terminal invoke needs comptime evaluation and is NOT modelled — but the
|
||||
// reference must survive, or `onTick` reads as dead code.
|
||||
expect(valueRefs).toContain('boot → onTick');
|
||||
expect(calls).not.toContain('boot → onTick');
|
||||
});
|
||||
|
||||
it('emits USES, never CALLS, for a registration', () => {
|
||||
// The whole distinction: if these became CALLS, `impact` would claim the
|
||||
// accessor is invoked from the binding table, which is not a fact the
|
||||
// analyzer has.
|
||||
expect(calls).not.toContain('JsApi → getNamespaceUri');
|
||||
expect(calls).not.toContain('JsApi → _tagName');
|
||||
});
|
||||
|
||||
it('does not mint a value reference for a non-callable argument', () => {
|
||||
// `Bridge(Element)` passes a TYPE. The property-dispatch pass keeps only
|
||||
// Function/Method/Constructor targets, which is what makes the broad
|
||||
// capture rules safe — the same gate that stops TypeScript's
|
||||
// `{ port: DEFAULT_PORT }` from registering anything.
|
||||
expect(valueRefs).not.toContain('JsApi → Element');
|
||||
expect(uses.filter((u) => u === 'JsApi → Element')).toHaveLength(0);
|
||||
});
|
||||
|
||||
it('leaves a method that is only ever CALLED untouched', () => {
|
||||
// The control. `getTagNameLower` is called twice and registered nowhere;
|
||||
// a change that sprayed USES edges over every method would satisfy every
|
||||
// assertion above and still be wrong.
|
||||
expect(calls).toContain('describe → getTagNameLower');
|
||||
expect(calls).toContain('_tagName → getTagNameLower');
|
||||
expect(valueRefs.filter((v) => v.endsWith(' → getTagNameLower'))).toEqual([]);
|
||||
});
|
||||
|
||||
it('binds a QUALIFIED reference to the owner that was written, not the nearest lexical match', () => {
|
||||
// `JsApi` declares its own `getLocalName` next to
|
||||
// `bridge.accessor(Element.getLocalName, …)`. `walkScopeChain` gives that
|
||||
// local binding precedence, so resolving the registration by tail name
|
||||
// alone attaches it to the SIBLING — a confidently wrong edge, which is a
|
||||
// worse failure than the missing edge this whole change is about. The
|
||||
// written receiver is the only thing that tells them apart.
|
||||
const local = valueRefTargetIds.filter((id) => id.endsWith('.getLocalName#0'));
|
||||
expect(local).toEqual(['Method:src/webapi/Element.zig:Element.getLocalName#0']);
|
||||
expect(local).not.toContain('Method:src/webapi/Element.zig:JsApi.getLocalName#0');
|
||||
});
|
||||
|
||||
it('declines a qualified reference whose receiver cannot be resolved', () => {
|
||||
// `bridge.accessor(unresolvable_ns.tick, …)` names an owner this index
|
||||
// does not have, while a file-level `tick` sits in the lexical chain
|
||||
// waiting to be mis-bound. Emitting nothing is the safe direction, but be
|
||||
// exact about what it buys: no edge means no evidence, and `impact` on
|
||||
// `tick` therefore stays `epistemic: "exact"` — this decline costs the
|
||||
// reference AND the hedge. It is still the right trade, because the
|
||||
// alternative is a confident edge to a function the source did not name,
|
||||
// and a wrong edge is worse than a missing one. See
|
||||
// `resolveValueRefTarget`'s docstring for the same distinction, and the
|
||||
// module-owner case below for the half of it that IS recoverable.
|
||||
expect(valueRefTargetIds.filter((id) => id.includes('.tick#'))).toEqual([]);
|
||||
expect(valueRefs).not.toContain('JsApi → tick');
|
||||
});
|
||||
|
||||
it('records a QUALIFIED function value owned by a MODULE, not a container (`bridge.accessor(dom_utils.compare, …)`)', () => {
|
||||
// `dom_utils` is a namespace-only file — no `@This()`, so no container
|
||||
// symbol to look the member up on. Resolving only through class-like
|
||||
// owners declines here, and a decline is SILENT: with no USES edge the
|
||||
// boundary probe measures a real zero and `impact` on `compare` goes back
|
||||
// to `epistemic: "exact"`, which is the defect, not a conservative answer.
|
||||
// The member-CALL path already resolves `dom_utils.compare()` through the
|
||||
// file's namespace import; the registration reads the same channel.
|
||||
expect(valueRefs).toContain('JsApi → compare');
|
||||
// And it must be dom_utils.zig's `compare`, not `decoy.zig`'s. That file
|
||||
// declares a CONTAINER also called `dom_utils`, with its own `compare`,
|
||||
// and `Element.zig` never imports it. `findClassBindingInScope` does not
|
||||
// stop at the scope chain: a namespace handle binds a Module, so the
|
||||
// `isClassLike` walk misses and its workspace-wide `qualifiedNames`
|
||||
// fallback answers with that unique container — preempting the `@import`
|
||||
// this very file wrote. The written import has to outrank a global guess.
|
||||
expect(valueRefTargetIds.filter((id) => id.includes('compare'))).toEqual([
|
||||
'Function:src/webapi/dom_utils.zig:compare',
|
||||
]);
|
||||
});
|
||||
|
||||
it('resolves a value reference through a HUB the same way a call through it resolves', () => {
|
||||
// `hub.zig` declares nothing: every name it publishes it imported
|
||||
// (`pub const normalize = @import("dom_utils.zig").normalize;`). That is
|
||||
// the shape `ScopeResolver.namespaceExportsIncludeImportedNames` exists
|
||||
// for, and `receiver-bound-calls` honours it — so `hub.scale(v)`
|
||||
// resolves. Accepting only locally-declared members here would make
|
||||
// `bridge.accessor(hub.scale, …)` decline, and one name would mean
|
||||
// two different things depending on whether a `(` followed it.
|
||||
expect(calls).toContain('callsThroughTheHub → scale');
|
||||
expect(valueRefs).toContain('JsApi → scale');
|
||||
expect(valueRefTargetIds.filter((id) => id.includes('scale'))).toEqual([
|
||||
'Function:src/webapi/dom_utils.zig:scale',
|
||||
]);
|
||||
});
|
||||
|
||||
it('applies the callable gate through a HUB too', () => {
|
||||
expect(valueRefs).not.toContain('JsApi → DEFAULT_NS');
|
||||
});
|
||||
|
||||
it('applies the callable gate to a MODULE owner too', () => {
|
||||
// `dom_utils.DEFAULT_NS` is a module-scope constant. Widening the owner
|
||||
// channel must not widen what counts as a registration, or every
|
||||
// `bridge.accessor(mod.SOME_CONST, …)` in a binding table starts claiming
|
||||
// a callable was registered.
|
||||
expect(valueRefs).not.toContain('JsApi → DEFAULT_NS');
|
||||
expect(valueRefTargetIds.filter((id) => id.includes('DEFAULT_NS'))).toEqual([]);
|
||||
});
|
||||
|
||||
it('declines a module-qualified reference whose handle is locally shadowed', () => {
|
||||
// `shadowsTheModuleHandle(dom_utils: u8)` names a PARAMETER, not the
|
||||
// file-level `@import`. Reading through the import here would attach the
|
||||
// registration to a module this site never named — the same wrong-edge
|
||||
// failure `isNamespaceNameShadowed` prevents on the member-call path, and
|
||||
// the reason the module channel is guarded rather than merely added.
|
||||
expect(valueRefs).not.toContain('shadowsTheModuleHandle → normalize');
|
||||
expect(valueRefTargetIds.filter((id) => id.includes('normalize'))).toEqual([]);
|
||||
});
|
||||
|
||||
it('declines a container-qualified reference whose owner name is locally shadowed', () => {
|
||||
// `shadowsAContainerName(Ticker: u8)` names a PARAMETER. This file neither
|
||||
// declares nor imports `Ticker.zig`'s container, so
|
||||
// `findClassBindingInScope` walks past the parameter (it filters by
|
||||
// `isClassLike`) and its qualified-name fallback answers with the unique
|
||||
// workspace `Ticker` — a struct the source never named at this site.
|
||||
// Verified to emit `shadowsAContainerName → fire` without the guard.
|
||||
expect(valueRefs).not.toContain('shadowsAContainerName → fire');
|
||||
expect(valueRefTargetIds.filter((id) => id.includes('Ticker'))).toEqual([]);
|
||||
});
|
||||
|
||||
it('still binds a reference whose container IS the local declaration', () => {
|
||||
// `registersALocalContainer` declares `Local` in its own body and registers
|
||||
// `Local.go`. The shadow guard above must exempt the container it just
|
||||
// resolved, or the nearer binding — which is that container — reads as its
|
||||
// own shadow and every function-local registry stops registering.
|
||||
expect(valueRefs).toContain('registersALocalContainer → go');
|
||||
});
|
||||
|
||||
it('declines a container-qualified reference shadowed at MODULE scope', () => {
|
||||
// `Element.zig` binds `Gauge` at module scope to something that is NOT a
|
||||
// container, and never imports `Gauge.zig`, which declares one. The class
|
||||
// walk filters by `isClassLike`, steps over that binding, and its
|
||||
// workspace-wide qualified-name fallback answers with the other file's
|
||||
// struct. The shadow guard has to inspect the MODULE scope to catch it —
|
||||
// stopping one rung short, as it did, permitted precisely this case.
|
||||
//
|
||||
// The binding is an IMPORT (`const Gauge = @import("dom_utils.zig").DEFAULT_NS;`),
|
||||
// not a local `const Gauge: u8 = 3;`, and that is the difference between a
|
||||
// live case and a self-defeating one: a local declaration would ALSO claim
|
||||
// the workspace qualified name `Gauge`, leaving two candidates, and the
|
||||
// fallback refuses to guess between two — so the case this test exists for
|
||||
// would never be reached. See the fixture's own note at `Element.zig:30-35`.
|
||||
expect(valueRefs).not.toContain('JsApi → read');
|
||||
expect(valueRefTargetIds.filter((id) => id.includes('Gauge'))).toEqual([]);
|
||||
});
|
||||
|
||||
it('declines a namespace member the written module does not have, rather than reaching a same-named container', () => {
|
||||
// The fall-through the channel order creates, and the guard that closes
|
||||
// it. `dom_utils` IS a namespace import here, but `dom_utils.zig` has no
|
||||
// `onlyOnDecoy`, so the namespace channel declines — and declining is not
|
||||
// the end: `findClassBindingInScope` runs next, its `isClassLike` walk
|
||||
// misses (an import binds a Module), and its WORKSPACE-WIDE
|
||||
// `qualifiedNames` fallback answers with `decoy.zig`'s same-named struct,
|
||||
// which does declare `onlyOnDecoy`. Only `isOwnerNameShadowedBySomethingElse`
|
||||
// stands between that and a confident edge into a file this one never
|
||||
// imported — the wrong-edge failure, arriving through the container
|
||||
// channel after the namespace channel said no.
|
||||
expect(valueRefs).not.toContain('JsApi → onlyOnDecoy');
|
||||
expect(valueRefTargetIds.filter((id) => id.includes('onlyOnDecoy'))).toEqual([]);
|
||||
});
|
||||
|
||||
it('does not mint a value reference for the CALLEE of an ordinary call', () => {
|
||||
// `register(onTick)` must produce ONE value reference (the argument), not
|
||||
// two: without binding the callee to the `function:` field the same rule
|
||||
// also matches `register` itself and every call in the repo would emit a
|
||||
// USES edge shadowing its own CALLS edge.
|
||||
expect(valueRefs).not.toContain('boot → register');
|
||||
expect(calls).toContain('boot → register');
|
||||
});
|
||||
});
|
||||
|
||||
/**
|
||||
* `@This()` aliases (#3219 review round 8).
|
||||
*
|
||||
* `@This()` IS the enclosing container, and `const Self = @This();` is how
|
||||
* most Zig files say so. The container itself is minted under the FILE STEM,
|
||||
* and the alias bound nothing class-like — a file-level alias mints no Const
|
||||
* at all, a container-level one mints a Variable that every `isClassLike`
|
||||
* walk steps over — so `Self.member` resolved to nothing at all: not a wrong
|
||||
* edge, no edge. On the corpora at hand that is 302 `Alias.member`
|
||||
* references (ghostty 73 files, tigerbeetle 93, mach 8), 96 of them calls.
|
||||
*
|
||||
* `bindZigThisAliases` binds the alias name to its container in the
|
||||
* post-finalize augmentation channel, so a compiler's answer and this
|
||||
* index's answer agree. Both spellings of the alias are exercised:
|
||||
* `Widget.zig`'s file-level `Self` and `Metrics`' container-level `Me`.
|
||||
*/
|
||||
describe('@This() aliases (#3219)', () => {
|
||||
let valueRefs: string[];
|
||||
let valueRefTargetIds: string[];
|
||||
beforeAll(() => {
|
||||
// Recomputed here rather than shared with the block above: these are
|
||||
// sibling describes, and a shared `beforeAll` would make the order of
|
||||
// the two blocks load-bearing.
|
||||
const edges = getRelationships(result, 'USES').filter(
|
||||
(e) => e.rel.reason === 'scope-resolution: value-ref',
|
||||
);
|
||||
valueRefs = edgeSet(edges);
|
||||
valueRefTargetIds = edges.map((e) => e.rel.targetId).sort();
|
||||
});
|
||||
|
||||
it('resolves a qualified CALL written through a file-level alias', () => {
|
||||
// `Widget.zig` writes `const Self = @This();` and calls `Self.width(self)`.
|
||||
expect(calls).toContain('describeWidth → width');
|
||||
expect(
|
||||
getRelationships(result, 'CALLS')
|
||||
.filter((e) => e.source === 'describeWidth')
|
||||
.map((e) => e.rel.targetId),
|
||||
).toEqual(['Method:src/webapi/Widget.zig:Widget.width#0']);
|
||||
});
|
||||
|
||||
it('resolves a qualified REGISTRATION written through a file-level alias', () => {
|
||||
// The #3399 shape spelled the ordinary way: `binder.accessor(Self.width, …)`.
|
||||
// Declining it cost the reference AND the hedge — no edge means no
|
||||
// evidence, so `impact` on `width` went back to claiming `exact`.
|
||||
expect(valueRefs).toContain('WidgetApi → width');
|
||||
expect(valueRefTargetIds.filter((id) => id.includes('Widget.width'))).toEqual([
|
||||
'Method:src/webapi/Widget.zig:Widget.width#0',
|
||||
]);
|
||||
});
|
||||
|
||||
it('resolves a qualified call through a CONTAINER-level alias', () => {
|
||||
// `Metrics` declares `const Me = @This();`, which mints a Variable beside
|
||||
// the Struct — the binding is there, it is just not class-like, so the
|
||||
// walk stepped over it and kept climbing.
|
||||
expect(calls).toContain('readTwice → read');
|
||||
expect(
|
||||
getRelationships(result, 'CALLS')
|
||||
.filter((e) => e.source === 'readTwice')
|
||||
.map((e) => e.rel.targetId),
|
||||
).toEqual([
|
||||
'Method:src/webapi/Widget.zig:Metrics.read#0',
|
||||
'Method:src/webapi/Widget.zig:Metrics.read#0',
|
||||
]);
|
||||
});
|
||||
|
||||
it('leaves a stem-spelled alias resolving exactly as it did', () => {
|
||||
// The control. `Element.zig` writes `const Element = @This();`, so its
|
||||
// qualified references already resolved through the stem binding. The
|
||||
// alias binding is an ADDITION to the augmentation channel, consulted
|
||||
// only after a scope's own bindings, so it must move nothing here.
|
||||
expect(valueRefTargetIds.filter((id) => id.endsWith('.getNamespaceUri#0'))).toEqual([
|
||||
'Method:src/webapi/Element.zig:Element.getNamespaceUri#0',
|
||||
]);
|
||||
expect(valueRefs).toContain('JsApi → getNamespaceUri');
|
||||
});
|
||||
|
||||
it('does not make the alias name resolvable from another file', () => {
|
||||
// `Self` and `Me` are container-private: Zig has no way to import them,
|
||||
// and the binding is appended at the declaring scope only. If it leaked
|
||||
// to the workspace channels, every file in a repo would see one
|
||||
// arbitrary `Self` — 66 files in ghostty declare that exact name.
|
||||
const targets = valueRefTargetIds.concat(
|
||||
getRelationships(result, 'CALLS').map((e) => e.rel.targetId),
|
||||
);
|
||||
// The alias's OWN def (`Metrics.Me`, a Variable) must never be an edge
|
||||
// target — matched on the last segment so `Metrics.read` is not read as
|
||||
// a hit on `Me`.
|
||||
expect(targets.filter((id) => /[:.](Self|Me)(#\d+)?$/.test(id))).toEqual([]);
|
||||
});
|
||||
});
|
||||
|
||||
it('types a receiver from its ANNOTATION (`var b: Counter = undefined; b.twice()`, `const c: Counter = .init(); c.get()`)', () => {
|
||||
// The declared type is the ONLY type source for `= undefined` and for
|
||||
// 0.14+ decl literals (`.init`, `.empty`), which current std uses for
|
||||
|
|
@ -1207,3 +1529,64 @@ describe.skipIf(!zigAvailable)(
|
|||
});
|
||||
},
|
||||
);
|
||||
|
||||
// ── Monorepo: several build packages, no build.zig at the repo root ──────────
|
||||
//
|
||||
// The layout the root-only config loader could not see. `loadZigBuildConfig`
|
||||
// read `<repoRoot>/build.zig{,.zon}` and nothing else, so a repo whose packages
|
||||
// live under `packages/<name>/` had no config at all and every bare
|
||||
// `@import("<module>")` in it went unresolved — cross-file resolution silently
|
||||
// degraded to relative imports. It now takes a `packageDir` and
|
||||
// `loadZigWorkspaceIndex` walks the repo for the packages to hand it, which is
|
||||
// the change these assert.
|
||||
//
|
||||
// They assert the EDGES, not the config: the unit tests in
|
||||
// `test/unit/zig-import-resolver.test.ts` pin the index, and this pins that the
|
||||
// index actually reaches symbol resolution.
|
||||
describe.skipIf(!zigAvailable)('Zig monorepo package resolution', () => {
|
||||
let result: PipelineResult;
|
||||
|
||||
beforeAll(async () => {
|
||||
result = await runPipelineFromRepo(path.join(FIXTURES, 'zig-monorepo'), () => {});
|
||||
}, 60000);
|
||||
|
||||
it('resolves a cross-package @import declared by the package’s own build files', () => {
|
||||
// `packages/app` depends on `packages/core` through `.path = "../core"` —
|
||||
// package-relative, and rejected outright when read from the repo root.
|
||||
const imports = getRelationships(result, 'IMPORTS').filter((e) =>
|
||||
e.sourceFilePath.includes('packages/app/src/main.zig'),
|
||||
);
|
||||
expect(imports.map((e) => e.targetFilePath).join('\n')).toContain('packages/core/src/root.zig');
|
||||
});
|
||||
|
||||
it('emits CALLS across the package boundary, from the module root and from a non-root file', () => {
|
||||
const calls = getRelationships(result, 'CALLS');
|
||||
const crossPackage = calls.filter(
|
||||
(e) =>
|
||||
e.sourceFilePath.includes('packages/app/') &&
|
||||
e.targetFilePath.includes('packages/core/src/root.zig'),
|
||||
);
|
||||
// `run` is in the module ROOT, `clamp` in a sibling file of the same
|
||||
// package: membership is the root plus what it reaches, so both must
|
||||
// resolve the alias — a fix that only worked for module roots would pass an
|
||||
// assertion on `run` alone.
|
||||
expect(edgeSet(crossPackage)).toContain('run → retryBudget');
|
||||
expect(edgeSet(crossPackage)).toContain('clamp → retryBudget');
|
||||
});
|
||||
|
||||
it('binds one alias to two different roots in two packages without crossing them', () => {
|
||||
// The discriminating case, and the reason the index is scoped per package
|
||||
// rather than flattened repo-wide: `tool` binds `core` to its OWN
|
||||
// src/core.zig. Flattened, `measure` would call into `packages/core` — a
|
||||
// confident edge into a package `tool` does not depend on, which is worse
|
||||
// than the unresolved import this change set out to fix.
|
||||
const fromTool = getRelationships(result, 'CALLS').filter((e) =>
|
||||
e.sourceFilePath.includes('packages/tool/src/main.zig'),
|
||||
);
|
||||
expect(edgeSet(fromTool)).toContain('measure → retryBudget');
|
||||
expect(fromTool.map((e) => e.targetFilePath).join('\n')).toContain(
|
||||
'packages/tool/src/core.zig',
|
||||
);
|
||||
expect(fromTool.map((e) => e.targetFilePath).join('\n')).not.toContain('packages/core/');
|
||||
});
|
||||
});
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue