llm-exe 0.0.6 → 1.0.0

package/dist/llm/_base.js.map

@@ -1 +1 @@
-{"version":3,"file":"_base.js","sourceRoot":"src/","sources":["llm/_base.ts"],"names":[],"mappings":";;;AAAA,6DAA8C;AAE9C,mCAA+C;AAC/C,yCAA4D;AAE5D;;;;GAIG;AACH,MAAsB,OAAO;IA0C3B;;;OAGG;IACH,YAAY,OAAuB;QA7CnC;;WAEG;QACH;;;;;WAAoB;QAEpB;;WAEG;QACH;;;;;WAAiC;QAEjC;;WAEG;QACH;;;;;WAA0B;QAE1B;;WAEG;QACH;;;;;WAA2B;QAE3B;;WAEG;QACH;;;;;WAAgC;QAEhC;;WAEG;QACH;;;;;WAAkC;QAElC;;WAEG;QACH;;;;mBAAyB;gBACvB,WAAW,EAAE,CAAC;gBACd,kBAAkB,EAAE,CAAC;gBACrB,gBAAgB,EAAE,CAAC;gBACnB,gBAAgB,EAAE,CAAC;gBACnB,OAAO,EAAE,EAAE;aACZ;WAAC;QAOA,IAAI,CAAC,MAAM,GAAG,IAAS,CAAC;QACxB,IAAI,CAAC,UAAU,GAAG,OAAO,EAAE,UAAU,IAAI,MAAM,CAAC;QAChD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,KAAK,CAAC;QACxC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,MAAM,CAAC;QACvC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,IAAI,CAAC;QACzC,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,IAAI,CAAC,CAAC;IAClD,CAAC;IAED,aAAa;QACX,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED;;OAEG;IACH,UAAU;QACR,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAED;;OAEG;IACH,WAAW;QACT,OAAO;YACL,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE;SAC3B,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,IAAI,CACR,MAAW,EACX,UAAgC;QAEhC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAC7D,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,cAAc,CAAC,MAAW,EAAE,UAAgC;QAChE,IAAI;YACF,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;YAC3B,MAAM,MAAM,GAAG,MAAM,IAAA,6BAAO,EAC1B,GAAG,EAAE,CACH,IAAA,4BAAoB,EAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,EACpE;gBACE,aAAa,EAAE,CAAC;gBAChB,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,aAAa,EAAE,IAAI,CAAC,aAAa;gBACjC,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,KAAK,EAAE,GAAG,EAAE;oBACV,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC;oBAChC,OAAO,CAAC,GAAG,CAAC,yBAAyB,IAAI,CAAC,OAAO,eAAe,CAAC,CAAC;oBAClE,OAAO,IAAI,CAAC;gBACd,CAAC;aACF,CACF,CAAC;YACF,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC;YAClC,OAAO,MAAM,CAAC;SACf;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC;YAChC,MAAM,KAAK,CAAC;SACb;IACH,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,KAAK,CACT,MAAW,EACX,WAAiC;QAEjC,OAAO,IAAI,sBAAa,CAAC,SAAS,CAAC,CAAC;IACtC,CAAC;CACF;AAzID,0BAyIC"}
+{"version":3,"file":"_base.js","sourceRoot":"src/","sources":["llm/_base.ts"],"names":[],"mappings":";;;AAAA,6DAA8C;AAE9C,mCAA+C;AAC/C,yCAA4D;AAE5D;;;;GAIG;AACH,MAAsB,OAAO;IA2C3B;;;OAGG;IACH,YAAY,OAAuB;QA9CnC;;WAEG;QACH;;;;;WAAoB;QAEpB;;WAEG;QACH;;;;;WAAiC;QAEjC;;WAEG;QACH;;;;;WAA0B;QAE1B;;WAEG;QACH;;;;;WAA2B;QAE3B;;WAEG;QACH;;;;;WAAgC;QAEhC;;WAEG;QACH;;;;;WAAkC;QAElC;;;;;WAAkC;QAClC;;WAEG;QACH;;;;mBAAyB;gBACvB,WAAW,EAAE,CAAC;gBACd,kBAAkB,EAAE,CAAC;gBACrB,gBAAgB,EAAE,CAAC;gBACnB,gBAAgB,EAAE,CAAC;gBACnB,OAAO,EAAE,EAAE;aACZ;WAAC;QAOA,IAAI,CAAC,OAAO,GAAG,OAAO,EAAE,OAAO,IAAI,IAAI,CAAC;QACxC,IAAI,CAAC,MAAM,GAAG,IAAS,CAAC;QACxB,IAAI,CAAC,UAAU,GAAG,OAAO,EAAE,UAAU,IAAI,MAAM,CAAC;QAChD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,KAAK,CAAC;QACxC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,MAAM,CAAC;QACvC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,IAAI,CAAC;QACzC,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,IAAI,CAAC,CAAC;IAClD,CAAC;IAED,aAAa;QACX,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED;;OAEG;IACH,UAAU;QACR,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAED;;OAEG;IACH,WAAW;QACT,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE;YAC1B,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE;SAC3B,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,IAAI,CACR,MAAW,EACX,GAAG,IAAW;QAEd,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC;QAC1D,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,cAAc,CAAC,MAAW,EAAE,GAAG,IAAW;QAC9C,IAAI;YACF,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;YAC3B,MAAM,MAAM,GAAG,MAAM,IAAA,6BAAO,EAC1B,GAAG,EAAE,CACH,IAAA,4BAAoB,EAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,EACjE;gBACE,aAAa,EAAE,CAAC;gBAChB,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,aAAa,EAAE,IAAI,CAAC,aAAa;gBACjC,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,KAAK,EAAE,GAAG,EAAE;oBACV,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC;oBAChC,OAAO,CAAC,GAAG,CAAC,yBAAyB,IAAI,CAAC,OAAO,eAAe,CAAC,CAAC;oBAClE,OAAO,IAAI,CAAC;gBACd,CAAC;aACF,CACF,CAAC;YACF,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC;YAClC,OAAO,MAAM,CAAC;SACf;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC;YAChC,MAAM,KAAK,CAAC;SACb;IACH,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,KAAK,CACT,MAAW,EACX,GAAG,KAAY;QAEf,OAAO,IAAI,sBAAa,CAAC,SAAS,CAAC,CAAC;IACtC,CAAC;IACD,WAAW,CAAC,OAAgB;QAC1B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,UAAU;QACR,OAAO,IAAI,CAAC,OAAO,CAAA;IACrB,CAAC;CACF;AAnJD,0BAmJC"}

