@graffiticode/parser 1.4.0 → 1.4.2

package/.claude/settings.local.json

@@ -6,7 +6,9 @@
       "Bash(npm test:*)",
       "Bash(npm publish:*)",
       "Bash(grep:*)",
-      "Bash(npm install:*)"
+      "Bash(npm install:*)",
+      "Bash(NODE_OPTIONS=--experimental-vm-modules node -e \"\nimport { parser } from './src/parser.js';\nimport { unparse } from './src/unparse.js';\nimport { lexicon as basisLexicon } from '@graffiticode/basis';\n\nconst src = 'case x of 1: \\\\\"one\\\\\" 2: \\\\\"two\\\\\" end..';\nconsole.log\\('Input:', src\\);\nconst ast = await parser.parse\\(0, src, basisLexicon\\);\nconsole.log\\('AST:', JSON.stringify\\(ast, null, 2\\)\\);\nconst result = unparse\\(ast, basisLexicon\\);\nconsole.log\\('Unparsed:', result\\);\n\")",
+      "Bash(NODE_OPTIONS=--experimental-vm-modules node -e \"\nimport { parser } from './src/parser.js';\nimport { unparse } from './src/unparse.js';\nimport { lexicon as basisLexicon } from '@graffiticode/basis';\n\n// Test nested case-of\nconst src1 = 'case x of 1: case y of 3: \\\\\"a\\\\\" 4: \\\\\"b\\\\\" end 2: \\\\\"two\\\\\" end..';\nconsole.log\\('Input:', src1\\);\ntry {\n  const ast1 = await parser.parse\\(0, src1, basisLexicon\\);\n  console.log\\('Unparsed:', unparse\\(ast1, basisLexicon\\)\\);\n} catch\\(e\\) { console.log\\('Error:', e.message\\); }\n\nconsole.log\\('---'\\);\n\n// Test with expression as case target\nconst src2 = 'case add 1 2 of 3: \\\\\"yes\\\\\" 4: \\\\\"no\\\\\" end..';\nconsole.log\\('Input:', src2\\);\ntry {\n  const ast2 = await parser.parse\\(0, src2, basisLexicon\\);\n  console.log\\('AST:', JSON.stringify\\(ast2, null, 2\\)\\);\n  console.log\\('Unparsed:', unparse\\(ast2, basisLexicon\\)\\);\n} catch\\(e\\) { console.log\\('Error:', e.message\\); }\n\nconsole.log\\('---'\\);\n\n// Test with identifier patterns\nconst src3 = 'case x of y: y end..';\nconsole.log\\('Input:', src3\\);\ntry {\n  const ast3 = await parser.parse\\(0, src3, basisLexicon\\);\n  console.log\\('AST:', JSON.stringify\\(ast3, null, 2\\)\\);\n  console.log\\('Unparsed:', unparse\\(ast3, basisLexicon\\)\\);\n} catch\\(e\\) { console.log\\('Error:', e.message\\); }\n\nconsole.log\\('---'\\);\n\n// Test case-of inside a let or other expression\nconst src4 = 'let x = 5 in case x of 5: \\\\\"five\\\\\" end..';\nconsole.log\\('Input:', src4\\);\ntry {\n  const ast4 = await parser.parse\\(0, src4, basisLexicon\\);\n  console.log\\('Unparsed:', unparse\\(ast4, basisLexicon\\)\\);\n} catch\\(e\\) { console.log\\('Error:', e.message\\); }\n\nconsole.log\\('---'\\);\n\n// Test case-of as argument to a function\nconst src5 = 'add \\(case x of 1: 10 2: 20 end\\) 5..';\nconsole.log\\('Input:', src5\\);\ntry {\n  const ast5 = await parser.parse\\(0, src5, basisLexicon\\);\n  console.log\\('Unparsed:', unparse\\(ast5, basisLexicon\\)\\);\n} catch\\(e\\) { console.log\\('Error:', e.message\\); }\n\")"
     ]
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graffiticode/parser",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "type": "module",
   "publishConfig": {
     "access": "public"

package/src/folder.spec.js

@@ -46,4 +46,33 @@ describe("folder", () => {
     expect(n2.tag).toBe("NUM");
     expect(n2.elts[0]).toBe("3");
   });
+
+  it("should pass 'pow 2 3' through as POW node", () => {
+    const ctx = {
+      state: {
+        nodePool: ["unused"],
+        nodeStack: [],
+        nodeStackStack: [],
+        nodeMap: {},
+        env: [{ name: "global", lexicon: {} }]
+      }
+    };
+
+    const n1Id = Ast.intern(ctx, { tag: "NUM", elts: ["2"] });
+    const n2Id = Ast.intern(ctx, { tag: "NUM", elts: ["3"] });
+    const powNodeId = Ast.intern(ctx, { tag: "POW", elts: [n1Id, n2Id] });
+
+    Folder.fold(ctx, powNodeId);
+    const resultId = ctx.state.nodeStack.pop();
+    const resultNode = ctx.state.nodePool[resultId];
+
+    expect(resultNode.tag).toBe("POW");
+    expect(resultNode.elts.length).toBe(2);
+    const n1 = Ast.node(ctx, resultNode.elts[0]);
+    const n2 = Ast.node(ctx, resultNode.elts[1]);
+    expect(n1.tag).toBe("NUM");
+    expect(n1.elts[0]).toBe("2");
+    expect(n2.tag).toBe("NUM");
+    expect(n2.elts[0]).toBe("3");
+  });
 });

