@ai-sdk-tool/parser 3.1.0 → 3.1.2

package/dist/community.js

@@ -1,7 +1,7 @@
 import {
   createToolMiddleware,
   xmlProtocol
-} from "./chunk-JVQVEA3K.js";
+} from "./chunk-TQT6XSP7.js";
 
 // src/community/sijawara.ts
 var sijawaraDetailedXmlToolMiddleware = createToolMiddleware({

package/dist/index.cjs

@@ -49,7 +49,6 @@ __export(src_exports, {
   hermesToolMiddleware: () => hermesToolMiddleware,
   isProtocolFactory: () => isProtocolFactory,
   isTCMProtocolFactory: () => isTCMProtocolFactory,
-  isToolCallContent: () => isToolCallContent,
   isToolChoiceActive: () => isToolChoiceActive,
   isToolResultPart: () => isToolResultPart,
   jsonProtocol: () => jsonProtocol,
@@ -409,12 +408,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;
   }
@@ -426,21 +428,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);
     }
   }
@@ -475,11 +470,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;
   }
@@ -493,14 +484,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);
@@ -1627,10 +1616,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,
@@ -2262,14 +2253,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 }) {
@@ -2659,10 +2653,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}>
@@ -2927,13 +2923,12 @@ function isToolChoiceActive(params) {
 }
 
 // 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");
-}
 function isToolResultPart(content) {
+  if (!content || typeof content !== "object") {
+    return false;
+  }
   const c = content;
-  return !!c && c.type === "tool-result" && typeof c.toolName === "string" && typeof c.toolCallId === "string" && "output" in c;
+  return c.type === "tool-result" && typeof c.toolName === "string" && typeof c.toolCallId === "string" && "output" in c;
 }
 function hasInputProperty(obj) {
   return typeof obj === "object" && obj !== null && "input" in obj;
@@ -3092,18 +3087,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,
@@ -3598,26 +3592,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");
@@ -3831,7 +3828,6 @@ var yamlToolMiddleware = createToolMiddleware({
   hermesToolMiddleware,
   isProtocolFactory,
   isTCMProtocolFactory,
-  isToolCallContent,
   isToolChoiceActive,
   isToolResultPart,
   jsonProtocol,