agency-lang 0.0.29 → 0.0.31

package/dist/lib/backends/agencyGenerator.d.ts

@@ -32,6 +32,7 @@ export declare class AgencyGenerator extends BaseGenerator {
     protected generateLiteral(literal: Literal): string;
     private generatePromptLiteral;
     private generateStringLiteral;
+    private generateMultiLineStringLiteral;
     protected processPromptLiteral(variableName: string, variableType: VariableType | undefined, node: PromptLiteral): string;
     protected processFunctionDefinition(node: FunctionDefinition): string;
     protected processFunctionCall(node: FunctionCall): string;

package/dist/lib/backends/agencyGenerator.js

@@ -86,8 +86,7 @@ export class AgencyGenerator extends BaseGenerator {
             case "variableName":
                 return literal.value;
             case "multiLineString":
-                const escapedMultiLine = literal.value;
-                return `"""${escapedMultiLine}"""`;
+                return this.generateMultiLineStringLiteral(literal);
             case "prompt":
                 return this.generatePromptLiteral(literal);
             default:
@@ -120,6 +119,19 @@ export class AgencyGenerator extends BaseGenerator {
         result += '"';
         return result;
     }
+    generateMultiLineStringLiteral(node) {
+        let result = '"""';
+        for (const segment of node.segments) {
+            if (segment.type === "text") {
+                result += segment.value;
+            }
+            else if (segment.type === "interpolation") {
+                result += `\${${segment.variableName}}`;
+            }
+        }
+        result += '"""';
+        return result;
+    }
     processPromptLiteral(variableName, variableType, node) {
         // For agency code, prompts are just part of assignments
         // This shouldn't be called directly, but return empty string
@@ -274,7 +286,7 @@ export class AgencyGenerator extends BaseGenerator {
             this.decreaseIndent();
             lines.push(elseBodyLines.join("").trimEnd() + "\n");
         }
-        lines.push(this.indentStr(`}\n\n`));
+        lines.push(this.indentStr(`}`));
         return lines.join("");
     }
     processReturnStatement(node) {

package/dist/lib/backends/typescriptGenerator.js

@@ -282,7 +282,7 @@ export class TypeScriptGenerator extends BaseGenerator {
             case "string":
                 return this.generateStringLiteral(literal.segments);
             case "multiLineString":
-                return `\`${escape(literal.value)}\``;
+                return this.generateStringLiteral(literal.segments);
             case "variableName":
                 return literal.value;
             case "prompt":

package/dist/lib/parsers/literals.d.ts

@@ -1,13 +1,14 @@
-import { InterpolationSegment, Literal, NumberLiteral, PromptLiteral, StringLiteral, TextSegment, VariableNameLiteral } from "../types.js";
+import { InterpolationSegment, Literal, MultiLineStringLiteral, NumberLiteral, PromptLiteral, StringLiteral, TextSegment, VariableNameLiteral } from "../types.js";
 import { Parser } from "tarsec";
 export declare const textSegmentParser: Parser<TextSegment>;
 export declare const stringTextSegmentParser: Parser<TextSegment>;
+export declare const multiLineStringTextSegmentParser: Parser<TextSegment>;
 export declare const interpolationSegmentParser: Parser<InterpolationSegment>;
 export declare const promptParserBackticks: Parser<PromptLiteral>;
 export declare const promptParserLlmFunction: Parser<PromptLiteral>;
 export declare const promptParser: Parser<PromptLiteral>;
 export declare const numberParser: Parser<NumberLiteral>;
 export declare const stringParser: Parser<StringLiteral>;
-export declare const multiLineStringParser: Parser<StringLiteral>;
+export declare const multiLineStringParser: Parser<MultiLineStringLiteral>;
 export declare const variableNameParser: Parser<VariableNameLiteral>;
 export declare const literalParser: Parser<Literal>;

package/dist/lib/parsers/literals.js

@@ -8,6 +8,10 @@ export const stringTextSegmentParser = map(many1Till(or(char('"'), char("$"))),
     type: "text",
     value: text,
 }));
+export const multiLineStringTextSegmentParser = map(many1Till(or(str('"""'), char("$"))), (text) => ({
+    type: "text",
+    value: text,
+}));
 export const interpolationSegmentParser = seqC(set("type", "interpolation"), char("$"), char("{"), capture(manyTillStr("}"), "variableName"), char("}"));
 export const promptParserBackticks = seqC(set("type", "prompt"), backtick, capture(many(or(textSegmentParser, interpolationSegmentParser)), "segments"), backtick);
 export const promptParserLlmFunction = (input) => {
@@ -17,7 +21,7 @@ export const promptParserLlmFunction = (input) => {
 export const promptParser = or(promptParserBackticks, promptParserLlmFunction);
 export const numberParser = seqC(set("type", "number"), capture(many1WithJoin(or(char("-"), char("."), digit)), "value"));
 export const stringParser = seqC(set("type", "string"), char('"'), capture(many(or(stringTextSegmentParser, interpolationSegmentParser)), "segments"), char('"'));
-export const multiLineStringParser = seqC(set("type", "string"), str('"""'), capture(many(or(stringTextSegmentParser, interpolationSegmentParser)), "segments"), str('"""'));
+export const multiLineStringParser = seqC(set("type", "multiLineString"), str('"""'), capture(many(or(multiLineStringTextSegmentParser, interpolationSegmentParser)), "segments"), str('"""'));
 export const variableNameParser = seq([
     set("type", "variableName"),
     capture(letter, "init"),

package/dist/lib/parsers/literals.test.js

@@ -534,14 +534,20 @@ describe("literals parsers", () => {
                 input: '"""hello"""',
                 expected: {
                     success: true,
-                    result: { type: "multiLineString", value: "hello" },
+                    result: {
+                        type: "multiLineString",
+                        segments: [{ type: "text", value: "hello" }],
+                    },
                 },
             },
             {
                 input: '"""world"""',
                 expected: {
                     success: true,
-                    result: { type: "multiLineString", value: "world" },
+                    result: {
+                        type: "multiLineString",
+                        segments: [{ type: "text", value: "world" }],
+                    },
                 },
             },
             // Empty multi-line string
@@ -549,7 +555,7 @@ describe("literals parsers", () => {
                 input: '""""""',
                 expected: {
                     success: true,
-                    result: { type: "multiLineString", value: "" },
+                    result: { type: "multiLineString", segments: [] },
                 },
             },
             // Multi-line strings with actual newlines
@@ -557,28 +563,40 @@ describe("literals parsers", () => {
                 input: '"""line1\nline2"""',
                 expected: {
                     success: true,
-                    result: { type: "multiLineString", value: "line1\nline2" },
+                    result: {
+                        type: "multiLineString",
+                        segments: [{ type: "text", value: "line1\nline2" }],
+                    },
                 },
             },
             {
                 input: '"""line1\nline2\nline3"""',
                 expected: {
                     success: true,
-                    result: { type: "multiLineString", value: "line1\nline2\nline3" },
+                    result: {
+                        type: "multiLineString",
+                        segments: [{ type: "text", value: "line1\nline2\nline3" }],
+                    },
                 },
             },
             {
                 input: '"""\nstarts with newline"""',
                 expected: {
                     success: true,
-                    result: { type: "multiLineString", value: "\nstarts with newline" },
+                    result: {
+                        type: "multiLineString",
+                        segments: [{ type: "text", value: "\nstarts with newline" }],
+                    },
                 },
             },
             {
                 input: '"""ends with newline\n"""',
                 expected: {
                     success: true,
-                    result: { type: "multiLineString", value: "ends with newline\n" },
+                    result: {
+                        type: "multiLineString",
+                        segments: [{ type: "text", value: "ends with newline\n" }],
+                    },
                 },
             },
             // Strings with special characters
@@ -586,28 +604,30 @@ describe("literals parsers", () => {
                 input: '"""Hello, World!"""',
                 expected: {
                     success: true,
-                    result: { type: "multiLineString", value: "Hello, World!" },
+                    result: {
+                        type: "multiLineString",
+                        segments: [{ type: "text", value: "Hello, World!" }],
+                    },
                 },
             },
             {
                 input: '"""123"""',
                 expected: {
                     success: true,
-                    result: { type: "multiLineString", value: "123" },
+                    result: {
+                        type: "multiLineString",
+                        segments: [{ type: "text", value: "123" }],
+                    },
                 },
             },
             {
                 input: '"""  spaces  and  tabs\t\t"""',
                 expected: {
                     success: true,
-                    result: { type: "multiLineString", value: "  spaces  and  tabs\t\t" },
-                },
-            },
-            {
-                input: '"""special!@#$%^&*()"""',
-                expected: {
-                    success: true,
-                    result: { type: "multiLineString", value: "special!@#$%^&*()" },
+                    result: {
+                        type: "multiLineString",
+                        segments: [{ type: "text", value: "  spaces  and  tabs\t\t" }],
+                    },
                 },
             },
             // Strings containing single and double quotes
@@ -615,36 +635,94 @@ describe("literals parsers", () => {
                 input: '"""single\'quotes\'here"""',
                 expected: {
                     success: true,
-                    result: { type: "multiLineString", value: "single'quotes'here" },
+                    result: {
+                        type: "multiLineString",
+                        segments: [{ type: "text", value: "single'quotes'here" }],
+                    },
                 },
             },
             {
                 input: '"""double"quotes"here"""',
                 expected: {
                     success: true,
-                    result: { type: "multiLineString", value: 'double"quotes"here' },
+                    result: {
+                        type: "multiLineString",
+                        segments: [{ type: "text", value: 'double"quotes"here' }],
+                    },
                 },
             },
             {
                 input: '"""mixed"and\'quotes"""',
                 expected: {
                     success: true,
-                    result: { type: "multiLineString", value: `mixed"and'quotes` },
+                    result: {
+                        type: "multiLineString",
+                        segments: [{ type: "text", value: `mixed"and'quotes` }],
+                    },
                 },
             },
-            // Strings containing backticks and interpolation-like syntax
+            // Strings containing backticks
             {
                 input: '"""`backtick`"""',
                 expected: {
                     success: true,
-                    result: { type: "multiLineString", value: "`backtick`" },
+                    result: {
+                        type: "multiLineString",
+                        segments: [{ type: "text", value: "`backtick`" }],
+                    },
+                },
+            },
+            // String interpolation support
+            {
+                input: '"""${name}"""',
+                expected: {
+                    success: true,
+                    result: {
+                        type: "multiLineString",
+                        segments: [{ type: "interpolation", variableName: "name" }],
+                    },
                 },
             },
             {
-                input: '"""${notInterpolation}"""',
+                input: '"""Hello, ${name}!"""',
                 expected: {
                     success: true,
-                    result: { type: "multiLineString", value: "${notInterpolation}" },
+                    result: {
+                        type: "multiLineString",
+                        segments: [
+                            { type: "text", value: "Hello, " },
+                            { type: "interpolation", variableName: "name" },
+                            { type: "text", value: "!" },
+                        ],
+                    },
+                },
+            },
+            {
+                input: '"""${firstName} ${lastName}"""',
+                expected: {
+                    success: true,
+                    result: {
+                        type: "multiLineString",
+                        segments: [
+                            { type: "interpolation", variableName: "firstName" },
+                            { type: "text", value: " " },
+                            { type: "interpolation", variableName: "lastName" },
+                        ],
+                    },
+                },
+            },
+            {
+                input: '"""line1\n${variable}\nline3"""',
+                expected: {
+                    success: true,
+                    result: {
+                        type: "multiLineString",
+                        segments: [
+                            { type: "text", value: "line1\n" },
+                            { type: "interpolation", variableName: "variable" },
+                            { type: "text", value: "\nline3" },
+                        ],
+                    },
                 },
             },
             // Multiple consecutive newlines
@@ -652,7 +730,10 @@ describe("literals parsers", () => {
                 input: '"""line1\n\n\nline2"""',
                 expected: {
                     success: true,
-                    result: { type: "multiLineString", value: "line1\n\n\nline2" },
+                    result: {
+                        type: "multiLineString",
+                        segments: [{ type: "text", value: "line1\n\n\nline2" }],
+                    },
                 },
             },
             // Mixed whitespace
@@ -660,7 +741,10 @@ describe("literals parsers", () => {
                 input: '"""  \n\t\n  """',
                 expected: {
                     success: true,
-                    result: { type: "multiLineString", value: "  \n\t\n  " },
+                    result: {
+                        type: "multiLineString",
+                        segments: [{ type: "text", value: "  \n\t\n  " }],
+                    },
                 },
             },
             // Failure cases

package/dist/lib/templates/backends/graphGenerator/imports.d.ts

@@ -1,4 +1,4 @@
-export declare const template = "import { z } from \"zod\";\nimport * as readline from \"readline\";\nimport fs from \"fs\";\nimport { PieMachine, goToNode } from \"piemachine\";\nimport { StatelogClient } from \"statelog-client\";\nimport { nanoid } from \"nanoid\";\nimport { assistantMessage, getClient, userMessage, toolMessage } from \"smoltalk\";\n\nconst statelogHost = \"https://statelog.adit.io\";\nconst traceId = nanoid();\nconst statelogConfig = {\n    host: statelogHost,\n    traceId: traceId,\n    apiKey: process.env.STATELOG_API_KEY || \"\",\n    projectId: \"agency-lang\",\n    debugMode: false,\n  };\nconst statelogClient = new StatelogClient(statelogConfig);\nconst __model: ModelName = \"gpt-4o-mini\";\n\n\nconst getClientWithConfig = (config = {}) => {\n  const defaultConfig = {\n    openAiApiKey: process.env.OPENAI_API_KEY || \"\",\n    googleApiKey: process.env.GEMINI_API_KEY || \"\",\n    model: __model,\n    logLevel: \"warn\",\n  };\n\n  return getClient({ ...defaultConfig, ...config });\n};\n\nlet __client = getClientWithConfig();\n\ntype State = {\n  messages: string[];\n  data: any;\n}\n\n// enable debug logging\nconst graphConfig = {\n  debug: {\n    log: true,\n    logData: true,\n  },\n  statelog: statelogConfig,\n};\n\n// Define the names of the nodes in the graph\n// Useful for type safety\nconst __nodes = {{{nodes:string}}} as const;\ntype Node = (typeof __nodes)[number];\n\nconst graph = new PieMachine<State, Node>(__nodes, graphConfig);\n\n// builtins\n\nconst not = (val: any): boolean => !val;\nconst eq = (a: any, b: any): boolean => a === b;\nconst neq = (a: any, b: any): boolean => a !== b;\nconst lt = (a: any, b: any): boolean => a < b;\nconst lte = (a: any, b: any): boolean => a <= b;\nconst gt = (a: any, b: any): boolean => a > b;\nconst gte = (a: any, b: any): boolean => a >= b;\nconst and = (a: any, b: any): boolean => a && b;\nconst or = (a: any, b: any): boolean => a || b;\n";
+export declare const template = "import { z } from \"zod\";\nimport * as readline from \"readline\";\nimport fs from \"fs\";\nimport { PieMachine, goToNode } from \"piemachine\";\nimport { StatelogClient } from \"statelog-client\";\nimport { nanoid } from \"nanoid\";\nimport { assistantMessage, getClient, userMessage, toolMessage } from \"smoltalk\";\n\nconst statelogHost = \"https://statelog.adit.io\";\nconst traceId = nanoid();\nconst statelogConfig = {\n    host: statelogHost,\n    traceId: traceId,\n    apiKey: process.env.STATELOG_API_KEY || \"\",\n    projectId: \"agency-lang\",\n    debugMode: false,\n  };\nconst statelogClient = new StatelogClient(statelogConfig);\nconst __model: ModelName = \"gpt-4o-mini\";\n\n\nconst getClientWithConfig = (config = {}) => {\n  const defaultConfig = {\n    openAiApiKey: process.env.OPENAI_API_KEY || \"\",\n    googleApiKey: process.env.GEMINI_API_KEY || \"\",\n    model: __model,\n    logLevel: \"warn\",\n  };\n\n  return getClient({ ...defaultConfig, ...config });\n};\n\nlet __client = getClientWithConfig();\n\ntype State = {\n  messages: string[];\n  data: any;\n}\n\n// enable debug logging\nconst graphConfig = {\n  debug: {\n    log: true,\n    logData: true,\n  },\n  statelog: statelogConfig,\n};\n\n// Define the names of the nodes in the graph\n// Useful for type safety\nconst __nodes = {{{nodes:string}}} as const;\ntype Node = (typeof __nodes)[number];\n\nconst graph = new PieMachine<State, Node>(__nodes, graphConfig);\n\n// builtins\n\nconst not = (val: any): boolean => !val;\nconst eq = (a: any, b: any): boolean => a === b;\nconst neq = (a: any, b: any): boolean => a !== b;\nconst lt = (a: any, b: any): boolean => a < b;\nconst lte = (a: any, b: any): boolean => a <= b;\nconst gt = (a: any, b: any): boolean => a > b;\nconst gte = (a: any, b: any): boolean => a >= b;\nconst and = (a: any, b: any): boolean => a && b;\nconst or = (a: any, b: any): boolean => a || b;\nconst head = <T>(arr: T[]): T | undefined => arr[0];\nconst tail = <T>(arr: T[]): T[] => arr.slice(1);";
 export type TemplateType = {
     nodes: string;
 };

package/dist/lib/templates/backends/graphGenerator/imports.js

@@ -68,7 +68,8 @@ const gt = (a: any, b: any): boolean => a > b;
 const gte = (a: any, b: any): boolean => a >= b;
 const and = (a: any, b: any): boolean => a && b;
 const or = (a: any, b: any): boolean => a || b;
-`;
+const head = <T>(arr: T[]): T | undefined => arr[0];
+const tail = <T>(arr: T[]): T[] => arr.slice(1);`;
 const render = (args) => {
     return apply(template, args);
 };

package/dist/lib/types/literals.d.ts

@@ -9,7 +9,7 @@ export type StringLiteral = {
 };
 export type MultiLineStringLiteral = {
     type: "multiLineString";
-    value: string;
+    segments: PromptSegment[];
 };
 export type VariableNameLiteral = {
     type: "variableName";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agency-lang",
-  "version": "0.0.29",
+  "version": "0.0.31",
   "description": "The Agency language",
   "main": "lib/index.js",
   "scripts": {
@@ -56,4 +56,4 @@
     "typescript": "^5.9.3",
     "vitest": "^4.0.16"
   }
-}
+}