agency-lang 0.0.14 → 0.0.16

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

@@ -2,10 +2,10 @@
 // Source: lib/templates/backends/typescriptGenerator/toolCall.mustache
 // Any manual changes will be lost.
 import { apply } from "typestache";
-export const template = `if (toolCall.type === "function" &&
-  toolCall.function.name === "{{{name:string}}}"
+export const template = `if (
+  toolCall.name === "{{{name:string}}}"
 ) {
-  const args = JSON.parse(toolCall.function.arguments);
+  const args = toolCall.arguments;
 
   toolCallStartTime = performance.now();
   const result = await {{{name}}}(args);
@@ -23,11 +23,10 @@ statelogClient.toolCall({
   });
 
   // Add function result to messages
-  __messages.push({
-    role: "tool",
-    tool_call_id: toolCall.id,
-    content: JSON.stringify(result),
-  });
+  __messages.push(toolMessage(result, {
+            tool_call_id: toolCall.id,
+            name: toolCall.name,
+      }));
 }`;
 const render = (args) => {
     return apply(template, args);

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

@@ -1,22 +1,22 @@
-import { FunctionCall } from "../types.js";
+import { AgencyNode, FunctionCall } from "../types.js";
 import { Literal } from "./literals.js";
-import { AgencyArray } from "./dataStructures.js";
 export type DotProperty = {
     type: "dotProperty";
-    object: Literal | FunctionCall | AccessExpression;
+    object: AgencyNode;
     propertyName: string;
 };
 export type IndexAccess = {
     type: "indexAccess";
-    array: Literal | FunctionCall | AccessExpression | AgencyArray;
+    array: AgencyNode;
     index: Literal | FunctionCall | AccessExpression;
 };
 export type DotFunctionCall = {
     type: "dotFunctionCall";
-    object: Literal | FunctionCall | AccessExpression;
+    object: AgencyNode;
     functionCall: FunctionCall;
 };
 export type AccessExpression = {
     type: "accessExpression";
     expression: DotProperty | IndexAccess | DotFunctionCall;
 };
+export declare function accessExpression(expression: DotProperty | IndexAccess | DotFunctionCall): AccessExpression;

package/dist/lib/types/access.js

@@ -1 +1,6 @@
-export {};
+export function accessExpression(expression) {
+    return {
+        type: "accessExpression",
+        expression
+    };
+}

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

@@ -1,12 +1,12 @@
-import { AccessExpression, Literal } from "../types.js";
+import { AccessExpression, IndexAccess, Literal } from "../types.js";
 import { FunctionCall } from "./function.js";
 export type AgencyArray = {
     type: "agencyArray";
-    items: (AccessExpression | Literal | FunctionCall | AgencyObject | AgencyArray | AccessExpression)[];
+    items: (IndexAccess | AccessExpression | Literal | FunctionCall | AgencyObject | AgencyArray | AccessExpression)[];
 };
 export type AgencyObjectKV = {
     key: string;
-    value: AccessExpression | Literal | FunctionCall | AgencyObject | AgencyArray | AccessExpression;
+    value: IndexAccess | AccessExpression | Literal | FunctionCall | AgencyObject | AgencyArray | AccessExpression;
 };
 export type AgencyObject = {
     type: "agencyObject";

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

@@ -1,17 +1,23 @@
-import { AgencyNode } from "../types.js";
-import { AccessExpression } from "./access.js";
+import { AgencyArray, AgencyNode, AgencyObject, VariableType } from "../types.js";
+import { AccessExpression, IndexAccess } from "./access.js";
 import { Literal } from "./literals.js";
+export type FunctionParameter = {
+    type: "functionParameter";
+    name: string;
+    typeHint?: VariableType;
+};
 export type FunctionDefinition = {
     type: "function";
     functionName: string;
-    parameters: string[];
+    parameters: FunctionParameter[];
     body: AgencyNode[];
+    returnType?: VariableType;
     docString?: DocString;
 };
 export type FunctionCall = {
     type: "functionCall";
     functionName: string;
-    arguments: (Literal | AccessExpression | FunctionCall)[];
+    arguments: (AgencyArray | AgencyObject | IndexAccess | Literal | AccessExpression | FunctionCall)[];
 };
 export type DocString = {
     type: "docString";

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

@@ -1,5 +1,5 @@
 import { Assignment, AgencyComment } from "../types.js";
-import { AccessExpression } from "./access.js";
+import { AccessExpression, IndexAccess } from "./access.js";
 import { Literal } from "./literals.js";
 import { FunctionCall } from "./function.js";
 import { AgencyArray, AgencyObject } from "./dataStructures.js";
@@ -7,7 +7,7 @@ import { ReturnStatement } from "./returnStatement.js";
 export type DefaultCase = "_";
 export type MatchBlockCase = {
     type: "matchBlockCase";
-    caseValue: AccessExpression | Literal | DefaultCase;
+    caseValue: AccessExpression | Literal | DefaultCase | IndexAccess;
     body: Assignment | Literal | FunctionCall | AccessExpression | AgencyArray | AgencyObject | ReturnStatement;
 };
 export type MatchBlock = {

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

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

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

@@ -1,6 +1,6 @@
-import { AccessExpression, AgencyNode, FunctionCall, Literal } from "../types.js";
+import { AccessExpression, AgencyNode, FunctionCall, IndexAccess, Literal } from "../types.js";
 export type WhileLoop = {
     type: "whileLoop";
-    condition: FunctionCall | AccessExpression | Literal;
+    condition: IndexAccess | FunctionCall | AccessExpression | Literal;
     body: AgencyNode[];
 };

package/dist/lib/types.d.ts

@@ -1,7 +1,7 @@
 import { Literal } from "./types/literals.js";
 import { TypeAlias, TypeHint, VariableType } from "./types/typeHints.js";
 import { MatchBlock } from "./types/matchBlock.js";
-import { AccessExpression } from "./types/access.js";
+import { AccessExpression, DotProperty, IndexAccess } from "./types/access.js";
 import { FunctionCall, FunctionDefinition } from "./types/function.js";
 import { AgencyArray, AgencyObject } from "./types/dataStructures.js";
 import { GraphNodeDefinition } from "./types/graphNode.js";
@@ -24,13 +24,13 @@ export * from "./types/whileLoop.js";
 export type Assignment = {
     type: "assignment";
     variableName: string;
-    value: AccessExpression | Literal | FunctionCall | AgencyObject | AgencyArray;
+    value: AccessExpression | Literal | FunctionCall | AgencyObject | AgencyArray | IndexAccess;
 };
 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;
+export type AgencyNode = TypeHint | TypeAlias | UsesTool | GraphNodeDefinition | FunctionDefinition | Assignment | Literal | FunctionCall | MatchBlock | ReturnStatement | AccessExpression | AgencyComment | AgencyObject | AgencyArray | ImportStatement | WhileLoop | SpecialVar | IndexAccess | DotProperty;
 export type AgencyProgram = {
     type: "agencyProgram";
     nodes: AgencyNode[];

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "agency-lang",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "description": "The Agency language",
   "main": "lib/index.js",
   "scripts": {
     "test": "vitest",
     "test:run": "vitest run",
     "build": "rm -rf dist/ && tsc && tsc-alias",
-    "start": "node dist/lib/index.js",
+    "start": "node dist/index.js",
     "templates": "typestache ./lib/templates",
     "typecheck": "tsc --noEmit",
     "agency": "node ./dist/scripts/agency.js",
@@ -41,6 +41,7 @@
   "homepage": "https://github.com/egonSchiele/agency-lang#readme",
   "dependencies": {
     "egonlog": "^0.0.2",
+    "smoltalk": "^0.0.11",
     "tarsec": "^0.1.1",
     "typestache": "^0.4.4",
     "zod": "^4.3.5"
@@ -49,10 +50,9 @@
     "@types/node": "^25.0.3",
     "nanoid": "^5.1.6",
     "piemachine": "^0.0.2",
-    "smoltalk": "^0.0.11",
     "statelog-client": "^0.0.31",
     "tsc-alias": "^1.8.16",
     "typescript": "^5.9.3",
     "vitest": "^4.0.16"
   }
-}
+}