@form-engine-ts/zod 1.1.0 → 2.0.0

package/README.md

@@ -1,11 +1,11 @@
 # @form-engine-ts/zod
 
-Generates a Zod 3 answer validator from a form-engine-ts `FormSchema` while preserving Core-compatible validation issues.
+Generates a Zod 4 answer validator from a form-engine-ts `FormSchema` while preserving Core-compatible validation issues.
 
 ## Install
 
 ```bash
-pnpm add @form-engine-ts/core @form-engine-ts/zod zod@^3
+pnpm add @form-engine-ts/core @form-engine-ts/zod zod@^4
 ```
 
 ## Quick start
@@ -29,3 +29,6 @@ Generate a validator for one wizard page while preserving passthrough values fro
 ```ts
 const firstPageResult = createZodFormSchema(schema, { pageIndex: 0 }).safeParse(values);
 ```
+
+Zod is a `^4.0.0` peer dependency. Schema metadata is checked by Core before validator creation, and parsed answer
+objects retain passthrough values. Required, choice, visibility, and page-scoped issue codes match Core validation.

package/dist/index.cjs

@@ -25,6 +25,16 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 var import_core = require("@form-engine-ts/core");
 var import_zod = require("zod");
+var jsonValueSchema = import_zod.z.lazy(
+  () => import_zod.z.union([
+    import_zod.z.string(),
+    import_zod.z.number().finite(),
+    import_zod.z.boolean(),
+    import_zod.z.null(),
+    import_zod.z.array(jsonValueSchema),
+    import_zod.z.record(import_zod.z.string(), jsonValueSchema)
+  ])
+);
 function cloneSchema(schema) {
   return JSON.parse(JSON.stringify(schema));
 }
@@ -34,9 +44,21 @@ function createZodFormSchema(schema, options = {}) {
   const page = options.pageIndex === void 0 || stableSchema.pages === void 0 ? void 0 : stableSchema.pages[options.pageIndex];
   const pageIds = page === void 0 ? void 0 : new Set(page.questionIds);
   const fields = options.pageIndex === void 0 || stableSchema.pages === void 0 ? stableSchema.fields : stableSchema.fields.filter((field) => pageIds?.has(field.id) === true);
-  const shape = Object.fromEntries(fields.map((field) => [field.id, import_zod.z.unknown().optional()]));
+  const allFieldIds = new Set(stableSchema.fields.map((field) => field.id));
+  const acceptsMetadata = !allFieldIds.has("metadata");
+  const acceptsTranslationMetadata = !allFieldIds.has("translationMetadata");
+  const shape = {
+    ...Object.fromEntries(fields.map((field) => [field.id, import_zod.z.unknown().optional()])),
+    ...acceptsMetadata ? { metadata: import_zod.z.record(import_zod.z.string(), jsonValueSchema).optional() } : {},
+    ...acceptsTranslationMetadata ? { translationMetadata: import_zod.z.record(import_zod.z.string(), jsonValueSchema).optional() } : {}
+  };
   return import_zod.z.object(shape).passthrough().superRefine((values, context) => {
-    const result = options.pageIndex === void 0 ? (0, import_core.validateAnswers)(stableSchema, values) : (0, import_core.validatePageAnswers)(stableSchema, options.pageIndex, values);
+    const answerValues = Object.fromEntries(
+      Object.entries(values).filter(
+        ([key]) => !(acceptsMetadata && key === "metadata") && !(acceptsTranslationMetadata && key === "translationMetadata")
+      )
+    );
+    const result = options.pageIndex === void 0 ? (0, import_core.validateAnswers)(stableSchema, answerValues) : (0, import_core.validatePageAnswers)(stableSchema, options.pageIndex, answerValues);
     if (result.valid) return;
     for (const issue of result.issues) {
       context.addIssue({

package/dist/index.js

@@ -5,6 +5,16 @@ import {
   validatePageAnswers
 } from "@form-engine-ts/core";
 import { z } from "zod";
+var jsonValueSchema = z.lazy(
+  () => z.union([
+    z.string(),
+    z.number().finite(),
+    z.boolean(),
+    z.null(),
+    z.array(jsonValueSchema),
+    z.record(z.string(), jsonValueSchema)
+  ])
+);
 function cloneSchema(schema) {
   return JSON.parse(JSON.stringify(schema));
 }
@@ -14,9 +24,21 @@ function createZodFormSchema(schema, options = {}) {
   const page = options.pageIndex === void 0 || stableSchema.pages === void 0 ? void 0 : stableSchema.pages[options.pageIndex];
   const pageIds = page === void 0 ? void 0 : new Set(page.questionIds);
   const fields = options.pageIndex === void 0 || stableSchema.pages === void 0 ? stableSchema.fields : stableSchema.fields.filter((field) => pageIds?.has(field.id) === true);
-  const shape = Object.fromEntries(fields.map((field) => [field.id, z.unknown().optional()]));
+  const allFieldIds = new Set(stableSchema.fields.map((field) => field.id));
+  const acceptsMetadata = !allFieldIds.has("metadata");
+  const acceptsTranslationMetadata = !allFieldIds.has("translationMetadata");
+  const shape = {
+    ...Object.fromEntries(fields.map((field) => [field.id, z.unknown().optional()])),
+    ...acceptsMetadata ? { metadata: z.record(z.string(), jsonValueSchema).optional() } : {},
+    ...acceptsTranslationMetadata ? { translationMetadata: z.record(z.string(), jsonValueSchema).optional() } : {}
+  };
   return z.object(shape).passthrough().superRefine((values, context) => {
-    const result = options.pageIndex === void 0 ? validateAnswers(stableSchema, values) : validatePageAnswers(stableSchema, options.pageIndex, values);
+    const answerValues = Object.fromEntries(
+      Object.entries(values).filter(
+        ([key]) => !(acceptsMetadata && key === "metadata") && !(acceptsTranslationMetadata && key === "translationMetadata")
+      )
+    );
+    const result = options.pageIndex === void 0 ? validateAnswers(stableSchema, answerValues) : validatePageAnswers(stableSchema, options.pageIndex, answerValues);
     if (result.valid) return;
     for (const issue of result.issues) {
       context.addIssue({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@form-engine-ts/zod",
-  "version": "1.1.0",
+  "version": "2.0.0",
   "publishConfig": {
     "access": "public"
   },
@@ -39,8 +39,13 @@
     "typescript"
   ],
   "dependencies": {
-    "zod": "^3.23.0",
-    "@form-engine-ts/core": "1.1.0"
+    "@form-engine-ts/core": "2.0.0"
+  },
+  "peerDependencies": {
+    "zod": "^4.0.0"
+  },
+  "devDependencies": {
+    "zod": "^4.0.0"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts --clean --external @form-engine-ts/core --external zod",