agency-lang 0.0.20 → 0.0.22

package/dist/lib/templates/backends/typescriptGenerator/tool.d.ts

@@ -1,4 +1,4 @@
-export declare const template = "const {{{name:string}}}Tool = {\n  name: \"{{{name:string}}}\",\n  description: \"{{{description:string}}}\",\n  schema: z.object({{{schema:string}}})\n};\n";
+export declare const template = "const {{{name:string}}}Tool = {\n  name: \"{{{name:string}}}\",\n  description: `{{{description:string}}}`,\n  schema: z.object({{{schema:string}}})\n};\n";
 export type TemplateType = {
     name: string;
     description: string;

package/dist/lib/templates/backends/typescriptGenerator/tool.js

@@ -4,7 +4,7 @@
 import { apply } from "typestache";
 export const template = `const {{{name:string}}}Tool = {
   name: "{{{name:string}}}",
-  description: "{{{description:string}}}",
+  description: \`{{{description:string}}}\`,
   schema: z.object({{{schema:string}}})
 };
 `;

package/dist/lib/templates/backends/typescriptGenerator/toolCall.d.ts

@@ -1,4 +1,4 @@
-export declare const template = "if (\n  toolCall.name === \"{{{name:string}}}\"\n) {\n  const args = toolCall.arguments;\n\n  toolCallStartTime = performance.now();\n  const result = await {{{name}}}(args);\n  toolCallEndTime = performance.now();\n\n  console.log(\"Tool '{{{name:string}}}' called with arguments:\", args);\n  console.log(\"Tool '{{{name:string}}}' returned result:\", result);\n\nstatelogClient.toolCall({\n    toolName: \"{{{name:string}}}\",\n    args,\n    output: result,\n    model: __client.getModel(),\n    timeTaken: toolCallEndTime - toolCallStartTime,\n  });\n\n  // Add function result to messages\n  __messages.push(toolMessage(result, {\n            tool_call_id: toolCall.id,\n            name: toolCall.name,\n      }));\n}";
+export declare const template = "if (\n  toolCall.name === \"{{{name:string}}}\"\n) {\n  const args = toolCall.arguments;\n\n  toolCallStartTime = performance.now();\n  const result = await {{{name}}}(args);\n  toolCallEndTime = performance.now();\n\n  // console.log(\"Tool '{{{name:string}}}' called with arguments:\", args);\n  // console.log(\"Tool '{{{name:string}}}' returned result:\", result);\n\nstatelogClient.toolCall({\n    toolName: \"{{{name:string}}}\",\n    args,\n    output: result,\n    model: __client.getModel(),\n    timeTaken: toolCallEndTime - toolCallStartTime,\n  });\n\n  // Add function result to messages\n  __messages.push(toolMessage(result, {\n            tool_call_id: toolCall.id,\n            name: toolCall.name,\n      }));\n}";
 export type TemplateType = {
     name: string;
 };

package/dist/lib/templates/backends/typescriptGenerator/toolCall.js

@@ -11,8 +11,8 @@ export const template = `if (
   const result = await {{{name}}}(args);
   toolCallEndTime = performance.now();
 
-  console.log("Tool '{{{name:string}}}' called with arguments:", args);
-  console.log("Tool '{{{name:string}}}' returned result:", result);
+  // console.log("Tool '{{{name:string}}}' called with arguments:", args);
+  // console.log("Tool '{{{name:string}}}' returned result:", result);
 
 statelogClient.toolCall({
     toolName: "{{{name:string}}}",

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

@@ -0,0 +1,7 @@
+import { AccessExpression } from "./access.js";
+import { FunctionCall } from "./function.js";
+import { Literal } from "./literals.js";
+export type AwaitStatement = {
+    type: "awaitStatement";
+    expression: AccessExpression | Literal | FunctionCall;
+};

package/dist/lib/types/await.js

@@ -0,0 +1 @@
+export {};

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

@@ -1,10 +1,11 @@
 import { AgencyNode, FunctionCall, VariableType } from "../types.js";
 import { AccessExpression } from "./access.js";
+import { FunctionParameter } from "./function.js";
 import { Literal } from "./literals.js";
 export type GraphNodeDefinition = {
     type: "graphNode";
     nodeName: string;
-    parameters: string[];
+    parameters: FunctionParameter[];
     body: AgencyNode[];
     returnType?: VariableType | null;
 };

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

@@ -0,0 +1,7 @@
+import { AccessExpression, AgencyNode, FunctionCall, IndexAccess, Literal } from "../types.js";
+export type IfElse = {
+    type: "ifElse";
+    condition: IndexAccess | FunctionCall | AccessExpression | Literal;
+    thenBody: AgencyNode[];
+    elseBody?: AgencyNode[];
+};

package/dist/lib/types/ifElse.js

@@ -0,0 +1 @@
+export {};

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

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

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

@@ -1,6 +1,7 @@
 import { AccessExpression, FunctionCall, IndexAccess, Literal } from "../types.js";
+import { AwaitStatement } from "./await.js";
 import { AgencyArray, AgencyObject } from "./dataStructures.js";
 export type ReturnStatement = {
     type: "returnStatement";
-    value: AccessExpression | FunctionCall | Literal | AgencyObject | AgencyArray | IndexAccess;
+    value: AccessExpression | FunctionCall | Literal | AgencyObject | AgencyArray | IndexAccess | AwaitStatement;
 };

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

@@ -0,0 +1,5 @@
+import { AgencyNode } from "../types.js";
+export type TimeBlock = {
+    type: "timeBlock";
+    body: AgencyNode[];
+};

package/dist/lib/types/timeBlock.js

@@ -0,0 +1 @@
+export {};

package/dist/lib/types.d.ts

@@ -1,19 +1,23 @@
-import { Literal } from "./types/literals.js";
-import { TypeAlias, TypeHint, VariableType } from "./types/typeHints.js";
-import { MatchBlock } from "./types/matchBlock.js";
 import { AccessExpression, DotProperty, IndexAccess } from "./types/access.js";
-import { FunctionCall, FunctionDefinition } from "./types/function.js";
+import { AwaitStatement } from "./types/await.js";
 import { AgencyArray, AgencyObject } from "./types/dataStructures.js";
+import { FunctionCall, FunctionDefinition } from "./types/function.js";
 import { GraphNodeDefinition } from "./types/graphNode.js";
+import { ImportStatement } from "./types/importStatement.js";
+import { Literal } from "./types/literals.js";
+import { MatchBlock } from "./types/matchBlock.js";
 import { ReturnStatement } from "./types/returnStatement.js";
+import { SpecialVar } from "./types/specialVar.js";
+import { TimeBlock } from "./types/timeBlock.js";
 import { UsesTool } from "./types/tools.js";
-import { ImportStatement } from "./types/importStatement.js";
+import { TypeAlias, TypeHint, VariableType } from "./types/typeHints.js";
 import { WhileLoop } from "./types/whileLoop.js";
-import { SpecialVar } from "./types/specialVar.js";
+import { IfElse } from "./types/ifElse.js";
 export * from "./types/access.js";
 export * from "./types/dataStructures.js";
 export * from "./types/function.js";
 export * from "./types/graphNode.js";
+export * from "./types/ifElse.js";
 export * from "./types/importStatement.js";
 export * from "./types/literals.js";
 export * from "./types/matchBlock.js";
@@ -24,13 +28,17 @@ export * from "./types/whileLoop.js";
 export type Assignment = {
     type: "assignment";
     variableName: string;
-    value: AccessExpression | Literal | FunctionCall | AgencyObject | AgencyArray | IndexAccess;
+    typeHint?: VariableType;
+    value: AccessExpression | Literal | FunctionCall | AgencyObject | AgencyArray | IndexAccess | TimeBlock | AwaitStatement;
 };
 export type AgencyComment = {
     type: "comment";
     content: string;
 };
-export type AgencyNode = TypeHint | TypeAlias | UsesTool | GraphNodeDefinition | FunctionDefinition | Assignment | Literal | FunctionCall | MatchBlock | ReturnStatement | AccessExpression | AgencyComment | AgencyObject | AgencyArray | ImportStatement | WhileLoop | SpecialVar | IndexAccess | DotProperty;
+export type NewLine = {
+    type: "newLine";
+};
+export type AgencyNode = TypeHint | TypeAlias | UsesTool | GraphNodeDefinition | FunctionDefinition | Assignment | Literal | FunctionCall | MatchBlock | ReturnStatement | AccessExpression | AgencyComment | AgencyObject | AgencyArray | ImportStatement | WhileLoop | IfElse | SpecialVar | IndexAccess | DotProperty | TimeBlock | AwaitStatement | NewLine;
 export type AgencyProgram = {
     type: "agencyProgram";
     nodes: AgencyNode[];

package/dist/lib/types.js

@@ -2,6 +2,7 @@ export * from "./types/access.js";
 export * from "./types/dataStructures.js";
 export * from "./types/function.js";
 export * from "./types/graphNode.js";
+export * from "./types/ifElse.js";
 export * from "./types/importStatement.js";
 export * from "./types/literals.js";
 export * from "./types/matchBlock.js";

package/dist/lib/utils.d.ts

@@ -1,3 +1,4 @@
 export declare function escape(str: string): string;
 export declare function deepCopy<T>(obj: T): T;
 export declare function zip<T, U>(arr1: T[], arr2: U[]): Array<[T, U]>;
+export declare function uniq<T>(arr: T[]): T[];

package/dist/lib/utils.js

@@ -16,3 +16,6 @@ export function zip(arr1, arr2) {
     }
     return result;
 }
+export function uniq(arr) {
+    return Array.from(new Set(arr));
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agency-lang",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "description": "The Agency language",
   "main": "lib/index.js",
   "scripts": {
@@ -48,6 +48,7 @@
   },
   "devDependencies": {
     "@types/node": "^25.0.3",
+    "cli-highlight": "^2.1.11",
     "nanoid": "^5.1.6",
     "piemachine": "^0.0.3",
     "statelog-client": "^0.0.31",
@@ -55,4 +56,4 @@
     "typescript": "^5.9.3",
     "vitest": "^4.0.16"
   }
-}
+}

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

@@ -1,3 +0,0 @@
-import { Assignment } from "../types.js";
-import { Parser } from "tarsec";
-export declare const assignmentParser: Parser<Assignment>;

package/dist/lib/parsers/assignment.js

@@ -1,8 +0,0 @@
-import { capture, char, many1WithJoin, or, seqC, set, trace, } from "tarsec";
-import { accessExpressionParser, indexAccessParser } from "./access.js";
-import { agencyArrayParser, agencyObjectParser } from "./dataStructures.js";
-import { functionCallParser } from "./functionCall.js";
-import { literalParser } from "./literals.js";
-import { optionalSemicolon } from "./parserUtils.js";
-import { optionalSpaces, varNameChar } from "./utils.js";
-export const assignmentParser = trace("assignmentParser", seqC(set("type", "assignment"), optionalSpaces, capture(many1WithJoin(varNameChar), "variableName"), optionalSpaces, char("="), optionalSpaces, capture(or(functionCallParser, indexAccessParser, accessExpressionParser, agencyArrayParser, agencyObjectParser, literalParser), "value"), optionalSemicolon));

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

@@ -1,7 +0,0 @@
-export declare const template = "let {{{name:string}}}:any;\n\ngraph.node(\"{{{name}}}\", async (state) => {\n  const innerFunc = async () => {\n    {{{body}}}\n  };\n  {{{name}}} = await innerFunc();\n  return {{{name}}};\n});\n";
-export type TemplateType = {
-    name: string;
-    body: string | boolean | number;
-};
-declare const render: (args: TemplateType) => string;
-export default render;

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

@@ -1,18 +0,0 @@
-// THIS FILE WAS AUTO-GENERATED
-// Source: lib/templates/backends/graphGenerator/node.mustache
-// Any manual changes will be lost.
-import { apply } from "typestache";
-export const template = `let {{{name:string}}}:any;
-
-graph.node("{{{name}}}", async (state) => {
-  const innerFunc = async () => {
-    {{{body}}}
-  };
-  {{{name}}} = await innerFunc();
-  return {{{name}}};
-});
-`;
-const render = (args) => {
-    return apply(template, args);
-};
-export default render;

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

@@ -1,8 +0,0 @@
-export declare const template = "let {{{name:string}}}:any;\n\ngraph.node(\"{{{name}}}\", async (state) => {\n  const innerFunc = {{{promptFunction:string}}};\n  {{{name}}} = await innerFunc({{{argsStr:string}}});\n  return {{{name}}};\n});\n";
-export type TemplateType = {
-    name: string;
-    promptFunction: string;
-    argsStr: string;
-};
-declare const render: (args: TemplateType) => string;
-export default render;

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

@@ -1,16 +0,0 @@
-// THIS FILE WAS AUTO-GENERATED
-// Source: lib/templates/backends/graphGenerator/promptNode.mustache
-// Any manual changes will be lost.
-import { apply } from "typestache";
-export const template = `let {{{name:string}}}:any;
-
-graph.node("{{{name}}}", async (state) => {
-  const innerFunc = {{{promptFunction:string}}};
-  {{{name}}} = await innerFunc({{{argsStr:string}}});
-  return {{{name}}};
-});
-`;
-const render = (args) => {
-    return apply(template, args);
-};
-export default render;