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

package/lib/dist/extraction/vba/call-sweep.d.ts

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

package/lib/dist/extraction/vba/call-sweep.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"call-sweep.d.ts","sourceRoot":"","sources":["../../../src/extraction/vba/call-sweep.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,mBAAmB,EAAY,MAAM,WAAW,CAAC;AA8B1D,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,mBAAmB,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CA8L5E"}

package/lib/dist/extraction/vba/call-sweep.js

@@ -0,0 +1,206 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sweepCallsAndSql = sweepCallsAndSql;
+/**
+ * Call/SQL sweep orchestrator (REQ-CODE-4, REQ-CODE-8). Walks the
+ * (uncommented) source once, maintaining the procedure stack and `With`
+ * receiver stack, and dispatches every per-line scanner: raise-events,
+ * call-sites, Me/Forms control refs, SQL wrappers, statement/qualified calls,
+ * `Set x = New …` late-instantiation, `DoCmd.Open*`, and TempVars.
+ */
+const constants_1 = require("./constants");
+const text_utils_1 = require("./text-utils");
+const calls_1 = require("./calls");
+const controls_1 = require("./controls");
+const docmd_1 = require("./docmd");
+const tempvars_1 = require("./tempvars");
+const sql_wrapper_1 = require("./sql-wrapper");
+/**
+ * Issue #46: `Set <var> = New <Type>[.<Inner>]` late-instantiation.
+ * Groups: (1) variable name, (2) outer type, (3) optional inner type.
+ * Operates on the MASKED line so `Set x = New Foo` inside a string literal
+ * never matches.
+ */
+const SET_NEW_RE = /\bSet\s+(\p{L}[\p{L}\p{N}_]*)\s*=\s*New\s+(\p{L}[\p{L}\p{N}_]*)(?:\.(\p{L}[\p{L}\p{N}_]*))?/iu;
+/** Issue #43: track the receiver for `With <expr>` / `End With` blocks. */
+const WITH_START_RE = /^\s*With\b\s+(.+?)\s*$/iu;
+const WITH_END_RE = /^\s*End\s+With\b/iu;
+function sweepCallsAndSql(ctx, src) {
+    const lines = src.split('\n');
+    const procedureStartLines = new Set();
+    const sqlTargetsThisFile = new Set();
+    // Issue #52: reset the shared scope state before the per-line walk
+    // begins. `sweepEnumsAndConsts` already populated `procStack` /
+    // `currentProcKey` during its own walk; clearing here guarantees the
+    // `scanDoCmdOpenCalls` / `scanDoCmdOpenQuery` reads (which consult
+    // `currentProcKey` per call-site) start in module scope and follow
+    // the same push/pop discipline as the existing `stack` array below.
+    ctx.procStack.length = 0;
+    ctx.currentProcKey = 'module';
+    // Walk the source once, emitting call edges and SQL edges per line and
+    // tracking the current procedure stack.
+    const stack = [];
+    const withReceiverStack = [];
+    const sqlVariables = new Map();
+    // C2 fix: track each procedure's `endLine` (the line containing the
+    // matching `End Sub`/`End Function`/`End Property`) keyed by its
+    // `startLine`. After the loop, we update every function node's
+    // `endLine` so `codegraph_explore` returns the full body span —
+    // not just the signature line.
+    const procEndLines = new Map();
+    for (let i = 0; i < lines.length; i++) {
+        const line = lines[i] ?? '';
+        const lineNum = i + 1;
+        const procStart = constants_1.PROC_RE.exec(line);
+        if (procStart) {
+            // Issue #52: mirror the proc push into the shared
+            // `procStack` + `currentProcKey` so Const reads in this same
+            // sweep see the same scope as the const writes did (during
+            // `sweepEnumsAndConsts`).
+            const procStartLine = lineNum;
+            ctx.procStack.push(procStartLine);
+            ctx.currentProcKey = String(procStartLine);
+            const name = procStart[3] ?? '';
+            const bucket = ctx.localProcs.get(name);
+            if (bucket) {
+                // Fix 1: select the ProcInfo whose startLine matches the current
+                // line, not always bucket[0]. When Property Get/Let/Set share a
+                // name, all three exist in the bucket; pushing bucket[0] every time
+                // meant Let/Set bodies erroneously attributed to the Get's ProcInfo.
+                const proc = bucket.find((p) => p.startLine === lineNum) ?? bucket[0];
+                if (proc)
+                    stack.push(proc);
+            }
+            procedureStartLines.add(lineNum);
+        }
+        else if (constants_1.PROCEDURE_END_RE.test(line) && stack.length > 0) {
+            const ending = stack.pop();
+            // Issue #52: mirror the pop into the shared scope state.
+            ctx.procStack.pop();
+            ctx.currentProcKey =
+                ctx.procStack.length > 0
+                    ? String(ctx.procStack[ctx.procStack.length - 1])
+                    : 'module';
+            procEndLines.set(ending.startLine, lineNum);
+            continue;
+        }
+        // Fix 2 (Issue #2): mask string-literal content before call scanning so
+        // patterns like `modHelper.BuildQuery(` inside a string argument are not
+        // mistakenly treated as call sites.  SQL scanning still uses the original
+        // line because SQL lives INSIDE string literals.
+        const callScanLine = (0, text_utils_1.maskStringContent)(line);
+        if (stack.length > 0 && WITH_END_RE.test(callScanLine)) {
+            withReceiverStack.pop();
+            continue;
+        }
+        if (stack.length > 0 && !procedureStartLines.has(lineNum)) {
+            const withStart = WITH_START_RE.exec(callScanLine);
+            if (withStart) {
+                const receiver = (0, calls_1.normalizeWithReceiver)(withStart[1] ?? '');
+                if (receiver)
+                    withReceiverStack.push(receiver);
+                continue;
+            }
+        }
+        // Don't scan call sites on the line that declares the procedure — it
+        // would match the proc name itself in `Sub Outer()`.
+        if (!procedureStartLines.has(lineNum) && stack.length > 0) {
+            const currentProc = stack[stack.length - 1];
+            (0, calls_1.scanRaiseEvents)(ctx, callScanLine, currentProc, lineNum);
+            (0, calls_1.scanCallSites)(ctx, callScanLine, currentProc, lineNum);
+        }
+        // Hueco 1: capture `Me.<Control>` references. Only inside procedures
+        // because `Me` is only meaningful inside a form's class module.
+        if (!procedureStartLines.has(lineNum) && stack.length > 0) {
+            (0, controls_1.scanMeControlReferences)(ctx, callScanLine, stack[stack.length - 1], lineNum);
+        }
+        // SQL wrappers — only inside a procedure.  Use the ORIGINAL line — SQL is
+        // inside string literals, so the masked line would strip the SQL content.
+        if (stack.length > 0) {
+            (0, sql_wrapper_1.trackSqlVariableAssignment)(lines, i, sqlVariables);
+            (0, sql_wrapper_1.scanSqlInLine)(ctx, line, lineNum, sqlTargetsThisFile, sqlVariables);
+        }
+        // H1 fix: detect statement-form Sub calls (no parens, no `Call` keyword).
+        // Issue #45: split single-line `If … Then <body>` clauses first so the
+        // actual call after `Then`/`Else`/`:` is not shadowed by the leading
+        // keyword.
+        if (stack.length > 0 && !procedureStartLines.has(lineNum)) {
+            // Issue #46: `Set x = New <Type>[.<Inner>]` late-instantiation.
+            // Run BEFORE the call-site scan so a later `<x>.Member ...` line
+            // finds `x` already registered in `localVarTypeMap`.
+            const setNew = SET_NEW_RE.exec(callScanLine);
+            if (setNew) {
+                const varName = setNew[1] ?? '';
+                const outerType = setNew[2] ?? '';
+                const innerType = setNew[3] ?? '';
+                if (varName && outerType) {
+                    // Skip primitives defensively — consistent with the Dim sweep guard.
+                    if (!constants_1.PRIMITIVE_TYPES.has(outerType.toLowerCase())) {
+                        ctx.localVarTypeMap.set(varName.toLowerCase(), {
+                            outer: outerType,
+                            // Mirror `Dim x As Foo.Bar`: qualified `Set rs = New
+                            // DAO.Recordset` registers `qualified: true` so the PR #61
+                            // gate keeps downstream `rs.Method` calls silent.
+                            qualified: !!innerType,
+                            assignedWithSet: true,
+                            variableName: varName,
+                        });
+                        ctx.emitReference(outerType, lineNum, 0, 'vba-set-new');
+                    }
+                }
+            }
+            const clauseLines = (0, calls_1.splitSingleLineIfClauses)(callScanLine);
+            for (const clauseLine of clauseLines) {
+                const stmtCall = (0, calls_1.detectStatementCall)(clauseLine);
+                if (stmtCall) {
+                    const caller = stack[stack.length - 1];
+                    (0, calls_1.emitStatementCallEdge)(ctx, caller, stmtCall, lineNum);
+                }
+                // Fix 7 + Fix 2 + Issue #40: qualified statement-form calls
+                // (`Receiver.Member args`) — the dominant cross-object call shape.
+                const qualStmt = (0, calls_1.detectQualifiedStatementCall)(clauseLine);
+                if (qualStmt) {
+                    const caller = stack[stack.length - 1];
+                    if (ctx.shouldProcessQualifiedCall(qualStmt.receiver)) {
+                        (0, calls_1.emitQualifiedStatementCallEdge)(ctx, caller, qualStmt.receiver, qualStmt.member, lineNum);
+                    }
+                }
+                const withReceiver = withReceiverStack[withReceiverStack.length - 1];
+                if (withReceiver) {
+                    const withCall = (0, calls_1.detectWithMemberCall)(clauseLine);
+                    if (withCall && ctx.isLocalProjectClassVar(withReceiver)) {
+                        const caller = stack[stack.length - 1];
+                        (0, calls_1.emitQualifiedStatementCallEdge)(ctx, caller, withReceiver, withCall.member, lineNum);
+                    }
+                }
+            }
+            // B4 (hueco 6): `DoCmd.OpenForm "FormName"` modelling — the literal
+            // form name lives INSIDE a string literal, so scan the ORIGINAL
+            // (unmasked) line. The receiver is the same proc-stack frame.
+            const caller2 = stack[stack.length - 1];
+            // Issue #48: shared OpenForm/OpenReport dispatch; OpenQuery emits an
+            // `UnresolvedReference` and stays separate.
+            (0, docmd_1.scanDoCmdOpenCalls)(ctx, line, caller2, lineNum);
+            (0, docmd_1.scanDoCmdOpenQuery)(ctx, line, caller2, lineNum);
+            // Issue #44: cross-form bang references (`Forms!X` / `Forms("X")!Y`) —
+            // scan the unmasked line (form name lives in a string literal in the
+            // paren form).
+            (0, controls_1.scanFormsBang)(ctx, line, caller2, lineNum);
+            // Issue #50: cross-form TempVars key accesses. Bang form scans the
+            // masked line, paren + Add forms scan the original.
+            (0, tempvars_1.sweepTempVars)(ctx, callScanLine, line, lineNum, caller2);
+        }
+    }
+    // Apply endLine to every emitted function node keyed by its startLine.
+    // Functions without a recorded endLine (e.g. malformed VBA without an
+    // `End`) keep their `endLine = startLine` from sweepProcedures —
+    // which is the correct "single line" representation.
+    for (const n of ctx.nodes) {
+        if (n.kind !== 'function')
+            continue;
+        const end = procEndLines.get(n.startLine);
+        if (end !== undefined)
+            n.endLine = end;
+    }
+}
+//# sourceMappingURL=call-sweep.js.map