package/src/unparse.js

@@ -100,7 +100,7 @@ function unparseNode(node, lexicon, indent = 0, options = {}) {
     if (opts.compact) {
       // Compact mode: inline list
       const items = node.elts.map(elt => unparseNode(elt, lexicon, indent, opts));
-      return "[" + items.join(", ") + "]";
+      return "[" + items.join(" ") + "]";
     } else {
       // Pretty print with each element on a new line
       const innerIndent = indent + opts.indentSize;
@@ -166,10 +166,10 @@ function unparseNode(node, lexicon, indent = 0, options = {}) {
     return "";
 
   case "LAMBDA":
-    // Lambda function
-    if (node.elts && node.elts.length >= 3) {
-      const params = node.elts[1];
-      const body = node.elts[2];
+    // Lambda function: elts = [param_names_list, body, pattern_list, init_list]
+    if (node.elts && node.elts.length >= 2) {
+      const params = node.elts[0];
+      const body = node.elts[1];
 
       // Extract parameter names
       let paramStr = "";
@@ -181,9 +181,9 @@ function unparseNode(node, lexicon, indent = 0, options = {}) {
       const bodyStr = unparseNode(body, lexicon, indent, opts);
 
       if (paramStr) {
-        return `\\${paramStr} . ${bodyStr}`;
+        return `<${paramStr}: ${bodyStr}>`;
       } else {
-        return `\\. ${bodyStr}`;
+        return `<: ${bodyStr}>`;
       }
     }
     return "";

package/src/unparse.spec.js

@@ -79,13 +79,13 @@ describe("unparse", () => {
     it("should unparse list with multiple elements", async () => {
       const source = "[1, 2, 3]..";
       const unparsed = await testRoundTrip(source);
-      expect(unparsed).toBe("[1, 2, 3]..");
+      expect(unparsed).toBe("[1 2 3]..");
     });
 
     it("should unparse nested lists", async () => {
       const source = "[[1, 2], [3, 4]]..";
       const unparsed = await testRoundTrip(source);
-      expect(unparsed).toBe("[[1, 2], [3, 4]]..");
+      expect(unparsed).toBe("[[1 2] [3 4]]..");
     });
 
     it("should unparse empty record", async () => {
@@ -207,6 +207,12 @@ describe("unparse", () => {
       const unparsed = await testRoundTrip(source);
       expect(unparsed).toBe("foo (bar 42)..");
     });
+
+    it("should unparse map with lambda and list", async () => {
+      const source = 'map (<x: add x 10>) [\n  1\n  2\n  3\n]..';
+      const unparsed = await testRoundTrip(source);
+      expect(unparsed).toBe("map (<x: add x 10>) [1 2 3]..");
+    });
   });
 
   describe("control flow", () => {
@@ -337,7 +343,7 @@ describe("unparse", () => {
     it("should support compact option", async () => {
       const source = "[1, 2, 3]..";
       const reformatted = await parser.reformat(0, source, basisLexicon, { compact: true });
-      expect(reformatted).toBe("[1, 2, 3]..");
+      expect(reformatted).toBe("[1 2 3]..");
     });
 
     it("should support custom indent size", async () => {