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

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

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.createDimsClassifier = createDimsClassifier;
 exports.sweepDimsAndWithEvents = sweepDimsAndWithEvents;
 const tree_sitter_helpers_1 = require("../tree-sitter-helpers");
 const constants_1 = require("./constants");
@@ -62,125 +63,140 @@ const DIM_ALL_VARS_RE = /\b(\p{L}[\p{L}\p{N}_]*)\s+As\s+(?:New\s+)?(?:\[([^\]]+)
 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++;
+/**
+ * Issue #83: factory for the Dim / WithEvents classifier. Stateless per-line.
+ */
+function createDimsClassifier() {
+    return {
+        name: 'dims',
+        count: 0,
+        classifyLine(line, i, ctx) {
+            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');
+                            this.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');
+                            this.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,
+                            });
+                        }
                     }
                 }
             }
-            // 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,
+            // 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);
+                    }
+                    this.count++;
                 }
             }
-        }
-        // 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++;
-            }
-        }
+        },
+    };
+}
+/**
+ * Backward-compat wrapper (see procedures.ts). Returns the classifier's
+ * `count` so the orchestrator can decide `hasAnySymbols`.
+ */
+function sweepDimsAndWithEvents(ctx, src) {
+    const cls = createDimsClassifier();
+    const lines = src.split('\n');
+    for (let i = 0; i < lines.length; i++) {
+        cls.classifyLine(lines[i] ?? '', i, ctx);
     }
-    return count;
+    return cls.count;
 }
 //# sourceMappingURL=dims.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"dims.js","sourceRoot":"","sources":["../../../src/extraction/vba/dims.ts"],"names":[],"mappings":";;AA8EA,wDA4HC;AAnMD,gEAAwD;AACxD,2CAA8C;AAG9C;;;;;;;;;;;;GAYG;AACH,MAAM,kBAAkB,GACtB,8FAA8F,CAAC;AAEjG;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,eAAe,GACnB,kIAAkI,CAAC;AAErI;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,eAAe,GACnB,iFAAiF,CAAC;AAEpF,0FAA0F;AAC1F,MAAM,aAAa,GACjB,iHAAiH,CAAC;AAEpH,SAAgB,sBAAsB,CAAC,GAAwB,EAAE,GAAW;IAC1E,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC9B,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,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,8DAA8D;QAC9D,mEAAmE;QACnE,gEAAgE;QAChE,iDAAiD;QACjD,IAAI,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAClC,eAAe,CAAC,SAAS,GAAG,CAAC,CAAC;YAC9B,IAAI,CAAyB,CAAC;YAC9B,OAAO,CAAC,CAAC,GAAG,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;gBACjD,MAAM,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBAC3B,gEAAgE;gBAChE,4DAA4D;gBAC5D,6DAA6D;gBAC7D,+DAA+D;gBAC/D,+DAA+D;gBAC/D,wCAAwC;gBACxC,MAAM,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBACrC,MAAM,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBAErC,4DAA4D;gBAC5D,8DAA8D;gBAC9D,IAAI,OAAO,IAAI,SAAS,EAAE,CAAC;oBACzB,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE;wBAC7C,KAAK,EAAE,SAAS;wBAChB,SAAS,EAAE,CAAC,CAAC,SAAS;qBACvB,CAAC,CAAC;gBACL,CAAC;gBAED,IAAI,SAAS,EAAE,CAAC;oBACd,8DAA8D;oBAC9D,iEAAiE;oBACjE,IAAI,SAAS,EAAE,CAAC;wBACd,GAAG,CAAC,aAAa,CAAC,SAAS,EAAE,OAAO,EAAE,CAAC,EAAE,qBAAqB,CAAC,CAAC;wBAChE,KAAK,EAAE,CAAC;oBACV,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,kEAAkE;oBAClE,qEAAqE;oBACrE,IAAI,SAAS,IAAI,CAAC,2BAAe,CAAC,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC;wBAC/D,GAAG,CAAC,aAAa,CAAC,SAAS,EAAE,OAAO,EAAE,CAAC,EAAE,qBAAqB,CAAC,CAAC;wBAChE,KAAK,EAAE,CAAC;oBACV,CAAC;gBACH,CAAC;YACH,CAAC;YAED,8DAA8D;YAC9D,8DAA8D;YAC9D,gEAAgE;YAChE,+DAA+D;YAC/D,kCAAkC;YAClC,EAAE;YACF,6DAA6D;YAC7D,6DAA6D;YAC7D,gEAAgE;YAChE,4DAA4D;YAC5D,iEAAiE;YACjE,oCAAoC;YACpC,MAAM,EAAE,GAAG,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACtC,IAAI,EAAE,EAAE,CAAC;gBACP,MAAM,OAAO,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBAC5B,IAAI,OAAO,EAAE,CAAC;oBACZ,MAAM,GAAG,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;oBAClC,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;wBAClC,+DAA+D;wBAC/D,2DAA2D;wBAC3D,gEAAgE;wBAChE,MAAM,IAAI,GAAG,gCAAgC,CAAC;wBAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;wBAChC,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;wBACrE,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,EAAE;4BAC3B,KAAK;4BACL,SAAS,EAAE,KAAK;yBACjB,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,sEAAsE;QACtE,2CAA2C;QAC3C,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAClC,IAAI,QAAQ,EAAE,CAAC;gBACb,kEAAkE;gBAClE,MAAM,MAAM,GAAG,sFAAsF,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACjH,MAAM,SAAS,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBACpC,IAAI,SAAS,EAAE,CAAC;oBACd,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE,EAAE;wBAC/C,KAAK,EAAE,QAAQ;wBACf,SAAS,EAAE,KAAK;wBAChB,UAAU,EAAE,IAAI;wBAChB,YAAY,EAAE,SAAS;qBACxB,CAAC,CAAC;gBACL,CAAC;gBACD,GAAG,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,CAAC,EAAE,gBAAgB,CAAC,CAAC;gBAC1D,MAAM,QAAQ,GAAG,IAAA,oCAAc,EAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;gBACpE,MAAM,cAAc,GAAS;oBAC3B,MAAM,EAAE,GAAG,CAAC,iBAAiB,EAAE,EAAE,IAAI,EAAE;oBACvC,MAAM,EAAE,QAAQ;oBAChB,IAAI,EAAE,kBAAkB;oBACxB,UAAU,EAAE,WAAW;oBACvB,QAAQ,EAAE;wBACR,aAAa,EAAE,gBAAgB;wBAC/B,YAAY,EAAE,SAAS,IAAI,SAAS;qBACrC;oBACD,IAAI,EAAE,OAAO;oBACb,MAAM,EAAE,CAAC;iBACV,CAAC;gBACF,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;gBAC/B,IAAI,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC;oBAC3B,GAAG,CAAC,0BAA0B,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;gBACtD,CAAC;gBACD,KAAK,EAAE,CAAC;YACV,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}