package/lib/dist/extraction/vba/call-sweep.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"call-sweep.js","sourceRoot":"","sources":["../../../src/extraction/vba/call-sweep.ts"],"names":[],"mappings":";;AAuCA,4CA8LC;AArOD;;;;;;GAMG;AACH,2CAAyE;AACzE,6CAAiD;AAEjD,mCAUiB;AACjB,yCAAoE;AACpE,mCAAiE;AACjE,yCAA2C;AAC3C,+CAA0E;AAE1E;;;;;GAKG;AACH,MAAM,UAAU,GACd,+FAA+F,CAAC;AAElG,2EAA2E;AAC3E,MAAM,aAAa,GAAG,0BAA0B,CAAC;AACjD,MAAM,WAAW,GAAG,oBAAoB,CAAC;AAEzC,SAAgB,gBAAgB,CAAC,GAAwB,EAAE,GAAW;IACpE,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC9B,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAU,CAAC;IAC9C,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAU,CAAC;IAE7C,mEAAmE;IACnE,gEAAgE;IAChE,qEAAqE;IACrE,mEAAmE;IACnE,mEAAmE;IACnE,oEAAoE;IACpE,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC;IACzB,GAAG,CAAC,cAAc,GAAG,QAAQ,CAAC;IAE9B,uEAAuE;IACvE,wCAAwC;IACxC,MAAM,KAAK,GAAe,EAAE,CAAC;IAC7B,MAAM,iBAAiB,GAAa,EAAE,CAAC;IACvC,MAAM,YAAY,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC/C,oEAAoE;IACpE,iEAAiE;IACjE,+DAA+D;IAC/D,gEAAgE;IAChE,+BAA+B;IAC/B,MAAM,YAAY,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC/C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC5B,MAAM,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC;QAEtB,MAAM,SAAS,GAAG,mBAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,SAAS,EAAE,CAAC;YACd,kDAAkD;YAClD,6DAA6D;YAC7D,2DAA2D;YAC3D,0BAA0B;YAC1B,MAAM,aAAa,GAAG,OAAO,CAAC;YAC9B,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAClC,GAAG,CAAC,cAAc,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;YAE3C,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAChC,MAAM,MAAM,GAAG,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACxC,IAAI,MAAM,EAAE,CAAC;gBACX,iEAAiE;gBACjE,gEAAgE;gBAChE,oEAAoE;gBACpE,qEAAqE;gBACrE,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,OAAO,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC;gBACtE,IAAI,IAAI;oBAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC7B,CAAC;YACD,mBAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACnC,CAAC;aAAM,IAAI,4BAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3D,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,EAAG,CAAC;YAC5B,yDAAyD;YACzD,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;YACpB,GAAG,CAAC,cAAc;gBAChB,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC;oBACtB,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;oBACjD,CAAC,CAAC,QAAQ,CAAC;YACf,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC5C,SAAS;QACX,CAAC;QAED,wEAAwE;QACxE,yEAAyE;QACzE,0EAA0E;QAC1E,iDAAiD;QACjD,MAAM,YAAY,GAAG,IAAA,8BAAiB,EAAC,IAAI,CAAC,CAAC;QAE7C,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;YACvD,iBAAiB,CAAC,GAAG,EAAE,CAAC;YACxB,SAAS;QACX,CAAC;QAED,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YAC1D,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACnD,IAAI,SAAS,EAAE,CAAC;gBACd,MAAM,QAAQ,GAAG,IAAA,6BAAqB,EAAC,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC3D,IAAI,QAAQ;oBAAE,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC/C,SAAS;YACX,CAAC;QACH,CAAC;QAED,qEAAqE;QACrE,qDAAqD;QACrD,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1D,MAAM,WAAW,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAE,CAAC;YAC7C,IAAA,uBAAe,EAAC,GAAG,EAAE,YAAY,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;YACzD,IAAA,qBAAa,EAAC,GAAG,EAAE,YAAY,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QACzD,CAAC;QAED,qEAAqE;QACrE,gEAAgE;QAChE,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1D,IAAA,kCAAuB,EAAC,GAAG,EAAE,YAAY,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAE,EAAE,OAAO,CAAC,CAAC;QAChF,CAAC;QAED,0EAA0E;QAC1E,0EAA0E;QAC1E,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,IAAA,wCAA0B,EAAC,KAAK,EAAE,CAAC,EAAE,YAAY,CAAC,CAAC;YACnD,IAAA,2BAAa,EAAC,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,kBAAkB,EAAE,YAAY,CAAC,CAAC;QACtE,CAAC;QAED,0EAA0E;QAC1E,uEAAuE;QACvE,qEAAqE;QACrE,WAAW;QACX,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YAC1D,gEAAgE;YAChE,iEAAiE;YACjE,qDAAqD;YACrD,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAC7C,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBAChC,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBAClC,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBAClC,IAAI,OAAO,IAAI,SAAS,EAAE,CAAC;oBACzB,qEAAqE;oBACrE,IAAI,CAAC,2BAAe,CAAC,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC;wBAClD,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE;4BAC7C,KAAK,EAAE,SAAS;4BAChB,qDAAqD;4BACrD,2DAA2D;4BAC3D,kDAAkD;4BAClD,SAAS,EAAE,CAAC,CAAC,SAAS;4BACtB,eAAe,EAAE,IAAI;4BACrB,YAAY,EAAE,OAAO;yBACtB,CAAC,CAAC;wBACH,GAAG,CAAC,aAAa,CAAC,SAAS,EAAE,OAAO,EAAE,CAAC,EAAE,aAAa,CAAC,CAAC;oBAC1D,CAAC;gBACH,CAAC;YACH,CAAC;YAED,MAAM,WAAW,GAAG,IAAA,gCAAwB,EAAC,YAAY,CAAC,CAAC;YAC3D,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;gBACrC,MAAM,QAAQ,GAAG,IAAA,2BAAmB,EAAC,UAAU,CAAC,CAAC;gBACjD,IAAI,QAAQ,EAAE,CAAC;oBACb,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAE,CAAC;oBACxC,IAAA,6BAAqB,EAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;gBACxD,CAAC;gBAED,4DAA4D;gBAC5D,mEAAmE;gBACnE,MAAM,QAAQ,GAAG,IAAA,oCAA4B,EAAC,UAAU,CAAC,CAAC;gBAC1D,IAAI,QAAQ,EAAE,CAAC;oBACb,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAE,CAAC;oBACxC,IAAI,GAAG,CAAC,0BAA0B,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;wBACtD,IAAA,sCAA8B,EAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;oBAC3F,CAAC;gBACH,CAAC;gBAED,MAAM,YAAY,GAAG,iBAAiB,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;gBACrE,IAAI,YAAY,EAAE,CAAC;oBACjB,MAAM,QAAQ,GAAG,IAAA,4BAAoB,EAAC,UAAU,CAAC,CAAC;oBAClD,IAAI,QAAQ,IAAI,GAAG,CAAC,sBAAsB,CAAC,YAAY,CAAC,EAAE,CAAC;wBACzD,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAE,CAAC;wBACxC,IAAA,sCAA8B,EAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;oBACtF,CAAC;gBACH,CAAC;YACH,CAAC;YAED,oEAAoE;YACpE,gEAAgE;YAChE,8DAA8D;YAC9D,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAE,CAAC;YACzC,qEAAqE;YACrE,4CAA4C;YAC5C,IAAA,0BAAkB,EAAC,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;YAChD,IAAA,0BAAkB,EAAC,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;YAChD,uEAAuE;YACvE,qEAAqE;YACrE,eAAe;YACf,IAAA,wBAAa,EAAC,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;YAE3C,mEAAmE;YACnE,oDAAoD;YACpD,IAAA,wBAAa,EAAC,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAC3D,CAAC;IAEH,CAAC;IAED,uEAAuE;IACvE,sEAAsE;IACtE,iEAAiE;IACjE,qDAAqD;IACrD,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;QAC1B,IAAI,CAAC,CAAC,IAAI,KAAK,UAAU;YAAE,SAAS;QACpC,MAAM,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAC1C,IAAI,GAAG,KAAK,SAAS;YAAE,CAAC,CAAC,OAAO,GAAG,GAAG,CAAC;IACzC,CAAC;AACH,CAAC"}

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

