modelfusion 0.80.0 → 0.82.0

package/README.md

@@ -193,31 +193,34 @@ Generate typed objects using a language model and a schema.
 Generate a structure that matches a schema.
 
 ```ts
+import { zodSchema, generateStructure, openai } from "modelfusion";
+
 const sentiment = await generateStructure(
-  openai.ChatTextGenerator({
-    model: "gpt-3.5-turbo",
-    temperature: 0,
-    maxCompletionTokens: 50,
-  }),
-  new ZodStructureDefinition({
-    name: "sentiment",
-    description: "Write the sentiment analysis",
-    schema: z.object({
+  openai
+    .ChatTextGenerator({
+      model: "gpt-3.5-turbo",
+      temperature: 0,
+      maxCompletionTokens: 50,
+    })
+    .asFunctionCallStructureGenerationModel({ fnName: "sentiment" })
+    .withInstructionPrompt(),
+
+  zodSchema(
+    z.object({
       sentiment: z
         .enum(["positive", "neutral", "negative"])
         .describe("Sentiment."),
-    }),
-  }),
-  [
-    OpenAIChatMessage.system(
+    })
+  ),
+
+  {
+    system:
       "You are a sentiment evaluator. " +
-        "Analyze the sentiment of the following product review:"
-    ),
-    OpenAIChatMessage.user(
+      "Analyze the sentiment of the following product review:",
+    instruction:
       "After I opened the package, I was met by a very unpleasant smell " +
-        "that did not disappear even after washing. Never again!"
-    ),
-  ]
+      "that did not disappear even after washing. Never again!",
+  }
 );
 ```
 
