vba-runner 0.1.0-alpha.0 → 0.1.1-alpha.1

package/dist/bin/vba-analyzer.cjs

@@ -41,6 +41,7 @@ __export(vba_analyzer_exports, {
   formatWorkspaceOutlineForMcp: () => formatWorkspaceOutline,
   formatWorkspaceReportForMcp: () => formatWorkspaceReportForMcp,
   formatWorkspaceSummary: () => formatWorkspaceSummary,
+  main: () => main,
   paramName: () => paramName,
   vbaTypeToTs: () => vbaTypeToTs
 });
@@ -55,6 +56,8 @@ var LexError = class extends Error {
     this.name = "LexError";
   }
 };
+var NUMERIC_TYPE_SUFFIXES = /* @__PURE__ */ new Set(["%", "&", "^", "!", "#", "@"]);
+var IDENTIFIER_TYPE_SUFFIXES = /* @__PURE__ */ new Set(["%", "&", "^", "!", "#", "@", "$"]);
 var Lexer = class _Lexer {
   input = "";
   pos = 0;
@@ -248,6 +251,7 @@ var Lexer = class _Lexer {
           while (/[0-9a-f]/i.test(this.peek())) {
             hexStr += this.advance();
           }
+          if (NUMERIC_TYPE_SUFFIXES.has(this.peek())) this.advance();
           return { type: 1 /* Number */, value: "0x" + hexStr, line: startLine, column: startColumn };
         } else if (next === "o" || this.isDigit(next)) {
           if (next === "o") this.advance();
@@ -255,6 +259,7 @@ var Lexer = class _Lexer {
           while (/[0-7]/.test(this.peek())) {
             octStr += this.advance();
           }
+          if (NUMERIC_TYPE_SUFFIXES.has(this.peek())) this.advance();
           return { type: 1 /* Number */, value: "0o" + octStr, line: startLine, column: startColumn };
         }
         return { type: 117 /* OperatorAmpersand */, value: "&", line: startLine, column: startColumn };
@@ -321,8 +326,7 @@ var Lexer = class _Lexer {
             numStr += this.advance();
           }
         }
-        const peekChar = this.peek();
-        if (["%", "&", "@", "!", "#", "^"].indexOf(peekChar) !== -1) {
+        if (NUMERIC_TYPE_SUFFIXES.has(this.peek())) {
           numStr += this.advance();
         }
         return { type: 1 /* Number */, value: numStr, line: startLine, column: startColumn };
@@ -332,9 +336,12 @@ var Lexer = class _Lexer {
         while (this.isAlphaNumeric(this.peek())) {
           idStr += this.advance();
         }
-        const typeHints = ["$", "%", "&", "#", "@"];
-        if (typeHints.includes(this.peek())) {
-          idStr += this.advance();
+        {
+          const nextCh = this.peek();
+          const charAfterNext = this.pos + 1 < this.input.length ? this.input[this.pos + 1] : "\0";
+          if (IDENTIFIER_TYPE_SUFFIXES.has(nextCh) && !((nextCh === "!" || nextCh === "^") && (this.isAlphaNumeric(charAfterNext) || charAfterNext === "_"))) {
+            idStr += this.advance();
+          }
         }
         const lowerId = idStr.toLowerCase();
         const lowerBase = lowerId.replace(/[$%&#@]$/, "");
@@ -585,25 +592,46 @@ var Parser = class _Parser {
     ..._Parser.CONTEXTUAL_KW_STMT_ABSENT,
     ..._Parser.CONTEXTUAL_KW_STRUCTURAL
   ]);
-  /** <statement-keyword> tokens additionally permitted as IDENTIFIERs in
-   *  expression context (parsePrimary) for practical VBA compatibility —
-   *  e.g. as method names (obj.Print, ws.Get) or file I/O targets.
-   *  These remain <reserved-identifier> per §3.3.5.2. */
+  /** <statement-keyword> tokens that are <reserved-identifier> per §3.3.5.2 but whose
+   *  enum values fall in [KeywordBase, KeywordAddressOf].
+   *  These CANNOT be used as module-level procedure names (parseProcedureDeclaration rejects them).
+   *  They ARE permitted as member names in expression context (obj.Print, ws.Get, obj.Open) via
+   *  parsePrimary, which is why they appear in COMPAT_KW_EXPR. */
+  static STATEMENT_KW_RESERVED = /* @__PURE__ */ new Set([
+    81 /* KeywordOpen */,
+    82 /* KeywordClose */,
+    84 /* KeywordInput */,
+    85 /* KeywordPrint */,
+    86 /* KeywordPut */,
+    92 /* KeywordWrite */,
+    93 /* KeywordLock */,
+    98 /* KeywordSeek */,
+    100 /* KeywordUnlock */,
+    102 /* KeywordEvent */,
+    103 /* KeywordRaiseEvent */,
+    105 /* KeywordImplements */
+  ]);
+  /** <statement-keyword> tokens permitted as member names in parsePrimary (obj.Print, ws.Get,
+   *  obj.Open, etc.) per §3.3.5.2 "unrestricted-name" rule.
+   *  In parseStatementInner these keywords are all dispatched unconditionally before the
+   *  identifier branch, so the COMPAT_KW_EXPR entries there are never reached — they exist
+   *  solely for parsePrimary dot-member-access context. */
   static COMPAT_KW_EXPR = /* @__PURE__ */ new Set([
     98 /* KeywordSeek */,
-    // <statement-keyword>
     84 /* KeywordInput */,
-    // <statement-keyword> / <special-form>
     85 /* KeywordPrint */,
-    // <statement-keyword>
     86 /* KeywordPut */,
-    // <statement-keyword>
     20 /* KeywordGet */,
-    // <statement-keyword>
+    // enum < KeywordBase so also rejected by range check in parseProcedureDeclaration
     93 /* KeywordLock */,
-    // <statement-keyword>
-    100 /* KeywordUnlock */
-    // <statement-keyword>
+    100 /* KeywordUnlock */,
+    81 /* KeywordOpen */,
+    82 /* KeywordClose */,
+    // Non-reserved statement keywords: can be user-defined proc names (e.g. Function Kill()).
+    // Included here so "Kill = v", "Reset = v", "Width = v" fall through to identifier branch.
+    97 /* KeywordKill */,
+    99 /* KeywordReset */,
+    109 /* KeywordWidth */
   ]);
   errorRecovery;
   /** Returns true if token is a valid IDENTIFIER per §3.3.5.2:
@@ -620,6 +648,15 @@ var Parser = class _Parser {
   isNameToken(token) {
     return token.type === 0 /* Identifier */ || token.type === 138 /* ForeignName */ || token.type >= 3 /* KeywordFor */ && token.type <= 110 /* KeywordAddressOf */;
   }
+  /**
+   * Returns true if the current token stream contains a file-I/O Open statement pattern
+   * ("For <file-mode>") on the current logical line.
+   * Open "path" For Input|Output|Append|Random|Binary ... As #n  →  true
+   * Open()  /  Open = value  /  Open x  (user-defined call)       →  false
+   *
+   * This syntactic check lets the parser disambiguate without a pre-scan:
+   * VBA §3.3.5.3 — user-defined procedures (priority 2) > built-in statement keywords (priority 3).
+   */
   recordError(message, token) {
     const pos = { line: token.line, column: token.column };
     this._diagnostics.push({ message, loc: { start: pos, end: pos }, severity: "error" });
@@ -699,7 +736,7 @@ var Parser = class _Parser {
       isByVal = this.advance().type === 47 /* KeywordByVal */;
     }
     const token = this.peek();
-    if (token.type !== 0 /* Identifier */ && (token.type < 79 /* KeywordBase */ || token.type > 110 /* KeywordAddressOf */)) {
+    if (token.type !== 0 /* Identifier */ && !_Parser.CONTEXTUAL_KW.has(token.type) && (token.type < 79 /* KeywordBase */ || token.type > 110 /* KeywordAddressOf */)) {
       this.throwError(`Parse error at line ${token.line}: Expected parameter name (Found ${this.tokenDisplay(token.value)})`);
     }
     const nameToken = this.advance();
@@ -1110,8 +1147,75 @@ var Parser = class _Parser {
     }
     return stmt;
   }
+  /**
+   * Parse an identifier, method call, or assignment statement.
+   * Called from the identifier branch of parseStatementInner AND from the ARCH-1
+   * user-proc override path (when a built-in keyword is user-defined as a procedure).
+   */
+  parseIdentifierOrCallStatement() {
+    const token = this.peek();
+    if ((token.type === 0 /* Identifier */ || _Parser.CONTEXTUAL_KW.has(token.type)) && this.pos + 1 < this.tokens.length && this.tokens[this.pos + 1].type === 130 /* OperatorColon */) {
+      const labelName = token.value;
+      this.advance();
+      this.advance();
+      return { type: "LabelStatement", label: labelName };
+    }
+    if (token.type === 1 /* Number */) {
+      const labelName = token.value;
+      this.advance();
+      this.match(130 /* OperatorColon */);
+      return { type: "LabelStatement", label: labelName };
+    }
+    const savedPos = this.pos;
+    const expr = this.parsePrimary();
+    if (this.match(120 /* OperatorEquals */)) {
+      return {
+        type: "AssignmentStatement",
+        left: expr,
+        right: this.parseExpression()
+      };
+    } else {
+      if (expr.type === "CallExpression" && this.isBinaryOnlyOperator(this.peek().type)) {
+        this.pos = savedPos;
+        const callee = this.parsePrimary(
+          /* stopBeforeSpacedLParen= */
+          true
+        );
+        const args2 = [this.parseCallArgument()];
+        while (this.match(126 /* OperatorComma */)) {
+          args2.push(this.parseCallArgument());
+        }
+        return { type: "CallStatement", expression: { type: "CallExpression", callee, args: args2 } };
+      }
+      const args = [];
+      if (this.peek().type !== 135 /* Newline */ && this.peek().type !== 136 /* EOF */ && this.peek().type !== 9 /* KeywordElse */ && this.peek().type !== 8 /* KeywordElseIf */ && this.peek().type !== 10 /* KeywordEnd */ && this.peek().type !== 5 /* KeywordNext */ && this.peek().type !== 14 /* KeywordLoop */) {
+        args.push(this.parseCallArgument());
+        while (this.match(126 /* OperatorComma */)) {
+          args.push(this.parseCallArgument());
+        }
+      }
+      if (args.length > 0) {
+        return { type: "CallStatement", expression: { type: "CallExpression", callee: expr, args } };
+      } else if (expr.type === "CallExpression") {
+        const callExpr = expr;
+        if (callExpr.args.length === 0 && callExpr.callee.type === "Identifier" && !callExpr.callee.foreign) {
+          const line = callExpr.loc?.start.line ?? this.peek().line;
+          this.throwError(`Parse error: syntax error at line ${line}`);
+        }
+        return { type: "CallStatement", expression: callExpr };
+      } else {
+        return { type: "CallStatement", expression: { type: "CallExpression", callee: expr, args: [] } };
+      }
+    }
+  }
   parseStatementInner() {
     const token = this.peek();
+    if (_Parser.CONTEXTUAL_KW.has(token.type) && this.pos + 1 < this.tokens.length && this.tokens[this.pos + 1].type === 130 /* OperatorColon */) {
+      const labelName = token.value;
+      this.advance();
+      this.advance();
+      return { type: "LabelStatement", label: labelName };
+    }
     if (token.type === 57 /* KeywordPublic */ || token.type === 58 /* KeywordPrivate */ || token.type === 60 /* KeywordFriend */) {
       const scope = this.advance().value.toLowerCase();
       const next = this.peek();
@@ -1138,6 +1242,9 @@ var Parser = class _Parser {
         stmt2.scope = scope;
         return stmt2;
       }
+      if (next.type === 102 /* KeywordEvent */) {
+        return this.parseEventDeclaration(scope);
+      }
       const stmt = this.parseDimStatement(false, true);
       if (stmt) {
         stmt.scope = scope;
@@ -1259,7 +1366,7 @@ var Parser = class _Parser {
       return this.parsePrintStatement();
     } else if (token.type === 86 /* KeywordPut */) {
       return this.parsePutStatement();
-    } else if (token.type === 20 /* KeywordGet */) {
+    } else if (token.type === 20 /* KeywordGet */ && this.peek(1).type === 111 /* OperatorHash */) {
       return this.parseGetStatement();
     } else if (token.type === 84 /* KeywordInput */) {
       return this.parseInputStatement();
@@ -1279,7 +1386,7 @@ var Parser = class _Parser {
       return this.parseLockStatement();
     } else if (token.type === 100 /* KeywordUnlock */) {
       return this.parseUnlockStatement();
-    } else if (token.type === 109 /* KeywordWidth */ && this.peek(1).type !== 120 /* OperatorEquals */) {
+    } else if (token.type === 109 /* KeywordWidth */ && this.peek(1).type === 111 /* OperatorHash */) {
       return this.parseWidthStatement();
     } else if (token.type === 69 /* KeywordClass */ && this.peek(1).type !== 120 /* OperatorEquals */) {
       return this.parseClassDeclaration();
@@ -1292,59 +1399,8 @@ var Parser = class _Parser {
         return { type: "CallStatement", expression: { type: "CallExpression", callee: expr, args: [] } };
       }
       this.throwError(`Parse error: Expected procedure call after 'Call'`);
-    } else if (token.type === 0 /* Identifier */ || token.type === 138 /* ForeignName */ || token.type === 129 /* OperatorDot */ || token.type === 1 /* Number */ || _Parser.CONTEXTUAL_KW.has(token.type)) {
-      if (token.type === 0 /* Identifier */ && this.pos + 1 < this.tokens.length && this.tokens[this.pos + 1].type === 130 /* OperatorColon */) {
-        const labelName = token.value;
-        this.advance();
-        this.advance();
-        return { type: "LabelStatement", label: labelName };
-      } else if (token.type === 1 /* Number */) {
-        const labelName = token.value;
-        this.advance();
-        this.match(130 /* OperatorColon */);
-        return { type: "LabelStatement", label: labelName };
-      }
-      const savedPos = this.pos;
-      const expr = this.parsePrimary();
-      if (this.match(120 /* OperatorEquals */)) {
-        return {
-          type: "AssignmentStatement",
-          left: expr,
-          right: this.parseExpression()
-        };
-      } else {
-        if (expr.type === "CallExpression" && this.isBinaryOnlyOperator(this.peek().type)) {
-          this.pos = savedPos;
-          const callee = this.parsePrimary(
-            /* stopBeforeSpacedLParen= */
-            true
-          );
-          const args2 = [this.parseCallArgument()];
-          while (this.match(126 /* OperatorComma */)) {
-            args2.push(this.parseCallArgument());
-          }
-          return { type: "CallStatement", expression: { type: "CallExpression", callee, args: args2 } };
-        }
-        const args = [];
-        if (this.peek().type !== 135 /* Newline */ && this.peek().type !== 136 /* EOF */ && this.peek().type !== 9 /* KeywordElse */ && this.peek().type !== 8 /* KeywordElseIf */ && this.peek().type !== 10 /* KeywordEnd */ && this.peek().type !== 5 /* KeywordNext */ && this.peek().type !== 14 /* KeywordLoop */) {
-          args.push(this.parseCallArgument());
-          while (this.match(126 /* OperatorComma */)) {
-            args.push(this.parseCallArgument());
-          }
-        }
-        if (args.length > 0) {
-          return { type: "CallStatement", expression: { type: "CallExpression", callee: expr, args } };
-        } else if (expr.type === "CallExpression") {
-          const callExpr = expr;
-          if (callExpr.args.length === 0 && callExpr.callee.type === "Identifier" && !callExpr.callee.foreign) {
-            const line = callExpr.loc?.start.line ?? this.peek().line;
-            this.throwError(`Parse error: syntax error at line ${line}`);
-          }
-          return { type: "CallStatement", expression: callExpr };
-        } else {
-          return { type: "CallStatement", expression: { type: "CallExpression", callee: expr, args: [] } };
-        }
-      }
+    } else if (token.type === 0 /* Identifier */ || token.type === 138 /* ForeignName */ || token.type === 129 /* OperatorDot */ || token.type === 70 /* KeywordMe */ || token.type === 1 /* Number */ || _Parser.CONTEXTUAL_KW.has(token.type) || _Parser.COMPAT_KW_EXPR.has(token.type)) {
+      return this.parseIdentifierOrCallStatement();
     } else if (token.type === 137 /* Unknown */) {
       this.throwError(`Parse error: Unknown token '${this.tokenDisplay(token.value)}' at line ${token.line}`);
     } else {
@@ -1352,7 +1408,7 @@ var Parser = class _Parser {
     }
     return null;
   }
-  parseProcedureDeclaration(scope, isStatic) {
+  parseProcedureDeclaration(scope, isStatic, isClassMember = false) {
     const isFunction = this.peek().type === 18 /* KeywordFunction */;
     const isProperty = this.peek().type === 19 /* KeywordProperty */;
     this.advance();
@@ -1370,6 +1426,9 @@ var Parser = class _Parser {
     if (!this.isIdentifier(idToken) && (idToken.type < 79 /* KeywordBase */ || idToken.type > 110 /* KeywordAddressOf */)) {
       this.throwError(`Parse error at line ${idToken.line}: Expected procedure name (Found ${this.tokenDisplay(idToken.value)})`);
     }
+    if (!isClassMember && _Parser.STATEMENT_KW_RESERVED.has(idToken.type)) {
+      this.throwError(`Compile error at line ${idToken.line}: '${idToken.value}' is a reserved word and cannot be used as a procedure name`);
+    }
     const name = this.makeIdentifier(idToken);
     const parameters = [];
     let paramsEndColumn;
@@ -1532,7 +1591,7 @@ var Parser = class _Parser {
   parseGoToStatement() {
     this.advance();
     const labelToken = this.advance();
-    if (labelToken.type !== 0 /* Identifier */ && labelToken.type !== 1 /* Number */) {
+    if (!this.isIdentifier(labelToken) && labelToken.type !== 1 /* Number */) {
       this.throwError(`Parse error: Expected identifier or number after 'GoTo' at line ${labelToken.line}`);
     }
     return { type: "GoToStatement", label: labelToken.value };
@@ -1655,7 +1714,7 @@ var Parser = class _Parser {
   parseClassDeclaration() {
     this.advance();
     const nameToken = this.advance();
-    if (nameToken.type !== 0 /* Identifier */) {
+    if (!this.isIdentifier(nameToken)) {
       this.throwError(`Parse error: Expected class name after 'Class' at line ${nameToken.line}`);
     }
     return this.parseClassBody(nameToken.value, true);
@@ -1681,7 +1740,7 @@ var Parser = class _Parser {
       }
       const inner = this.peek();
       if (inner.type === 17 /* KeywordSub */ || inner.type === 18 /* KeywordFunction */ || inner.type === 19 /* KeywordProperty */) {
-        const proc = this.parseProcedureDeclaration(scope);
+        const proc = this.parseProcedureDeclaration(scope, void 0, true);
         proc.moduleName = className;
         procedures.push(proc);
         body.push(proc);
@@ -1697,13 +1756,16 @@ var Parser = class _Parser {
       } else if (inner.type === 102 /* KeywordEvent */) {
         const event = this.parseEventDeclaration(scope);
         body.push(event);
+      } else if (inner.type === 31 /* KeywordConst */) {
+        const constDecl = this.parseConstDeclaration();
+        body.push(constDecl);
       } else if (inner.type === 68 /* KeywordStatic */) {
         this.advance();
         const field = this.parseDimStatement(true, true);
         field.scope = scope ?? "public";
         fields.push(field);
         body.push(field);
-      } else if (scope !== void 0 && inner.type === 0 /* Identifier */) {
+      } else if (scope !== void 0 && (this.isIdentifier(inner) || inner.type === 104 /* KeywordWithEvents */)) {
         const field = this.parseDimStatement(false, true);
         field.scope = scope;
         fields.push(field);
@@ -2182,7 +2244,8 @@ var Parser = class _Parser {
     } else if (token.type === 0 /* Identifier */ || _Parser.CONTEXTUAL_KW.has(token.type) || _Parser.COMPAT_KW_EXPR.has(token.type)) {
       expr = { type: "Identifier", name: token.value };
     } else if (token.type === 110 /* KeywordAddressOf */) {
-      const procName = this.consume(0 /* Identifier */, "Expected procedure name after 'AddressOf'");
+      const procName = this.advance();
+      if (!this.isIdentifier(procName)) this.throwError(`Parse error at line ${procName.line}: Expected procedure name after 'AddressOf'`);
       expr = { type: "AddressOfExpression", procedureName: { type: "Identifier", name: procName.value } };
     } else if (token.type === 44 /* KeywordEmpty */) {
       expr = { type: "Identifier", name: token.value };
@@ -2217,7 +2280,7 @@ var Parser = class _Parser {
         this.throwError(`Parse error: Expected 'Is' after 'TypeOf' at line ${this.peek().line}`);
       }
       const typeToken = this.advance();
-      if (typeToken.type !== 0 /* Identifier */ && typeToken.type !== 25 /* KeywordCollection */) {
+      if (!this.isIdentifier(typeToken) && typeToken.type !== 25 /* KeywordCollection */) {
         this.throwError(`Parse error: Expected type name after 'Is' at line ${typeToken.line}`);
       }
       expr = { type: "TypeOfIsExpression", expression: expr, typeName: typeToken.value };
@@ -2306,7 +2369,7 @@ var Parser = class _Parser {
     const labels = [];
     while (true) {
       const labelToken = this.advance();
-      if (labelToken.type !== 0 /* Identifier */ && labelToken.type !== 1 /* Number */) {
+      if (!this.isIdentifier(labelToken) && labelToken.type !== 1 /* Number */) {
         this.throwError(`Parse error: Expected label (identifier or number) in On...GoTo/GoSub at line ${labelToken.line}`);
       }
       labels.push(labelToken.value);
@@ -2319,7 +2382,7 @@ var Parser = class _Parser {
   parseGoSubStatement() {
     this.advance();
     const labelToken = this.advance();
-    if (labelToken.type !== 0 /* Identifier */ && labelToken.type !== 1 /* Number */) {
+    if (!this.isIdentifier(labelToken) && labelToken.type !== 1 /* Number */) {
       this.throwError(`Parse error: Expected label after GoSub at line ${labelToken.line}`);
     }
     return { type: "GoSubStatement", label: labelToken.value };
@@ -2349,7 +2412,8 @@ var Parser = class _Parser {
   }
   parseEventDeclaration(scope) {
     this.advance();
-    const idToken = this.consume(0 /* Identifier */, "Expected identifier after 'Event'");
+    const idToken = this.advance();
+    if (!this.isIdentifier(idToken) && !this.isNameToken(idToken)) this.throwError(`Expected identifier after 'Event' at line ${idToken.line}`);
     const name = { type: "Identifier", name: idToken.value };
     const parameters = [];
     if (this.match(127 /* OperatorLParen */)) {
@@ -2365,7 +2429,8 @@ var Parser = class _Parser {
   }
   parseRaiseEventStatement() {
     this.advance();
-    const idToken = this.consume(0 /* Identifier */, "Expected identifier after 'RaiseEvent'");
+    const idToken = this.advance();
+    if (!this.isIdentifier(idToken) && !this.isNameToken(idToken)) this.throwError(`Expected identifier after 'RaiseEvent' at line ${idToken.line}`);
     const eventName = { type: "Identifier", name: idToken.value };
     const args = [];
     if (this.match(127 /* OperatorLParen */)) {
@@ -2381,7 +2446,8 @@ var Parser = class _Parser {
   }
   parseImplementsDirective() {
     this.advance();
-    const idToken = this.consume(0 /* Identifier */, "Expected interface name after 'Implements'");
+    const idToken = this.advance();
+    if (!this.isIdentifier(idToken)) this.throwError(`Parse error at line ${idToken.line}: Expected interface name after 'Implements'`);
     return { type: "ImplementsDirective", interfaceName: idToken.value };
   }
   parseAppActivateStatement() {
@@ -2693,6 +2759,11 @@ function evaluateCCExpr(expr, resolve) {
 // ../../test-libs/vba-analyzer.ts
 var fs = __toESM(require("fs"), 1);
 var path = __toESM(require("path"), 1);
+
+// ../../test-libs/version.ts
+var VERSION = "0.1.1-alpha.1";
+
+// ../../test-libs/vba-analyzer.ts
 function isStatementArray(v) {
   return Array.isArray(v);
 }
@@ -4196,7 +4267,8 @@ function analyzeFile(filePath) {
       definedTypes: /* @__PURE__ */ new Set(),
       callsByProc: /* @__PURE__ */ new Map(),
       xlVbConstantRefs: /* @__PURE__ */ new Set(),
-      commentedCodeBlocks: detectCommentedCode(src, filePath)
+      commentedCodeBlocks: detectCommentedCode(src, filePath),
+      withEventsVars: /* @__PURE__ */ new Set()
     };
   }
   if (ast.diagnostics && ast.diagnostics.length > 0) {
@@ -4275,13 +4347,22 @@ function analyzeFile(filePath) {
   const xlVbConstantRefs = collectExcelConstantRefs(ast);
   const gotoGraphs = procs.map((proc) => analyzeGotoInProc(proc));
   const loopAnalyses = procs.map((proc, i) => analyzeLoopsInProc(proc, gotoGraphs[i]));
+  const withEventsVars = /* @__PURE__ */ new Set();
+  for (const s of ast.body) {
+    if (s.type === "VariableDeclaration") {
+      for (const decl of s.declarations ?? []) {
+        if (decl.isWithEvents) withEventsVars.add((decl.name?.name ?? "").toLowerCase());
+      }
+    }
+  }
   return {
     report: { filePath, totalLines: lines.length, procedureCount: procedures.length, procedures, prefixClusters, warnings, gotoGraphs, loopAnalyses },
     definedProcs,
     definedTypes,
     callsByProc,
     xlVbConstantRefs,
-    commentedCodeBlocks: detectCommentedCode(src, filePath)
+    commentedCodeBlocks: detectCommentedCode(src, filePath),
+    withEventsVars
   };
 }
 function buildWorkspaceReport(analyses) {
@@ -4313,6 +4394,10 @@ function buildWorkspaceReport(analyses) {
   for (const a of analyses) {
     for (const p of a.report.procedures) {
       if (p.referenceCount === 0) {
+        const nameLower = p.name.toLowerCase();
+        const sep = nameLower.indexOf("_");
+        const isEventHandler = nameLower === "class_initialize" || nameLower === "class_terminate" || sep > 0 && a.withEventsVars.has(nameLower.slice(0, sep));
+        if (isEventHandler) continue;
         if (p.scope === "private") {
           deadCodeCandidates.push({
             file: a.report.filePath,
@@ -4977,10 +5062,13 @@ function buildDiffJson(baseline, current) {
     }
   };
 }
-function main() {
-  const args = process.argv.slice(2);
+function main(args) {
+  if (args.includes("--version") || args.includes("-v")) {
+    console.log(VERSION);
+    process.exit(0);
+  }
   if (args.length === 0 || args.includes("--help")) {
-    console.log("Usage: npx tsx test-libs/vba-analyzer.ts <file-or-dir> [options]");
+    console.log("Usage: vba-runner analyze <file-or-dir> [options]");
     console.log("");
     console.log("  --json                JSON \u5F62\u5F0F\u3067\u51FA\u529B\uFF08\u30D7\u30ED\u30B0\u30E9\u30E0\u9023\u643A\u7528\uFF09");
     console.log("  --diff <baseline>     baseline JSON \u3068\u306E\u5DEE\u5206\u3092\u8868\u793A\uFF08--json \u3068\u4F75\u7528\u53EF\uFF09");
@@ -4990,6 +5078,7 @@ function main() {
     console.log("  --goto-graph          GoTo \u6587\u306E\u5236\u5FA1\u30D5\u30ED\u30FC\u30B0\u30E9\u30D5\u3068\u30EA\u30D5\u30A1\u30AF\u30BF\u30EA\u30F3\u30B0\u63D0\u6848\u3092\u8868\u793A");
     console.log("  --cross-iter          \u30AF\u30ED\u30B9\u30A4\u30C6\u30EC\u30FC\u30B7\u30E7\u30F3\u5909\u6570\uFF08ByRef \u5FC5\u8981\u5909\u6570\uFF09\u306E\u4E00\u89A7\u3092\u8868\u793A");
     console.log("  --gen-test-dir <dir>  \u30C6\u30B9\u30C8\u7528\u30BD\u30FC\u30B9\u3092\u6307\u5B9A\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u751F\u6210\uFF08const.ts \u7B49\uFF09");
+    console.log("  --version             \u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u8868\u793A");
     process.exit(args.length === 0 ? 1 : 0);
   }
   const wantJson = args.includes("--json");
@@ -5064,7 +5153,7 @@ function main() {
   );
   if (hasParseErrors) process.exit(1);
 }
-if (process.argv[1]?.includes("vba-analyzer")) main();
+if (process.argv[1]?.includes("vba-analyzer")) main(process.argv.slice(2));
 function analyzeWorkspaceForMcpFromFiles(files) {
   const analyses = files.map((f) => analyzeFile(f));
   return buildWorkspaceReport(analyses);
@@ -5088,6 +5177,7 @@ function formatWorkspaceReportForMcp(w) {
   formatWorkspaceOutlineForMcp,
   formatWorkspaceReportForMcp,
   formatWorkspaceSummary,
+  main,
   paramName,
   vbaTypeToTs
 });

package/dist/bin/vba-formatter.cjs

@@ -5,6 +5,10 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
     for (let key of __getOwnPropNames(from))
@@ -21,8 +25,14 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // ../../test-libs/vba-formatter.ts
+var vba_formatter_exports = {};
+__export(vba_formatter_exports, {
+  main: () => main
+});
+module.exports = __toCommonJS(vba_formatter_exports);
 var fs = __toESM(require("fs"), 1);
 var path = __toESM(require("path"), 1);
 
@@ -35,6 +45,8 @@ var LexError = class extends Error {
     this.name = "LexError";
   }
 };
+var NUMERIC_TYPE_SUFFIXES = /* @__PURE__ */ new Set(["%", "&", "^", "!", "#", "@"]);
+var IDENTIFIER_TYPE_SUFFIXES = /* @__PURE__ */ new Set(["%", "&", "^", "!", "#", "@", "$"]);
 var Lexer = class _Lexer {
   input = "";
   pos = 0;
@@ -228,6 +240,7 @@ var Lexer = class _Lexer {
           while (/[0-9a-f]/i.test(this.peek())) {
             hexStr += this.advance();
           }
+          if (NUMERIC_TYPE_SUFFIXES.has(this.peek())) this.advance();
           return { type: 1 /* Number */, value: "0x" + hexStr, line: startLine, column: startColumn };
         } else if (next === "o" || this.isDigit(next)) {
           if (next === "o") this.advance();
@@ -235,6 +248,7 @@ var Lexer = class _Lexer {
           while (/[0-7]/.test(this.peek())) {
             octStr += this.advance();
           }
+          if (NUMERIC_TYPE_SUFFIXES.has(this.peek())) this.advance();
           return { type: 1 /* Number */, value: "0o" + octStr, line: startLine, column: startColumn };
         }
         return { type: 117 /* OperatorAmpersand */, value: "&", line: startLine, column: startColumn };
@@ -301,8 +315,7 @@ var Lexer = class _Lexer {
             numStr += this.advance();
           }
         }
-        const peekChar = this.peek();
-        if (["%", "&", "@", "!", "#", "^"].indexOf(peekChar) !== -1) {
+        if (NUMERIC_TYPE_SUFFIXES.has(this.peek())) {
           numStr += this.advance();
         }
         return { type: 1 /* Number */, value: numStr, line: startLine, column: startColumn };
@@ -312,9 +325,12 @@ var Lexer = class _Lexer {
         while (this.isAlphaNumeric(this.peek())) {
           idStr += this.advance();
         }
-        const typeHints = ["$", "%", "&", "#", "@"];
-        if (typeHints.includes(this.peek())) {
-          idStr += this.advance();
+        {
+          const nextCh = this.peek();
+          const charAfterNext = this.pos + 1 < this.input.length ? this.input[this.pos + 1] : "\0";
+          if (IDENTIFIER_TYPE_SUFFIXES.has(nextCh) && !((nextCh === "!" || nextCh === "^") && (this.isAlphaNumeric(charAfterNext) || charAfterNext === "_"))) {
+            idStr += this.advance();
+          }
         }
         const lowerId = idStr.toLowerCase();
         const lowerBase = lowerId.replace(/[$%&#@]$/, "");
@@ -910,6 +926,9 @@ function applyEdits(source, edits) {
   return lines.join("\n");
 }
 
+// ../../test-libs/version.ts
+var VERSION = "0.1.1-alpha.1";
+
 // ../../test-libs/vba-formatter.ts
 var VBA_EXTENSIONS = /\.(bas|cls|frm)$/i;
 function collectFiles(target) {
@@ -944,21 +963,25 @@ function buildDiff(original, formatted, filePath) {
   }
   return hasDiff ? diffLines.join("\n") : "";
 }
-function main() {
-  const args = process.argv.slice(2);
+function main(args) {
+  if (args.includes("--version") || args.includes("-v")) {
+    console.log(VERSION);
+    process.exit(0);
+  }
   if (args.length === 0 || args[0] === "--help" || args[0] === "-h") {
-    console.log(`Usage: vba-formatter <file-or-dir> [--check | --write] [options]
+    console.log(`Usage: vba-runner format <file-or-dir> [--check | --write] [options]
 
 Options:
   --check            \u5DEE\u5206\u304C\u3042\u308C\u3070\u8868\u793A\u3057\u3066 exit code 1 \u3067\u7D42\u4E86
   --write            \u30D5\u30A1\u30A4\u30EB\u3092\u4E0A\u66F8\u304D\uFF08\u6307\u5B9A\u3057\u306A\u3044\u5834\u5408\u306F stdout \u306B\u51FA\u529B\uFF09
   --indent-size=N    \u30A4\u30F3\u30C7\u30F3\u30C8\u5E45\uFF08\u30C7\u30D5\u30A9\u30EB\u30C8: 4\uFF09
   --no-keyword-case  \u30AD\u30FC\u30EF\u30FC\u30C9\u306E\u5927\u6587\u5B57\u5316\u3092\u7121\u52B9\u5316
+  --version          \u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u8868\u793A
 
 Example:
-  npx tsx test-libs/vba-formatter.ts src/vba/Main.bas
-  npx tsx test-libs/vba-formatter.ts src/vba/ --check
-  npx tsx test-libs/vba-formatter.ts src/vba/Main.bas --write --indent-size=2`);
+  vba-runner format src/vba/Main.bas
+  vba-runner format src/vba/ --check
+  vba-runner format src/vba/Main.bas --write --indent-size=2`);
     process.exit(0);
   }
   const target = args.find((a) => !a.startsWith("-"));
@@ -1009,4 +1032,8 @@ Example:
     process.exit(1);
   }
 }
-main();
+if (process.argv[1]?.includes("vba-formatter")) main(process.argv.slice(2));
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  main
+});