@aroman22/codegraph-vba-darwin-arm64 1.9.0 → 1.11.0

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

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.RULES = void 0;
 exports.createEventsTypesDeclaresClassifier = createEventsTypesDeclaresClassifier;
 exports.sweepEventsTypesAndDeclares = sweepEventsTypesAndDeclares;
 const tree_sitter_helpers_1 = require("../tree-sitter-helpers");
 const text_utils_1 = require("./text-utils");
+const rules_1 = require("./rules");
 /** `[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. */
@@ -15,143 +17,229 @@ const TYPE_MEMBER_RE = /^\s*(\p{L}[\p{L}\p{N}_]*)\s*(?:\([^)]*\))?\s+As\s+(.+?)\
 /** `[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;
 /**
- * Issue #83: factory for the events/types/declares classifier. Closure
- * state: `currentType` (the open `Type ... End Type` block).
+ * Issue #153: the declarative rule table for the events/types/declares
+ * concern. Five rules, partitioned by where they fire:
+ *
+ *  - `event-decl`   (outside-type-block) — match an `Event <Name>` decl
+ *  - `type-start`   (outside-type-block) — match a `Type <Name>` header;
+ *                  sets `ctx.vbaDeclTypeBlock` on a successful match
+ *  - `type-end`     (inside-type-block)  — match `End Type`; clears
+ *                  `ctx.vbaDeclTypeBlock` on a successful match
+ *  - `type-member`  (inside-type-block)  — match `<Member> As <Type>`
+ *                  inside an open type block
+ *  - `dll-declare`  (outside-type-block) — match a `[Private|Public]
+ *                  Declare [PtrSafe] Sub|Function <Name> Lib "<dll>"
+ *                  [Alias "<x>"]` Win32 API declaration
+ *
+ * The `requires` field encodes the type-block precondition. The
+ * dispatcher (the factory's `classifyLine`) filters rules whose
+ * precondition does not hold, so an `End Type` line never
+ * accidentally re-enters the `event-decl` / `dll-declare` paths.
+ *
+ * Inter-line state lives on `ctx.vbaDeclTypeBlock` (replaces the
+ * pre-#153 factory closure variable) so the emit functions can
+ * read/write it without taking a mutable closure reference.
+ */
+exports.RULES = [
+    (0, rules_1.defineRule)({
+        id: 'event-decl',
+        description: 'Match an `[Public|Private|Friend] Event <Name>(...)` custom event declaration; emit an `event` node + `contains` edge from the module/class.',
+        pattern: EVENT_DECL_RE,
+        requires: 'outside-type-block',
+        emit: (m, ctx, line, lineNum) => {
+            const visibility = (0, text_utils_1.foldVisibility)(m[1] ?? '');
+            const name = m[2] ?? '';
+            if (!name)
+                return null;
+            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);
+            return { name };
+        },
+    }),
+    (0, rules_1.defineRule)({
+        id: 'type-start',
+        description: 'Match a `[Public|Private|Friend] Type <Name>` UDT block header; emit a `type` node + `contains` edge and mark `ctx.vbaDeclTypeBlock` so subsequent member lines route to `type-member` / `End Type` lines route to `type-end`.',
+        pattern: TYPE_START_RE,
+        requires: 'outside-type-block',
+        emit: (m, ctx, line, lineNum) => {
+            const visibility = (0, text_utils_1.foldVisibility)(m[1] ?? '');
+            const name = m[2] ?? '';
+            if (!name)
+                return null;
+            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);
+            // Mark the open type block on ctx so the next non-End line is
+            // dispatched to `type-member` / `type-end` instead of the
+            // outside-type-block rules.
+            ctx.vbaDeclTypeBlock = { id: typeId, name };
+            return { name, typeId };
+        },
+    }),
+    (0, rules_1.defineRule)({
+        id: 'type-end',
+        description: 'Match `End Type` while inside a type block; emit nothing and clear `ctx.vbaDeclTypeBlock` so subsequent lines route back to the outside-type-block rules.',
+        pattern: TYPE_END_RE,
+        requires: 'inside-type-block',
+        emit: (_m, ctx) => {
+            ctx.vbaDeclTypeBlock = null;
+            return { kind: 'end-type-block' };
+        },
+    }),
+    (0, rules_1.defineRule)({
+        id: 'type-member',
+        description: 'Match `<MemberName> [As <Type>]` inside an open type block; emit a `type_member` node + a `type-member` edge from the open type to the member.',
+        pattern: TYPE_MEMBER_RE,
+        requires: 'inside-type-block',
+        emit: (m, ctx, line, lineNum) => {
+            const memberName = m[1] ?? '';
+            const memberType = (m[2] ?? '').trim();
+            if (!memberName || !ctx.vbaDeclTypeBlock)
+                return null;
+            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: `${ctx.vbaDeclTypeBlock.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: ctx.vbaDeclTypeBlock.id,
+                target: memberId,
+                kind: 'type-member',
+                provenance: 'parser',
+            });
+            return { name: memberName };
+        },
+    }),
+    (0, rules_1.defineRule)({
+        id: 'dll-declare',
+        description: 'Match a `[Public|Private] Declare [PtrSafe] Sub|Function <Name> Lib "<dll>" [Alias "<x>"]` Win32 API declaration; emit a `declare` node + `contains` edge and register the name in `functionNodeByName` so call-site scanning can resolve it.',
+        pattern: DLL_DECLARE_RE,
+        requires: 'outside-type-block',
+        emit: (m, ctx, line, lineNum) => {
+            const visibility = (0, text_utils_1.foldVisibility)(m[1] ?? '');
+            const ptrSafe = !!m[2];
+            const declareKind = (m[3] ?? '').toLowerCase();
+            const name = m[4] ?? '';
+            const dll = m[5] ?? '';
+            const aliasName = m[6] ?? undefined;
+            if (!name)
+                return null;
+            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);
+            return { name };
+        },
+    }),
+];
+/**
+ * Issue #83: factory for the events/types/declares classifier.
+ *
+ * Inter-line state (`ctx.vbaDeclTypeBlock`) lives on `ctx` — the
+ * declarative RULES table's `emit` functions read/write it directly.
+ * The dispatcher below honours each rule's `requires` precondition
+ * so the per-line dispatch mirrors the legacy cascade exactly:
+ *
+ *   if (currentType) {
+ *     try type-end, then type-member; return early
+ *   } else {
+ *     try event-decl, type-start, dll-declare
+ *   }
  */
 function createEventsTypesDeclaresClassifier() {
-    let currentType = null;
     const cls = {
         name: 'eventsTypesDeclares',
         count: 0,
         classifyLine(line, i, ctx) {
             const lineNum = i + 1;
-            if (currentType) {
-                if (TYPE_END_RE.test(line)) {
-                    currentType = null;
-                    return;
-                }
-                const member = TYPE_MEMBER_RE.exec(line);
-                if (member) {
-                    const memberName = member[1] ?? '';
-                    const memberType = (member[2] ?? '').trim();
-                    if (!memberName)
-                        return;
-                    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',
-                    });
-                }
-                return;
-            }
-            const eventDecl = EVENT_DECL_RE.exec(line);
-            if (eventDecl) {
-                const visibility = (0, text_utils_1.foldVisibility)(eventDecl[1] ?? '');
-                const name = eventDecl[2] ?? '';
-                if (!name)
-                    return;
-                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);
-                this.count++;
-                return;
-            }
-            const typeStart = TYPE_START_RE.exec(line);
-            if (typeStart) {
-                const visibility = (0, text_utils_1.foldVisibility)(typeStart[1] ?? '');
-                const name = typeStart[2] ?? '';
-                if (!name)
-                    return;
-                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 };
-                this.count++;
-                return;
-            }
-            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)
-                    return;
-                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);
+            for (const rule of exports.RULES) {
+                // Gate by the rule's `requires` precondition. The
+                // `outside-type-block` / `inside-type-block` values are the
+                // concrete preconditions the dispatcher knows about today;
+                // unknown strings are treated as "always" so adding new
+                // preconditions does not require touching this loop.
+                if (rule.requires === 'inside-type-block' && !ctx.vbaDeclTypeBlock)
+                    continue;
+                if (rule.requires === 'outside-type-block' && ctx.vbaDeclTypeBlock)
+                    continue;
+                const m = (0, rules_1.matchRule)(rule.pattern, line);
+                if (!m)
+                    continue;
+                const result = rule.emit(m, ctx, line, lineNum);
+                if (result !== null && result !== undefined) {
+                    this.count += rule.count ? rule.count(result) : 1;
                 }
-                ctx.pushContainsFromModule(declareId);
-                this.count++;
+                // `type-end` cleared the type block — nothing else on this
+                // line can apply (a VBA `End Type` line cannot also be an
+                // `Event <Name>` declaration). The legacy cascade did the
+                // same short-circuit via `return`. Break out of the loop
+                // explicitly so a later refactor cannot accidentally let an
+                // outside-type-block rule fire on the same line.
+                if (rule.id === 'type-end')
+                    break;
             }
         },
     };

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

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

@@ -1,6 +1,40 @@
 import { VbaExtractorContext, VbaClassifier } from './context';
+import { VbaExtractionRule } from './rules';
 /**
- * Issue #83: factory for the Dim / WithEvents classifier. Stateless per-line.
+ * Issue #153: the declarative rule table for the Dim / WithEvents
+ * concern. Two rules:
+ *
+ *  - `dim-decl`       — match a `Dim|Private|Public|Global|Static
+ *                       <var> [As [New] <TypePart>[.<TypePart>]][, …]`
+ *                       declaration; populate `localVarTypeMap` and
+ *                       emit one `references` edge per non-primitive
+ *                       type (or per qualified outer type).
+ *  - `withevents-decl`— match a `[Dim|Private|Public|Global|Static]
+ *                       WithEvents <var> As <FormType>` declaration;
+ *                       populate `localVarTypeMap` with `withEvents: true`,
+ *                       emit a `references` edge (synthesizedBy:
+ *                       `vba-withevents`) and a `subscribes-event` edge.
+ *
+ * The two rules are dispatched independently and BOTH can fire on the
+ * same line in principle (a `WithEvents` line does NOT match the
+ * `Dim|Private|...` prefix because the negative lookahead excludes it).
+ * The `dim-decl` rule's `count` hook reports the number of
+ * non-primitive `references` edges it emitted, so a multi-variable
+ * `Dim a As Foo, b As Bar` line adds 2 to the classifier count, and a
+ * bare `Dim x` line adds 0 (the bare-Dim path is a `localVarTypeMap`
+ * only side effect, no graph edges).
+ *
+ * No inter-line state — each rule is self-contained.
+ */
+export declare const RULES: readonly VbaExtractionRule<unknown>[];
+/**
+ * Issue #83: factory for the Dim / WithEvents classifier.
+ *
+ * The body walks the declarative `RULES` table (Issue #153). The two
+ * rules are independent: `dim-decl` handles typed declarations
+ * (REJECTED if the line is a `WithEvents` because the prefix
+ * negative-lookahead excludes `WithEvents`), `withevents-decl`
+ * handles WithEvents. No inter-line state.
  */
 export declare function createDimsClassifier(): VbaClassifier;
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"dims.d.ts","sourceRoot":"","sources":["../../../src/extraction/vba/dims.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAqE/D;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,aAAa,CA4HpD;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,mBAAmB,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAOpF"}
+{"version":3,"file":"dims.d.ts","sourceRoot":"","sources":["../../../src/extraction/vba/dims.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC/D,OAAO,EAAyB,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAiFnE;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,eAAO,MAAM,KAAK,EAAE,SAAS,iBAAiB,CAAC,OAAO,CAAC,EAyItD,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,IAAI,aAAa,CAgBpD;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,mBAAmB,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAOpF"}