@ai-sdk-tool/parser 4.1.0 → 4.1.1

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 import * as _ai_sdk_provider from '@ai-sdk/provider';
-import { LanguageModelV3FunctionTool, LanguageModelV3StreamPart, LanguageModelV3ToolCall, LanguageModelV3Content, LanguageModelV3ProviderTool, JSONSchema7, LanguageModelV3, LanguageModelV3TextPart, LanguageModelV3FilePart, LanguageModelV3Middleware, LanguageModelV3Prompt, SharedV3ProviderOptions } from '@ai-sdk/provider';
+import { LanguageModelV3FunctionTool, LanguageModelV3StreamPart, LanguageModelV3ToolCall, LanguageModelV3Content, LanguageModelV3ProviderTool, JSONSchema7, SharedV3ProviderOptions, LanguageModelV3, LanguageModelV3TextPart, LanguageModelV3FilePart, LanguageModelV3Middleware, LanguageModelV3Prompt } from '@ai-sdk/provider';
 import { ToolResultPart } from '@ai-sdk/provider-utils';
 export { ParseOptions, parse, stringify, transform } from './rjson.cjs';
 
@@ -37,7 +37,7 @@ interface TCMProtocol {
 }
 type TCMCoreProtocol = TCMProtocol;
 declare function isProtocolFactory(protocol: TCMProtocol | (() => TCMProtocol)): protocol is () => TCMProtocol;
