@aroman22/codegraph-vba-darwin-arm64 1.5.2 → 1.6.0

package/lib/dist/extraction/vba/declarations.js

@@ -0,0 +1,154 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sweepEventsTypesAndDeclares = sweepEventsTypesAndDeclares;
+const tree_sitter_helpers_1 = require("../tree-sitter-helpers");
+const text_utils_1 = require("./text-utils");
+/** `[visibility] Event <Name>(...)` custom event declaration. */
+const EVENT_DECL_RE = /^\s*((?:Public|Private|Friend)\s+)?Event\s+(\p{L}[\p{L}\p{N}_]*)\b/iu;
+/** `[visibility] Type <Name>` user-defined type block start. */
+const TYPE_START_RE = /^\s*((?:Public|Private|Friend)\s+)?Type\s+(\p{L}[\p{L}\p{N}_]*)\b/iu;
+/** `End Type` user-defined type block end. */
+const TYPE_END_RE = /^\s*End\s+Type\b/iu;
+/** `<MemberName> As <Type>` inside a user-defined type block. */
+const TYPE_MEMBER_RE = /^\s*(\p{L}[\p{L}\p{N}_]*)\s*(?:\([^)]*\))?\s+As\s+(.+?)\s*$/iu;
+/** `[visibility] Declare [PtrSafe] Sub|Function <Name> Lib "dll" [Alias "x"] ...` */
+const DLL_DECLARE_RE = /^\s*((?:Public|Private)\s+)?Declare\s+(PtrSafe\s+)?(Sub|Function)\s+(\p{L}[\p{L}\p{N}_]*)\s+Lib\s+"([^"]+)"(?:\s+Alias\s+"([^"]+)")?/iu;
+function sweepEventsTypesAndDeclares(ctx, src) {
+    const lines = src.split('\n');
+    let count = 0;
+    let currentType = null;
+    for (let i = 0; i < lines.length; i++) {
+        const line = lines[i] ?? '';
+        const lineNum = i + 1;
+        if (currentType) {
+            if (TYPE_END_RE.test(line)) {
+                currentType = null;
+                continue;
+            }
+            const member = TYPE_MEMBER_RE.exec(line);
+            if (member) {
+                const memberName = member[1] ?? '';
+                const memberType = (member[2] ?? '').trim();
+                if (!memberName)
+                    continue;
+                const memberId = (0, tree_sitter_helpers_1.generateNodeId)(ctx.filePath, 'type_member', memberName, lineNum);
+                ctx.nodes.push({
+                    id: memberId,
+                    kind: 'type_member',
+                    name: memberName,
+                    qualifiedName: `${currentType.name}.${memberName}`,
+                    filePath: ctx.filePath,
+                    language: 'vba',
+                    startLine: lineNum,
+                    endLine: lineNum,
+                    startColumn: 0,
+                    endColumn: line.length,
+                    metadata: { memberType },
+                    updatedAt: Date.now(),
+                });
+                ctx.edges.push({
+                    source: currentType.id,
+                    target: memberId,
+                    kind: 'type-member',
+                    provenance: 'parser',
+                });
+            }
+            continue;
+        }
+        const eventDecl = EVENT_DECL_RE.exec(line);
+        if (eventDecl) {
+            const visibility = (0, text_utils_1.foldVisibility)(eventDecl[1] ?? '');
+            const name = eventDecl[2] ?? '';
+            if (!name)
+                continue;
+            const eventId = (0, tree_sitter_helpers_1.generateNodeId)(ctx.filePath, 'event', name, lineNum);
+            const eventNode = {
+                id: eventId,
+                kind: 'event',
+                name,
+                signature: line.trim(),
+                qualifiedName: ctx.classNamePrefix ? `${ctx.classNamePrefix}.${name}` : name,
+                filePath: ctx.filePath,
+                language: 'vba',
+                startLine: lineNum,
+                endLine: lineNum,
+                startColumn: 0,
+                endColumn: line.length,
+                visibility,
+                updatedAt: Date.now(),
+            };
+            ctx.nodes.push(eventNode);
+            ctx.localEvents.set(name.toLowerCase(), eventNode);
+            ctx.pushContainsFromModule(eventId);
+            count++;
+            continue;
+        }
+        const typeStart = TYPE_START_RE.exec(line);
+        if (typeStart) {
+            const visibility = (0, text_utils_1.foldVisibility)(typeStart[1] ?? '');
+            const name = typeStart[2] ?? '';
+            if (!name)
+                continue;
+            const typeId = (0, tree_sitter_helpers_1.generateNodeId)(ctx.filePath, 'type', name, lineNum);
+            ctx.nodes.push({
+                id: typeId,
+                kind: 'type',
+                name,
+                qualifiedName: ctx.classNamePrefix ? `${ctx.classNamePrefix}.${name}` : name,
+                filePath: ctx.filePath,
+                language: 'vba',
+                startLine: lineNum,
+                endLine: lineNum,
+                startColumn: 0,
+                endColumn: line.length,
+                visibility,
+                updatedAt: Date.now(),
+            });
+            ctx.pushContainsFromModule(typeId);
+            currentType = { id: typeId, name };
+            count++;
+            continue;
+        }
+        const declaration = DLL_DECLARE_RE.exec(line);
+        if (declaration) {
+            const visibility = (0, text_utils_1.foldVisibility)(declaration[1] ?? '');
+            const ptrSafe = !!declaration[2];
+            const declareKind = (declaration[3] ?? '').toLowerCase();
+            const name = declaration[4] ?? '';
+            const dll = declaration[5] ?? '';
+            const aliasName = declaration[6] ?? undefined;
+            if (!name)
+                continue;
+            const declareId = (0, tree_sitter_helpers_1.generateNodeId)(ctx.filePath, 'declare', name, lineNum);
+            const declareNode = {
+                id: declareId,
+                kind: 'declare',
+                name,
+                qualifiedName: ctx.classNamePrefix ? `${ctx.classNamePrefix}.${name}` : name,
+                filePath: ctx.filePath,
+                language: 'vba',
+                startLine: lineNum,
+                endLine: lineNum,
+                startColumn: 0,
+                endColumn: line.length,
+                visibility,
+                metadata: {
+                    isDeclare: true,
+                    dll,
+                    declareKind,
+                    ptrSafe,
+                    ...(aliasName ? { aliasName } : {}),
+                },
+                updatedAt: Date.now(),
+            };
+            ctx.nodes.push(declareNode);
+            if (!ctx.functionNodeByName.has(name)) {
+                ctx.functionNodeByName.set(name, declareNode);
+            }
+            ctx.pushContainsFromModule(declareId);
+            count++;
+        }
+    }
+    return count;
+}
+//# sourceMappingURL=declarations.js.map

package/lib/dist/extraction/vba/declarations.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"declarations.js","sourceRoot":"","sources":["../../../src/extraction/vba/declarations.ts"],"names":[],"mappings":"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"}

