vba-runner 0.1.1-alpha.2 → 0.1.1-alpha.3

package/dist/bin/vba-analyzer.cjs

@@ -2521,7 +2521,7 @@ var Parser = class _Parser {
   parseEventDeclaration(scope) {
     this.advance();
     const idToken = this.advance();
-    if (!this.isIdentifier(idToken) && !this.isNameToken(idToken)) this.throwError(`Expected identifier after 'Event' at line ${idToken.line}`);
+    if (!this.isIdentifier(idToken)) this.throwError(`Expected identifier after 'Event' at line ${idToken.line}`);
     const name = { type: "Identifier", name: idToken.value };
     const parameters = [];
     if (this.match(128 /* OperatorLParen */)) {
@@ -2539,7 +2539,7 @@ var Parser = class _Parser {
   parseRaiseEventStatement() {
     this.advance();
     const idToken = this.advance();
-    if (!this.isIdentifier(idToken) && !this.isNameToken(idToken)) this.throwError(`Expected identifier after 'RaiseEvent' at line ${idToken.line}`);
+    if (!this.isIdentifier(idToken)) this.throwError(`Expected identifier after 'RaiseEvent' at line ${idToken.line}`);
     const eventName = { type: "Identifier", name: idToken.value };
     const args = [];
     if (this.match(128 /* OperatorLParen */)) {
@@ -2864,6 +2864,21 @@ function evaluateCCExpr(expr, resolve) {
   }
   return parseOr();
 }
+function stripVBAFileHeader(source) {
+  const lines = source.split("\n");
+  if (!lines[0]?.trimEnd().toUpperCase().startsWith("VERSION")) return source;
+  const result = [...lines];
+  let i = 0;
+  result[i] = "";
+  i++;
+  while (i < result.length) {
+    const trimmed = result[i].trimEnd().toUpperCase();
+    result[i] = "";
+    i++;
+    if (trimmed === "END") break;
+  }
+  return result.join("\n");
+}
 
 // ../../test-libs/vba-analyzer.ts
 var fs = __toESM(require("fs"), 1);
@@ -4379,7 +4394,9 @@ function analyzeGotoInProc(proc) {
   };
 }
 function analyzeFile(filePath) {
-  const src = fs.readFileSync(filePath, "utf-8");
+  const ext = path.extname(filePath).toLowerCase();
+  const raw = fs.readFileSync(filePath, "utf-8");
+  const src = stripVBAFileHeader(raw);
   const lines = src.split("\n");
   const warnings = [];
   let ast;

package/dist/bin/vba-parse-check.cjs

@@ -2508,7 +2508,7 @@ var Parser = class _Parser {
   parseEventDeclaration(scope) {
     this.advance();
     const idToken = this.advance();
-    if (!this.isIdentifier(idToken) && !this.isNameToken(idToken)) this.throwError(`Expected identifier after 'Event' at line ${idToken.line}`);
+    if (!this.isIdentifier(idToken)) this.throwError(`Expected identifier after 'Event' at line ${idToken.line}`);
     const name = { type: "Identifier", name: idToken.value };
     const parameters = [];
     if (this.match(128 /* OperatorLParen */)) {
@@ -2526,7 +2526,7 @@ var Parser = class _Parser {
   parseRaiseEventStatement() {
     this.advance();
     const idToken = this.advance();
-    if (!this.isIdentifier(idToken) && !this.isNameToken(idToken)) this.throwError(`Expected identifier after 'RaiseEvent' at line ${idToken.line}`);
+    if (!this.isIdentifier(idToken)) this.throwError(`Expected identifier after 'RaiseEvent' at line ${idToken.line}`);
     const eventName = { type: "Identifier", name: idToken.value };
     const args = [];
     if (this.match(128 /* OperatorLParen */)) {
@@ -2604,6 +2604,23 @@ var Parser = class _Parser {
   }
 };
 
+// ../../src/engine/preprocessor.ts
+function stripVBAFileHeader(source) {
+  const lines = source.split("\n");
+  if (!lines[0]?.trimEnd().toUpperCase().startsWith("VERSION")) return source;
+  const result = [...lines];
+  let i = 0;
+  result[i] = "";
+  i++;
+  while (i < result.length) {
+    const trimmed = result[i].trimEnd().toUpperCase();
+    result[i] = "";
+    i++;
+    if (trimmed === "END") break;
+  }
+  return result.join("\n");
+}
+
 // ../../test-libs/vba-parse-check.ts
 var fs = __toESM(require("fs"), 1);
 var path = __toESM(require("path"), 1);
@@ -2613,7 +2630,9 @@ var VERSION = "0.1.1-alpha.1";
 
 // ../../test-libs/vba-parse-check.ts
 function checkFile(filePath) {
-  const src = fs.readFileSync(filePath, "utf8");
+  const ext = path.extname(filePath).toLowerCase();
+  const raw = fs.readFileSync(filePath, "utf8");
+  const src = stripVBAFileHeader(raw);
   const diags = [];
   const lexer = new Lexer(src);
   let tokens;

package/dist/bin/vba-run.cjs

@@ -2510,7 +2510,7 @@ var Parser = class _Parser {
   parseEventDeclaration(scope) {
     this.advance();
     const idToken = this.advance();
-    if (!this.isIdentifier(idToken) && !this.isNameToken(idToken)) this.throwError(`Expected identifier after 'Event' at line ${idToken.line}`);
+    if (!this.isIdentifier(idToken)) this.throwError(`Expected identifier after 'Event' at line ${idToken.line}`);
     const name = { type: "Identifier", name: idToken.value };
     const parameters = [];
     if (this.match(128 /* OperatorLParen */)) {
@@ -2528,7 +2528,7 @@ var Parser = class _Parser {
   parseRaiseEventStatement() {
     this.advance();
     const idToken = this.advance();
-    if (!this.isIdentifier(idToken) && !this.isNameToken(idToken)) this.throwError(`Expected identifier after 'RaiseEvent' at line ${idToken.line}`);
+    if (!this.isIdentifier(idToken)) this.throwError(`Expected identifier after 'RaiseEvent' at line ${idToken.line}`);
     const eventName = { type: "Identifier", name: idToken.value };
     const args = [];
     if (this.match(128 /* OperatorLParen */)) {
@@ -9707,6 +9707,21 @@ function evaluateCCExpr(expr, resolve2) {
   }
   return parseOr();
 }
+function stripVBAFileHeader(source) {
+  const lines = source.split("\n");
+  if (!lines[0]?.trimEnd().toUpperCase().startsWith("VERSION")) return source;
+  const result = [...lines];
+  let i = 0;
+  result[i] = "";
+  i++;
+  while (i < result.length) {
+    const trimmed = result[i].trimEnd().toUpperCase();
+    result[i] = "";
+    i++;
+    if (trimmed === "END") break;
+  }
+  return result.join("\n");
+}
 
 // ../../test-libs/version.ts
 var VERSION = "0.1.1-alpha.1";
@@ -9754,8 +9769,10 @@ function main(args) {
   for (const file of files) {
     const moduleName = path4.basename(file, path4.extname(file));
     ev.setSourceModule(moduleName);
-    const src = preprocess(fs2.readFileSync(file, "utf-8"));
     const ext = path4.extname(file).toLowerCase();
+    let src = fs2.readFileSync(file, "utf-8");
+    src = stripVBAFileHeader(src);
+    src = preprocess(src);
     const isRawCls = ext === ".cls" && !src.trim().toLowerCase().startsWith("class ") && !src.toLowerCase().includes("end class");
     const ast = new Parser(new Lexer(src).tokenize(), isRawCls ? { parseAsClass: moduleName } : {}).parse();
     ev.evaluateModule(ast);

package/dist/bin/vba-runner.cjs

@@ -2500,7 +2500,7 @@ var Parser = class _Parser {
   parseEventDeclaration(scope) {
     this.advance();
     const idToken = this.advance();
-    if (!this.isIdentifier(idToken) && !this.isNameToken(idToken)) this.throwError(`Expected identifier after 'Event' at line ${idToken.line}`);
+    if (!this.isIdentifier(idToken)) this.throwError(`Expected identifier after 'Event' at line ${idToken.line}`);
     const name = { type: "Identifier", name: idToken.value };
     const parameters = [];
     if (this.match(128 /* OperatorLParen */)) {
@@ -2518,7 +2518,7 @@ var Parser = class _Parser {
   parseRaiseEventStatement() {
     this.advance();
     const idToken = this.advance();
-    if (!this.isIdentifier(idToken) && !this.isNameToken(idToken)) this.throwError(`Expected identifier after 'RaiseEvent' at line ${idToken.line}`);
+    if (!this.isIdentifier(idToken)) this.throwError(`Expected identifier after 'RaiseEvent' at line ${idToken.line}`);
     const eventName = { type: "Identifier", name: idToken.value };
     const args = [];
     if (this.match(128 /* OperatorLParen */)) {
@@ -9697,6 +9697,21 @@ function evaluateCCExpr(expr, resolve2) {
   }
   return parseOr();
 }
+function stripVBAFileHeader(source) {
+  const lines = source.split("\n");
+  if (!lines[0]?.trimEnd().toUpperCase().startsWith("VERSION")) return source;
+  const result = [...lines];
+  let i = 0;
+  result[i] = "";
+  i++;
+  while (i < result.length) {
+    const trimmed = result[i].trimEnd().toUpperCase();
+    result[i] = "";
+    i++;
+    if (trimmed === "END") break;
+  }
+  return result.join("\n");
+}
 
 // ../../test-libs/version.ts
 var VERSION = "0.1.1-alpha.1";
@@ -9744,8 +9759,10 @@ function main(args) {
   for (const file of files) {
     const moduleName = path4.basename(file, path4.extname(file));
     ev.setSourceModule(moduleName);
-    const src = preprocess(fs2.readFileSync(file, "utf-8"));
     const ext = path4.extname(file).toLowerCase();
+    let src = fs2.readFileSync(file, "utf-8");
+    src = stripVBAFileHeader(src);
+    src = preprocess(src);
     const isRawCls = ext === ".cls" && !src.trim().toLowerCase().startsWith("class ") && !src.toLowerCase().includes("end class");
     const ast = new Parser(new Lexer(src).tokenize(), isRawCls ? { parseAsClass: moduleName } : {}).parse();
     ev.evaluateModule(ast);
@@ -11271,7 +11288,9 @@ function analyzeGotoInProc(proc) {
   };
 }
 function analyzeFile(filePath) {
-  const src = fs3.readFileSync(filePath, "utf-8");
+  const ext = path5.extname(filePath).toLowerCase();
+  const raw = fs3.readFileSync(filePath, "utf-8");
+  const src = stripVBAFileHeader(raw);
   const lines = src.split("\n");
   const warnings = [];
   let ast;
@@ -12730,7 +12749,9 @@ if (process.argv[1]?.includes("vba-formatter")) main3(process.argv.slice(2));
 var fs5 = __toESM(require("fs"), 1);
 var path7 = __toESM(require("path"), 1);
 function checkFile(filePath) {
-  const src = fs5.readFileSync(filePath, "utf8");
+  const ext = path7.extname(filePath).toLowerCase();
+  const raw = fs5.readFileSync(filePath, "utf8");
+  const src = stripVBAFileHeader(raw);
   const diags = [];
   const lexer = new Lexer(src);
   let tokens;

package/dist/lib.cjs

@@ -2522,7 +2522,7 @@ var Parser = class _Parser {
   parseEventDeclaration(scope) {
     this.advance();
     const idToken = this.advance();
-    if (!this.isIdentifier(idToken) && !this.isNameToken(idToken)) this.throwError(`Expected identifier after 'Event' at line ${idToken.line}`);
+    if (!this.isIdentifier(idToken)) this.throwError(`Expected identifier after 'Event' at line ${idToken.line}`);
     const name = { type: "Identifier", name: idToken.value };
     const parameters = [];
     if (this.match(128 /* OperatorLParen */)) {
@@ -2540,7 +2540,7 @@ var Parser = class _Parser {
   parseRaiseEventStatement() {
     this.advance();
     const idToken = this.advance();
-    if (!this.isIdentifier(idToken) && !this.isNameToken(idToken)) this.throwError(`Expected identifier after 'RaiseEvent' at line ${idToken.line}`);
+    if (!this.isIdentifier(idToken)) this.throwError(`Expected identifier after 'RaiseEvent' at line ${idToken.line}`);
     const eventName = { type: "Identifier", name: idToken.value };
     const args = [];
     if (this.match(128 /* OperatorLParen */)) {
@@ -9666,6 +9666,21 @@ function evaluateCCExpr(expr, resolve2) {
   }
   return parseOr();
 }
+function stripVBAFileHeader(source) {
+  const lines = source.split("\n");
+  if (!lines[0]?.trimEnd().toUpperCase().startsWith("VERSION")) return source;
+  const result = [...lines];
+  let i = 0;
+  result[i] = "";
+  i++;
+  while (i < result.length) {
+    const trimmed = result[i].trimEnd().toUpperCase();
+    result[i] = "";
+    i++;
+    if (trimmed === "END") break;
+  }
+  return result.join("\n");
+}
 
 // ../../test-libs/mock-loader.ts
 var fs = __toESM(require("fs"), 1);
@@ -9720,7 +9735,8 @@ function loadVbaMock(file, evaluator) {
     const source = fs.readFileSync(file, "utf-8");
     const ext = path4.extname(file).toLowerCase();
     const moduleName = path4.basename(file, ext);
-    const processed = preprocess(source);
+    const stripped = stripVBAFileHeader(source);
+    const processed = preprocess(stripped);
     const isRawCls = ext === ".cls" && !processed.trim().toLowerCase().startsWith("class ") && !processed.toLowerCase().includes("end class");
     const parseOpts = isRawCls ? { parseAsClass: moduleName } : {};
     const classesBefore = evaluator.getRegisteredClassNames();
@@ -10577,8 +10593,9 @@ var VBARunner = class {
       try {
         const moduleName = path5.basename(file, path5.extname(file));
         this.evaluator.setSourceModule(moduleName);
-        source = preprocess(source, config.compilerConstants);
         const ext = path5.extname(file).toLowerCase();
+        source = stripVBAFileHeader(source);
+        source = preprocess(source, config.compilerConstants);
         const isRawCls = ext === ".cls" && !source.trim().toLowerCase().startsWith("class ") && !source.toLowerCase().includes("end class");
         const parseOpts = isRawCls ? { parseAsClass: moduleName } : {};
         const ast = new Parser(new Lexer(source).tokenize(), parseOpts).parse();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vba-runner",
-  "version": "0.1.1-alpha.2",
+  "version": "0.1.1-alpha.3",
   "description": "VBA execution engine with test runner and CLI tools (analyzer, formatter, parse-check)",
   "type": "module",
   "license": "MIT",