package/dist/llm/openai.d.ts

@@ -1,5 +1,5 @@
 import { OpenAIApi } from "openai";
-import { IChatMessages, OpenAIModelName, OpenAIOptions } from "../types";
+import { IChatMessages, OpenAIModelName, OpenAIOptions, OpenAiLlmExecutorOptions } from "../types";
 import { BaseLlm } from "./_base";
 import { OutputOpenAIChat } from "../llm/output";
 import { OutputOpenAICompletion } from "./output/openai";
@@ -59,13 +59,13 @@ export declare class OpenAI extends BaseLlm<OpenAIApi> {
      * @param input - The input for the chat/completion API.
      * @returns The chat/completion response from the API.
      */
-    _call(input: string | IChatMessages): Promise<OutputOpenAIChat | OutputOpenAICompletion>;
+    _call(input: string | IChatMessages, arg2?: OpenAiLlmExecutorOptions): Promise<OutputOpenAIChat | OutputOpenAICompletion>;
     /**
      * Communicate with the OpenAI Chat API.
      * @param messages - A list of message objects for the API call.
      * @returns The chat response from the API.
      */
-    chat(messages: IChatMessages): Promise<OutputOpenAIChat>;
+    chat(messages: IChatMessages, _args?: OpenAiLlmExecutorOptions): Promise<OutputOpenAIChat>;
     /**
      * Communicate with the OpenAI Completion API.
      * @param messages - A list of message objects for the API call.
@@ -73,6 +73,7 @@ export declare class OpenAI extends BaseLlm<OpenAIApi> {
      */
     completion(prompt: string): Promise<OutputOpenAICompletion>;
     getMetadata(): {
+        traceId: string | null;
         promptType: import("../types").PromptType;
         timeout: number;
         jitter: "none" | "full";

package/dist/llm/openai.js

@@ -6,6 +6,7 @@ const _base_1 = require("./_base");
 const output_1 = require("../llm/output");
 const utils_1 = require("../utils");
 const openai_2 = require("./output/openai");
+const const_1 = require("../utils/const");
 /**
  * Create a new instance of the OpenAI API wrapper.
  * @param options - Configuration options for the OpenAI API wrapper.
@@ -103,7 +104,8 @@ class OpenAI extends _base_1.BaseLlm {
         this.frequencyPenalty = frequencyPenalty;
         this.logitBias = logitBias;
         this.user = user;
-        if (["gpt-3.5-turbo", "gpt-4"].includes(this.model)) {
+        if (this.model.substring(0, 13) === "gpt-3.5-turbo" ||
+            this.model.substring(0, 5) === "gpt-4") {
             this.promptType = "chat";
         }
         else {
@@ -141,21 +143,12 @@ class OpenAI extends _base_1.BaseLlm {
      * @returns An object for input/output tokens and cost.
      */
     calculatePrice(input_tokens, output_tokens = 0) {
-        const cost = {
-            "gpt-3.5-turbo": [1000, 0.002, 0.002],
-            "gpt-4": [1000, 0.03, 0.06],
-            davinci: [1000, 0.02, 0.02],
-            "text-curie-001": [1000, 0.002, 0.002],
-            "text-babbage-001": [1000, 0.0005, 0.0005],
-            "text-ada-001": [1000, 0.0004, 0.0004],
-            "text-embedding-ada-002": [1000, 0.0004, 0.0004],
-        };
         const out = {
             input_cost: 0,
             output_cost: 0,
             total_cost: 0,
         };
-        const price = cost[this.model];
+        const price = const_1.OpenAiPricing[this.model];
         if (price) {
             const [amount, inputAmount, outputAmount] = price;
             if (inputAmount && input_tokens) {
@@ -194,10 +187,11 @@ class OpenAI extends _base_1.BaseLlm {
      * @param input - The input for the chat/completion API.
      * @returns The chat/completion response from the API.
      */
-    async _call(input) {
-        if (["gpt-3.5-turbo", "gpt-4"].includes(this.model)) {
+    async _call(input, arg2) {
+        if (this.model.substring(0, 13) === "gpt-3.5-turbo" ||
+            this.model.substring(0, 5) === "gpt-4") {
             (0, utils_1.assert)(Array.isArray(input), "Invalid prompt.");
-            return await this.chat(input);
+            return await this.chat(input, arg2);
         }
         else {
             (0, utils_1.assert)(typeof input === "string");
@@ -209,7 +203,7 @@ class OpenAI extends _base_1.BaseLlm {
      * @param messages - A list of message objects for the API call.
      * @returns The chat response from the API.
      */
-    async chat(messages) {
+    async chat(messages, _args) {
         (0, utils_1.assert)(Array.isArray(messages), "Invalid prompt.");
         const options = (0, utils_1.removeEmptyFromObject)({
             messages,
@@ -225,6 +219,12 @@ class OpenAI extends _base_1.BaseLlm {
             logitBias: this.logitBias,
             user: this.user,
         });
+        if (_args && _args?.function_call) {
+            options["function_call"] = _args?.function_call;
+        }
+        if (_args && _args?.functions?.length) {
+            options["functions"] = _args.functions.map(f => (0, utils_1.pick)(f, ["name", "description", "parameters"]));
+        }
         const response = await this.client.createChatCompletion(options);
         const { data } = response;
         this.metrics.history.push(data);

package/dist/llm/openai.js.map

@@ -1 +1 @@
-{"version":3,"file":"openai.js","sourceRoot":"src/","sources":["llm/openai.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"openai.js","sourceRoot":"src/","sources":["llm/openai.ts"],"names":[],"mappings":"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"}

package/dist/llm/output/openai.d.ts

@@ -1,9 +1,13 @@
+import { OutputOpenAIChatChoice } from "../../types";
 import { BaseLlmOutput } from "./base";
+export interface OutputOpenAIChat {
+    results: OutputOpenAIChatChoice[];
+}
 export declare class OutputOpenAIChat extends BaseLlmOutput {
     constructor(result: any);
     setResult(result: any, _attributes?: {}): void;
-    getResult(resultIndex?: number): any;
-    getResultContent(resultIndex?: number): any;
+    getResult(resultIndex?: number): OutputOpenAIChatChoice | undefined;
+    getResultContent(resultIndex?: number): string | undefined;
 }
 export declare class OutputOpenAICompletion extends BaseLlmOutput {
     constructor(result: any);

package/dist/llm/output/openai.js

@@ -18,10 +18,17 @@ class OutputOpenAIChat extends base_1.BaseLlmOutput {
             const result = this.results[resultIndex];
             return result;
         }
+        return;
     }
     getResultContent(resultIndex = 0) {
         const result = this.getResult(resultIndex);
-        return result?.message?.content;
+        if (result?.message?.content) {
+            return result?.message?.content;
+        }
+        if (result?.message?.content === null || result?.message?.function_call) {
+            return JSON.stringify({ function_call: result?.message?.function_call });
+        }
+        return;
     }
 }
 exports.OutputOpenAIChat = OutputOpenAIChat;

package/dist/llm/output/openai.js.map

@@ -1 +1 @@
-{"version":3,"file":"openai.js","sourceRoot":"src/","sources":["llm/output/openai.ts"],"names":[],"mappings":";;;AAAA,iCAAuC;AAEvC,MAAa,gBAAiB,SAAQ,oBAAa;IACjD,YAAY,MAAW;QACrB,KAAK,CAAC,MAAM,CAAC,CAAC;IAChB,CAAC;IAED,SAAS,CAAC,MAAW,EAAE,WAAW,GAAG,EAAE;QACrC,IAAI,CAAC,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC;QACpB,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAC9B,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;QAC1B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;IAChC,CAAC;IAED,SAAS,CAAC,WAAW,GAAG,CAAC;QACvB,IAAI,WAAW,GAAG,CAAC,CAAC,IAAI,WAAW,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YAC1D,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YACzC,OAAO,MAAM,CAAC;SACf;IACH,CAAC;IACD,gBAAgB,CAAC,WAAW,GAAG,CAAC;QAC9B,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QAC3C,OAAO,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC;IAClC,CAAC;CACF;AAvBD,4CAuBC;AAGD,MAAa,sBAAuB,SAAQ,oBAAa;IACvD,YAAY,MAAW;QACrB,KAAK,CAAC,MAAM,CAAC,CAAC;IAChB,CAAC;IAED,SAAS,CAAC,MAAW,EAAE,WAAW,GAAG,EAAE;QACrC,IAAI,CAAC,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC;QACpB,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAC9B,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;QAC1B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;IAChC,CAAC;IAED,SAAS,CAAC,WAAW,GAAG,CAAC;QACvB,IAAI,WAAW,GAAG,CAAC,CAAC,IAAI,WAAW,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YAC1D,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YACzC,OAAO,MAAM,CAAC;SACf;IACH,CAAC;IACD,gBAAgB,CAAC,WAAW,GAAG,CAAC;QAC9B,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QAC3C,OAAO,MAAM,EAAE,IAAI,CAAC;IACtB,CAAC;CACF;AAvBD,wDAuBC"}
+{"version":3,"file":"openai.js","sourceRoot":"src/","sources":["llm/output/openai.ts"],"names":[],"mappings":";;;AACA,iCAAuC;AAOvC,MAAa,gBAAiB,SAAQ,oBAAa;IACjD,YAAY,MAAW;QACrB,KAAK,CAAC,MAAM,CAAC,CAAC;IAChB,CAAC;IAED,SAAS,CAAC,MAAW,EAAE,WAAW,GAAG,EAAE;QACrC,IAAI,CAAC,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC;QACpB,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAC9B,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;QAC1B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;IAChC,CAAC;IAED,SAAS,CAAC,WAAW,GAAG,CAAC;QACvB,IAAI,WAAW,GAAG,CAAC,CAAC,IAAI,WAAW,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YAC1D,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YACzC,OAAO,MAAM,CAAC;SACf;QACD,OAAO;IACT,CAAC;IACD,gBAAgB,CAAC,WAAW,GAAG,CAAC;QAC9B,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QAC3C,IAAG,MAAM,EAAE,OAAO,EAAE,OAAO,EAAC;YAC1B,OAAO,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC;SACjC;QACD,IAAG,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,IAAI,MAAM,EAAE,OAAO,EAAE,aAAa,EAAC;YACrE,OAAO,IAAI,CAAC,SAAS,CAAC,EAAC,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAC,CAAC,CAAA;SACvE;QACD,OAAO;IACT,CAAC;CACF;AA9BD,4CA8BC;AAED,MAAa,sBAAuB,SAAQ,oBAAa;IACvD,YAAY,MAAW;QACrB,KAAK,CAAC,MAAM,CAAC,CAAC;IAChB,CAAC;IAED,SAAS,CAAC,MAAW,EAAE,WAAW,GAAG,EAAE;QACrC,IAAI,CAAC,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC;QACpB,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAC9B,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;QAC1B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;IAChC,CAAC;IAED,SAAS,CAAC,WAAW,GAAG,CAAC;QACvB,IAAI,WAAW,GAAG,CAAC,CAAC,IAAI,WAAW,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YAC1D,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YACzC,OAAO,MAAM,CAAC;SACf;IACH,CAAC;IACD,gBAAgB,CAAC,WAAW,GAAG,CAAC;QAC9B,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QAC3C,OAAO,MAAM,EAAE,IAAI,CAAC;IACtB,CAAC;CACF;AAvBD,wDAuBC"}

package/dist/parser/_base.d.ts

@@ -1,33 +1,33 @@
-import { BaseParserOptions } from "../types";
-import { JSONSchema7 } from "json-schema-to-ts";
-export interface BaseParser<T> {
-    onParseError?(text: string, attributes?: Record<string, any>): any;
-}
+import { BaseParserOptions, BaseParserOptionsWithSchema } from "../types";
+import { FromSchema, JSONSchema } from "json-schema-to-ts";
 /**
  * BaseParser is an abstract class for parsing text and enforcing JSON schema on the parsed data.
  */
 export declare abstract class BaseParser<T = any> {
     name: string;
-    schema: JSONSchema7 | undefined;
-    options: {};
+    options: BaseParserOptions;
     /**
      * Create a new BaseParser.
-     * @param {string} name - The name of the parser.
+     * @param name - The name of the parser.
      * @param  options - options
      */
     constructor(name: string, options?: BaseParserOptions);
     /**
      * Parse the given text and return the parsed data.
      * @abstract
-     * @param {string} text - The text to parse.
-     * @param {Record<string, any>} [attributes] - Optional attributes to use during parsing.
-     * @returns {T} The parsed data.
+     * @param text - The text to parse.
+     * @param [attributes] - Optional attributes to use during parsing.
+     * @returns The parsed data.
      */
     abstract parse(text: string, attributes?: Record<string, any>): T;
+}
+export declare abstract class BaseParserWithJson<S extends JSONSchema | undefined = undefined, T = S extends JSONSchema ? FromSchema<S> : Record<string, any>> extends BaseParser<T> {
+    schema: S;
+    validateSchema: boolean;
     /**
-     * Enforce the JSON schema on the given parsed data.
-     * @param {Record<string, any>} parsed - The parsed data.
-     * @returns The parsed data with schema enforced.
+     * Create a new BaseParser.
+     * @param name - The name of the parser.
+     * @param  options - options
      */
-    enforceSchema(parsed: Record<string, any>): T;
+    constructor(name: string, options: BaseParserOptionsWithSchema<S>);
 }

package/dist/parser/_base.js

@@ -1,63 +1,62 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseParser = void 0;
-const utils_1 = require("../utils");
-const jsonschema_1 = require("jsonschema");
+exports.BaseParserWithJson = exports.BaseParser = void 0;
 /**
  * BaseParser is an abstract class for parsing text and enforcing JSON schema on the parsed data.
  */
 class BaseParser {
     /**
      * Create a new BaseParser.
-     * @param {string} name - The name of the parser.
+     * @param name - The name of the parser.
      * @param  options - options
      */
-    constructor(name, options) {
+    constructor(name, options = {}) {
         Object.defineProperty(this, "name", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "schema", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
+        // public schema: JSONSchema7 | undefined;
         Object.defineProperty(this, "options", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: {}
+            value: void 0
         });
         this.name = name;
         if (options) {
-            const { schema, ...restOfOptions } = options;
-            this.options = restOfOptions;
-            if (schema) {
-                this.schema = schema;
-            }
+            this.options = options;
         }
     }
+}
+exports.BaseParser = BaseParser;
+class BaseParserWithJson extends BaseParser {
     /**
-     * Enforce the JSON schema on the given parsed data.
-     * @param {Record<string, any>} parsed - The parsed data.
-     * @returns The parsed data with schema enforced.
+     * Create a new BaseParser.
+     * @param name - The name of the parser.
+     * @param  options - options
      */
-    enforceSchema(parsed) {
-        /* istanbul ignore next */
-        if (!this.schema || !parsed || typeof parsed !== "object") {
-            return parsed;
-        }
-        const { schema } = this;
-        let results = (0, utils_1.filterObjectOnSchema)(schema, parsed);
-        const validate = (0, jsonschema_1.validate)(results, this.schema);
-        if (validate.errors.length) {
-            throw new Error("schema error");
+    constructor(name, options) {
+        super(name);
+        Object.defineProperty(this, "schema", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "validateSchema", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        const { schema, validateSchema } = options;
+        this.validateSchema = !!validateSchema;
+        if (schema) {
+            this.schema = schema;
         }
-        return results;
     }
 }
-exports.BaseParser = BaseParser;
+exports.BaseParserWithJson = BaseParserWithJson;
 //# sourceMappingURL=_base.js.map

package/dist/parser/_base.js.map

@@ -1 +1 @@
-{"version":3,"file":"_base.js","sourceRoot":"src/","sources":["parser/_base.ts"],"names":[],"mappings":";;;AAEA,mCAA+C;AAC/C,2CAAuD;AAMvD;;GAEG;AACH,MAAsB,UAAU;IAI9B;;;;OAIG;IACH,YAAY,IAAY,EAAE,OAA2B;QARrD;;;;;WAAoB;QACpB;;;;;WAAuC;QACvC;;;;mBAAiB,EAAE;WAAC;QAOlB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,OAAO,EAAE;YACX,MAAM,EAAE,MAAM,EAAE,GAAG,aAAa,EAAE,GAAG,OAAO,CAAC;YAC7C,IAAI,CAAC,OAAO,GAAG,aAAa,CAAC;YAE7B,IAAI,MAAM,EAAE;gBACV,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;aACtB;SACF;IACH,CAAC;IAWD;;;;OAIG;IAEH,aAAa,CAAC,MAA2B;QACvC,0BAA0B;QAC1B,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;YACzD,OAAO,MAAW,CAAC;SACpB;QAED,MAAM,EAAE,MAAM,EAAE,GAAG,IAAW,CAAC;QAE/B,IAAI,OAAO,GAAG,IAAA,4BAAoB,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAEnD,MAAM,QAAQ,GAAG,IAAA,qBAAc,EAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAEtD,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE;YAC1B,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;SACjC;QAED,OAAO,OAAY,CAAC;IACtB,CAAC;CACF;AAtDD,gCAsDC"}
+{"version":3,"file":"_base.js","sourceRoot":"src/","sources":["parser/_base.ts"],"names":[],"mappings":";;;AAGA;;GAEG;AACH,MAAsB,UAAU;IAI9B;;;;OAIG;IACH,YAAY,IAAY,EAAE,UAA6B,EAAE;QARzD;;;;;WAAoB;QACpB,0CAA0C;QAC1C;;;;;WAAkC;QAOhC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,OAAO,EAAE;YACX,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;SACxB;IACH,CAAC;CAUF;AAxBD,gCAwBC;AAGD,MAAsB,kBAGpB,SAAQ,UAAa;IAGrB;;;;OAIG;IACH,YAAY,IAAY,EAAE,OAAuC;QAC/D,KAAK,CAAC,IAAI,CAAC,CAAC;QARd;;;;;WAAiB;QACjB;;;;;WAA+B;QAS7B,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC;QAC3C,IAAI,CAAC,cAAc,GAAG,CAAC,CAAC,cAAc,CAAC;QAEvC,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;SACtB;IACH,CAAC;CACF;AArBD,gDAqBC"}

package/dist/parser/_functions.d.ts

@@ -1,5 +1,5 @@
 import { JSONSchema } from "json-schema-to-ts";
-import { BaseParserOptionsWithSchema, CreateParserType, ExecutorContext } from "../types";
+import { BaseParserOptions, BaseParserOptionsWithSchema, CreateParserType, ExecutorContext } from "../types";
 import { StringParser } from "./parsers/StringParser";
 import { BooleanParser } from "./parsers/BooleanParser";
 import { NumberParser } from "./parsers/NumberParser";
@@ -12,92 +12,98 @@ import { ReplaceStringTemplateParser } from "./parsers/ReplaceStringTemplatePars
 import { MarkdownCodeBlockParser } from "./parsers/MarkdownCodeBlock";
 import { MarkdownCodeBlocksParser } from "./parsers/MarkdownCodeBlocks";
 import { StringExtractParser, StringExtractParserOptions } from "./parsers/StringExtractParser";
-export type ParserOptions<T extends CreateParserType, S extends JSONSchema | undefined = undefined> = T extends "json" ? BaseParserOptionsWithSchema<S> : T extends "listToJson" ? BaseParserOptionsWithSchema<S> : T extends "stringExtract" ? StringExtractParserOptions : T extends "markdownCodeBlocks" ? undefined : T extends "markdownCodeBlock" ? undefined : T extends "listToArray" ? undefined : T extends "listToKeyValue" ? undefined : T extends "replaceStringTemplate" ? undefined : T extends "number" ? undefined : T extends "boolean" ? undefined : T extends "string" ? undefined : undefined;
+export type ParserOptions<T extends CreateParserType, S extends JSONSchema | undefined = undefined> = T extends "json" ? BaseParserOptionsWithSchema<S> : T extends "listToJson" ? BaseParserOptionsWithSchema<S> : T extends "stringExtract" ? StringExtractParserOptions : T extends "markdownCodeBlocks" ? BaseParserOptions : T extends "markdownCodeBlock" ? BaseParserOptions : T extends "listToArray" ? BaseParserOptions : T extends "listToKeyValue" ? BaseParserOptions : T extends "replaceStringTemplate" ? BaseParserOptions : T extends "number" ? BaseParserOptions : T extends "boolean" ? BaseParserOptions : T extends "string" ? BaseParserOptions : BaseParserOptions;
+export type ParserMap<S extends JSONSchema | undefined = undefined> = {
+    string: StringParser;
+    boolean: BooleanParser;
+    number: NumberParser;
+    listToArray: ListToArrayParser;
+    listToKeyValue: ListToKeyValueParser;
+    replaceStringTemplate: ReplaceStringTemplateParser;
+    markdownCodeBlock: MarkdownCodeBlockParser;
+    markdownCodeBlocks: MarkdownCodeBlocksParser;
+    stringExtract: StringExtractParser;
+    listToJson: ListToJsonParser<S>;
+    json: JsonParser<S>;
+};
 /**
  * Creates a parser based on the given type.
  * @template S - JSON schema type.
- * @param {Extract<CreateParserType, "listToKeyValue">} type - The type of parser to create.
+ * @param type - The type of parser to create.
  * @returns An instance of ListToKeyValueParser.
  */
-export declare function createParser<T extends Extract<CreateParserType, "markdownCodeBlocks">>(type: T): MarkdownCodeBlocksParser;
+export declare function createParser<T extends Extract<CreateParserType, "markdownCodeBlocks">>(type: T, options?: BaseParserOptions): MarkdownCodeBlocksParser;
 /**
  * Creates a parser based on the given type.
  * @template S - JSON schema type.
- * @param {Extract<CreateParserType, "listToKeyValue">} type - The type of parser to create.
+ * @param type - The type of parser to create.
  * @returns An instance of ListToKeyValueParser.
  */
-export declare function createParser<T extends Extract<CreateParserType, "markdownCodeBlock">>(type: T): MarkdownCodeBlockParser;
+export declare function createParser<T extends Extract<CreateParserType, "markdownCodeBlock">>(type: T, options?: BaseParserOptions): MarkdownCodeBlockParser;
 /**
  * Creates a parser based on the given type.
  * @template S - JSON schema type.
- * @param {Extract<CreateParserType, "listToKeyValue">} type - The type of parser to create.
+ * @param type - The type of parser to create.
  * @returns An instance of ListToKeyValueParser.
  */
-export declare function createParser<T extends Extract<CreateParserType, "listToKeyValue">>(type: T): ListToKeyValueParser;
-/**
- * Creates a parser based on the given type and schema.
- * @template S - JSON schema type.
- * @param {Extract<CreateParserType, "listToJson">} type - The type of parser to create.
- * @param options - The JSON schema.
- * @returns An instance of ListToJsonParser.
- */
-export declare function createParser<T extends Extract<CreateParserType, "listToJson">, S extends JSONSchema | undefined = undefined>(type: T, options: ParserOptions<T, S>): ListToJsonParser<S>;
+export declare function createParser<T extends Extract<CreateParserType, "listToKeyValue">>(type: T, options?: BaseParserOptions): ListToKeyValueParser;
 /**
  * Creates a parser based on the given type.
  * @template S - JSON schema type.
- * @param {Extract<CreateParserType, "listToArray">} type - The type of parser to create.
+ * @param  type - The type of parser to create.
  * @returns An instance of ListToArrayParser.
  */
-export declare function createParser<T extends Extract<CreateParserType, "listToArray">, S extends JSONSchema | undefined = undefined>(type: T): ListToArrayParser;
+export declare function createParser<T extends Extract<CreateParserType, "listToArray">, S extends JSONSchema | undefined = undefined>(type: T, options?: BaseParserOptions): ListToArrayParser;
 /**
  * Creates a parser based on the given type.
  * @template S - JSON schema type.
- * @param {Extract<CreateParserType, "number">} type - The type of parser to create.
+ * @param type - The type of parser to create.
  * @returns An instance of NumberParser.
  */
-export declare function createParser<T extends Extract<CreateParserType, "number">, S extends JSONSchema | undefined = undefined>(type: T): NumberParser;
+export declare function createParser<T extends Extract<CreateParserType, "number">, S extends JSONSchema | undefined = undefined>(type: T, options?: BaseParserOptions): NumberParser;
 /**
  * Creates a parser based on the given type.
  * @template S - JSON schema type.
- * @param {Extract<CreateParserType, "number">} type - The type of parser to create.
+ * @param  type - The type of parser to create.
  * @returns An instance of NumberParser.
  */
-export declare function createParser<T extends Extract<CreateParserType, "boolean">, S extends JSONSchema | undefined = undefined>(type: T): BooleanParser;
+export declare function createParser<T extends Extract<CreateParserType, "boolean">, S extends JSONSchema | undefined = undefined>(type: T, options?: BaseParserOptions): BooleanParser;
 /**
  * Creates a parser based on the given type.
  * @template S - JSON schema type.
- * @param {Extract<CreateParserType, "replaceStringTemplate">} type - The type of parser to create.
+ * @param  type - The type of parser to create.
  * @returns  An instance of ReplaceStringTemplateParser.
  */
-export declare function createParser<T extends Extract<CreateParserType, "replaceStringTemplate">, S extends JSONSchema | undefined = undefined>(type: T): ReplaceStringTemplateParser;
+export declare function createParser<T extends Extract<CreateParserType, "replaceStringTemplate">, S extends JSONSchema | undefined = undefined>(type: T, options?: BaseParserOptions): ReplaceStringTemplateParser;
 /**
- * Creates a parser based on the given type and schema.
+ * Creates a parser based on the given type.
  * @template S - JSON schema type.
- * @param {Extract<CreateParserType, "json">} type - The type of parser to create.
- * @param [options] - The JSON schema.
- * @returns An instance of JsonParser.
+ * @param type - The type of parser to create.
+ * @returns  An instance of StringParser.
  */
-export declare function createParser<T extends Extract<CreateParserType, "json">, S extends JSONSchema | undefined = undefined>(type: T, options: ParserOptions<T, S>): JsonParser<S>;
+export declare function createParser<T extends Extract<CreateParserType, "string">, S extends JSONSchema | undefined = undefined>(type: T, options?: BaseParserOptions): StringParser;
 /**
  * Creates a parser based on the given type.
  * @template S - JSON schema type.
- * @param {Extract<CreateParserType, "string">} type - The type of parser to create.
+ * @param  type - The type of parser to create.
  * @returns  An instance of StringParser.
  */
-export declare function createParser<T extends Extract<CreateParserType, "string">, S extends JSONSchema | undefined = undefined>(type: T): StringParser;
+export declare function createParser<T extends Extract<CreateParserType, "stringExtract">, S extends JSONSchema | undefined = undefined>(type: T, options?: StringExtractParserOptions): StringExtractParser;
 /**
- * Creates a parser based on the given type.
+ * Creates a parser based on the given type and schema.
  * @template S - JSON schema type.
- * @param {Extract<CreateParserType, "string">} type - The type of parser to create.
- * @returns  An instance of StringParser.
+ * @param type - The type of parser to create.
+ * @param options - The JSON schema.
+ * @returns An instance of ListToJsonParser.
  */
-export declare function createParser<T extends Extract<CreateParserType, "stringExtract">, S extends JSONSchema | undefined = undefined>(type: T, options: ParserOptions<T>): StringExtractParser;
+export declare function createParser<T extends Extract<CreateParserType, "listToJson">, S extends JSONSchema | undefined = undefined>(type: T, options?: BaseParserOptionsWithSchema<S>): ListToJsonParser<S>;
 /**
- * Creates a default string parser if type defined
+ * Creates a parser based on the given type and schema.
  * @template S - JSON schema type.
- * @param {Extract<CreateParserType, "string">} type - The type of parser to create.
- * @returns An instance of StringParser.
+ * @param  type - The type of parser to create.
+ * @param [options] - The JSON schema.
+ * @returns An instance of JsonParser.
  */
-export declare function createParser<T extends CreateParserType, S extends JSONSchema | undefined = undefined>(type?: undefined): StringParser;
-export declare function createParser<T extends CreateParserType, S extends JSONSchema | undefined = undefined>(type: T, options?: ParserOptions<T>): JsonParser<S> | ListToJsonParser<S> | StringParser | NumberParser | BooleanParser | ListToArrayParser | ListToKeyValueParser | ReplaceStringTemplateParser | MarkdownCodeBlockParser | MarkdownCodeBlocksParser | StringExtractParser;
-export declare function createCustomParser<O>(name: string, parserFn: (text: string, inputValues: ExecutorContext<any, O>) => O): CustomParser<ReturnType<typeof parserFn>>;
+export declare function createParser<T extends Extract<CreateParserType, "json">, S extends JSONSchema | undefined = undefined>(type: T, options?: BaseParserOptionsWithSchema<S>): JsonParser<S>;
+export declare function createParser<T extends CreateParserType, S extends JSONSchema | undefined = undefined>(type: T, options?: BaseParserOptionsWithSchema<S> | BaseParserOptions): JsonParser<S> | ListToJsonParser<S> | StringParser | NumberParser | BooleanParser | ListToArrayParser | ListToKeyValueParser | ReplaceStringTemplateParser | MarkdownCodeBlockParser | MarkdownCodeBlocksParser | StringExtractParser;
+export declare function createCustomParser<O>(name: string, parserFn: (text: string, inputValues: ExecutorContext<any, any>) => O): CustomParser<ReturnType<typeof parserFn>>;

package/dist/parser/_functions.js

@@ -20,14 +20,14 @@ const StringExtractParser_1 = require("./parsers/StringExtractParser");
  * @param options - The parser options.
  * @returns  An instance of the specified parser.
  */
-function createParser(type, options) {
+function createParser(type, options = {}) {
     switch (type) {
+        case "json":
+            return new JsonParser_1.JsonParser(options);
         case "markdownCodeBlocks":
             return new MarkdownCodeBlocks_1.MarkdownCodeBlocksParser();
         case "markdownCodeBlock":
             return new MarkdownCodeBlock_1.MarkdownCodeBlockParser();
-        case "json":
-            return new JsonParser_1.JsonParser(options);
         case "listToArray":
             return new ListToArrayParser_1.ListToArrayParser();
         case "listToJson":

package/dist/parser/_functions.js.map

@@ -1 +1 @@
-{"version":3,"file":"_functions.js","sourceRoot":"src/","sources":["parser/_functions.ts"],"names":[],"mappings":";;;AAMA,yDAAsD;AACtD,2DAAwD;AACxD,yDAAsD;AACtD,qDAAkD;AAClD,iEAA8D;AAC9D,yEAAsE;AACtE,yDAAsD;AACtD,mEAAgE;AAChE,uFAAoF;AACpF,mEAAsE;AACtE,qEAAwE;AACxE,uEAGuC;AAoLvC;;;;;;GAMG;AACH,SAAgB,YAAY,CAI1B,IAAQ,EACR,OAAa;IAab,QAAQ,IAAI,EAAE;QACZ,KAAK,oBAAoB;YACvB,OAAO,IAAI,6CAAwB,EAAE,CAAC;QACxC,KAAK,mBAAmB;YACtB,OAAO,IAAI,2CAAuB,EAAE,CAAC;QACvC,KAAK,MAAM;YACT,OAAO,IAAI,uBAAU,CAAC,OAAO,CAAC,CAAC;QACjC,KAAK,aAAa;YAChB,OAAO,IAAI,qCAAiB,EAAE,CAAC;QACjC,KAAK,YAAY;YACf,OAAO,IAAI,mCAAgB,CAAC,OAAO,CAAC,CAAC;QACvC,KAAK,gBAAgB;YACnB,OAAO,IAAI,2CAAoB,EAAE,CAAC;QACpC,KAAK,uBAAuB;YAC1B,OAAO,IAAI,yDAA2B,EAAE,CAAC;QAC3C,KAAK,SAAS;YACZ,OAAO,IAAI,6BAAa,EAAE,CAAC;QAC7B,KAAK,QAAQ;YACX,OAAO,IAAI,2BAAY,EAAE,CAAC;QAC5B,KAAK,eAAe;YAClB,OAAO,IAAI,yCAAmB,CAAC,OAAO,CAAC,CAAC;QAC1C,KAAK,QAAQ,CAAC;QACd;YACE,OAAO,IAAI,2BAAY,EAAE,CAAC;KAC7B;AACH,CAAC;AA3CD,oCA2CC;AAED,SAAgB,kBAAkB,CAChC,IAAY,EACZ,QAAmE;IAEnE,OAAO,IAAI,2BAAY,CAA8B,IAAI,EAAE,QAAQ,CAAC,CAAC;AACvE,CAAC;AALD,gDAKC"}
+{"version":3,"file":"_functions.js","sourceRoot":"src/","sources":["parser/_functions.ts"],"names":[],"mappings":";;;AAOA,yDAAsD;AACtD,2DAAwD;AACxD,yDAAsD;AACtD,qDAAkD;AAClD,iEAA8D;AAC9D,yEAAsE;AACtE,yDAAsD;AACtD,mEAAgE;AAChE,uFAAoF;AACpF,mEAAsE;AACtE,qEAAwE;AACxE,uEAGuC;AAyQvC;;;;;;GAMG;AACH,SAAgB,YAAY,CAI1B,IAAO,EACP,UAAe,EAAE;IAEjB,QAAQ,IAAI,EAAE;QACZ,KAAK,MAAM;YACT,OAAO,IAAI,uBAAU,CAAI,OAAO,CAAC,CAAC;QACpC,KAAK,oBAAoB;YACvB,OAAO,IAAI,6CAAwB,EAAE,CAAC;QACxC,KAAK,mBAAmB;YACtB,OAAO,IAAI,2CAAuB,EAAE,CAAC;QACvC,KAAK,aAAa;YAChB,OAAO,IAAI,qCAAiB,EAAE,CAAC;QACjC,KAAK,YAAY;YACf,OAAO,IAAI,mCAAgB,CAAI,OAAO,CAAC,CAAC;QAC1C,KAAK,gBAAgB;YACnB,OAAO,IAAI,2CAAoB,EAAE,CAAC;QACpC,KAAK,uBAAuB;YAC1B,OAAO,IAAI,yDAA2B,EAAE,CAAC;QAC3C,KAAK,SAAS;YACZ,OAAO,IAAI,6BAAa,EAAE,CAAC;QAC7B,KAAK,QAAQ;YACX,OAAO,IAAI,2BAAY,EAAE,CAAC;QAC5B,KAAK,eAAe;YAClB,OAAO,IAAI,yCAAmB,CAAC,OAAO,CAAC,CAAC;QAC1C,KAAK,QAAQ,CAAC;QACd;YACE,OAAO,IAAI,2BAAY,EAAE,CAAC;KAC7B;AACH,CAAC;AAhCD,oCAgCC;AAED,SAAgB,kBAAkB,CAChC,IAAY,EACZ,QAAqE;IAErE,OAAO,IAAI,2BAAY,CAA8B,IAAI,EAAE,QAAQ,CAAC,CAAC;AACvE,CAAC;AALD,gDAKC"}

package/dist/parser/_utils.d.ts

@@ -0,0 +1,3 @@
+import { JSONSchema, JSONSchema7, FromSchema } from "json-schema-to-ts";
+export declare function enforceParserSchema<S extends JSONSchema | undefined = undefined, T = S extends JSONSchema ? FromSchema<S> : Record<string, any>>(schema: S, parsed: T): T;
+export declare function validateParserSchema<S extends JSONSchema7, T extends Record<string, any>>(schema: S, parsed: T): import("jsonschema").ValidationError[] | null;

package/dist/parser/_utils.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateParserSchema = exports.enforceParserSchema = void 0;
+const utils_1 = require("../utils");
+const jsonschema_1 = require("jsonschema");
+function enforceParserSchema(schema, parsed) {
+    if (!schema || !parsed || typeof parsed !== "object") {
+        return parsed;
+    }
+    return (0, utils_1.filterObjectOnSchema)(schema, parsed);
+}
+exports.enforceParserSchema = enforceParserSchema;
+function validateParserSchema(schema, parsed) {
+    if (!schema || !parsed || typeof parsed !== "object") {
+        return null;
+    }
+    const validate = (0, jsonschema_1.validate)(parsed, schema);
+    if (validate.errors.length) {
+        return validate.errors;
+    }
+    return null;
+}
+exports.validateParserSchema = validateParserSchema;
+//# sourceMappingURL=_utils.js.map

package/dist/parser/_utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"_utils.js","sourceRoot":"src/","sources":["parser/_utils.ts"],"names":[],"mappings":";;;AACA,mCAA+C;AAC/C,2CAAwD;AAExD,SAAgB,mBAAmB,CAGjC,MAAS,EAAE,MAAS;IACpB,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QACpD,OAAO,MAAW,CAAC;KACpB;IACD,OAAO,IAAA,4BAAoB,EAAC,MAAM,EAAE,MAAM,CAAM,CAAC;AACnD,CAAC;AARD,kDAQC;AAED,SAAgB,oBAAoB,CAGlC,MAAS,EAAE,MAAS;IACpB,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QACpD,OAAO,IAAI,CAAC;KACb;IACD,MAAM,QAAQ,GAAG,IAAA,qBAAc,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEhD,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE;QAC1B,OAAO,QAAQ,CAAC,MAAM,CAAC;KACxB;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAdD,oDAcC"}

package/dist/parser/index.d.ts

@@ -1,4 +1,5 @@
-import { BaseParser } from "./_base";
+import { OpenAiFunctionParser } from '../parser/parsers/OpenAiFunctionParser';
+import { BaseParser, BaseParserWithJson } from "./_base";
 import { StringParser } from "./parsers/StringParser";
 import { BooleanParser } from "./parsers/BooleanParser";
 import { NumberParser } from "./parsers/NumberParser";
@@ -11,4 +12,4 @@ import { ReplaceStringTemplateParser } from "./parsers/ReplaceStringTemplatePars
 import { MarkdownCodeBlockParser } from "./parsers/MarkdownCodeBlock";
 import { MarkdownCodeBlocksParser } from "./parsers/MarkdownCodeBlocks";
 import { createCustomParser, createParser } from "./_functions";
-export { BaseParser, BooleanParser, StringParser, NumberParser, JsonParser, ListToJsonParser, ListToKeyValueParser, ListToArrayParser, ReplaceStringTemplateParser, MarkdownCodeBlockParser, MarkdownCodeBlocksParser, CustomParser, createParser, createCustomParser, };
+export { BaseParser, BaseParserWithJson, BooleanParser, StringParser, NumberParser, JsonParser, ListToJsonParser, ListToKeyValueParser, ListToArrayParser, ReplaceStringTemplateParser, OpenAiFunctionParser, MarkdownCodeBlockParser, MarkdownCodeBlocksParser, CustomParser, createParser, createCustomParser, };

package/dist/parser/index.js

@@ -1,8 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createCustomParser = exports.createParser = exports.CustomParser = exports.MarkdownCodeBlocksParser = exports.MarkdownCodeBlockParser = exports.ReplaceStringTemplateParser = exports.ListToArrayParser = exports.ListToKeyValueParser = exports.ListToJsonParser = exports.JsonParser = exports.NumberParser = exports.StringParser = exports.BooleanParser = exports.BaseParser = void 0;
+exports.createCustomParser = exports.createParser = exports.CustomParser = exports.MarkdownCodeBlocksParser = exports.MarkdownCodeBlockParser = exports.OpenAiFunctionParser = exports.ReplaceStringTemplateParser = exports.ListToArrayParser = exports.ListToKeyValueParser = exports.ListToJsonParser = exports.JsonParser = exports.NumberParser = exports.StringParser = exports.BooleanParser = exports.BaseParserWithJson = exports.BaseParser = void 0;
+const OpenAiFunctionParser_1 = require("../parser/parsers/OpenAiFunctionParser");
+Object.defineProperty(exports, "OpenAiFunctionParser", { enumerable: true, get: function () { return OpenAiFunctionParser_1.OpenAiFunctionParser; } });
 const _base_1 = require("./_base");
 Object.defineProperty(exports, "BaseParser", { enumerable: true, get: function () { return _base_1.BaseParser; } });
+Object.defineProperty(exports, "BaseParserWithJson", { enumerable: true, get: function () { return _base_1.BaseParserWithJson; } });
 const StringParser_1 = require("./parsers/StringParser");
 Object.defineProperty(exports, "StringParser", { enumerable: true, get: function () { return StringParser_1.StringParser; } });
 const BooleanParser_1 = require("./parsers/BooleanParser");

package/dist/parser/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"src/","sources":["parser/index.ts"],"names":[],"mappings":";;;AAAA,mCAAqC;AAenC,2FAfO,kBAAU,OAeP;AAdZ,yDAAsD;AAgBpD,6FAhBO,2BAAY,OAgBP;AAfd,2DAAwD;AActD,8FAdO,6BAAa,OAcP;AAbf,yDAAsD;AAepD,6FAfO,2BAAY,OAeP;AAdd,qDAAkD;AAehD,2FAfO,uBAAU,OAeP;AAdZ,iEAA8D;AAe5D,iGAfO,mCAAgB,OAeP;AAdlB,yEAAsE;AAepE,qGAfO,2CAAoB,OAeP;AAdtB,yDAAsD;AAmBpD,6FAnBO,2BAAY,OAmBP;AAlBd,mEAAgE;AAc9D,kGAdO,qCAAiB,OAcP;AAbnB,uFAAoF;AAclF,4GAdO,yDAA2B,OAcP;AAb7B,mEAAsE;AAcpE,wGAdO,2CAAuB,OAcP;AAbzB,qEAAwE;AActE,yGAdO,6CAAwB,OAcP;AAb1B,6CAAgE;AAgB9D,mGAhBO,+BAAkB,OAgBP;AADlB,6FAf2B,yBAAY,OAe3B"}
+{"version":3,"file":"index.js","sourceRoot":"src/","sources":["parser/index.ts"],"names":[],"mappings":";;;AAAA,gFAA6E;AA0B3E,qGA1BO,2CAAoB,OA0BP;AAzBtB,mCAAyD;AAevD,2FAfO,kBAAU,OAeP;AACV,mGAhBmB,0BAAkB,OAgBnB;AAfpB,yDAAsD;AAiBpD,6FAjBO,2BAAY,OAiBP;AAhBd,2DAAwD;AAetD,8FAfO,6BAAa,OAeP;AAdf,yDAAsD;AAgBpD,6FAhBO,2BAAY,OAgBP;AAfd,qDAAkD;AAgBhD,2FAhBO,uBAAU,OAgBP;AAfZ,iEAA8D;AAgB5D,iGAhBO,mCAAgB,OAgBP;AAflB,yEAAsE;AAgBpE,qGAhBO,2CAAoB,OAgBP;AAftB,yDAAsD;AAqBpD,6FArBO,2BAAY,OAqBP;AApBd,mEAAgE;AAe9D,kGAfO,qCAAiB,OAeP;AAdnB,uFAAoF;AAelF,4GAfO,yDAA2B,OAeP;AAd7B,mEAAsE;AAgBpE,wGAhBO,2CAAuB,OAgBP;AAfzB,qEAAwE;AAgBtE,yGAhBO,6CAAwB,OAgBP;AAf1B,6CAAgE;AAkB9D,mGAlBO,+BAAkB,OAkBP;AADlB,6FAjB2B,yBAAY,OAiB3B"}