package/lib/dist/extraction/vba/dims.d.ts

@@ -0,0 +1,3 @@
+import { VbaExtractorContext } from './context';
+export declare function sweepDimsAndWithEvents(ctx: VbaExtractorContext, src: string): number;
+//# sourceMappingURL=dims.d.ts.map

package/lib/dist/extraction/vba/dims.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dims.d.ts","sourceRoot":"","sources":["../../../src/extraction/vba/dims.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAqEhD,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,mBAAmB,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CA4HpF"}

package/lib/dist/extraction/vba/dims.js

@@ -0,0 +1,186 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sweepDimsAndWithEvents = sweepDimsAndWithEvents;
+const tree_sitter_helpers_1 = require("../tree-sitter-helpers");
+const constants_1 = require("./constants");
+/**
+ * Check that a line is a variable declaration and NOT a Sub/Function/
+ * Property/Const/WithEvents header (those have their own sweeps).
+ * Fix 1+3 (Issues #1,#3): replaced the old single-match DIM_QUAL_RE /
+ * DIM_UNQUAL_RE pair with a prefix-check + global scan that handles
+ * `As New <Type>`, multi-variable `Dim a As Foo, b As Bar`, and all
+ * visibility keywords in one pass.
+ * Issue #47: now also accepts `Global` (module-level typed instance) and
+ * `Static` (procedure-local retention modifier) so they emit the same
+ * `references` edge and `localVarTypeMap` registration as their `Dim`
+ * siblings today. The negative lookahead is unchanged: `Const` is still
+ * routed to `sweepEnumsAndConsts`.
+ */
+const DIM_DECL_PREFIX_RE = /^\s*(?:Dim|Private|Public|Global|Static)\s+(?!(?:Function|Sub|Property|Const|WithEvents)\b)/i;
+/**
+ * Globally scan all `identifier As [New] TypePart1[.TypePart2]` on a
+ * variable declaration line. Run with /g after confirming DIM_DECL_PREFIX_RE.
+ *
+ * Groups: (1) variable name, (2) bracketed outer type, (3) unbracketed
+ * outer type, (4) bracketed inner type (if qualified), (5) unbracketed
+ * inner type. The variable name is always bare (`Dim` cannot declare a
+ * bracketed variable). The TYPE position accepts BOTH bracketed names
+ * with spaces (e.g. `[Clase Con Espacios]`) and bare identifiers — the
+ * bracketed capture wins when present. Only one of (2)/(3) and one of
+ * (4)/(5) is ever populated per match.
+ * `(?:New\s+)?` consumes the VBA auto-instantiation keyword so it is
+ * never captured as the type name (Fix 1).
+ *
+ * Issue #54: extends the type alternative to accept `[Name With Spaces]`
+ * so `Dim x As [Clase Con Espacios]` emits a `references` edge to
+ * `Clase Con Espacios` (brackets unwrapped). The unwrap is applied in
+ * the sweep loop by picking the bracketed capture group when present.
+ */
+const DIM_ALL_VARS_RE = /\b(\p{L}[\p{L}\p{N}_]*)\s+As\s+(?:New\s+)?(?:\[([^\]]+)\]|(\p{L}[\p{L}\p{N}_]*))(?:\.(?:\[([^\]]+)\]|(\p{L}[\p{L}\p{N}_]*)))?/giu;
+/**
+ * Bare-declared variable capture for the `Dim|Private|Public|Global|Static`
+ * prefix. Captures (1) the variable name. Used to register bare `Dim x`
+ * (no `As` clause) and explicit-primitive `Dim x As Long|String|...`
+ * declarations into `localVarTypeMap` so the type tracking is consistent
+ * across all three Dim shapes:
+ *
+ *   `Dim x`                → outer = 'variant' (VBA default)
+ *   `Dim x As Variant`     → outer = 'variant'  (PRIMITIVE_TYPES member)
+ *   `Dim x As Long`        → outer = 'long'     (PRIMITIVE_TYPES member)
+ *   `Dim x As Foo`         → outer = 'foo'      (project class — non-primitive)
+ *
+ * Antigravity audit Task 3: the previous `DIM_ALL_VARS_RE` only matched
+ * the `... As <Type>` form, so a bare `Dim x` was invisible to
+ * `isLocalProjectClassVar` / `scanCallSites` and `x.Method(1)` produced
+ * a dead-end `calls` edge to a stub named `x.Method` that no resolver
+ * could repoint. Registering bare Dim with `outer = 'variant'` closes
+ * the gate, so `scanCallSites` skips ONLY when the receiver is mapped
+ * as a primitive — leaving the "undeclared receiver → stub → resolver
+ * repoints" path intact for cross-module qualified calls like
+ * `modUtils.Foo(1)` (`modUtils` is not in `localVarTypeMap`).
+ */
+const BARE_DIM_VAR_RE = /^\s*(?:Dim|Private|Public|Global|Static)\s+(\p{L}[\p{L}\p{N}_]*)\s*(?:,|$|\b)/iu;
+/** `WithEvents m_X As Form_Foo` — Dim/Private/Public/Global/Static prefix is optional. */
+const WITHEVENTS_RE = /^\s*(?:(?:Dim|Private|Public|Global|Static)\s+)?WithEvents\s+\p{L}[\p{L}\p{N}_]*\s+As\s+(\p{L}[\p{L}\p{N}_]*)/iu;
+function sweepDimsAndWithEvents(ctx, src) {
+    const lines = src.split('\n');
+    let count = 0;
+    for (let i = 0; i < lines.length; i++) {
+        const line = lines[i] ?? '';
+        const lineNum = i + 1;
+        // Fix 1 + Fix 3 (Issues #1, #3): replace the old single-match
+        // DIM_QUAL_RE / DIM_UNQUAL_RE pair with a global scan that handles
+        // `As New <Type>`, multi-variable `Dim a As Foo, b As Bar`, and
+        // qualified `Dim x As Foo.Bar` in a single pass.
+        if (DIM_DECL_PREFIX_RE.test(line)) {
+            DIM_ALL_VARS_RE.lastIndex = 0;
+            let m;
+            while ((m = DIM_ALL_VARS_RE.exec(line)) !== null) {
+                const varName = m[1] ?? '';
+                // Issue #54: DIM_ALL_VARS_RE groups (2) and (3) are alternative
+                // captures for the same outer-type position — the bracketed
+                // alternative wins when present, the bare one otherwise. The
+                // captured value is already unwrapped (the `[...]` is consumed
+                // by the regex, group (2) holds the inner content). Same shape
+                // for the inner type at groups (4)/(5).
+                const outerType = m[2] ?? m[3] ?? '';
+                const innerType = m[4] ?? m[5] ?? '';
+                // Fix 2 (Issue #2): populate the local var type map so that
+                // `sweepCallsAndSql` can gate qualified statement-form calls.
+                if (varName && outerType) {
+                    ctx.localVarTypeMap.set(varName.toLowerCase(), {
+                        outer: outerType,
+                        qualified: !!innerType,
+                    });
+                }
+                if (innerType) {
+                    // Qualified form (`Dim x As Foo.Bar`) — emit reference to the
+                    // outer type `Foo` (same behaviour as the old DIM_QUAL_RE path).
+                    if (outerType) {
+                        ctx.emitReference(outerType, lineNum, 0, 'vba-name-resolution');
+                        count++;
+                    }
+                }
+                else {
+                    // Unqualified form (`Dim x As SomeType`, `Dim x As New SomeType`)
+                    // — emit reference only when the type is not a primitive or keyword.
+                    if (outerType && !constants_1.PRIMITIVE_TYPES.has(outerType.toLowerCase())) {
+                        ctx.emitReference(outerType, lineNum, 0, 'vba-name-resolution');
+                        count++;
+                    }
+                }
+            }
+            // Antigravity audit Task 3: bare `Dim x` (no `As` clause) and
+            // explicit-primitive `Dim x As <primitive>` declarations must
+            // still register `x` in `localVarTypeMap` so the qualified-call
+            // site scan in `scanCallSites` can gate the dead-end stub that
+            // no resolver could ever repoint.
+            //
+            // Captures the FIRST variable name only. Multi-variable bare
+            // Dim (e.g. `Dim a, b, c` without an `As` clause) is rare in
+            // real Dysflow fixtures and is intentionally NOT tracked here —
+            // those bare variables fall back to the undeclared-receiver
+            // path, which is the conservative choice. Skip if the typed-form
+            // loop already populated the entry.
+            const bm = BARE_DIM_VAR_RE.exec(line);
+            if (bm) {
+                const varName = bm[1] ?? '';
+                if (varName) {
+                    const key = varName.toLowerCase();
+                    if (!ctx.localVarTypeMap.has(key)) {
+                        // Look for an `As <Type>` continuation on the same line so the
+                        // outer type matches the existing typed-form behaviour. If
+                        // absent, the variable is implicit `Variant` per VBA semantics.
+                        const asRe = /\bAs\s+(\p{L}[\p{L}\p{N}_]*)/iu;
+                        const asMatch = asRe.exec(line);
+                        const outer = asMatch ? (asMatch[1] ?? '').toLowerCase() : 'variant';
+                        ctx.localVarTypeMap.set(key, {
+                            outer,
+                            qualified: false,
+                        });
+                    }
+                }
+            }
+        }
+        // WithEvents declarations — handled by their own regex; also populate
+        // the local var type map for completeness.
+        const weMatch = WITHEVENTS_RE.exec(line);
+        if (weMatch) {
+            const formType = weMatch[1] ?? '';
+            if (formType) {
+                // Extract the variable name from the WithEvents line for the map.
+                const weVarM = /^\s*(?:(?:Dim|Private|Public|Global|Static)\s+)?WithEvents\s+(\p{L}[\p{L}\p{N}_]*)/iu.exec(line);
+                const weVarName = weVarM?.[1] ?? '';
+                if (weVarName) {
+                    ctx.localVarTypeMap.set(weVarName.toLowerCase(), {
+                        outer: formType,
+                        qualified: false,
+                        withEvents: true,
+                        variableName: weVarName,
+                    });
+                }
+                ctx.emitReference(formType, lineNum, 0, 'vba-withevents');
+                const targetId = (0, tree_sitter_helpers_1.generateNodeId)(ctx.filePath, 'class', formType, 0);
+                const subscriberEdge = {
+                    source: ctx.moduleOrClassNode?.id ?? '',
+                    target: targetId,
+                    kind: 'subscribes-event',
+                    provenance: 'heuristic',
+                    metadata: {
+                        synthesizedBy: 'vba-withevents',
+                        variableName: weVarName || undefined,
+                    },
+                    line: lineNum,
+                    column: 0,
+                };
+                ctx.edges.push(subscriberEdge);
+                if (!ctx.moduleOrClassNode) {
+                    ctx.pendingModuleOrClassSource.push(subscriberEdge);
+                }
+                count++;
+            }
+        }
+    }
+    return count;
+}
+//# sourceMappingURL=dims.js.map

