@aroman22/codegraph-vba-darwin-arm64 1.14.0 → 1.16.0

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RULES = void 0;
 exports.createDimsClassifier = createDimsClassifier;
-exports.sweepDimsAndWithEvents = sweepDimsAndWithEvents;
 const tree_sitter_helpers_1 = require("../tree-sitter-helpers");
 const constants_1 = require("./constants");
 const rules_1 = require("./rules");
@@ -18,8 +17,24 @@ const rules_1 = require("./rules");
  * `references` edge and `localVarTypeMap` registration as their `Dim`
  * siblings today. The negative lookahead is unchanged: `Const` is still
  * routed to `sweepEnumsAndConsts`.
+ * Issue #207: extend the negative lookahead with `Declare|Event|Enum|Type`
+ * so the four other header keywords that own their own sweeps are not
+ * misread as variable declarations. Before the fix:
+ *   - `Private Declare PtrSafe Function Foo Lib "k32" (ByVal h As T) As Long`
+ *     emitted a phantom `vba-name-resolution` edge to `T` and registered
+ *     `h` in `localVarTypeMap` (the map has no procedure scope — #205
+ *     territory — so a param name that collides with a real local
+ *     silently changes that local's call-emission behavior).
+ *   - `Public Event SomethingHappened(ByVal payload As T)` emitted a
+ *     phantom edge to `T` and registered `payload` in the map.
+ *   - `Public Enum Foo` / `Public Type Foo` registered the keyword itself
+ *     (`Enum` / `Type`) in the map via `BARE_DIM_VAR_RE`.
+ * Each header has its own classifier (`dll-declare`, `event-decl`,
+ * `type-start`, plus `sweepEnumsAndConsts` for `Enum`) — they own the
+ * registration, so excluding them here is the correct separation of
+ * concerns and prevents silent graph pollution.
  */
-const DIM_DECL_PREFIX_RE = /^\s*(?:Dim|Private|Public|Global|Static)\s+(?!(?:Function|Sub|Property|Const|WithEvents)\b)/i;
+const DIM_DECL_PREFIX_RE = /^\s*(?:Dim|Private|Public|Global|Static)\s+(?!(?:Function|Sub|Property|Const|WithEvents|Declare|Event|Enum|Type)\b)/i;
 /**
  * Globally scan all `identifier As [New] TypePart1[.TypePart2]` on a
  * variable declaration line. Run with /g after confirming DIM_DECL_PREFIX_RE.
@@ -78,6 +93,150 @@ function isArrayDeclaration(line, variableName) {
     const escaped = variableName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
     return new RegExp(`\\b${escaped}\\s*\\(`, 'iu').test(line);
 }
+/**
+ * Issue #251: modifier keywords that may precede a parameter name in a
+ * VBA procedure signature. They are skipped so `ByVal p_Codigo As String`
+ * yields `p_Codigo` rather than `ByVal`.
+ */
+const PARAM_MODIFIERS = new Set(['byval', 'byref', 'optional', 'paramarray']);
+/**
+ * Issue #251: the declared parameter names of a procedure signature line.
+ *
+ * Only the names are wanted (types, defaults and array parens are all
+ * irrelevant to a shadow check), so the parser stays deliberately small:
+ * take the signature's own parenthesised span — the one that closes the
+ * first `(`, which on a colon-separated single-line procedure stops before
+ * the inline body — split it on commas, and from each chunk take the first
+ * identifier that is not a modifier keyword. A signature with no parameter
+ * list yields an empty array.
+ *
+ * A default value containing a comma (`Optional n As Long = 1`) cannot
+ * produce a wrong NAME: the comma split can only over-split a chunk, and an
+ * over-split chunk's first identifier belongs to the default expression,
+ * never to a new parameter. Over-registering a shadow name is the safe
+ * direction — at worst one genuine module-variable read goes unreported,
+ * which is the same silence the graph had before this issue.
+ */
+function parseParameterNames(line) {
+    const open = line.indexOf('(');
+    if (open < 0)
+        return [];
+    let depth = 0;
+    let close = -1;
+    for (let i = open; i < line.length; i++) {
+        const ch = line[i];
+        if (ch === '(')
+            depth++;
+        else if (ch === ')') {
+            depth--;
+            if (depth === 0) {
+                close = i;
+                break;
+            }
+        }
+    }
+    if (close <= open)
+        return [];
+    const names = [];
+    for (const chunk of line.slice(open + 1, close).split(',')) {
+        const identifiers = chunk.match(/\p{L}[\p{L}\p{N}_]*/gu);
+        if (!identifiers)
+            continue;
+        for (const identifier of identifiers) {
+            if (PARAM_MODIFIERS.has(identifier.toLowerCase()))
+                continue;
+            names.push(identifier);
+            break;
+        }
+    }
+    return names;
+}
+/**
+ * Issue #251: the declaration keyword that opens a module-level
+ * declaration line (`Dim` / `Private` / `Public` / `Global` / `Static`),
+ * or the empty string for a bare `WithEvents m_X As Form_Y` line.
+ */
+const DECL_KEYWORD_RE = /^\s*(Dim|Private|Public|Global|Static)\b/i;
+/**
+ * Issue #251: fold a module-level declaration keyword to the canonical
+ * visibility enum.
+ *
+ * This is deliberately NOT `foldVisibility` from `text-utils.ts`. That
+ * helper answers "what did the author write" for keywords that only ever
+ * appear as a visibility (`Public` / `Private` / `Friend` / `Global`) and
+ * folds everything it does not recognise to `'public'`. A variable
+ * declaration also accepts `Dim` and `Static`, and in the declarations
+ * section of a VBA module BOTH mean module-private — folding them to
+ * `'public'` would claim every `Dim gblFoo` is exported from its module.
+ * Only `Public` and `Global` export a module-level variable.
+ */
+function moduleVarVisibility(line) {
+    const keyword = (DECL_KEYWORD_RE.exec(line)?.[1] ?? '').toLowerCase();
+    return keyword === 'public' || keyword === 'global' ? 'public' : 'private';
+}
+/**
+ * Issue #251: emit ONE `variable` node plus its module -> variable
+ * `contains` edge for a module-level declaration.
+ *
+ * Two gates, both load-bearing:
+ *
+ *  1. `ctx.currentVarTypeProcKey === 'module'` — procedure locals stay
+ *     OUT of the graph. Every local of every procedure would be tens of
+ *     thousands of nodes whose only consumer is the def-use analysis this
+ *     project deliberately does not do; module-level state is the part
+ *     that couples modules to one another, and therefore the part worth a
+ *     node.
+ *  2. `ctx.moduleVariables` membership — a name re-declared on a later
+ *     line, or reached through BOTH the typed loop and the bare-Dim
+ *     fallback of the same emit, keeps its first node instead of gaining
+ *     a duplicate.
+ *
+ * The `contains` edge goes through `pushContainsFromModule`, so it is
+ * parked on `pendingModuleOrClassSource` and re-pointed once `extract()`
+ * creates the module/class node after the walk.
+ *
+ * Returns 1 when a node was emitted, 0 otherwise, so the caller can fold
+ * the result into the rule's `count`: a file whose only symbols are
+ * module-level variables must still get a module node, for the same
+ * reason a Const-only `.bas` gets one.
+ */
+function emitModuleVariableNode(ctx, decl, line, lineNum) {
+    if (ctx.currentVarTypeProcKey !== 'module')
+        return 0;
+    if (!decl.name)
+        return 0;
+    const key = decl.name.toLowerCase();
+    if (ctx.moduleVariables.has(key))
+        return 0;
+    const nodeId = (0, tree_sitter_helpers_1.generateNodeId)(ctx.filePath, 'variable', decl.name, lineNum);
+    ctx.nodes.push({
+        id: nodeId,
+        kind: 'variable',
+        name: decl.name,
+        qualifiedName: ctx.moduleName ? `${ctx.moduleName}.${decl.name}` : decl.name,
+        filePath: ctx.filePath,
+        language: 'vba',
+        startLine: lineNum,
+        endLine: lineNum,
+        startColumn: 0,
+        endColumn: line.length,
+        visibility: moduleVarVisibility(line),
+        metadata: {
+            declaredType: decl.declaredType,
+            isArray: decl.isArray,
+            isWithEvents: decl.isWithEvents,
+            // Module-level `Const` declarations are owned by the enum/const
+            // classifier, which emits a `constant` node for them. The flag is
+            // stamped `false` here so a consumer reading `variable` nodes never
+            // has to know that and can filter on a single field.
+            isConst: false,
+        },
+        updatedAt: Date.now(),
+    });
+    ctx.pushContainsFromModule(nodeId);
+    ctx.moduleVariables.set(key, { name: decl.name, nodeId });
+    return 1;
+}
 /**
  * Issue #153: the declarative rule table for the Dim / WithEvents
  * concern. Two rules:
@@ -109,13 +268,20 @@ exports.RULES = [
         id: 'dim-decl',
         description: 'Match a `Dim|Private|Public|Global|Static <var> [As [New] <Type>][, …]` declaration; populate `localVarTypeMap` and emit one `vba-name-resolution` `references` edge per non-primitive type (or per qualified outer type).',
         pattern: DIM_DECL_PREFIX_RE,
-        count: (result) => result.edges,
+        count: (result) => {
+            // Issue #251: module-level `variable` nodes count as symbols, so a
+            // `.bas` whose only content is a declarations section still reaches
+            // `hasAnySymbols` and gets its module node.
+            const { edges, variables } = result;
+            return edges + variables;
+        },
         emit: (_m, ctx, line, lineNum) => {
             // Re-run the prefix check inside the emit (the pattern is a
             // RegExp without /g so `.test()` is enough and idempotent). This
             // keeps the rule table's contract "pattern matches → emit fires"
             // while the emit body is the same code that used to live inline.
             let edgesEmitted = 0;
+            let variablesEmitted = 0;
             if (!DIM_DECL_PREFIX_RE.test(line))
                 return null;
             DIM_ALL_VARS_RE.lastIndex = 0;
@@ -132,12 +298,28 @@ exports.RULES = [
                 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.
+                // Issue #205: the write is scoped to the current procedure's
+                // bucket (or `'module'` when no procedure is open) — see
+                // `currentVarTypeProcKey` on the context.
                 if (varName && outerType) {
-                    ctx.localVarTypeMap.set(varName.toLowerCase(), {
+                    ctx.setLocalVarTypeInScope(ctx.currentVarTypeProcKey, varName, {
                         outer: outerType,
                         qualified: !!innerType,
                         isArray: isArrayDeclaration(line, varName),
                     });
+                    // Issue #251: a procedure-local declaration shadows a
+                    // module-level variable of the same name, so the read/write
+                    // scan must know this procedure owns the name.
+                    ctx.declareProcLocalName(ctx.currentVarTypeProcKey, varName);
+                    // Issue #251: module-level declarations additionally become a
+                    // `variable` node. `Dim x As Long` inside a Sub does not — the
+                    // gate lives inside `emitModuleVariableNode`.
+                    variablesEmitted += emitModuleVariableNode(ctx, {
+                        name: varName,
+                        declaredType: innerType ? `${outerType}.${innerType}` : outerType,
+                        isArray: isArrayDeclaration(line, varName),
+                        isWithEvents: false,
+                    }, line, lineNum);
                 }
                 if (innerType) {
                     // Qualified form (`Dim x As Foo.Bar`) — emit reference to the
@@ -172,22 +354,44 @@ exports.RULES = [
             if (bm) {
                 const varName = bm[1] ?? '';
                 if (varName) {
-                    const key = varName.toLowerCase();
-                    if (!ctx.localVarTypeMap.has(key)) {
+                    // Issue #205: the existing-key check is scoped to the
+                    // CURRENT procedure's bucket via `lookupLocalVarType`
+                    // (proc-bucket first, then module-bucket). Without the
+                    // scoping, a bare `Dim x` inside a procedure would NOT
+                    // register when a MODULE-LEVEL `Dim x` exists, which is
+                    // wrong — the proc-local declaration should win inside
+                    // the proc.
+                    // Issue #251: the shadow registration is UNCONDITIONAL — unlike
+                    // the type-map write below, which yields to an outer declaration
+                    // of the same name. `Dim codigo` inside a Sub declares a local
+                    // whether or not the module also declares `codigo`; that is
+                    // precisely the case the read/write scan must stay silent on.
+                    ctx.declareProcLocalName(ctx.currentVarTypeProcKey, varName);
+                    if (!ctx.lookupLocalVarType(varName)) {
                         // 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 asMatch = DIM_AS_TYPE_RE.exec(line);
                         const outer = asMatch ? (asMatch[1] ?? '').toLowerCase() : 'variant';
-                        ctx.localVarTypeMap.set(key, {
+                        ctx.setLocalVarTypeInScope(ctx.currentVarTypeProcKey, varName, {
                             outer,
                             qualified: false,
                             isArray: isArrayDeclaration(line, varName),
                         });
+                        variablesEmitted += emitModuleVariableNode(ctx, {
+                            name: varName,
+                            // Source-cased so the node reports what the author wrote;
+                            // the type map's lowercase form is a lookup key, not a
+                            // display value. An `As`-less declaration is `Variant` per
+                            // VBA semantics.
+                            declaredType: asMatch ? (asMatch[1] ?? 'Variant') : 'Variant',
+                            isArray: isArrayDeclaration(line, varName),
+                            isWithEvents: false,
+                        }, line, lineNum);
                     }
                 }
             }
-            return { edges: edgesEmitted };
+            return { edges: edgesEmitted, variables: variablesEmitted };
         },
     }),
     (0, rules_1.defineRule)({
@@ -202,12 +406,27 @@ exports.RULES = [
             const weVarM = WITHEVENTS_VAR_RE.exec(line);
             const weVarName = weVarM?.[1] ?? '';
             if (weVarName) {
-                ctx.localVarTypeMap.set(weVarName.toLowerCase(), {
+                // Issue #205: write to the current procedure's bucket so a
+                // `WithEvents` field in `Form_Foo` does not pollute the
+                // `'module'` bucket's `weVarName` key for sibling forms or
+                // unrelated code.
+                ctx.setLocalVarTypeInScope(ctx.currentVarTypeProcKey, weVarName, {
                     outer: formType,
                     qualified: false,
                     withEvents: true,
                     variableName: weVarName,
                 });
+                ctx.declareProcLocalName(ctx.currentVarTypeProcKey, weVarName);
+                // Issue #251: a `WithEvents` field is module-level state like any
+                // other declaration and gets the same `variable` node, flagged so
+                // a consumer can tell an event sink from a plain field. The
+                // `references` + `subscribes-event` edges below are untouched.
+                emitModuleVariableNode(ctx, {
+                    name: weVarName,
+                    declaredType: formType,
+                    isArray: false,
+                    isWithEvents: true,
+                }, line, lineNum);
             }
             // Stamp `variableName` onto the `references` edge's metadata so
             // the post-extraction event-handler synthesis pass (#150) can
@@ -249,36 +468,53 @@ exports.RULES = [
  * 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.
+ * handles WithEvents.
+ *
+ * Issue #205: the classifier maintains a closure-local proc stack
+ * (parallel to the calls-sweep's `ctx.procStack` in
+ * `call-sweep.ts:213`) and writes the top of that stack into
+ * `ctx.currentVarTypeProcKey` so `localVarTypeMap` writes are scoped
+ * to the procedure whose body the `Dim` is inside (or `'module'`
+ * when no procedure is open). The two stacks track the same
+ * `PROC_RE` / `PROCEDURE_END_RE` boundaries so they stay in sync at
+ * every line.
  */
 function createDimsClassifier() {
+    // Issue #205: per-instance proc stack. Holds the `startLine` of
+    // every procedure whose `End Sub`/`End Function`/`End Property`
+    // the classifier has not yet seen. Initialized empty so module-
+    // level `Dim`s write to the `'module'` bucket.
+    const stack = [];
     return {
         name: 'dims',
         count: 0,
         classifyLine(line, i, ctx) {
             const lineNum = i + 1;
-            for (const rule of exports.RULES) {
-                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;
+            // Issue #205: track proc scope BEFORE rule dispatch so a
+            // `Dim x As Y` declaration on the same line as `Sub Foo()` is
+            // written to the `'module'` bucket (the proc isn't open yet
+            // at that point — VBA declares inside the proc, but a `Sub`
+            // line is not a `Dim` line, so the gate is theoretical; we
+            // still process the line as a proc start first to mirror the
+            // call-sweep's order).
+            const procStart = constants_1.PROC_RE.exec(line);
+            if (procStart) {
+                stack.push(lineNum);
+                ctx.currentVarTypeProcKey = String(lineNum);
+                // Issue #251: a parameter shadows a module-level variable of the
+                // same name for the whole procedure body, exactly like a `Dim`
+                // does, so the names are registered on the same shadow bucket.
+                for (const paramName of parseParameterNames(line)) {
+                    ctx.declareProcLocalName(ctx.currentVarTypeProcKey, paramName);
                 }
             }
+            else if (constants_1.PROCEDURE_END_RE.test(line) && stack.length > 0) {
+                stack.pop();
+                ctx.currentVarTypeProcKey =
+                    stack.length > 0 ? String(stack[stack.length - 1]) : 'module';
+            }
+            this.count += (0, rules_1.runRules)(exports.RULES, ctx, line, line, lineNum, {});
         },
     };
 }
-/**
- * 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 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":"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"}
+{"version":3,"file":"dims.js","sourceRoot":"","sources":["../../../src/extraction/vba/dims.ts"],"names":[],"mappings":"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"}

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

@@ -5,12 +5,39 @@ import { VbaExtractorContext, ProcInfo } from './context';
  * a cached stub node (form-layout / report-layout) and an
  * `opens-form` / `opens-report` heuristic edge from the calling Sub.
  */
-export declare function scanDoCmdOpenCalls(ctx: VbaExtractorContext, line: string, caller: ProcInfo, lineNum: number): void;
+export declare function scanDoCmdOpenCalls(ctx: VbaExtractorContext, line: string, maskedLine: string, caller: ProcInfo, lineNum: number): void;
 /**
  * Issue #48: scan one line of VBA source for `DoCmd.OpenQuery "X"` calls.
  * Each match emits ONE `UnresolvedReference` (NOT a stub + edge) so the
  * resolver binds to the REAL `query` node that `SqlQueryExtractor`
  * produces for `queries/<Name>.sql`, tagged `synthesizedBy: 'vba-opens-query'`.
  */
-export declare function scanDoCmdOpenQuery(ctx: VbaExtractorContext, line: string, caller: ProcInfo, lineNum: number): void;
+export declare function scanDoCmdOpenQuery(ctx: VbaExtractorContext, line: string, maskedLine: string, caller: ProcInfo, lineNum: number): void;
+/**
+ * Issue #246 (task T4): scan one line of VBA source for
+ * `DoCmd.Close acForm|acReport, "<Name>"`.
+ *
+ * Each match emits ONE `references` edge -- not a new edge kind -- from the
+ * calling procedure to the very same `form-layout` / `report-layout` stub
+ * that `opens-form` / `opens-report` already point at, by reusing
+ * `resolveOpensStubId`'s cache. A form that is both opened and closed
+ * therefore ends up with ONE node carrying two distinct edges.
+ *
+ * The edge carries `synthesizedBy: 'vba-closes-form'` for both object types
+ * (one tag for the whole verb keeps every close edge queryable as a set) and
+ * `targetFormName` as its single name key, for the same reason. If a
+ * first-class `closes-form` edge kind is ever wanted, that tag is the seam.
+ */
+export declare function scanDoCmdCloseCalls(ctx: VbaExtractorContext, line: string, maskedLine: string, caller: ProcInfo, lineNum: number): void;
+/**
+ * Issue #254: scan one line of VBA source for every `DoCmd` verb in
+ * `DOCMD_OBJECT_DISPATCH`. Each match whose object argument resolves to a
+ * static name emits ONE `UnresolvedReference` — no node, ever.
+ *
+ * `maskedLine` has string CONTENT blanked out, so the `docmd` prefix check
+ * rejects a verb name that only appears inside a string literal. The object
+ * name itself lives inside a literal, which is why the split runs on the
+ * original `line`.
+ */
+export declare function scanDoCmdObjectCalls(ctx: VbaExtractorContext, line: string, maskedLine: string, caller: ProcInfo, lineNum: number): void;
 //# sourceMappingURL=docmd.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"docmd.d.ts","sourceRoot":"","sources":["../../../src/extraction/vba/docmd.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,mBAAmB,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AA2E1D;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,mBAAmB,EACxB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,QAAQ,EAChB,OAAO,EAAE,MAAM,GACd,IAAI,CAoBN;AAmED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,mBAAmB,EACxB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,QAAQ,EAChB,OAAO,EAAE,MAAM,GACd,IAAI,CAsBN"}
+{"version":3,"file":"docmd.d.ts","sourceRoot":"","sources":["../../../src/extraction/vba/docmd.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,mBAAmB,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAoG1D;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,mBAAmB,EACxB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,QAAQ,EAChB,OAAO,EAAE,MAAM,GACd,IAAI,CAqBN;AAsFD;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,mBAAmB,EACxB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,QAAQ,EAChB,OAAO,EAAE,MAAM,GACd,IAAI,CAuBN;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,mBAAmB,EACxB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,QAAQ,EAChB,OAAO,EAAE,MAAM,GACd,IAAI,CAgCN;AAgLD;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,mBAAmB,EACxB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,QAAQ,EAChB,OAAO,EAAE,MAAM,GACd,IAAI,CAmCN"}