Add tests

lib/compiler/asts.js

@@ -7,24 +7,25 @@ const visitor = require("./visitor");
  * in the order [...a, ...b].
  *
  * @template T
- * @param {T | T[] | undefined} a
- * @param {T | T[] | undefined} b
- * @returns {T | T[] | undefined}
+ * @param {T | T[]} a
+ * @param {T | T[]} b
+ * @returns {T | T[]}
  */
 function combinePossibleArrays(a, b) {
-  if (a) {
-    if (!b) {
-      return a;
-    }
-    const aa = Array.isArray(a) ? a : [a];
-    const bb = Array.isArray(b) ? b : [b];
-    return aa.concat(bb);
-  }
-  return b;
+  const aa = Array.isArray(a) ? a : [a];
+  const bb = Array.isArray(b) ? b : [b];
+  return aa.concat(bb);
 }
 
 // AST utilities.
 const asts = {
+  /**
+   * Find the rule with the given name, if it exists.
+   *
+   * @param {PEG.ast.Grammar} ast
+   * @param {string} name
+   * @returns {PEG.ast.Rule | undefined}
+   */
   findRule(ast, name) {
     for (let i = 0; i < ast.rules.length; i++) {
       if (ast.rules[i].name === name) {
@@ -35,6 +36,14 @@ const asts = {
     return undefined;
   },
 
+  /**
+   * Find the index of the rule with the given name, if it exists.
+   * Otherwise returns -1.
+   *
+   * @param {PEG.ast.Grammar} ast
+   * @param {string} name
+   * @returns {number}
+   */
   indexOfRule(ast, name) {
     for (let i = 0; i < ast.rules.length; i++) {
       if (ast.rules[i].name === name) {

lib/compiler/passes/generate-js.js

@@ -852,11 +852,12 @@ function generateJS(ast, options) {
       if (Array.isArray(ast.topLevelInitializer)) {
         for (const tli of ast.topLevelInitializer) {
           parts.push(ast2SourceNode(tli));
+          parts.push("");
         }
       } else {
         parts.push(ast2SourceNode(ast.topLevelInitializer));
+        parts.push("");
       }
-      parts.push("");
     }
 
     parts.push(
@@ -1292,11 +1293,12 @@ function generateJS(ast, options) {
       if (Array.isArray(ast.initializer)) {
         for (const init of ast.initializer) {
           parts.push(ast2SourceNode(init));
+          parts.push("");
         }
       } else {
         parts.push(ast2SourceNode(ast.initializer));
+        parts.push("");
       }
-      parts.push("");
     }
 
     parts.push(

test/cli/fixtures/imports1.peggy

@@ -0,0 +1,18 @@
+{{
+  // imports1 topLevelInitializer import
+  import {
+    basename,
+    dirname,
+    parse
+  } from "path"
+  // imports1 topLevelInitializer code
+  const tli1 = dirname(__filename);
+}}
+
+{
+  // imports1 initializer
+  const pf = path.parse(__filename);
+}
+full
+  = '/'
+  / f:('/' segment )+ '/'? { return parse(f) }

test/cli/fixtures/imports2.peggy

@@ -0,0 +1,12 @@
+{{
+// imports2 topLevelInitializer import
+import fs from 'node:fs';
+
+// imports2 topLevelInitializer code
+const tli2 = 'top';
+}}
+{
+// imports2 initializer
+const contents = fs.readFileSync(__filename);
+}
+segment = [^/]

test/cli/run.spec.ts

@@ -837,6 +837,19 @@ Options:
     })).resolves.toMatch("DefaultTracer: peg$DefaultTracer");
   });
 
+  it("handles multiple files", async() => {
+    const input1 = path.join(__dirname, "fixtures", "imports1.peggy");
+    const input2 = path.join(__dirname, "fixtures", "imports2.peggy");
+    const out = path.join(__dirname, "fixtures", "imports1.js");
+
+    await expect(exec({
+      args: [input1, input2],
+      exitCode: 0,
+    })).resolves.toBe("");
+
+    fs.unlinkSync(out);
+  });
+
   describe("handles source map", () => {
     describe("with default name without --output", () => {
       const sourceMap = path.resolve(__dirname, "..", "..", "source.map");