package/lib/dist/extraction/vba/dims.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dims.js","sourceRoot":"","sources":["../../../src/extraction/vba/dims.ts"],"names":[],"mappings":"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"}

package/lib/dist/extraction/vba/docmd.d.ts

@@ -0,0 +1,16 @@
+import { VbaExtractorContext, ProcInfo } from './context';
+/**
+ * B4 (hueco 6) extended by Issue #48: scan one line of VBA source for
+ * `DoCmd.OpenX "Target"` calls where X ∈ {Form, Report}. For each match emit
+ * a cached stub node (form-layout / report-layout) and an
+ * `opens-form` / `opens-report` heuristic edge from the calling Sub.
+ */
+export declare function scanDoCmdOpenCalls(ctx: VbaExtractorContext, line: string, caller: ProcInfo, lineNum: number): void;
+/**
+ * Issue #48: scan one line of VBA source for `DoCmd.OpenQuery "X"` calls.
+ * Each match emits ONE `UnresolvedReference` (NOT a stub + edge) so the
+ * resolver binds to the REAL `query` node that `SqlQueryExtractor`
+ * produces for `queries/<Name>.sql`, tagged `synthesizedBy: 'vba-opens-query'`.
+ */
+export declare function scanDoCmdOpenQuery(ctx: VbaExtractorContext, line: string, caller: ProcInfo, lineNum: number): void;
+//# sourceMappingURL=docmd.d.ts.map

