agency-lang 0.0.26 → 0.0.28

package/dist/lib/backends/agencyGenerator.js

@@ -95,7 +95,7 @@ export class AgencyGenerator extends BaseGenerator {
         }
     }
     generatePromptLiteral(node) {
-        let result = "`";
+        let result = 'llm("';
         for (const segment of node.segments) {
             if (segment.type === "text") {
                 result += segment.value;
@@ -104,7 +104,7 @@ export class AgencyGenerator extends BaseGenerator {
                 result += `\${${segment.variableName}}`;
             }
         }
-        result += "`";
+        result += `")`;
         return result;
     }
     generateStringLiteral(node) {

package/dist/lib/parsers/function.js

@@ -2,7 +2,7 @@ import { capture, captureCaptures, char, debug, many, many1, many1Till, many1Wit
 import { accessExpressionParser, indexAccessParser } from "./access.js";
 import { commentParser } from "./comment.js";
 import { functionCallParser } from "./functionCall.js";
-import { literalParser } from "./literals.js";
+import { literalParser, promptParser } from "./literals.js";
 import { matchBlockParser } from "./matchBlock.js";
 import { optionalSemicolon } from "./parserUtils.js";
 import { returnStatementParser } from "./returnStatement.js";
@@ -14,7 +14,7 @@ import { agencyArrayParser, agencyObjectParser } from "./dataStructures.js";
 import { awaitParser } from "./await.js";
 import { newLineParser } from "./newline.js";
 export const assignmentParser = (input) => {
-    const parser = trace("assignmentParser", seqC(set("type", "assignment"), optionalSpaces, capture(many1WithJoin(varNameChar), "variableName"), optionalSpaces, optional(captureCaptures(seqC(char(":"), optionalSpaces, capture(variableTypeParser, "typeHint")))), optionalSpaces, char("="), optionalSpaces, capture(or(timeBlockParser, awaitParser, functionCallParser, indexAccessParser, accessExpressionParser, agencyArrayParser, agencyObjectParser, literalParser), "value"), optionalSemicolon));
+    const parser = trace("assignmentParser", seqC(set("type", "assignment"), optionalSpaces, capture(many1WithJoin(varNameChar), "variableName"), optionalSpaces, optional(captureCaptures(seqC(char(":"), optionalSpaces, capture(variableTypeParser, "typeHint")))), optionalSpaces, char("="), optionalSpaces, capture(or(timeBlockParser, awaitParser, promptParser, functionCallParser, indexAccessParser, accessExpressionParser, agencyArrayParser, agencyObjectParser, literalParser), "value"), optionalSemicolon));
     return parser(input);
 };
 const trim = (s) => s.trim();

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

@@ -1,11 +1,13 @@
-import { InterpolationSegment, Literal, MultiLineStringLiteral, NumberLiteral, PromptLiteral, StringLiteral, TextSegment, VariableNameLiteral } from "../types.js";
+import { InterpolationSegment, Literal, 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 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<MultiLineStringLiteral>;
+export declare const multiLineStringParser: Parser<StringLiteral>;
 export declare const variableNameParser: Parser<VariableNameLiteral>;
 export declare const literalParser: Parser<Literal>;

package/dist/lib/parsers/literals.js

@@ -1,4 +1,4 @@
-import { backtick, varNameChar } from "./utils.js";
+import { backtick, optionalSpaces, varNameChar } from "./utils.js";
 import { capture, char, digit, letter, many, many1Till, many1WithJoin, manyTillStr, manyWithJoin, map, or, seq, seqC, set, str, } from "tarsec";
 export const textSegmentParser = map(many1Till(or(backtick, char("$"))), (text) => ({
     type: "text",
@@ -9,10 +9,15 @@ export const stringTextSegmentParser = map(many1Till(or(char('"'), char("$"))),
     value: text,
 }));
 export const interpolationSegmentParser = seqC(set("type", "interpolation"), char("$"), char("{"), capture(manyTillStr("}"), "variableName"), char("}"));
-export const promptParser = seqC(set("type", "prompt"), backtick, capture(many(or(textSegmentParser, interpolationSegmentParser)), "segments"), backtick);
+export const promptParserBackticks = seqC(set("type", "prompt"), backtick, capture(many(or(textSegmentParser, interpolationSegmentParser)), "segments"), backtick);
+export const promptParserLlmFunction = (input) => {
+    const parser = seqC(set("type", "prompt"), str("llm("), optionalSpaces, capture(map(stringParser, (str) => str.segments), "segments"), optionalSpaces, char(")"));
+    return parser(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", "multiLineString"), str('"""'), capture(manyTillStr('"""'), "value"), str('"""'));
+export const multiLineStringParser = seqC(set("type", "string"), str('"""'), capture(many(or(stringTextSegmentParser, interpolationSegmentParser)), "segments"), str('"""'));
 export const variableNameParser = seq([
     set("type", "variableName"),
     capture(letter, "init"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agency-lang",
-  "version": "0.0.26",
+  "version": "0.0.28",
   "description": "The Agency language",
   "main": "lib/index.js",
   "scripts": {