@@ -228,16 +231,19 @@ Providers: [OpenAI](https://modelfusion.dev/integration/model-provider/openai)
 Stream a structure that matches a schema. Partial structures before the final part are untyped JSON.
 
 ```ts
+import { zodSchema, openai, streamStructure } from "modelfusion";
+
 const structureStream = await streamStructure(
-  openai.ChatTextGenerator({
-    model: "gpt-3.5-turbo",
-    temperature: 0,
-    maxCompletionTokens: 2000,
-  }),
-  new ZodStructureDefinition({
-    name: "generateCharacter" as const,
-    description: "Generate character descriptions.",
-    schema: z.object({
+  openai
+    .ChatTextGenerator(/* ... */)
+    .asFunctionCallStructureGenerationModel({
+      fnName: "generateCharacter",
+      fnDescription: "Generate character descriptions.",
+    })
+    .withTextPrompt(),
+
+  zodSchema(
+    z.object({
       characters: z.array(
         z.object({
           name: z.string(),
@@ -247,13 +253,10 @@ const structureStream = await streamStructure(
           description: z.string(),
         })
       ),
-    }),
-  }),
-  [
-    OpenAIChatMessage.user(
-      "Generate 3 character descriptions for a fantasy role playing game."
-    ),
-  ]
+    })
+  ),
+
+  "Generate 3 character descriptions for a fantasy role playing game."
 );
 
 for await (const part of structureStream) {
@@ -320,10 +323,14 @@ Guard functions can be used to implement retry on error, redacting and changing
 const result = await guard(
   (input, options) =>
     generateStructure(
-      openai.ChatTextGenerator({
-        // ...
-      }),
-      new ZodStructureDefinition({
+      openai
+        .ChatTextGenerator({
+          // ...
+        })
+        .asFunctionCallStructureGenerationModel({
+          fnName: "myFunction",
+        }),
+      zodSchema({
         // ...
       }),
       input,
@@ -335,10 +342,14 @@ const result = await guard(
   fixStructure({
     modifyInputForRetry: async ({ input, error }) => [
       ...input,
-      OpenAIChatMessage.functionCall(null, {
-        name: error.structureName,
-        arguments: error.valueText,
-      }),
+      {
+        role: "assistant",
+        content: null,
+        function_call: {
+          name: "sentiment",
+          arguments: JSON.stringify(error.valueText),
+        },
+      } satisfies OpenAIChatMessage,
       OpenAIChatMessage.user(error.message),
       OpenAIChatMessage.user("Please fix the error and try again."),
     ],
@@ -361,7 +372,7 @@ const calculator = new Tool({
   name: "calculator",
   description: "Execute a calculation",
 
-  parameters: new ZodSchema(
+  parameters: zodSchema(
     z.object({
       a: z.number().describe("The first number."),
       b: z.number().describe("The second number."),

package/core/schema/UncheckedSchema.d.ts

@@ -1,5 +1,6 @@
+import { JsonSchemaProducer } from "./JsonSchemaProducer.js";
 import { Schema } from "./Schema.js";
-export declare class UncheckedSchema<STRUCTURE> implements Schema<STRUCTURE> {
+export declare class UncheckedSchema<STRUCTURE> implements Schema<STRUCTURE>, JsonSchemaProducer {
     private readonly jsonSchema?;
     constructor(jsonSchema?: unknown);
     validate(data: unknown): {

package/core/schema/ZodSchema.cjs

@@ -1,7 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ZodSchema = void 0;
+exports.ZodSchema = exports.zodSchema = void 0;
 const zod_to_json_schema_1 = require("zod-to-json-schema");
+function zodSchema(zodSchema) {
+    return new ZodSchema(zodSchema);
+}
+exports.zodSchema = zodSchema;
 class ZodSchema {
     constructor(zodSchema) {
         Object.defineProperty(this, "zodSchema", {

package/core/schema/ZodSchema.d.ts

@@ -1,6 +1,8 @@
 import { z } from "zod";
+import { JsonSchemaProducer } from "./JsonSchemaProducer.js";
 import { Schema } from "./Schema.js";
-export declare class ZodSchema<STRUCTURE> implements Schema<STRUCTURE> {
+export declare function zodSchema<STRUCTURE>(zodSchema: z.Schema<STRUCTURE>): ZodSchema<STRUCTURE>;
+export declare class ZodSchema<STRUCTURE> implements Schema<STRUCTURE>, JsonSchemaProducer {
     readonly zodSchema: z.Schema<STRUCTURE>;
     constructor(zodSchema: z.Schema<STRUCTURE>);
     validate(data: unknown): {

package/core/schema/ZodSchema.js

@@ -1,4 +1,7 @@
 import { zodToJsonSchema } from "zod-to-json-schema";
+export function zodSchema(zodSchema) {
+    return new ZodSchema(zodSchema);
+}
 export class ZodSchema {
     constructor(zodSchema) {
         Object.defineProperty(this, "zodSchema", {

package/core/schema/index.cjs

@@ -17,9 +17,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./JSONParseError.cjs"), exports);
 __exportStar(require("./JsonSchemaProducer.cjs"), exports);
 __exportStar(require("./Schema.cjs"), exports);
-__exportStar(require("./StructureDefinition.cjs"), exports);
 __exportStar(require("./UncheckedSchema.cjs"), exports);
-__exportStar(require("./UncheckedStructureDefinition.cjs"), exports);
 __exportStar(require("./ZodSchema.cjs"), exports);
-__exportStar(require("./ZodStructureDefinition.cjs"), exports);
 __exportStar(require("./parseJSON.cjs"), exports);

package/core/schema/index.d.ts

@@ -1,9 +1,6 @@
 export * from "./JSONParseError.js";
 export * from "./JsonSchemaProducer.js";
 export * from "./Schema.js";
-export * from "./StructureDefinition.js";
 export * from "./UncheckedSchema.js";
-export * from "./UncheckedStructureDefinition.js";
 export * from "./ZodSchema.js";
-export * from "./ZodStructureDefinition.js";
 export * from "./parseJSON.js";

package/core/schema/index.js

@@ -1,9 +1,6 @@
 export * from "./JSONParseError.js";
 export * from "./JsonSchemaProducer.js";
 export * from "./Schema.js";
-export * from "./StructureDefinition.js";
 export * from "./UncheckedSchema.js";
-export * from "./UncheckedStructureDefinition.js";
 export * from "./ZodSchema.js";
-export * from "./ZodStructureDefinition.js";
 export * from "./parseJSON.js";

package/guard/fixStructure.cjs

@@ -29,12 +29,14 @@ const StructureValidationError_js_1 = require("../model-function/generate-struct
  * const result = await guard(
  *  (input) =>
  *    generateStructure(
- *      openai.ChatTextGenerator({
- *        // ...
- *      }),
- *      new ZodStructureDefinition({
+ *      openai
+ *        .ChatTextGenerator(/* ... * /)
+ *        .asFunctionCallStructureGenerationModel(/* ... * /),
+ *
+ *      new ZodSchema({
  *        // ...
  *      }),
+ *
  *      input
  *    ),
  *  [
@@ -43,10 +45,14 @@ const StructureValidationError_js_1 = require("../model-function/generate-struct
  *  fixStructure({
  *    modifyInputForRetry: async ({ input, error }) => [
  *      ...input,
- *      OpenAIChatMessage.functionCall(null, {
- *        name: error.structureName,
- *        arguments: error.valueText,
- *      }),
+ *      {
+ *        role: "assistant",
+  *       content: null,
+          function_call: {
+ *          name: "sentiment",
+ *          arguments: JSON.stringify(error.valueText),
+ *        },
+ *      } satisfies OpenAIChatMessage,
  *      OpenAIChatMessage.user(error.message),
  *      OpenAIChatMessage.user("Please fix the error and try again."),
  *    ],

package/guard/fixStructure.d.ts

@@ -27,12 +27,14 @@ import { Guard } from "./guard.js";
  * const result = await guard(
  *  (input) =>
  *    generateStructure(
- *      openai.ChatTextGenerator({
- *        // ...
- *      }),
- *      new ZodStructureDefinition({
+ *      openai
+ *        .ChatTextGenerator(/* ... * /)
+ *        .asFunctionCallStructureGenerationModel(/* ... * /),
+ *
+ *      new ZodSchema({
  *        // ...
  *      }),
+ *
  *      input
  *    ),
  *  [
@@ -41,10 +43,14 @@ import { Guard } from "./guard.js";
  *  fixStructure({
  *    modifyInputForRetry: async ({ input, error }) => [
  *      ...input,
- *      OpenAIChatMessage.functionCall(null, {
- *        name: error.structureName,
- *        arguments: error.valueText,
- *      }),
+ *      {
+ *        role: "assistant",
+  *       content: null,
+          function_call: {
+ *          name: "sentiment",
+ *          arguments: JSON.stringify(error.valueText),
+ *        },
+ *      } satisfies OpenAIChatMessage,
  *      OpenAIChatMessage.user(error.message),
  *      OpenAIChatMessage.user("Please fix the error and try again."),
  *    ],

package/guard/fixStructure.js

@@ -26,12 +26,14 @@ import { StructureValidationError } from "../model-function/generate-structure/S
  * const result = await guard(
  *  (input) =>
  *    generateStructure(
- *      openai.ChatTextGenerator({
- *        // ...
- *      }),
- *      new ZodStructureDefinition({
+ *      openai
+ *        .ChatTextGenerator(/* ... * /)
+ *        .asFunctionCallStructureGenerationModel(/* ... * /),
+ *
+ *      new ZodSchema({
  *        // ...
  *      }),
+ *
  *      input
  *    ),
  *  [
@@ -40,10 +42,14 @@ import { StructureValidationError } from "../model-function/generate-structure/S
  *  fixStructure({
  *    modifyInputForRetry: async ({ input, error }) => [
  *      ...input,
- *      OpenAIChatMessage.functionCall(null, {
- *        name: error.structureName,
- *        arguments: error.valueText,
- *      }),
+ *      {
+ *        role: "assistant",
+  *       content: null,
+          function_call: {
+ *          name: "sentiment",
+ *          arguments: JSON.stringify(error.valueText),
+ *        },
+ *      } satisfies OpenAIChatMessage,
  *      OpenAIChatMessage.user(error.message),
  *      OpenAIChatMessage.user("Please fix the error and try again."),
  *    ],

package/model-function/generate-structure/StructureFromTextGenerationModel.cjs

@@ -29,8 +29,8 @@ class StructureFromTextGenerationModel {
     get settingsForEvent() {
         return this.model.settingsForEvent;
     }
-    async doGenerateStructure(structure, prompt, options) {
-        const { response, value } = await (0, generateText_js_1.generateText)(this.model, this.format.createPrompt(prompt, structure), {
+    async doGenerateStructure(schema, prompt, options) {
+        const { response, value } = await (0, generateText_js_1.generateText)(this.model, this.format.createPrompt(prompt, schema), {
             ...options,
             returnType: "full",
         });
@@ -43,7 +43,6 @@ class StructureFromTextGenerationModel {
         }
         catch (error) {
             throw new StructureParseError_js_1.StructureParseError({
-                structureName: structure.name,
                 valueText: value,
                 cause: error,
             });

package/model-function/generate-structure/StructureFromTextGenerationModel.d.ts

@@ -1,22 +1,20 @@
 import { FunctionOptions } from "../../core/FunctionOptions.js";
-import { StructureDefinition } from "../../core/schema/StructureDefinition.js";
+import { JsonSchemaProducer } from "../../core/schema/JsonSchemaProducer.js";
+import { Schema } from "../../core/schema/Schema.js";
 import { TextGenerationModel, TextGenerationModelSettings } from "../generate-text/TextGenerationModel.js";
+import { StructureFromTextPromptFormat } from "./StructureFromTextPromptFormat.js";
 import { StructureGenerationModel } from "./StructureGenerationModel.js";
-export type StructureFromTextPromptFormat<PROMPT> = {
-    createPrompt: (prompt: PROMPT, structure: StructureDefinition<string, unknown>) => string;
-    extractStructure: (response: string) => unknown;
-};
-export declare class StructureFromTextGenerationModel<PROMPT, MODEL extends TextGenerationModel<string, TextGenerationModelSettings>> implements StructureGenerationModel<PROMPT, MODEL["settings"]> {
-    private readonly model;
-    private readonly format;
+export declare class StructureFromTextGenerationModel<SOURCE_PROMPT, TARGET_PROMPT, MODEL extends TextGenerationModel<TARGET_PROMPT, TextGenerationModelSettings>> implements StructureGenerationModel<SOURCE_PROMPT, MODEL["settings"]> {
+    protected readonly model: MODEL;
+    protected readonly format: StructureFromTextPromptFormat<SOURCE_PROMPT, TARGET_PROMPT>;
     constructor({ model, format, }: {
         model: MODEL;
-        format: StructureFromTextPromptFormat<PROMPT>;
+        format: StructureFromTextPromptFormat<SOURCE_PROMPT, TARGET_PROMPT>;
     });
     get modelInformation(): import("../ModelInformation.js").ModelInformation;
     get settings(): TextGenerationModelSettings;
     get settingsForEvent(): Partial<MODEL["settings"]>;
-    doGenerateStructure(structure: StructureDefinition<string, unknown>, prompt: PROMPT, options?: FunctionOptions): Promise<{
+    doGenerateStructure(schema: Schema<unknown> & JsonSchemaProducer, prompt: SOURCE_PROMPT, options?: FunctionOptions): Promise<{
         response: unknown;
         value: unknown;
         valueText: string;

package/model-function/generate-structure/StructureFromTextGenerationModel.js

@@ -26,8 +26,8 @@ export class StructureFromTextGenerationModel {
     get settingsForEvent() {
         return this.model.settingsForEvent;
     }
-    async doGenerateStructure(structure, prompt, options) {
-        const { response, value } = await generateText(this.model, this.format.createPrompt(prompt, structure), {
+    async doGenerateStructure(schema, prompt, options) {
+        const { response, value } = await generateText(this.model, this.format.createPrompt(prompt, schema), {
             ...options,
             returnType: "full",
         });
@@ -40,7 +40,6 @@ export class StructureFromTextGenerationModel {
         }
         catch (error) {
             throw new StructureParseError({
-                structureName: structure.name,
                 valueText: value,
                 cause: error,
             });

package/model-function/generate-structure/StructureFromTextPromptFormat.d.ts

@@ -0,0 +1,6 @@
+import { JsonSchemaProducer } from "../../core/schema/JsonSchemaProducer.js";
+import { Schema } from "../../core/schema/Schema.js";
+export type StructureFromTextPromptFormat<SOURCE_PROMPT, TARGET_PROMPT> = {
+    createPrompt: (prompt: SOURCE_PROMPT, schema: Schema<unknown> & JsonSchemaProducer) => TARGET_PROMPT;
+    extractStructure: (response: string) => unknown;
+};

package/model-function/generate-structure/StructureFromTextStreamingModel.cjs

@@ -0,0 +1,69 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StructureFromTextStreamingModel = void 0;
+const streamText_js_1 = require("../../model-function/generate-text/streamText.cjs");
+const AsyncQueue_js_1 = require("../../util/AsyncQueue.cjs");
+const generateText_js_1 = require("../generate-text/generateText.cjs");
+const StructureFromTextGenerationModel_js_1 = require("./StructureFromTextGenerationModel.cjs");
+const StructureParseError_js_1 = require("./StructureParseError.cjs");
+const parsePartialJson_js_1 = require("./parsePartialJson.cjs");
+class StructureFromTextStreamingModel extends StructureFromTextGenerationModel_js_1.StructureFromTextGenerationModel {
+    constructor(options) {
+        super(options);
+    }
+    async doStreamStructure(schema, prompt, options) {
+        const textStream = await (0, streamText_js_1.streamText)(this.model, this.format.createPrompt(prompt, schema), options);
+        const queue = new AsyncQueue_js_1.AsyncQueue();
+        // run async on purpose:
+        (async () => {
+            try {
+                let fullText = "";
+                for await (const deltaText of textStream) {
+                    fullText += deltaText;
+                    const deltaStructure = (0, parsePartialJson_js_1.parsePartialJson)(fullText);
+                    // only publish parsable structures
+                    if (deltaStructure != null) {
+                        queue.push({
+                            type: "delta",
+                            fullDelta: fullText,
+                            valueDelta: deltaStructure,
+                        });
+                    }
+                }
+            }
+            catch (error) {
+                queue.push({ type: "error", error });
+            }
+            finally {
+                queue.close();
+            }
+        })();
+        return queue;
+    }
+    async doGenerateStructure(schema, prompt, options) {
+        const { response, value } = await (0, generateText_js_1.generateText)(this.model, this.format.createPrompt(prompt, schema), {
+            ...options,
+            returnType: "full",
+        });
+        try {
+            return {
+                response,
+                value: this.format.extractStructure(value),
+                valueText: value,
+            };
+        }
+        catch (error) {
+            throw new StructureParseError_js_1.StructureParseError({
+                valueText: value,
+                cause: error,
+            });
+        }
+    }
+    withSettings(additionalSettings) {
+        return new StructureFromTextStreamingModel({
+            model: this.model.withSettings(additionalSettings),
+            format: this.format,
+        });
+    }
+}
+exports.StructureFromTextStreamingModel = StructureFromTextStreamingModel;

package/model-function/generate-structure/StructureFromTextStreamingModel.d.ts

@@ -0,0 +1,22 @@
+import { FunctionOptions } from "../../core/FunctionOptions.js";
+import { JsonSchemaProducer } from "../../core/schema/JsonSchemaProducer.js";
+import { Schema } from "../../core/schema/Schema.js";
+import { Delta } from "../../model-function/Delta.js";
+import { AsyncQueue } from "../../util/AsyncQueue.js";
+import { TextGenerationModelSettings, TextStreamingModel } from "../generate-text/TextGenerationModel.js";
+import { StructureFromTextGenerationModel } from "./StructureFromTextGenerationModel.js";
+import { StructureFromTextPromptFormat } from "./StructureFromTextPromptFormat.js";
+import { StructureStreamingModel } from "./StructureGenerationModel.js";
+export declare class StructureFromTextStreamingModel<SOURCE_PROMPT, TARGET_PROMPT, MODEL extends TextStreamingModel<TARGET_PROMPT, TextGenerationModelSettings>> extends StructureFromTextGenerationModel<SOURCE_PROMPT, TARGET_PROMPT, MODEL> implements StructureStreamingModel<SOURCE_PROMPT, MODEL["settings"]> {
+    constructor(options: {
+        model: MODEL;
+        format: StructureFromTextPromptFormat<SOURCE_PROMPT, TARGET_PROMPT>;
+    });
+    doStreamStructure(schema: Schema<unknown> & JsonSchemaProducer, prompt: SOURCE_PROMPT, options?: FunctionOptions): Promise<AsyncQueue<Delta<unknown>>>;
+    doGenerateStructure(schema: Schema<unknown> & JsonSchemaProducer, prompt: SOURCE_PROMPT, options?: FunctionOptions): Promise<{
+        response: unknown;
+        value: unknown;
+        valueText: string;
+    }>;
+    withSettings(additionalSettings: Partial<MODEL["settings"]>): this;
+}

package/model-function/generate-structure/StructureFromTextStreamingModel.js

@@ -0,0 +1,65 @@
+import { streamText } from "../../model-function/generate-text/streamText.js";
+import { AsyncQueue } from "../../util/AsyncQueue.js";
+import { generateText } from "../generate-text/generateText.js";
+import { StructureFromTextGenerationModel } from "./StructureFromTextGenerationModel.js";
+import { StructureParseError } from "./StructureParseError.js";
+import { parsePartialJson } from "./parsePartialJson.js";
+export class StructureFromTextStreamingModel extends StructureFromTextGenerationModel {
+    constructor(options) {
+        super(options);
+    }
+    async doStreamStructure(schema, prompt, options) {
+        const textStream = await streamText(this.model, this.format.createPrompt(prompt, schema), options);
+        const queue = new AsyncQueue();
+        // run async on purpose:
+        (async () => {
+            try {
+                let fullText = "";
+                for await (const deltaText of textStream) {
+                    fullText += deltaText;
+                    const deltaStructure = parsePartialJson(fullText);
+                    // only publish parsable structures
+                    if (deltaStructure != null) {
+                        queue.push({
+                            type: "delta",
+                            fullDelta: fullText,
+                            valueDelta: deltaStructure,
+                        });
+                    }
+                }
+            }
+            catch (error) {
+                queue.push({ type: "error", error });
+            }
+            finally {
+                queue.close();
+            }
+        })();
+        return queue;
+    }
+    async doGenerateStructure(schema, prompt, options) {
+        const { response, value } = await generateText(this.model, this.format.createPrompt(prompt, schema), {
+            ...options,
+            returnType: "full",
+        });
+        try {
+            return {
+                response,
+                value: this.format.extractStructure(value),
+                valueText: value,
+            };
+        }
+        catch (error) {
+            throw new StructureParseError({
+                valueText: value,
+                cause: error,
+            });
+        }
+    }
+    withSettings(additionalSettings) {
+        return new StructureFromTextStreamingModel({
+            model: this.model.withSettings(additionalSettings),
+            format: this.format,
+        });
+    }
+}

package/model-function/generate-structure/StructureGenerationModel.d.ts

@@ -1,11 +1,12 @@
+import { JsonSchemaProducer } from "../../core/schema/JsonSchemaProducer.js";
 import { FunctionOptions } from "../../core/FunctionOptions.js";
-import { StructureDefinition } from "../../core/schema/StructureDefinition.js";
+import { Schema } from "../../core/schema/Schema.js";
 import { Delta } from "../../model-function/Delta.js";
 import { Model, ModelSettings } from "../Model.js";
 export interface StructureGenerationModelSettings extends ModelSettings {
 }
 export interface StructureGenerationModel<PROMPT, SETTINGS extends StructureGenerationModelSettings = StructureGenerationModelSettings> extends Model<SETTINGS> {
-    doGenerateStructure(structure: StructureDefinition<string, unknown>, prompt: PROMPT, options?: FunctionOptions): PromiseLike<{
+    doGenerateStructure(schema: Schema<unknown> & JsonSchemaProducer, prompt: PROMPT, options?: FunctionOptions): PromiseLike<{
         response: unknown;
         valueText: string;
         value: unknown;
@@ -17,5 +18,5 @@ export interface StructureGenerationModel<PROMPT, SETTINGS extends StructureGene
     }>;
 }
 export interface StructureStreamingModel<PROMPT, SETTINGS extends StructureGenerationModelSettings = StructureGenerationModelSettings> extends StructureGenerationModel<PROMPT, SETTINGS> {
-    doStreamStructure(structureDefinition: StructureDefinition<string, unknown>, prompt: PROMPT, options?: FunctionOptions): PromiseLike<AsyncIterable<Delta<unknown>>>;
+    doStreamStructure(schema: Schema<unknown> & JsonSchemaProducer, prompt: PROMPT, options?: FunctionOptions): PromiseLike<AsyncIterable<Delta<unknown>>>;
 }

package/model-function/generate-structure/StructureParseError.cjs

@@ -3,16 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.StructureParseError = void 0;
 const getErrorMessage_js_1 = require("../../util/getErrorMessage.cjs");
 class StructureParseError extends Error {
-    constructor({ structureName, valueText, cause, }) {
-        super(`Structure parsing failed for '${structureName}'. ` +
+    constructor({ valueText, cause }) {
+        super(`Structure parsing failed. ` +
             `Value: ${valueText}.\n` +
             `Error message: ${(0, getErrorMessage_js_1.getErrorMessage)(cause)}`);
-        Object.defineProperty(this, "structureName", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         Object.defineProperty(this, "cause", {
             enumerable: true,
             configurable: true,
@@ -26,7 +20,6 @@ class StructureParseError extends Error {
             value: void 0
         });
         this.name = "StructureParseError";
-        this.structureName = structureName;
         this.cause = cause;
         this.valueText = valueText;
     }
@@ -36,7 +29,6 @@ class StructureParseError extends Error {
             cause: this.cause,
             message: this.message,
             stack: this.stack,
-            structureName: this.structureName,
             valueText: this.valueText,
         };
     }

package/model-function/generate-structure/StructureParseError.d.ts

@@ -1,9 +1,7 @@
 export declare class StructureParseError extends Error {
-    readonly structureName: string;
     readonly cause: unknown;
     readonly valueText: string;
-    constructor({ structureName, valueText, cause, }: {
-        structureName: string;
+    constructor({ valueText, cause }: {
         valueText: string;
         cause: unknown;
     });
@@ -12,7 +10,6 @@ export declare class StructureParseError extends Error {
         cause: unknown;
         message: string;
         stack: string | undefined;
-        structureName: string;
         valueText: string;
     };
 }