@ai-sdk-tool/parser 4.1.6 → 4.1.7

package/dist/community.js

@@ -7,13 +7,13 @@ import {
   safeStringifyInputExample,
   toSafeXmlTagName,
   uiTarsXmlProtocol
-} from "./chunk-ZIOUCBCX.js";
+} from "./chunk-7EDEAFRX.js";
 import {
   escapeXmlMinimalAttr,
   escapeXmlMinimalText,
   stringify
-} from "./chunk-D4YULTAO.js";
-import "./chunk-QBZNMO5C.js";
+} from "./chunk-IATDQDRY.js";
+import "./chunk-A3DLFT2S.js";
 import "./chunk-GMTE7BY5.js";
 
 // src/community/sijawara.ts

package/dist/index.cjs

@@ -323,7 +323,7 @@ function popToken(tokens, state) {
   const token = tokens[state.pos];
   state.pos += 1;
   if (!token) {
-    const lastLine = tokens.length !== 0 ? (_b = (_a = tokens.at(-1)) == null ? void 0 : _a.line) != null ? _b : 1 : 1;
+    const lastLine = tokens.length === 0 ? 1 : (_b = (_a = tokens.at(-1)) == null ? void 0 : _a.line) != null ? _b : 1;
     return { type: "eof", match: "", value: void 0, line: lastLine };
   }
   return token;
@@ -4002,7 +4002,7 @@ function getTopLevelStringProps(s) {
 function restorePlaceholderString(val, placeholderMap) {
   if (val.startsWith("__RXML_PLACEHOLDER_")) {
     const orig = placeholderMap.get(val);
-    return orig !== void 0 ? orig : val;
+    return orig === void 0 ? val : orig;
   }
   return val;
 }
@@ -8488,19 +8488,19 @@ function processToolCallMatch(text, tc, currentIndex, processedElements, options
     processedElements
   );
   const parsedArgs = parseYamlContent(tc.content, options);
-  if (parsedArgs !== null) {
+  if (parsedArgs === null) {
+    const originalText = text.substring(tc.startIndex, tc.endIndex);
+    (_a = options == null ? void 0 : options.onError) == null ? void 0 : _a.call(options, "Could not parse YAML tool call", {
+      toolCall: originalText
+    });
+    processedElements.push({ type: "text", text: originalText });
+  } else {
     processedElements.push({
       type: "tool-call",
       toolCallId: generateToolCallId(),
       toolName: tc.toolName,
       input: JSON.stringify(parsedArgs)
     });
-  } else {
-    const originalText = text.substring(tc.startIndex, tc.endIndex);
-    (_a = options == null ? void 0 : options.onError) == null ? void 0 : _a.call(options, "Could not parse YAML tool call", {
-      toolCall: originalText
-    });
-    processedElements.push({ type: "text", text: originalText });
   }
   return tc.endIndex;
 }
@@ -8624,7 +8624,22 @@ ${yamlContent}</${toolCall.toolName}>`;
         var _a;
         const parsedArgs = parseYamlContent(toolContent, options);
         flushText(controller);
-        if (parsedArgs !== null) {
+        if (parsedArgs === null) {
+          const original = `<${toolName}>${toolContent}</${toolName}>`;
+          const emitRawFallback = shouldEmitRawToolCallTextOnError(options);
+          emitFailedToolInputLifecycle({
+            controller,
+            id: toolCallId,
+            emitRawToolCallTextOnError: emitRawFallback,
+            rawToolCallText: original,
+            emitRawText: (rawText) => {
+              flushText(controller, rawText);
+            }
+          });
+          (_a = options == null ? void 0 : options.onError) == null ? void 0 : _a.call(options, "Could not parse streaming YAML tool call", {
+            toolCall: original
+          });
+        } else {
           const finalInput = stringifyToolInputWithSchema({
             toolName,
             args: parsedArgs,
@@ -8647,21 +8662,6 @@ ${yamlContent}</${toolCall.toolName}>`;
               input: finalInput
             });
           }
-        } else {
-          const original = `<${toolName}>${toolContent}</${toolName}>`;
-          const emitRawFallback = shouldEmitRawToolCallTextOnError(options);
-          emitFailedToolInputLifecycle({
-            controller,
-            id: toolCallId,
-            emitRawToolCallTextOnError: emitRawFallback,
-            rawToolCallText: original,
-            emitRawText: (rawText) => {
-              flushText(controller, rawText);
-            }
-          });
-          (_a = options == null ? void 0 : options.onError) == null ? void 0 : _a.call(options, "Could not parse streaming YAML tool call", {
-            toolCall: original
-          });
         }
       };
       const finalizeUnclosedToolCall = (controller) => {
@@ -8674,21 +8674,7 @@ ${yamlContent}</${toolCall.toolName}>`;
         const reconciledBuffer = stripTrailingPartialCloseTag(buffer, toolName);
         const parsedArgs = parseYamlContent(reconciledBuffer, options);
         flushText(controller);
-        if (parsedArgs !== null) {
-          const finalInput = stringifyToolInputWithSchema({
-            toolName,
-            args: parsedArgs,
-            tools
-          });
-          emitFinalizedToolInputLifecycle({
-            controller,
-            id: toolCallId,
-            state: currentToolCall,
-            toolName,
-            finalInput,
-            onMismatch: options == null ? void 0 : options.onError
-          });
-        } else {
+        if (parsedArgs === null) {
           const unfinishedContent = `<${toolName}>${buffer}`;
           const emitRawFallback = shouldEmitRawToolCallTextOnError(options);
           emitFailedToolInputLifecycle({
@@ -8705,6 +8691,20 @@ ${yamlContent}</${toolCall.toolName}>`;
             "Could not complete streaming YAML tool call at finish.",
             { toolCall: unfinishedContent }
           );
+        } else {
+          const finalInput = stringifyToolInputWithSchema({
+            toolName,
+            args: parsedArgs,
+            tools
+          });
+          emitFinalizedToolInputLifecycle({
+            controller,
+            id: toolCallId,
+            state: currentToolCall,
+            toolName,
+            finalInput,
+            onMismatch: options == null ? void 0 : options.onError
+          });
         }
         buffer = "";
         currentToolCall = null;
@@ -9160,7 +9160,7 @@ function extractJsonLikeCandidates(rawText) {
 }
 function mergeJsonCandidatesByStart(tagged, codeBlocks, balanced) {
   return [...tagged, ...codeBlocks, ...balanced].sort(
-    (a, b) => a.startIndex !== b.startIndex ? a.startIndex - b.startIndex : b.endIndex - a.endIndex
+    (a, b) => a.startIndex === b.startIndex ? b.endIndex - a.endIndex : a.startIndex - b.startIndex
   );
 }
 function toToolCallPart(candidate) {