+{"version":3,"file":"dims.js","sourceRoot":"","sources":["../../../src/extraction/vba/dims.ts"],"names":[],"mappings":"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"}

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

@@ -1,15 +1,18 @@
-import { VbaExtractorContext } from './context';
+import { VbaExtractorContext, VbaClassifier } 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).
+ * Issue #83: factory for the enum / const classifier. Closure state:
+ * `currentEnum` (open `Enum ... End Enum` block).
  *
- * Returns the number of top-level symbols (enums + constants) emitted so
- * the caller can flip `hasAnySymbols`.
+ * Also resets + advances the SHARED `ctx.procStack`/`ctx.currentProcKey`
+ * per line — same protocol the pre-#83 sweep followed. The calls-sql
+ * classifier runs AFTER this one in the per-line dispatch order and
+ * applies the same protocol, so the end-of-line scope state is identical
+ * to the legacy sequential-sweep behaviour.
+ */
+export declare function createEnumsConstsClassifier(): VbaClassifier;
+/**
+ * Backward-compat wrapper (see procedures.ts). Returns the classifier's
+ * `count` so the orchestrator can decide `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

@@ -1 +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"}
+{"version":3,"file":"enums-consts.d.ts","sourceRoot":"","sources":["../../../src/extraction/vba/enums-consts.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAqB/D;;;;;;;;;GASG;AACH,wBAAgB,2BAA2B,IAAI,aAAa,CAiK3D;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,mBAAmB,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAOjF"}