Chore/zod 4 update

genkit-tools/common/package.json

@@ -33,8 +33,7 @@
     "uuid": "^9.0.1",
     "winston": "^3.11.0",
     "yaml": "^2.4.1",
-    "zod": "^3.22.4",
-    "zod-to-json-schema": "^3.22.4"
+    "zod": "^4.0.0"
   },
   "devDependencies": {
     "@jest/globals": "^29.7.0",

genkit-tools/common/src/types/eval.ts

@@ -16,7 +16,6 @@
 
 import type { JSONSchema7 } from 'json-schema';
 import { z } from 'zod';
-import zodToJsonSchema from 'zod-to-json-schema';
 import type {
   CreateDatasetRequest,
   ListEvalKeysRequest,
@@ -37,34 +36,22 @@ export const ModelInferenceInputSchema = z.union([
   GenerateRequestSchema,
 ]);
 export type ModelInferenceInput = z.infer<typeof ModelInferenceInputSchema>;
-export const ModelInferenceInputJSONSchema = zodToJsonSchema(
-  ModelInferenceInputSchema,
-  {
-    $refStrategy: 'none',
-    removeAdditionalStrategy: 'strict',
-  }
+export const ModelInferenceInputJSONSchema = z.toJSONSchema(
+  ModelInferenceInputSchema
 ) as JSONSchema7;
 
 /**
  * GenerateRequest JSON schema to support eval-inference using models
  */
-export const GenerateRequestJSONSchema = zodToJsonSchema(
-  GenerateRequestSchema,
-  {
-    $refStrategy: 'none',
-    removeAdditionalStrategy: 'strict',
-  }
+export const GenerateRequestJSONSchema = z.toJSONSchema(
+  GenerateRequestSchema
 ) as JSONSchema7;
 
 /**
  * Combined GenerateInput JSON schema to support eval-inference using models
  */
-export const GenerateInputJSONSchema = zodToJsonSchema(
-  z.union([GenerateRequestSchema, GenerateActionOptionsSchema]),
-  {
-    $refStrategy: 'none',
-    removeAdditionalStrategy: 'strict',
-  }
+export const GenerateInputJSONSchema = z.toJSONSchema(
+  z.union([GenerateRequestSchema, GenerateActionOptionsSchema])
 ) as JSONSchema7;
 
 /**
@@ -252,11 +239,11 @@ export interface EvalStore {
 
 export const DatasetSchemaSchema = z.object({
   inputSchema: z
-    .record(z.any())
+    .record(z.string(), z.any())
     .describe('Valid JSON Schema for the `input` field of dataset entry.')
     .optional(),
   referenceSchema: z
-    .record(z.any())
+    .record(z.string(), z.any())
     .describe('Valid JSON Schema for the `reference` field of dataset entry.')
     .optional(),
 });

genkit-tools/common/src/types/model.ts

@@ -97,7 +97,7 @@ export type Role = z.infer<typeof RoleSchema>;
 export const MessageSchema = z.object({
   role: RoleSchema,
   content: z.array(PartSchema),
-  metadata: z.record(z.unknown()).optional(),
+  metadata: z.record(z.string(), z.unknown()).optional(),
 });
 
 /**
@@ -114,7 +114,7 @@ export const ModelInfoSchema = z.object({
   /** Friendly label for this model (e.g. "Google AI - Gemini Pro") */
   label: z.string().optional(),
   /** Model Specific configuration. */
-  configSchema: z.record(z.any()).optional(),
+  configSchema: z.record(z.string(), z.any()).optional(),
   /** Supported model capabilities. */
   supports: z
     .object({
@@ -205,7 +205,7 @@ export type GenerationCommonConfig = typeof GenerationCommonConfigSchema;
  */
 export const OutputConfigSchema = z.object({
   format: z.string().optional(),
-  schema: z.record(z.any()).optional(),
+  schema: z.record(z.string(), z.any()).optional(),
   constrained: z.boolean().optional(),
   contentType: z.string().optional(),
 });
@@ -267,7 +267,7 @@ export const GenerationUsageSchema = z.object({
   outputVideos: z.number().optional(),
   inputAudioFiles: z.number().optional(),
   outputAudioFiles: z.number().optional(),
-  custom: z.record(z.number()).optional(),
+  custom: z.record(z.string(), z.number()).optional(),
   thoughtsTokens: z.number().optional(),
   cachedContentTokens: z.number().optional(),
 });
@@ -390,7 +390,7 @@ export const GenerateActionOptionsSchema = z.object({
     .object({
       respond: z.array(ToolResponsePartSchema).optional(),
       restart: z.array(ToolRequestPartSchema).optional(),
-      metadata: z.record(z.any()).optional(),
+      metadata: z.record(z.string(), z.any()).optional(),
     })
     .optional(),
   /** When true, return tool calls for manual processing instead of automatically resolving them. */

genkit-tools/common/src/types/parts.ts

@@ -22,8 +22,8 @@ const EmptyPartSchema = z.object({
   toolRequest: z.never().optional(),
   toolResponse: z.never().optional(),
   data: z.unknown().optional(),
-  metadata: z.record(z.unknown()).optional(),
-  custom: z.record(z.unknown()).optional(),
+  metadata: z.record(z.string(), z.unknown()).optional(),
+  custom: z.record(z.string(), z.unknown()).optional(),
   reasoning: z.never().optional(),
   resource: z.never().optional(),
 });
@@ -152,7 +152,7 @@ export type DataPart = z.infer<typeof DataPartSchema>;
  * Zod schema of a custom part.
  */
 export const CustomPartSchema = EmptyPartSchema.extend({
-  custom: z.record(z.any()),
+  custom: z.record(z.string(), z.any()),
 });
 
 /**

genkit-tools/common/src/types/prompt.ts

@@ -44,7 +44,7 @@ export const PromptFrontmatterSchema = z.object({
       schema: z.unknown().optional(),
     })
     .optional(),
-  metadata: z.record(z.unknown()).optional(),
+  metadata: z.record(z.string(), z.unknown()).optional(),
 });
 
 export type PromptFrontmatter = z.infer<typeof PromptFrontmatterSchema>;

genkit-tools/package.json

@@ -18,8 +18,7 @@
     "only-allow": "^1.2.1",
     "rimraf": "^6.0.1",
     "tsx": "^4.20.3",
-    "zod": "^3.25.67",
-    "zod-to-json-schema": "^3.24.5"
+    "zod": "^4.0.0"
   },
   "pnpm": {
     "overrides": {

genkit-tools/scripts/schema-exporter.ts

@@ -18,7 +18,6 @@ import * as fs from 'fs';
 import type { JSONSchema7 } from 'json-schema';
 import * as path from 'path';
 import * as z from 'zod';
-import { zodToJsonSchema } from 'zod-to-json-schema';
 
 /** List of files that contain types to be exported. */
 const EXPORTED_TYPE_MODULES = [
@@ -53,12 +52,11 @@ function generateJsonSchema(modulePaths: string[]): JSONSchema7 {
     });
   }
   // Putting all of the schemas in an object and later extracting out the definitions is the most succinct way.
-  const { $defs } = zodToJsonSchema(z.object(schemas), {
-    definitions: schemas,
-    definitionPath: '$defs',
-    target: 'jsonSchema7',
-  }) as JSONSchema7;
-  return { $schema: 'http://json-schema.org/draft-07/schema#', $defs };
+  const jsonSchema = z.toJSONSchema(z.object(schemas)) as any;
+  return {
+    $schema: 'http://json-schema.org/draft-07/schema#',
+    $defs: jsonSchema.properties,
+  };
 }
 
 if (!process.argv[2]) {

genkit-tools/telemetry-server/package.json

@@ -37,7 +37,7 @@
     "async-mutex": "^0.5.0",
     "express": "^4.21.0",
     "lockfile": "^1.0.4",
-    "zod": "^3.22.4"
+    "zod": "^4.0.0"
   },
   "devDependencies": {
     "@types/express": "~4.17.21",
@@ -48,7 +48,7 @@
     "rimraf": "^6.0.1",
     "genversion": "^3.2.0",
     "tsx": "^4.19.2",
-    "typescript": "^4.9.0"
+    "typescript": "^5.5.0"
   },
   "types": "./lib/types/index.d.ts",
   "exports": {

js/ai/package.json

@@ -45,7 +45,7 @@
     "rimraf": "^6.0.1",
     "tsup": "^8.3.5",
     "tsx": "^4.19.2",
-    "typescript": "^4.9.0",
+    "typescript": "^5.5.0",
     "yaml": "^2.7.0"
   },
   "types": "lib/index.d.ts",
@@ -166,4 +166,4 @@
       ]
     }
   }
-}
+}

js/ai/src/chat.ts

@@ -185,15 +185,15 @@ export class Chat {
           return response;
         }
       )
-    );
+    ) as Promise<GenerateResponse<z.infer<O>>>;
   }
 
   sendStream<
     O extends z.ZodTypeAny = z.ZodTypeAny,
     CustomOptions extends z.ZodTypeAny = typeof GenerationCommonConfigSchema,
   >(
     options: string | Part[] | GenerateStreamOptions<O, CustomOptions>
-  ): GenerateStreamResponse<z.infer<O>> {
+  ): GenerateStreamResponse<O> {
     const channel = new Channel<GenerateResponseChunk>();
     const resolvedOptions = resolveSendOptions(options);
 

js/ai/src/check-operation.ts

@@ -36,5 +36,5 @@ export async function checkOperation<T = unknown>(
       message: `Failed to resolve background action from original request: ${operation.action}`,
     });
   }
-  return await backgroundAction.check(operation);
+  return (await backgroundAction.check(operation)) as unknown as Operation<T>;
 }