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

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

@@ -98,8 +98,52 @@ class VbaExtractorContext {
      * of every procedure whose `End` marker the sweep has not yet seen.
      */
     procStack = [];
+    /**
+     * Issue #153: per-extraction state for the events/types/declares
+     * classifier's `Type <Name> ... End Type` block tracking. The
+     * `currentTypeBlock` is set when a `type-start` rule fires and
+     * cleared when the matching `type-end` rule fires. Lives on `ctx`
+     * (instead of the factory's closure) so the declarative RULES
+     * table's `emit` functions can read/write it without taking a
+     * closure-captured mutable reference. `null` means "outside any
+     * type block right now". Reset implicitly per-extraction (a fresh
+     * `VbaExtractorContext` is constructed every `extract()` call).
+     */
+    vbaDeclTypeBlock = null;
+    /**
+     * Issue #153: per-extraction state for the enum/consts classifier's
+     * `Enum <Name> ... End Enum` block tracking. Same shape and
+     * rationale as `vbaDeclTypeBlock`: lives on `ctx` so the
+     * declarative RULES table's `emit` functions can read/write it
+     * without taking a closure-captured mutable reference.
+     * `null` means "outside any enum block right now".
+     */
+    vbaEnumBlock = null;
+    /**
+     * Issue #153: per-extraction state for the calls/SQL classifier's
+     * `With <receiver> ... End With` block tracking. The with-receiver
+     * stack mirrors the textual nesting of `With` blocks inside a
+     * procedure body — the top of the stack is the active receiver
+     * for `.Member` and `.Member(args)` statement-form calls. Reset
+     * implicitly per-extraction (a fresh `VbaExtractorContext` is
+     * constructed every `extract()` call). Replaces the per-factory
+     * closure variable that lived in `sweepCallsAndSql` before the
+     * Issue #153 RULES-table refactor.
+     */
+    vbaWithStack = [];
     /** Local event name (lowercase) → event node for `RaiseEvent` edge emission. */
     localEvents = new Map();
+    /**
+     * Issue #152: per-event counter for `RaiseEvent <EventName>` sites. Keyed
+     * by event node id (so two different events that share a name across
+     * files don't collide — the gate is per-file). The count is incremented
+     * in `scanRaiseEvents` BEFORE the edge is pushed, so the count equals
+     * the number of raise sites regardless of the gate decision downstream.
+     * The orchestrator's fanout-gate pass reads this map to decide which
+     * event nodes to flag `metadata.highFanout: true` and which `raises-event`
+     * edges to drop.
+     */
+    raiseEventCounts = new Map();
     /**
      * Same-file function/property return types, keyed by lowercase proc name →
      * declared return type. ONLY non-primitive (project-class) return types are
@@ -111,9 +155,45 @@ class VbaExtractorContext {
      * time) — that stays the resolver's frontier.
      */
     functionReturnTypes = new Map();
+    /**
+     * Issue #156: per-stage timings, lazily allocated ONLY when
+     * `CODEGRAPH_VBA_TIMING=1|2` is set. The default path (env var unset)
+     * keeps this `null` so `recordStage` is a single null-check and we
+     * pay zero Map-allocation cost in the hot path. Stage names are
+     * dot-separated: `preprocess.stripVbaComments`,
+     * `preprocess.cc.lexer+parser`, `walk.procedures`, `walk.main`,
+     * `classifier.<name>`. Counters are in milliseconds (float).
+     */
+    timings = null;
+    /**
+     * Issue #156: how many times each classifier's `classifyLine` was
+     * invoked. Only allocated together with `timings` so the default path
+     * pays no cost.
+     */
+    classifierInvokeCounts = null;
     constructor(filePath) {
         this.filePath = filePath;
     }
+    /**
+     * Issue #156: ensure the timings Maps exist. Called once per
+     * `extract()` by the orchestrator right after it reads the env var.
+     * No-op when already allocated.
+     */
+    ensureTimings() {
+        if (this.timings === null) {
+            this.timings = new Map();
+            this.classifierInvokeCounts = new Map();
+        }
+    }
+    /**
+     * Issue #156: add `ms` to the stage named `name`. No-op when
+     * `timings` is null (default path).
+     */
+    recordStage(name, ms) {
+        if (this.timings === null)
+            return;
+        this.timings.set(name, (this.timings.get(name) ?? 0) + ms);
+    }
     /**
      * Emit a `contains` edge from the (lazily-created) module/class node to
      * `targetId`. Mirrors the pending-source pattern the procedure and
@@ -209,6 +289,66 @@ class VbaExtractorContext {
         // `sweepProcedures` (audit S2 — replaced an O(n) linear scan per call site).
         return this.functionNodeByName.get(name);
     }
+    /**
+     * Issue #152: apply the per-file `RaiseEvent` fanout gate. For every
+     * event whose `raiseEventCounts` value exceeds `maxFanout`:
+     *   1. Stamp the event node's `metadata.highFanout = true` and
+     *      `metadata.raiseCount = <count>` so consumers (codegraph_explore,
+     *      vba-event-tracer) can recognize a high-fanout event.
+     *   2. Drop every `raises-event` edge targeting that event id from
+     *      `edges`. The event node itself stays — declaration site, handler
+     *      linkage via `subscribes-event`, and metadata are all preserved.
+     *
+     * Events with `<= maxFanout` raise sites are untouched (no flag, edges
+     * stay). When `maxFanout` is undefined, the gate is disabled and the
+     * method is a no-op. Mirrors the upstream `EVENT_FANOUT_CAP` discipline
+     * in `src/resolution/callback-synthesizer.ts:43` (this side suppresses
+     * the producer side, the upstream side suppresses the synthesized
+     * cross-file dispatcher/handler edges).
+     *
+     * Returns the number of `raises-event` edges dropped (zero when the
+     * gate is disabled or no event exceeds the cap — useful for tests).
+     */
+    applyRaiseFanoutGate(maxFanout) {
+        if (maxFanout === undefined)
+            return 0;
+        if (maxFanout < 0)
+            return 0;
+        // 1. Build the set of event node ids that exceed the cap.
+        const overThreshold = new Set();
+        for (const [eventId, count] of this.raiseEventCounts) {
+            if (count > maxFanout)
+                overThreshold.add(eventId);
+        }
+        if (overThreshold.size === 0)
+            return 0;
+        // 2. Stamp the metadata on the event nodes.
+        for (const eventId of overThreshold) {
+            const eventNode = this.nodes.find((n) => n.id === eventId && n.kind === 'event');
+            if (!eventNode)
+                continue;
+            const md = (eventNode.metadata ?? {});
+            md.highFanout = true;
+            md.raiseCount = this.raiseEventCounts.get(eventId) ?? 0;
+            eventNode.metadata = md;
+        }
+        // 3. Drop every `raises-event` edge targeting an over-threshold event.
+        // Re-build the edges array so the dropped edges vanish without
+        // disturbing the other edges' order. `edges.length` is the only
+        // property kept; this matches how every other sweep mutates `edges`
+        // (push-only, never splice).
+        const before = this.edges.length;
+        const kept = [];
+        for (const e of this.edges) {
+            if (e.kind === 'raises-event' && overThreshold.has(e.target))
+                continue;
+            kept.push(e);
+        }
+        this.edges.length = 0;
+        for (const e of kept)
+            this.edges.push(e);
+        return before - kept.length;
+    }
     /**
      * Emit a `references` edge from the file's module/class node to a synthetic
      * node named `targetName`. Used by Dim, WithEvents, Set-New, and SQL sweeps.
@@ -222,8 +362,18 @@ class VbaExtractorContext {
      * TempVars sweep already emits (`emitTempVarReference`). Omitted for
      * structural references (Dim/WithEvents/Set-New) where the direction is not
      * meaningful.
+     *
+     * `extras` (optional): additional metadata fields to merge into the
+     * emitted edge's `metadata` object. Used by the WithEvents sweep to
+     * stamp `variableName` (issue #150) so the post-extraction
+     * event-handler synthesis pass can find the `m_<var>_<event>`
+     * handler Sub even after `resolveVbaReferenceStubs` CASCADE-deletes
+     * the companion `subscribes-event` edge along with the synthetic
+     * class stub. Fields here are merged AFTER the standard
+     * `{ synthesizedBy [, access] }` shape, so callers can override
+     * (rarely useful) but not accidentally drop the stamp.
      */
-    emitReference(targetName, lineNum, column, synthesizedBy, access) {
+    emitReference(targetName, lineNum, column, synthesizedBy, access, extras) {
         if (!targetName)
             return;
         const targetId = (0, tree_sitter_helpers_1.generateNodeId)(this.filePath, 'class', // placeholder kind; cross-file resolution will re-type at lookup
@@ -247,12 +397,15 @@ class VbaExtractorContext {
                 updatedAt: Date.now(),
             });
         }
+        const metadata = access
+            ? { synthesizedBy, access, ...(extras ?? {}) }
+            : { synthesizedBy, ...(extras ?? {}) };
         const edge = {
             source: '', // rewritten after module node exists
             target: targetId,
             kind: 'references',
             provenance: 'heuristic',
-            metadata: access ? { synthesizedBy, access } : { synthesizedBy },
+            metadata,
             line: lineNum,
             column,
         };

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

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

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

@@ -1,7 +1,43 @@
 import { VbaExtractorContext, VbaClassifier } from './context';
+import { VbaExtractionRule } from './rules';
 /**
- * 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.
+ */
+export declare const RULES: readonly VbaExtractionRule<unknown>[];
+/**
+ * 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
+ *   }
  */
 export declare function createEventsTypesDeclaresClassifier(): VbaClassifier;
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"declarations.d.ts","sourceRoot":"","sources":["../../../src/extraction/vba/declarations.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAqB/D;;;GAGG;AACH,wBAAgB,mCAAmC,IAAI,aAAa,CA0InE;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,mBAAmB,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAOzF"}
+{"version":3,"file":"declarations.d.ts","sourceRoot":"","sources":["../../../src/extraction/vba/declarations.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC/D,OAAO,EAAyB,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAqBnE;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,eAAO,MAAM,KAAK,EAAE,SAAS,iBAAiB,CAAC,OAAO,CAAC,EA2JtD,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,wBAAgB,mCAAmC,IAAI,aAAa,CA+BnE;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,mBAAmB,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAOzF"}

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;
             }
         },
     };