package/lib/dist/extraction/vba/docmd.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"docmd.d.ts","sourceRoot":"","sources":["../../../src/extraction/vba/docmd.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,mBAAmB,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AA2E1D;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,mBAAmB,EACxB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,QAAQ,EAChB,OAAO,EAAE,MAAM,GACd,IAAI,CAoBN;AAmED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,mBAAmB,EACxB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,QAAQ,EAChB,OAAO,EAAE,MAAM,GACd,IAAI,CAsBN"}

package/lib/dist/extraction/vba/docmd.js

@@ -0,0 +1,179 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.scanDoCmdOpenCalls = scanDoCmdOpenCalls;
+exports.scanDoCmdOpenQuery = scanDoCmdOpenQuery;
+/**
+ * `DoCmd.OpenForm` / `DoCmd.OpenReport` / `DoCmd.OpenQuery` modelling
+ * (hueco 6 / issues #48, #52). OpenForm/OpenReport emit a synthetic
+ * form-layout/report-layout stub + `opens-form`/`opens-report` edge; OpenQuery
+ * emits an `UnresolvedReference` the resolver binds to the real `query` node.
+ *
+ * `DoCmd` is in `RUNTIME_RECEIVER_BLACKLIST`, so these methods are skipped by
+ * the generic call-site scan and handled here with their own emission path.
+ */
+const tree_sitter_helpers_1 = require("../tree-sitter-helpers");
+const text_utils_1 = require("./text-utils");
+/**
+ * `DoCmd.OpenForm "<FormName>"` modelling regex — B4 (hueco 6). Captures the
+ * first argument (group 1) as either a `"literal"` or a bare identifier; the
+ * trailing positional args (`acNormal`, `acFormEdit`, …) are NOT captured.
+ */
+const OPEN_FORM_ARG_RE = /\bDoCmd\.OpenForm\s+("(?:(?:[^"]|"")*)"|\p{L}[\p{L}\p{N}_]*)/gu;
+/**
+ * Issue #48: `DoCmd.OpenReport "<ReportName>"` modelling regex — sibling
+ * of `OPEN_FORM_ARG_RE`. Same literal-or-bare-id argument capture and same
+ * trailing positional-args drop.
+ */
+const OPEN_REPORT_ARG_RE = /\bDoCmd\.OpenReport\s+("(?:(?:[^"]|"")*)"|\p{L}[\p{L}\p{N}_]*)/gu;
+/**
+ * Issue #48: `DoCmd.OpenQuery "<QueryName>"` modelling regex. Emits an
+ * `UnresolvedReference` (NOT a stub + edge) so the resolver binds to the
+ * REAL `query` node `SqlQueryExtractor` emits for `queries/<Name>.sql`.
+ */
+const OPEN_QUERY_ARG_RE = /\bDoCmd\.OpenQuery\s+("(?:(?:[^"]|"")*)"|\p{L}[\p{L}\p{N}_]*)/gu;
+/**
+ * Issue #48 dispatch table — shared literal-or-Const argument resolution
+ * for `DoCmd.OpenForm` and `DoCmd.OpenReport`. Each entry carries everything
+ * `scanDoCmdOpenCalls` + `emitOpensStubEdge` need to share the pipeline
+ * between methods while keeping the per-method names distinct.
+ *
+ * OpenQuery is intentionally NOT in this dispatch — it emits an
+ * `UnresolvedReference` (not a stub + edge). See `scanDoCmdOpenQuery`.
+ */
+const DOCMD_OPEN_DISPATCH = [
+    {
+        method: 'OpenForm',
+        re: OPEN_FORM_ARG_RE,
+        edgeKind: 'opens-form',
+        stubKind: 'form-layout',
+        syntheticPrefix: 'synthetic:opensFormStub',
+        syntheticExtension: '.form.txt',
+        moduleNamePrefix: 'Form_',
+        cacheKey: 'OpenForm',
+        metadataTargetKey: 'targetFormName',
+        synthesizedBy: 'vba-opens-form',
+    },
+    {
+        method: 'OpenReport',
+        re: OPEN_REPORT_ARG_RE,
+        edgeKind: 'opens-report',
+        stubKind: 'report-layout',
+        syntheticPrefix: 'synthetic:opensReportStub',
+        syntheticExtension: '.report.txt',
+        moduleNamePrefix: 'Report_',
+        cacheKey: 'OpenReport',
+        metadataTargetKey: 'targetReportName',
+        synthesizedBy: 'vba-opens-report',
+    },
+];
+/**
+ * B4 (hueco 6) extended by Issue #48: scan one line of VBA source for
+ * `DoCmd.OpenX "Target"` calls where X ∈ {Form, Report}. For each match emit
+ * a cached stub node (form-layout / report-layout) and an
+ * `opens-form` / `opens-report` heuristic edge from the calling Sub.
+ */
+function scanDoCmdOpenCalls(ctx, line, caller, lineNum) {
+    for (const dispatch of DOCMD_OPEN_DISPATCH) {
+        // Each regex has /g so we MUST reset `lastIndex` before use; cloning
+        // the regex is the simplest way to avoid leaking state across lines
+        // AND across dispatch iterations.
+        const localRe = new RegExp(dispatch.re.source, dispatch.re.flags);
+        let m;
+        while ((m = localRe.exec(line)) !== null) {
+            const rawArg = (m[1] ?? '').trim();
+            // Issue #52: const lookup is now per-proc-bucket with module
+            // fallback (see `resolveLocalConst`). Two procs declaring the
+            // same Const name with different values no longer collide —
+            // each call site uses the value visible at its own scope.
+            const targetName = rawArg.startsWith('"')
+                ? (0, text_utils_1.unwrapVbaStringLiteral)(rawArg)
+                : (ctx.resolveLocalConst(rawArg) ?? rawArg);
+            if (!targetName)
+                continue;
+            emitOpensStubEdge(ctx, dispatch, caller, targetName, lineNum, m.index);
+        }
+    }
+}
+/**
+ * B4 (hueco 6) extended by Issue #48: emit a stub `form-layout` /
+ * `report-layout` node for `targetName` (cached per dispatch entry so
+ * duplicates collapse and OpenForm/OpenReport de-dup buckets stay
+ * disjoint) and a single `opens-form` / `opens-report` heuristic edge
+ * from `caller` to that stub.
+ */
+function emitOpensStubEdge(ctx, dispatch, caller, targetName, lineNum, column) {
+    const key = `${dispatch.cacheKey}:${targetName.toLowerCase()}`;
+    let stubId = ctx.opensStubIdsByKey.get(key);
+    if (!stubId) {
+        // Synthetic file path keeps the stub's id deterministic AND
+        // disambiguates it from any real `.form.txt` / `.report.txt`
+        // indexed later. The directory prefix is intentionally not a real
+        // filesystem path — it just namespaces the id space. The file
+        // extension DOES mirror the real form/report file extension so a
+        // reader of the synthetic path can tell the stub's intent at a glance.
+        const syntheticFilePath = `${dispatch.syntheticPrefix}/${targetName}${dispatch.syntheticExtension}`;
+        stubId = (0, tree_sitter_helpers_1.generateNodeId)(syntheticFilePath, dispatch.stubKind, targetName, 0);
+        ctx.opensStubIdsByKey.set(key, stubId);
+        ctx.nodes.push({
+            id: stubId,
+            kind: dispatch.stubKind,
+            name: targetName,
+            // Convention: form module names in Access are `Form_<Name>` and
+            // report module names are `Report_<Name>`. We follow the same
+            // convention in the synthetic stub's qualifiedName so cross-file
+            // lookups can find it consistently.
+            qualifiedName: `${dispatch.moduleNamePrefix}${targetName}`,
+            filePath: syntheticFilePath,
+            language: 'vba',
+            startLine: lineNum,
+            endLine: lineNum,
+            startColumn: 0,
+            endColumn: 0,
+            metadata: { stub: true },
+            updatedAt: Date.now(),
+        });
+    }
+    ctx.edges.push({
+        source: ctx.findOrCreateFunctionNodeId(caller),
+        target: stubId,
+        kind: dispatch.edgeKind,
+        provenance: 'heuristic',
+        metadata: {
+            synthesizedBy: dispatch.synthesizedBy,
+            [dispatch.metadataTargetKey]: targetName,
+        },
+        line: lineNum,
+        column,
+    });
+}
+/**
+ * Issue #48: scan one line of VBA source for `DoCmd.OpenQuery "X"` calls.
+ * Each match emits ONE `UnresolvedReference` (NOT a stub + edge) so the
+ * resolver binds to the REAL `query` node that `SqlQueryExtractor`
+ * produces for `queries/<Name>.sql`, tagged `synthesizedBy: 'vba-opens-query'`.
+ */
+function scanDoCmdOpenQuery(ctx, line, caller, lineNum) {
+    const localRe = new RegExp(OPEN_QUERY_ARG_RE.source, OPEN_QUERY_ARG_RE.flags);
+    let m;
+    while ((m = localRe.exec(line)) !== null) {
+        const rawArg = (m[1] ?? '').trim();
+        // Issue #52: same per-proc-with-module-fallback lookup as
+        // `scanDoCmdOpenCalls`.
+        const targetName = rawArg.startsWith('"')
+            ? (0, text_utils_1.unwrapVbaStringLiteral)(rawArg)
+            : (ctx.resolveLocalConst(rawArg) ?? rawArg);
+        if (!targetName)
+            continue;
+        ctx.unresolvedReferences.push({
+            fromNodeId: ctx.findOrCreateFunctionNodeId(caller),
+            referenceName: targetName,
+            referenceKind: 'references',
+            line: lineNum,
+            column: m.index,
+            filePath: ctx.filePath,
+            language: 'vba',
+            metadata: { synthesizedBy: 'vba-opens-query' },
+        });
+    }
+}
+//# sourceMappingURL=docmd.js.map