@@ -0,0 +1,55 @@
+import { VbaExtractorContext, ProcInfo } from './context';
+export declare function scanRaiseEvents(ctx: VbaExtractorContext, line: string, from: ProcInfo, lineNum: number): void;
+export declare function scanCallSites(ctx: VbaExtractorContext, line: string, from: ProcInfo, lineNum: number): void;
+/**
+ * Issue #45: split a single-line VBA `If <cond> Then <body>` into one or
+ * more statement-clause fragments the statement-call detectors can process
+ * (`If x Then Foo Else Bar`, colon-separated `If x Then DoA: DoB`). When the
+ * line is not a single-line `If … Then` shape, returns `[<line>]` so
+ * block-form `If` still works through the per-line scan. `GoTo`/`Exit`/
+ * `Resume` clauses are filtered out. `line` is the string-literal-masked
+ * scan line, which makes global `:`/`Else` splitting safe.
+ */
+export declare function splitSingleLineIfClauses(line: string): string[];
+/**
+ * H1: detect a statement-form Sub call (`MySub`, `MySub arg1, x`,
+ * `Call MySub arg1`). Returns the called proc name, or null for
+ * declarations, assignments, comments, keyword lines, and the paren form
+ * (handled by CALL_RE).
+ */
+export declare function detectStatementCall(line: string): string | null;
+/**
+ * H1: emit a same-file `calls` edge for a statement-form Sub call to the
+ * already-emitted function node named `procName`.
+ */
+export declare function emitStatementCallEdge(ctx: VbaExtractorContext, caller: ProcInfo, procName: string, lineNum: number): void;
+/**
+ * Fix 7: detect a qualified statement-form call — `Receiver.Member <args>`
+ * where `Receiver.Member` is NOT followed by `(`. Distinct from the paren
+ * form (handled by CALL_RE). Property assignments and blacklisted
+ * receivers/members are excluded. Returns `{receiver, member}` or null.
+ */
+export declare function detectQualifiedStatementCall(line: string): {
+    receiver: string;
+    member: string;
+} | null;
+/**
+ * Fix 7: emit a heuristic `calls` edge for a qualified statement-form call.
+ * Same shape as the qualified-paren path in `scanCallSites` — reuses the
+ * same `callDedupe` / `synthFunctionNodeIds` sets so a paren and non-paren
+ * form on the same line don't create duplicate edges.
+ */
+export declare function emitQualifiedStatementCallEdge(ctx: VbaExtractorContext, caller: ProcInfo, receiver: string, member: string, lineNum: number): void;
+/**
+ * Issue #43: normalize the receiver of a `With <expr>` block to a bare
+ * identifier, or null when it is a keyword / runtime object / unparseable.
+ */
+export declare function normalizeWithReceiver(expr: string): string | null;
+/**
+ * Issue #43: detect a `.Member` call inside a `With` block (leading-dot
+ * member reference that is a call, not a property assignment).
+ */
+export declare function detectWithMemberCall(line: string): {
+    member: string;
+} | null;
+//# sourceMappingURL=calls.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"calls.d.ts","sourceRoot":"","sources":["../../../src/extraction/vba/calls.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,mBAAmB,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAe1D,wBAAgB,eAAe,CAC7B,GAAG,EAAE,mBAAmB,EACxB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,QAAQ,EACd,OAAO,EAAE,MAAM,GACd,IAAI,CAiBN;AAED,wBAAgB,aAAa,CAC3B,GAAG,EAAE,mBAAmB,EACxB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,QAAQ,EACd,OAAO,EAAE,MAAM,GACd,IAAI,CAsGN;AAED;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAgC/D;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CA4B/D;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,mBAAmB,EACxB,MAAM,EAAE,QAAQ,EAChB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GACd,IAAI,CAaN;AAED;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,MAAM,GACX;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAuC7C;AAED;;;;;GAKG;AACH,wBAAgB,8BAA8B,CAC5C,GAAG,EAAE,mBAAmB,EACxB,MAAM,EAAE,QAAQ,EAChB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,GACd,IAAI,CA2CN;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAiBjE;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAoB5E"}