@ai-sdk-tool/parser 3.1.0 → 3.1.2

package/dist/community.cjs

@@ -346,12 +346,15 @@ function handleOpeningTagSegment(src, lt, out, stack) {
   }
   return q + 1;
 }
-function shouldDeduplicateStringTags(schema) {
+function extractSchemaProperties(schema) {
   const unwrapped = (0, import_rxml.unwrapJsonSchema)(schema);
   if (!unwrapped || typeof unwrapped !== "object") {
-    return false;
+    return void 0;
   }
-  const props = unwrapped.properties;
+  return unwrapped.properties;
+}
+function shouldDeduplicateStringTags(schema) {
+  const props = extractSchemaProperties(schema);
   if (!props) {
     return false;
   }
@@ -363,21 +366,14 @@ function shouldDeduplicateStringTags(schema) {
   return (command == null ? void 0 : command.type) === "array";
 }
 function getStringPropertyNames(schema) {
-  const unwrapped = (0, import_rxml.unwrapJsonSchema)(schema);
-  if (!unwrapped || typeof unwrapped !== "object") {
-    return [];
-  }
-  const props = unwrapped.properties;
+  const props = extractSchemaProperties(schema);
   if (!props) {
     return [];
   }
   const names = [];
   for (const key of Object.keys(props)) {
-    const prop = (0, import_rxml.unwrapJsonSchema)(
-      props[key]
-    );
-    const type = prop.type;
-    if (type === "string") {
+    const prop = (0, import_rxml.unwrapJsonSchema)(props[key]);
+    if ((prop == null ? void 0 : prop.type) === "string") {
       names.push(key);
     }
   }
@@ -412,11 +408,7 @@ function repairParsedAgainstSchema(input, schema) {
   if (!input || typeof input !== "object") {
     return input;
   }
-  const unwrapped = (0, import_rxml.unwrapJsonSchema)(schema);
-  if (!unwrapped || typeof unwrapped !== "object") {
-    return input;
-  }
-  const properties = unwrapped.properties;
+  const properties = extractSchemaProperties(schema);
   if (!properties) {
     return input;
   }
@@ -430,14 +422,12 @@ function applySchemaProps(obj, properties) {
       continue;
     }
     const prop = (0, import_rxml.unwrapJsonSchema)(propSchema);
-    const propType = prop.type;
-    if (propType === "array" && prop.items) {
-      const itemSchemaRaw = prop.items;
-      const itemSchema = (0, import_rxml.unwrapJsonSchema)(itemSchemaRaw);
+    if ((prop == null ? void 0 : prop.type) === "array" && prop.items) {
+      const itemSchema = (0, import_rxml.unwrapJsonSchema)(prop.items);
       obj[key] = coerceArrayItems(obj[key], itemSchema);
       continue;
     }
-    if (propType === "object") {
+    if ((prop == null ? void 0 : prop.type) === "object") {
       const val = obj[key];
       if (val && typeof val === "object") {
         obj[key] = repairParsedAgainstSchema(val, prop);
@@ -1536,10 +1526,12 @@ var jsonProtocol = ({
   },
   formatToolCall(toolCall) {
     let args = {};
-    try {
-      args = JSON.parse(toolCall.input);
-    } catch (e) {
-      args = toolCall.input;
+    if (toolCall.input != null) {
+      try {
+        args = JSON.parse(toolCall.input);
+      } catch (e) {
+        args = toolCall.input;
+      }
     }
     return `${toolCallStart}${JSON.stringify({
       name: toolCall.toolName,
@@ -2168,14 +2160,17 @@ var xmlProtocol = (protocolOptions) => {
     },
     formatToolCall(toolCall) {
       let args = {};
-      try {
-        args = JSON.parse(toolCall.input);
-      } catch (e) {
-        args = toolCall.input;
+      if (toolCall.input != null) {
+        try {
+          args = JSON.parse(toolCall.input);
+        } catch (e) {
+          args = toolCall.input;
+        }
       }
       return (0, import_rxml2.stringify)(toolCall.toolName, args, {
         suppressEmptyNode: false,
-        format: false
+        format: true,
+        minimalEscaping: true
       });
     },
     parseGeneratedText({ text, tools, options }) {
@@ -2565,10 +2560,12 @@ var yamlProtocol = (_protocolOptions) => {
     },
     formatToolCall(toolCall) {
       let args = {};
-      try {
-        args = JSON.parse(toolCall.input);
-      } catch (e) {
-        args = { value: toolCall.input };
+      if (toolCall.input != null) {
+        try {
+          args = JSON.parse(toolCall.input);
+        } catch (e) {
+          args = { value: toolCall.input };
+        }
       }
       const yamlContent = import_yaml.default.stringify(args);
       return `<${toolCall.toolName}>
@@ -2829,12 +2826,6 @@ function isToolChoiceActive(params) {
   return !!(typeof params.providerOptions === "object" && params.providerOptions !== null && typeof ((_c = params.providerOptions) == null ? void 0 : _c.toolCallMiddleware) === "object" && toolChoice && typeof toolChoice === "object" && (toolChoice.type === "tool" || toolChoice.type === "required"));
 }
 
-// src/core/utils/type-guards.ts
-function isToolCallContent(content) {
-  return content.type === "tool-call" && typeof content.toolName === "string" && // input may be a JSON string or an already-parsed object depending on provider/runtime
-  (typeof content.input === "string" || typeof content.input === "object");
-}
-
 // src/generate-handler.ts
 var import_provider_utils = require("@ai-sdk/provider-utils");
 var import_rxml3 = require("@ai-sdk-tool/rxml");
@@ -2988,18 +2979,17 @@ function fixToolCallWithSchema(part, tools) {
   if (part.type !== "tool-call") {
     return part;
   }
-  const tc = part;
   let args = {};
-  if (typeof tc.input === "string") {
+  if (typeof part.input === "string") {
     try {
-      args = JSON.parse(tc.input);
+      args = JSON.parse(part.input);
     } catch (e) {
       return part;
     }
-  } else if (tc.input && typeof tc.input === "object") {
-    args = tc.input;
+  } else if (part.input && typeof part.input === "object") {
+    args = part.input;
   }
-  const schema = (_a = tools.find((t) => t.name === tc.toolName)) == null ? void 0 : _a.inputSchema;
+  const schema = (_a = tools.find((t) => t.name === part.toolName)) == null ? void 0 : _a.inputSchema;
   const coerced = (0, import_rxml3.coerceBySchema)(args, schema);
   return {
     ...part,
@@ -3494,26 +3484,29 @@ function processAssistantContent(content, resolvedProtocol, providerOptions) {
   var _a;
   const newContent = [];
   for (const item of content) {
-    if (isToolCallContent(item)) {
-      newContent.push({
-        type: "text",
-        text: resolvedProtocol.formatToolCall(item)
-      });
-    } else if (item.type === "text") {
-      newContent.push(item);
-    } else if (item.type === "reasoning") {
-      newContent.push(item);
-    } else {
-      const options = extractOnErrorOption(providerOptions);
-      (_a = options == null ? void 0 : options.onError) == null ? void 0 : _a.call(
-        options,
-        "tool-call-middleware: unknown assistant content; stringifying for provider compatibility",
-        { content: item }
-      );
-      newContent.push({
-        type: "text",
-        text: JSON.stringify(item)
-      });
+    switch (item.type) {
+      case "tool-call":
+        newContent.push({
+          type: "text",
+          text: resolvedProtocol.formatToolCall(item)
+        });
+        break;
+      case "text":
+      case "reasoning":
+        newContent.push(item);
+        break;
+      default: {
+        const options = extractOnErrorOption(providerOptions);
+        (_a = options == null ? void 0 : options.onError) == null ? void 0 : _a.call(
+          options,
+          "tool-call-middleware: unknown assistant content; stringifying for provider compatibility",
+          { content: item }
+        );
+        newContent.push({
+          type: "text",
+          text: JSON.stringify(item)
+        });
+      }
     }
   }
   const onlyText = newContent.every((c) => c.type === "text");