@jaypie/llm 1.2.40 → 1.2.41

package/dist/cjs/index.cjs

@@ -575,6 +575,154 @@ function extractReasoning(history) {
     return reasoningTexts;
 }
 
+function naturalZodSchema(definition) {
+    if (Array.isArray(definition)) {
+        if (definition.length === 0) {
+            // Handle empty array - accept any[]
+            return v4.z.array(v4.z.any());
+        }
+        else if (definition.length === 1) {
+            // Handle array types
+            const itemType = definition[0];
+            switch (itemType) {
+                case String:
+                    return v4.z.array(v4.z.string());
+                case Number:
+                    return v4.z.array(v4.z.number());
+                case Boolean:
+                    return v4.z.array(v4.z.boolean());
+                default:
+                    if (typeof itemType === "object") {
+                        // Handle array of objects
+                        return v4.z.array(naturalZodSchema(itemType));
+                    }
+                    // Handle enum arrays
+                    return v4.z.enum(definition);
+            }
+        }
+        else {
+            // Handle enum arrays
+            return v4.z.enum(definition);
+        }
+    }
+    else if (definition && typeof definition === "object") {
+        if (Object.keys(definition).length === 0) {
+            // Handle empty object - accept any key-value pairs
+            return v4.z.record(v4.z.string(), v4.z.any());
+        }
+        else {
+            // Handle object with properties
+            const schemaShape = {};
+            for (const [key, value] of Object.entries(definition)) {
+                schemaShape[key] = naturalZodSchema(value);
+            }
+            return v4.z.object(schemaShape);
+        }
+    }
+    else {
+        switch (definition) {
+            case String:
+                return v4.z.string();
+            case Number:
+                return v4.z.number();
+            case Boolean:
+                return v4.z.boolean();
+            case Object:
+                return v4.z.record(v4.z.string(), v4.z.any());
+            case Array:
+                return v4.z.array(v4.z.any());
+            default:
+                throw new Error(`Unsupported type: ${definition}`);
+        }
+    }
+}
+
+//
+//
+// Helpers
+//
+function isPlainObject(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+/**
+ * Convert a `format` declaration (Zod schema, NaturalSchema, or a JSON Schema
+ * JsonObject) into a plain JSON Schema we can walk. Mirrors the conversion the
+ * provider adapters perform in `formatOutputSchema`, but without any
+ * provider-specific sanitization.
+ */
+function formatToJsonSchema(format) {
+    if (format instanceof v4.z.ZodType) {
+        return v4.z.toJSONSchema(format);
+    }
+    if (isPlainObject(format) && format.type === "json_schema") {
+        const clone = structuredClone(format);
+        clone.type = "object";
+        return clone;
+    }
+    try {
+        return v4.z.toJSONSchema(naturalZodSchema(format));
+    }
+    catch {
+        return undefined;
+    }
+}
+/**
+ * Walk a JSON Schema alongside a parsed value, filling any declared array field
+ * that is absent (`undefined`/`null`) with `[]`. Recurses into object
+ * properties and array items so nested declared arrays are also backfilled.
+ */
+function fillFromSchema(schema, value) {
+    if (!isPlainObject(schema)) {
+        return value;
+    }
+    const type = schema.type;
+    const isArray = type === "array" || (type === undefined && "items" in schema);
+    if (isArray) {
+        if (value === undefined || value === null) {
+            return [];
+        }
+        const items = schema.items;
+        if (Array.isArray(value) && isPlainObject(items)) {
+            return value.map((entry) => fillFromSchema(items, entry));
+        }
+        return value;
+    }
+    const isObject = type === "object" || (type === undefined && "properties" in schema);
+    if (isObject) {
+        if (!isPlainObject(value)) {
+            return value;
+        }
+        const properties = schema.properties;
+        if (isPlainObject(properties)) {
+            for (const [key, propSchema] of Object.entries(properties)) {
+                value[key] = fillFromSchema(propSchema, value[key]);
+            }
+        }
+        return value;
+    }
+    return value;
+}
+//
+//
+// Main
+//
+/**
+ * Ensure every array field declared in `format` is present in `content` as an
+ * array. A declared `format` is a schema contract: an empty list should surface
+ * as `[]`, not be dropped from the response. Some providers/models omit empty
+ * array fields entirely, leaving consumers to read `.length` on `undefined`.
+ *
+ * Only mutates a (cloned) structured object; strings and non-objects pass
+ * through untouched.
+ */
+function fillFormatArrays({ content, format, }) {
+    const schema = formatToJsonSchema(format);
+    if (!schema) {
+        return content;
+    }
+    return fillFromSchema(schema, structuredClone(content));
+}
+
 /**
  * Converts a string to a standardized LlmInputMessage
  * @param input - String to format
@@ -702,68 +850,6 @@ function maxTurnsFromOptions(options) {
     return 1;
 }
 
-function naturalZodSchema(definition) {
-    if (Array.isArray(definition)) {
-        if (definition.length === 0) {
-            // Handle empty array - accept any[]
-            return v4.z.array(v4.z.any());
-        }
-        else if (definition.length === 1) {
-            // Handle array types
-            const itemType = definition[0];
-            switch (itemType) {
-                case String:
-                    return v4.z.array(v4.z.string());
-                case Number:
-                    return v4.z.array(v4.z.number());
-                case Boolean:
-                    return v4.z.array(v4.z.boolean());
-                default:
-                    if (typeof itemType === "object") {
-                        // Handle array of objects
-                        return v4.z.array(naturalZodSchema(itemType));
-                    }
-                    // Handle enum arrays
-                    return v4.z.enum(definition);
-            }
-        }
-        else {
-            // Handle enum arrays
-            return v4.z.enum(definition);
-        }
-    }
-    else if (definition && typeof definition === "object") {
-        if (Object.keys(definition).length === 0) {
-            // Handle empty object - accept any key-value pairs
-            return v4.z.record(v4.z.string(), v4.z.any());
-        }
-        else {
-            // Handle object with properties
-            const schemaShape = {};
-            for (const [key, value] of Object.entries(definition)) {
-                schemaShape[key] = naturalZodSchema(value);
-            }
-            return v4.z.object(schemaShape);
-        }
-    }
-    else {
-        switch (definition) {
-            case String:
-                return v4.z.string();
-            case Number:
-                return v4.z.number();
-            case Boolean:
-                return v4.z.boolean();
-            case Object:
-                return v4.z.record(v4.z.string(), v4.z.any());
-            case Array:
-                return v4.z.array(v4.z.any());
-            default:
-                throw new Error(`Unsupported type: ${definition}`);
-        }
-    }
-}
-
 //
 // Constants
 //
@@ -6092,7 +6178,7 @@ class OperateLoop {
         if (this.adapter.hasStructuredOutput(response)) {
             const structuredOutput = this.adapter.extractStructuredOutput(response);
             if (structuredOutput) {
-                state.responseBuilder.setContent(structuredOutput);
+                state.responseBuilder.setContent(this.applyFormatArrayDefaults(structuredOutput, options));
                 state.responseBuilder.complete();
                 return false; // Stop loop
             }
@@ -6217,7 +6303,7 @@ class OperateLoop {
             }
         }
         // No tool calls or no toolkit - we're done
-        state.responseBuilder.setContent(parsed.content);
+        state.responseBuilder.setContent(this.applyFormatArrayDefaults(parsed.content, options));
         state.responseBuilder.complete();
         // Add final history items
         const historyItems = this.adapter.responseToHistoryItems(parsed.raw);
@@ -6226,6 +6312,20 @@ class OperateLoop {
         }
         return false; // Stop loop
     }
+    /**
+     * Backfill declared array fields when a `format` is supplied. A declared
+     * `format` is a schema contract: an empty array field should surface as `[]`
+     * rather than be dropped by a provider/model that omits empty lists.
+     */
+    applyFormatArrayDefaults(content, options) {
+        if (!options.format) {
+            return content;
+        }
+        if (typeof content !== "object" || content === null) {
+            return content;
+        }
+        return fillFormatArrays({ content, format: options.format });
+    }
     /**
      * Sync the current input state from the updated provider request.
      * This is necessary because appendToolResult modifies the provider-specific request,