@core-ai/core-ai 0.6.1 → 0.7.1

package/dist/index.d.ts

@@ -315,6 +315,17 @@ declare class StructuredOutputValidationError extends StructuredOutputError {
 
 declare function defineTool(options: ToolDefinition): ToolDefinition;
 
+/**
+ * Convert a Zod schema to a JSON Schema object using Zod 4's native
+ * `z.toJSONSchema()`.
+ */
+declare function zodSchemaToJsonSchema(schema: z.ZodType): Record<string, unknown>;
+
+declare function stripModelDateSuffix(modelId: string): string;
+
+declare function asObject(value: unknown): Record<string, unknown>;
+declare function safeParseJsonObject(json: string): Record<string, unknown>;
+
 type ResultToMessageOptions = {
     includeReasoning?: boolean;
 };
@@ -360,4 +371,4 @@ type GenerateImageParams = ImageGenerateOptions & {
 };
 declare function generateImage(params: GenerateImageParams): Promise<ImageGenerateResult>;
 
-export { type AssistantContentPart, type AssistantMessage, type AssistantTextPart, type BaseGenerateOptions, type ChatInputTokenDetails, type ChatModel, type ChatOutputTokenDetails, type ChatStream, type ChatUsage, type EmbedOptions, type EmbedProviderOptions, type EmbedResult, type EmbeddingModel, type EmbeddingUsage, type FilePart, type FinishReason, type GenerateObjectOptions, type GenerateObjectResult, type GenerateOptions, type GenerateProviderOptions, type GenerateResult, type GeneratedImage, type ImageGenerateOptions, type ImageGenerateResult, type ImageModel, type ImagePart, type ImageProviderOptions, LLMError, type Message, type ObjectStream, type ObjectStreamEvent, ProviderError, type ReasoningConfig, type ReasoningEffort, type ReasoningPart, StreamAbortedError, type StreamEvent, type StreamObjectOptions, StructuredOutputError, StructuredOutputNoObjectGeneratedError, StructuredOutputParseError, StructuredOutputValidationError, type SystemMessage, type TextPart, type ToolCall, type ToolCallPart, type ToolChoice, type ToolDefinition, type ToolResultMessage, type ToolSet, type UserContentPart, type UserMessage, assistantMessage, createChatStream, createObjectStream, defineTool, embed, generate, generateImage, generateObject, getProviderMetadata, resultToMessage, stream, streamObject };
+export { type AssistantContentPart, type AssistantMessage, type AssistantTextPart, type BaseGenerateOptions, type ChatInputTokenDetails, type ChatModel, type ChatOutputTokenDetails, type ChatStream, type ChatUsage, type EmbedOptions, type EmbedProviderOptions, type EmbedResult, type EmbeddingModel, type EmbeddingUsage, type FilePart, type FinishReason, type GenerateObjectOptions, type GenerateObjectResult, type GenerateOptions, type GenerateProviderOptions, type GenerateResult, type GeneratedImage, type ImageGenerateOptions, type ImageGenerateResult, type ImageModel, type ImagePart, type ImageProviderOptions, LLMError, type Message, type ObjectStream, type ObjectStreamEvent, ProviderError, type ReasoningConfig, type ReasoningEffort, type ReasoningPart, StreamAbortedError, type StreamEvent, type StreamObjectOptions, StructuredOutputError, StructuredOutputNoObjectGeneratedError, StructuredOutputParseError, StructuredOutputValidationError, type SystemMessage, type TextPart, type ToolCall, type ToolCallPart, type ToolChoice, type ToolDefinition, type ToolResultMessage, type ToolSet, type UserContentPart, type UserMessage, asObject, assistantMessage, createChatStream, createObjectStream, defineTool, embed, generate, generateImage, generateObject, getProviderMetadata, resultToMessage, safeParseJsonObject, stream, streamObject, stripModelDateSuffix, zodSchemaToJsonSchema };

package/dist/index.js

@@ -53,11 +53,39 @@ var StructuredOutputValidationError = class extends StructuredOutputError {
 };
 
 // src/tool.ts
-import { zodToJsonSchema } from "zod-to-json-schema";
 function defineTool(options) {
   return options;
 }
 
+// src/json-schema.ts
+import { z } from "zod";
+function zodSchemaToJsonSchema(schema) {
+  return z.toJSONSchema(schema, {
+    io: "input"
+  });
+}
+
+// src/model-id.ts
+var MODEL_DATE_SUFFIX_PATTERN = /-\d{8}$/;
+function stripModelDateSuffix(modelId) {
+  return modelId.replace(MODEL_DATE_SUFFIX_PATTERN, "");
+}
+
+// src/provider-utils.ts
+function asObject(value) {
+  if (value && typeof value === "object" && !Array.isArray(value)) {
+    return value;
+  }
+  return {};
+}
+function safeParseJsonObject(json) {
+  try {
+    return asObject(JSON.parse(json));
+  } catch {
+    return {};
+  }
+}
+
 // src/result-to-message.ts
 function resultToMessage(result, options) {
   const includeReasoning = options?.includeReasoning ?? true;
@@ -104,26 +132,33 @@ function splitModelFromParams(params) {
     options
   };
 }
+function callModelWithOptions(params, call) {
+  const { model, options } = splitModelFromParams(params);
+  return call(model, options);
+}
 
 // src/generate.ts
 async function generate(params) {
   assertNonEmptyMessages(params.messages);
-  const { model, options } = splitModelFromParams(params);
-  return model.generate(options);
+  return callModelWithOptions(
+    params,
+    (model, options) => model.generate(options)
+  );
 }
 
 // src/generate-object.ts
 async function generateObject(params) {
   assertNonEmptyMessages(params.messages);
-  const { model, options } = splitModelFromParams(params);
-  return model.generateObject(options);
+  return callModelWithOptions(
+    params,
+    (model, options) => model.generateObject(options)
+  );
 }
 
 // src/stream-chat.ts
 async function stream(params) {
   assertNonEmptyMessages(params.messages);
-  const { model, options } = splitModelFromParams(params);
-  return model.stream(options);
+  return callModelWithOptions(params, (model, options) => model.stream(options));
 }
 
 // src/base-stream.ts
@@ -163,31 +198,31 @@ function createStream(options) {
   function cleanupSignalListener() {
     signal?.removeEventListener("abort", abortStream);
   }
-  function settleCompleted(finalResult) {
+  function settleTerminalState(nextState) {
     if (terminalState.status !== "running") {
       return;
     }
-    terminalState = {
-      status: "completed",
-      result: finalResult
-    };
+    terminalState = nextState;
     cleanupSignalListener();
-    resolveResult?.(finalResult);
+    if (nextState.status === "completed") {
+      resolveResult?.(nextState.result);
+    } else {
+      rejectResult?.(nextState.error);
+    }
     resolveEvents?.([...bufferedEvents]);
     notifyWaiters();
   }
+  function settleCompleted(finalResult) {
+    settleTerminalState({
+      status: "completed",
+      result: finalResult
+    });
+  }
   function settleRejected(error) {
-    if (terminalState.status !== "running") {
-      return;
-    }
-    terminalState = {
+    settleTerminalState({
       status: "rejected",
       error
-    };
-    cleanupSignalListener();
-    rejectResult?.(error);
-    resolveEvents?.([...bufferedEvents]);
-    notifyWaiters();
+    });
   }
   function closeSourceIterator() {
     if (closeSourceIteratorPromise) {
@@ -241,6 +276,12 @@ function createStream(options) {
     }
   }
   void pump();
+  function getDoneResult() {
+    return {
+      done: true,
+      value: void 0
+    };
+  }
   return {
     [Symbol.asyncIterator]() {
       let index = 0;
@@ -248,17 +289,11 @@ function createStream(options) {
       return {
         async next() {
           if (closed) {
-            return {
-              done: true,
-              value: void 0
-            };
+            return getDoneResult();
           }
           while (!closed && index >= bufferedEvents.length) {
             if (terminalState.status === "completed") {
-              return {
-                done: true,
-                value: void 0
-              };
+              return getDoneResult();
             }
             if (terminalState.status === "rejected") {
               throw terminalState.error;
@@ -266,10 +301,7 @@ function createStream(options) {
             await resolveWhenUpdated();
           }
           if (closed) {
-            return {
-              done: true,
-              value: void 0
-            };
+            return getDoneResult();
           }
           const value = bufferedEvents[index];
           index += 1;
@@ -281,10 +313,7 @@ function createStream(options) {
         async return() {
           closed = true;
           notifyWaiters();
-          return {
-            done: true,
-            value: void 0
-          };
+          return getDoneResult();
         }
       };
     },
@@ -296,8 +325,10 @@ function createStream(options) {
 // src/stream-object.ts
 async function streamObject(params) {
   assertNonEmptyMessages(params.messages);
-  const { model, ...options } = params;
-  return model.streamObject(options);
+  return callModelWithOptions(
+    params,
+    (model, options) => model.streamObject(options)
+  );
 }
 function createObjectStream(source, options = {}) {
   const { signal } = options;
@@ -423,6 +454,31 @@ function createChatStream(source, options = {}) {
     finishReason = event.finishReason;
     usage = event.usage;
   };
+  const collectFinalizedData = () => {
+    const contentSegments = [];
+    const reasoningSegments = [];
+    const toolCalls = [];
+    for (const part of parts) {
+      if (part.type === "text") {
+        contentSegments.push(part.text);
+        continue;
+      }
+      if (part.type === "reasoning") {
+        reasoningSegments.push(part.text);
+        continue;
+      }
+      if (part.type === "tool-call") {
+        toolCalls.push(part.toolCall);
+      }
+    }
+    const content = contentSegments.join("");
+    const reasoning = reasoningSegments.join("");
+    return {
+      content: content.length > 0 ? content : null,
+      reasoning: reasoning.length > 0 ? reasoning : null,
+      toolCalls
+    };
+  };
   return createStream({
     source: resolvedSource,
     signal,
@@ -453,17 +509,11 @@ function createChatStream(source, options = {}) {
     finalizeResult() {
       flushText();
       flushReasoning();
-      const content = parts.flatMap((part) => part.type === "text" ? [part.text] : []).join("");
-      const reasoning = parts.flatMap(
-        (part) => part.type === "reasoning" ? [part.text] : []
-      ).join("");
-      const toolCalls = parts.flatMap(
-        (part) => part.type === "tool-call" ? [part.toolCall] : []
-      );
+      const { content, reasoning, toolCalls } = collectFinalizedData();
       return {
         parts,
-        content: content.length > 0 ? content : null,
-        reasoning: reasoning.length > 0 ? reasoning : null,
+        content,
+        reasoning,
         toolCalls,
         finishReason,
         usage
@@ -480,15 +530,16 @@ function getProviderMetadata(providerMetadata, provider) {
 // src/embed.ts
 async function embed(params) {
   assertNonEmptyEmbedInput(params.input);
-  const { model, options } = splitModelFromParams(params);
-  return model.embed(options);
+  return callModelWithOptions(params, (model, options) => model.embed(options));
 }
 
 // src/generate-image.ts
 async function generateImage(params) {
   assertNonEmptyPrompt(params.prompt);
-  const { model, options } = splitModelFromParams(params);
-  return model.generate(options);
+  return callModelWithOptions(
+    params,
+    (model, options) => model.generate(options)
+  );
 }
 export {
   LLMError,
@@ -498,6 +549,7 @@ export {
   StructuredOutputNoObjectGeneratedError,
   StructuredOutputParseError,
   StructuredOutputValidationError,
+  asObject,
   assistantMessage,
   createChatStream,
   createObjectStream,
@@ -508,6 +560,9 @@ export {
   generateObject,
   getProviderMetadata,
   resultToMessage,
+  safeParseJsonObject,
   stream,
-  streamObject
+  streamObject,
+  stripModelDateSuffix,
+  zodSchemaToJsonSchema
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@core-ai/core-ai",
-    "version": "0.6.1",
+    "version": "0.7.1",
     "description": "Type-safe LLM abstraction layer over native provider SDKs",
     "license": "MIT",
     "author": "Omnifact (https://omnifact.ai)",
@@ -43,8 +43,7 @@
         "test:watch": "vitest"
     },
     "dependencies": {
-        "zod": "^3.25.0 || ^4.0.0",
-        "zod-to-json-schema": "^3.25.1"
+        "zod": "^4.0.0"
     },
     "devDependencies": {
         "@core-ai/eslint-config": "*",