-declare function isTCMProtocolFactory(protocol: TCMProtocol | (() => TCMProtocol)): protocol is () => TCMProtocol;
+declare const isTCMProtocolFactory: typeof isProtocolFactory;
 
 interface HermesProtocolOptions {
     toolCallEnd?: string;
@@ -106,12 +106,11 @@ declare function createDynamicIfThenElseSchema(tools: (LanguageModelV3FunctionTo
  */
 declare function getPotentialStartIndex(text: string, searchedText: string): number | null;
 
-type OnErrorFn$1 = (message: string, metadata?: Record<string, unknown>) => void;
+type OnErrorFn = (message: string, metadata?: Record<string, unknown>) => void;
 declare function extractOnErrorOption(providerOptions?: unknown): {
-    onError?: OnErrorFn$1;
+    onError?: OnErrorFn;
 } | undefined;
 
-type OnErrorFn = (message: string, metadata?: Record<string, unknown>) => void;
 interface ToolCallMiddlewareProviderOptions {
     toolCallMiddleware?: {
         debugSummary?: {
@@ -144,10 +143,13 @@ declare function encodeOriginalTools(tools: LanguageModelV3FunctionTool[] | unde
     inputSchema: string;
 }>;
 declare function decodeOriginalTools(originalTools: EncodedOriginalTool[] | undefined, options?: DecodeOriginalToolsOptions): LanguageModelV3FunctionTool[];
+declare function decodeOriginalToolsFromProviderOptions(providerOptions: ToolCallMiddlewareProviderOptions | undefined, options?: DecodeOriginalToolsOptions): LanguageModelV3FunctionTool[];
 declare function extractToolNamesFromOriginalTools(originalTools: Array<{
     name: string;
     inputSchema: string;
 }> | undefined): string[];
+declare function getToolCallMiddlewareOptions(providerOptions?: unknown): Record<string, unknown>;
+declare function mergeToolCallMiddlewareOptions(providerOptions: unknown, overrides: Record<string, unknown>): SharedV3ProviderOptions;
 declare function isToolChoiceActive(params: {
     providerOptions?: {
         toolCallMiddleware?: {
@@ -248,40 +250,7 @@ declare function transformParams({ params, protocol, toolSystemPromptTemplate, t
     prompt: LanguageModelV3Prompt;
     tools: never[];
     toolChoice: undefined;
-    providerOptions: SharedV3ProviderOptions;
-} | {
-    responseFormat: {
-        type: "json";
-        schema: JSONSchema7;
-        name: string;
-        description: string | undefined;
-    };
-    providerOptions: {
-        toolCallMiddleware: {
-            toolChoice?: {
-                type: string;
-                toolName?: string;
-            } | undefined;
-        };
-    };
-    prompt: LanguageModelV3Prompt;
-    tools: never[];
-    toolChoice: undefined;
-} | {
-    responseFormat: {
-        type: "json";
-        schema: JSONSchema7;
-    };
-    providerOptions: {
-        toolCallMiddleware: {
-            toolChoice: {
-                type: "required";
-            };
-        };
-    };
-    prompt: LanguageModelV3Prompt;
-    tools: never[];
-    toolChoice: undefined;
+    providerOptions: _ai_sdk_provider.SharedV3ProviderOptions;
 };
 
-export { type DebugLevel, type MorphXmlProtocolOptions, type OnErrorFn$1 as OnErrorFn, type ParserOptions, Qwen3CoderToolParser, type TCMCoreProtocol, type TCMProtocol, type ToolCallMiddlewareProviderOptions, type YamlXmlProtocolOptions, createDynamicIfThenElseSchema, createToolMiddleware, decodeOriginalTools, encodeOriginalTools, escapeRegExp, extractOnErrorOption, extractToolNamesFromOriginalTools, getDebugLevel, getPotentialStartIndex, hasInputProperty, hermesProtocol, hermesToolMiddleware, isProtocolFactory, isTCMProtocolFactory, isToolChoiceActive, isToolResultPart, logParseFailure, logParsedChunk, logParsedSummary, logRawChunk, morphXmlProtocol, morphXmlToolMiddleware, originalToolsSchema, qwen3CoderProtocol, qwen3CoderToolMiddleware, toolChoiceStream, transformParams, uiTarsXmlProtocol, wrapGenerate, wrapStream, yamlXmlProtocol, yamlXmlToolMiddleware };
+export { type DebugLevel, type MorphXmlProtocolOptions, type OnErrorFn, type ParserOptions, Qwen3CoderToolParser, type TCMCoreProtocol, type TCMProtocol, type ToolCallMiddlewareProviderOptions, type YamlXmlProtocolOptions, createDynamicIfThenElseSchema, createToolMiddleware, decodeOriginalTools, decodeOriginalToolsFromProviderOptions, encodeOriginalTools, escapeRegExp, extractOnErrorOption, extractToolNamesFromOriginalTools, getDebugLevel, getPotentialStartIndex, getToolCallMiddlewareOptions, hasInputProperty, hermesProtocol, hermesToolMiddleware, isProtocolFactory, isTCMProtocolFactory, isToolChoiceActive, isToolResultPart, logParseFailure, logParsedChunk, logParsedSummary, logRawChunk, mergeToolCallMiddlewareOptions, morphXmlProtocol, morphXmlToolMiddleware, originalToolsSchema, qwen3CoderProtocol, qwen3CoderToolMiddleware, toolChoiceStream, transformParams, uiTarsXmlProtocol, wrapGenerate, wrapStream, yamlXmlProtocol, yamlXmlToolMiddleware };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as _ai_sdk_provider from '@ai-sdk/provider';
-import { LanguageModelV3FunctionTool, LanguageModelV3StreamPart, LanguageModelV3ToolCall, LanguageModelV3Content, LanguageModelV3ProviderTool, JSONSchema7, LanguageModelV3, LanguageModelV3TextPart, LanguageModelV3FilePart, LanguageModelV3Middleware, LanguageModelV3Prompt, SharedV3ProviderOptions } from '@ai-sdk/provider';
+import { LanguageModelV3FunctionTool, LanguageModelV3StreamPart, LanguageModelV3ToolCall, LanguageModelV3Content, LanguageModelV3ProviderTool, JSONSchema7, SharedV3ProviderOptions, LanguageModelV3, LanguageModelV3TextPart, LanguageModelV3FilePart, LanguageModelV3Middleware, LanguageModelV3Prompt } from '@ai-sdk/provider';
 import { ToolResultPart } from '@ai-sdk/provider-utils';
 export { ParseOptions, parse, stringify, transform } from './rjson.js';
 
@@ -37,7 +37,7 @@ interface TCMProtocol {
 }
 type TCMCoreProtocol = TCMProtocol;
 declare function isProtocolFactory(protocol: TCMProtocol | (() => TCMProtocol)): protocol is () => TCMProtocol;
-declare function isTCMProtocolFactory(protocol: TCMProtocol | (() => TCMProtocol)): protocol is () => TCMProtocol;
+declare const isTCMProtocolFactory: typeof isProtocolFactory;
 
 interface HermesProtocolOptions {
     toolCallEnd?: string;
@@ -106,12 +106,11 @@ declare function createDynamicIfThenElseSchema(tools: (LanguageModelV3FunctionTo
  */
 declare function getPotentialStartIndex(text: string, searchedText: string): number | null;
 
-type OnErrorFn$1 = (message: string, metadata?: Record<string, unknown>) => void;
+type OnErrorFn = (message: string, metadata?: Record<string, unknown>) => void;
 declare function extractOnErrorOption(providerOptions?: unknown): {
-    onError?: OnErrorFn$1;
+    onError?: OnErrorFn;
 } | undefined;
 
-type OnErrorFn = (message: string, metadata?: Record<string, unknown>) => void;
 interface ToolCallMiddlewareProviderOptions {
     toolCallMiddleware?: {
         debugSummary?: {
@@ -144,10 +143,13 @@ declare function encodeOriginalTools(tools: LanguageModelV3FunctionTool[] | unde
     inputSchema: string;
 }>;
 declare function decodeOriginalTools(originalTools: EncodedOriginalTool[] | undefined, options?: DecodeOriginalToolsOptions): LanguageModelV3FunctionTool[];
+declare function decodeOriginalToolsFromProviderOptions(providerOptions: ToolCallMiddlewareProviderOptions | undefined, options?: DecodeOriginalToolsOptions): LanguageModelV3FunctionTool[];
 declare function extractToolNamesFromOriginalTools(originalTools: Array<{
     name: string;
     inputSchema: string;
 }> | undefined): string[];
+declare function getToolCallMiddlewareOptions(providerOptions?: unknown): Record<string, unknown>;
+declare function mergeToolCallMiddlewareOptions(providerOptions: unknown, overrides: Record<string, unknown>): SharedV3ProviderOptions;
 declare function isToolChoiceActive(params: {
     providerOptions?: {
         toolCallMiddleware?: {
@@ -248,40 +250,7 @@ declare function transformParams({ params, protocol, toolSystemPromptTemplate, t
     prompt: LanguageModelV3Prompt;
     tools: never[];
     toolChoice: undefined;
-    providerOptions: SharedV3ProviderOptions;
-} | {
-    responseFormat: {
-        type: "json";
-        schema: JSONSchema7;
-        name: string;
-        description: string | undefined;
-    };
-    providerOptions: {
-        toolCallMiddleware: {
-            toolChoice?: {
-                type: string;
-                toolName?: string;
-            } | undefined;
-        };
-    };
-    prompt: LanguageModelV3Prompt;
-    tools: never[];
-    toolChoice: undefined;
-} | {
-    responseFormat: {
-        type: "json";
-        schema: JSONSchema7;
-    };
-    providerOptions: {
-        toolCallMiddleware: {
-            toolChoice: {
-                type: "required";
-            };
-        };
-    };
-    prompt: LanguageModelV3Prompt;
-    tools: never[];
-    toolChoice: undefined;
+    providerOptions: _ai_sdk_provider.SharedV3ProviderOptions;
 };
 
-export { type DebugLevel, type MorphXmlProtocolOptions, type OnErrorFn$1 as OnErrorFn, type ParserOptions, Qwen3CoderToolParser, type TCMCoreProtocol, type TCMProtocol, type ToolCallMiddlewareProviderOptions, type YamlXmlProtocolOptions, createDynamicIfThenElseSchema, createToolMiddleware, decodeOriginalTools, encodeOriginalTools, escapeRegExp, extractOnErrorOption, extractToolNamesFromOriginalTools, getDebugLevel, getPotentialStartIndex, hasInputProperty, hermesProtocol, hermesToolMiddleware, isProtocolFactory, isTCMProtocolFactory, isToolChoiceActive, isToolResultPart, logParseFailure, logParsedChunk, logParsedSummary, logRawChunk, morphXmlProtocol, morphXmlToolMiddleware, originalToolsSchema, qwen3CoderProtocol, qwen3CoderToolMiddleware, toolChoiceStream, transformParams, uiTarsXmlProtocol, wrapGenerate, wrapStream, yamlXmlProtocol, yamlXmlToolMiddleware };
+export { type DebugLevel, type MorphXmlProtocolOptions, type OnErrorFn, type ParserOptions, Qwen3CoderToolParser, type TCMCoreProtocol, type TCMProtocol, type ToolCallMiddlewareProviderOptions, type YamlXmlProtocolOptions, createDynamicIfThenElseSchema, createToolMiddleware, decodeOriginalTools, decodeOriginalToolsFromProviderOptions, encodeOriginalTools, escapeRegExp, extractOnErrorOption, extractToolNamesFromOriginalTools, getDebugLevel, getPotentialStartIndex, getToolCallMiddlewareOptions, hasInputProperty, hermesProtocol, hermesToolMiddleware, isProtocolFactory, isTCMProtocolFactory, isToolChoiceActive, isToolResultPart, logParseFailure, logParsedChunk, logParsedSummary, logRawChunk, mergeToolCallMiddlewareOptions, morphXmlProtocol, morphXmlToolMiddleware, originalToolsSchema, qwen3CoderProtocol, qwen3CoderToolMiddleware, toolChoiceStream, transformParams, uiTarsXmlProtocol, wrapGenerate, wrapStream, yamlXmlProtocol, yamlXmlToolMiddleware };

package/dist/index.js

@@ -3,11 +3,13 @@ import {
   createDynamicIfThenElseSchema,
   createToolMiddleware,
   decodeOriginalTools,
+  decodeOriginalToolsFromProviderOptions,
   encodeOriginalTools,
   extractOnErrorOption,
   extractToolNamesFromOriginalTools,
   getDebugLevel,
   getPotentialStartIndex,
+  getToolCallMiddlewareOptions,
   hasInputProperty,
   hermesProtocol,
   hermesToolMiddleware,
@@ -19,6 +21,7 @@ import {
   logParsedChunk,
   logParsedSummary,
   logRawChunk,
+  mergeToolCallMiddlewareOptions,
   morphXmlProtocol,
   morphXmlToolMiddleware,
   originalToolsSchema,
@@ -31,10 +34,10 @@ import {
   wrapStream,
   yamlXmlProtocol,
   yamlXmlToolMiddleware
-} from "./chunk-O6NWVXQD.js";
+} from "./chunk-722D5BGD.js";
 import {
   escapeRegExp
-} from "./chunk-MHZC45AC.js";
+} from "./chunk-D4YULTAO.js";
 import {
   parse,
   stringify,
@@ -46,12 +49,14 @@ export {
   createDynamicIfThenElseSchema,
   createToolMiddleware,
   decodeOriginalTools,
+  decodeOriginalToolsFromProviderOptions,
   encodeOriginalTools,
   escapeRegExp,
   extractOnErrorOption,
   extractToolNamesFromOriginalTools,
   getDebugLevel,
   getPotentialStartIndex,
+  getToolCallMiddlewareOptions,
   hasInputProperty,
   hermesProtocol,
   hermesToolMiddleware,
@@ -63,6 +68,7 @@ export {
   logParsedChunk,
   logParsedSummary,
   logRawChunk,
+  mergeToolCallMiddlewareOptions,
   morphXmlProtocol,
   morphXmlToolMiddleware,
   originalToolsSchema,

package/dist/rxml.cjs

@@ -1472,7 +1472,7 @@ function updateBestMatch(depth, bestDepth, contentStart, contentEnd) {
 }
 function processTargetTag(options) {
   const { xmlContent, tagEnd, isSelfClosing, target, len, depth, bestDepth } = options;
-  const contentStart = xmlContent[tagEnd] === ">" ? tagEnd + 1 : tagEnd + 1;
+  const contentStart = tagEnd + 1;
   if (isSelfClosing) {
     return updateBestMatch(depth, bestDepth, contentStart, contentStart);
   }
@@ -1508,7 +1508,7 @@ function processOpeningTagInExtract(options) {
     });
   }
   return {
-    newPos: xmlContent[tagEnd] === ">" ? tagEnd + 1 : tagEnd + 1,
+    newPos: tagEnd + 1,
     newDepth: depth + (isSelfClosing ? 0 : 1),
     bestMatch
   };
@@ -1562,7 +1562,7 @@ function extractRawInner(xmlContent, tagName) {
 }
 function processOpeningTag(options) {
   const { xmlContent, tagEnd, isSelfClosing, target, len, ranges } = options;
-  const contentStart = xmlContent[tagEnd] === ">" ? tagEnd + 1 : tagEnd + 1;
+  const contentStart = tagEnd + 1;
   if (isSelfClosing) {
     ranges.push({ start: contentStart, end: contentStart });
     return contentStart;
@@ -1605,7 +1605,7 @@ function findAllInnerRanges(xmlContent, tagName) {
     const tagEnd = tagEndInfo.pos;
     const isSelfClosing = tagEndInfo.isSelfClosing;
     if (tagInfo.name !== target) {
-      i = xmlContent[tagEnd] === ">" ? tagEnd + 1 : tagEnd + 1;
+      i = tagEnd + 1;
       continue;
     }
     const nextPos = processOpeningTag({
@@ -1625,7 +1625,7 @@ function findAllInnerRanges(xmlContent, tagName) {
 }
 function findTopLevelTargetRange(options) {
   const { xmlContent, tagEnd, isSelfClosing, target, len } = options;
-  const contentStart = xmlContent[tagEnd] === ">" ? tagEnd + 1 : tagEnd + 1;
+  const contentStart = tagEnd + 1;
   if (isSelfClosing) {
     return { start: contentStart, end: contentStart };
   }
@@ -1678,7 +1678,7 @@ function findFirstTopLevelRange(xmlContent, tagName) {
         len
       });
     }
-    i = xmlContent[tagEnd] === ">" ? tagEnd + 1 : tagEnd + 1;
+    i = tagEnd + 1;
     depth += isSelfClosing ? 0 : 1;
   }
   return;