make StructuredObject from @ai-sdk/svelte accept zod v4 schemas

Author: gr2m

packages/svelte/src/structured-object.svelte.test.ts

@@ -12,12 +12,13 @@ const server = createTestServer({
 });
 
 describe('text stream', () => {
-  let structuredObject: StructuredObject<{ content: string }>;
+  const schema = z.object({ content: z.string() });
+  let structuredObject: StructuredObject<typeof schema>;
 
   beforeEach(() => {
     structuredObject = new StructuredObject({
       api: '/api/object',
-      schema: z.object({ content: z.string() }),
+      schema,
     });
   });
 

packages/svelte/src/structured-object.svelte.ts

@@ -3,6 +3,7 @@ import {
   isAbortError,
   safeValidateTypes,
   type FetchFunction,
+  type InferSchema,
 } from '@ai-sdk/provider-utils';
 import {
   asSchema,
@@ -11,15 +12,19 @@ import {
   type DeepPartial,
   type Schema,
 } from 'ai';
-import { type z } from 'zod';
+import type * as z3 from 'zod/v3';
+import type * as z4 from 'zod/v4/core';
 import {
   getStructuredObjectContext,
   hasStructuredObjectContext,
   KeyedStructuredObjectStore,
   type StructuredObjectStore,
 } from './structured-object-context.svelte.js';
 
-export type Experimental_StructuredObjectOptions<RESULT> = {
+export type Experimental_StructuredObjectOptions<
+  SCHEMA extends z3.Schema | z4.$ZodType | Schema,
+  RESULT = InferSchema<SCHEMA>,
+> = {
   /**
    * The API endpoint. It should stream JSON that matches the schema as chunked text.
    */
@@ -28,7 +33,7 @@ export type Experimental_StructuredObjectOptions<RESULT> = {
   /**
    * A Zod schema that defines the shape of the complete object.
    */
-  schema: z.Schema<RESULT, z.ZodTypeDef, unknown> | Schema<RESULT>;
+  schema: SCHEMA;
 
   /**
    * An unique identifier. If not provided, a random one will be
@@ -82,9 +87,13 @@ export type Experimental_StructuredObjectOptions<RESULT> = {
   credentials?: RequestCredentials;
 };
 
-export class StructuredObject<RESULT, INPUT = unknown> {
-  #options: Experimental_StructuredObjectOptions<RESULT> =
-    {} as Experimental_StructuredObjectOptions<RESULT>;
+export class StructuredObject<
+  SCHEMA extends z3.Schema | z4.$ZodType | Schema,
+  RESULT = InferSchema<SCHEMA>,
+  INPUT = unknown,
+> {
+  #options: Experimental_StructuredObjectOptions<SCHEMA, RESULT> =
+    {} as Experimental_StructuredObjectOptions<SCHEMA, RESULT>;
   readonly #id = $derived(this.#options.id ?? generateId());
   readonly #keyedStore = $state<KeyedStructuredObjectStore>()!;
   readonly #store = $derived(
@@ -114,7 +123,7 @@ export class StructuredObject<RESULT, INPUT = unknown> {
     return this.#store.loading;
   }
 
-  constructor(options: Experimental_StructuredObjectOptions<RESULT>) {
+  constructor(options: Experimental_StructuredObjectOptions<SCHEMA, RESULT>) {
     if (hasStructuredObjectContext()) {
       this.#keyedStore = getStructuredObjectContext();
     } else {