package/lib/dist/extraction/vba/docmd.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"docmd.js","sourceRoot":"","sources":["../../../src/extraction/vba/docmd.ts"],"names":[],"mappings":"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"}

package/lib/dist/extraction/vba/enums-consts.d.ts

@@ -0,0 +1,15 @@
+import { VbaExtractorContext } from './context';
+/**
+ * Walk the (uncommented, line-joined) source and emit:
+ *  - one `enum` node per `Enum <Name>` block, with one `enum_member` node
+ *    per member and a `contains` edge enum→member;
+ *  - one `constant` node per name declared on a `Const` line (multi-name
+ *    lines emit one node per name);
+ *  - a `contains` edge from the module/class node to each enum and constant
+ *    (held in `pendingModuleOrClassSource` until the module node exists).
+ *
+ * Returns the number of top-level symbols (enums + constants) emitted so
+ * the caller can flip `hasAnySymbols`.
+ */
+export declare function sweepEnumsAndConsts(ctx: VbaExtractorContext, src: string): number;
+//# sourceMappingURL=enums-consts.d.ts.map

package/lib/dist/extraction/vba/enums-consts.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"enums-consts.d.ts","sourceRoot":"","sources":["../../../src/extraction/vba/enums-consts.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAqBhD;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,mBAAmB,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAuJjF"}