Merge branch 'master' into make-v27

Author: RobinTail

CHANGELOG.md

@@ -33,6 +33,12 @@
 
 ## Version 26
 
+### v26.3.0
+
+- Supporting several latest features of Zod 4.2 and 4.3 by the `Integration` generator:
+  - `z.looseRecord()` schema;
+  - Object properties wrapped by `z.exactOptional()` or created by `ZodType::exactOptional()` method.
+
 ### v26.2.0
 
 - Ability to specify a custom name for a schema in the generated Documentation:

example/package.json

@@ -17,7 +17,7 @@
     "express-zod-api": "workspace:*",
     "http-errors": "catalog:dev",
     "qs": "^6.14.1",
-    "swagger-ui-express": "^5.0.0",
+    "swagger-ui-express": "^5.0.1",
     "typescript": "catalog:dev",
     "zod": "catalog:dev"
   }

express-zod-api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-zod-api",
-  "version": "26.2.0",
+  "version": "26.3.0",
   "description": "A Typescript framework to help you get an API server up and running with I/O schema validation and custom middlewares in minutes.",
   "license": "MIT",
   "repository": {
@@ -43,7 +43,7 @@
   },
   "dependencies": {
     "@express-zod-api/zod-plugin": "workspace:^",
-    "ansis": "^4.1.0",
+    "ansis": "^4.2.0",
     "node-mocks-http": "^1.17.2",
     "openapi3-ts": "^4.5.0",
     "ramda": "catalog:prod"
@@ -90,7 +90,7 @@
     "@types/express": "catalog:dev",
     "@types/express-fileupload": "catalog:dev",
     "@types/http-errors": "catalog:dev",
-    "@types/node-forge": "^1.3.11",
+    "@types/node-forge": "^1.3.14",
     "@types/ramda": "catalog:dev",
     "camelize-ts": "catalog:dev",
     "compression": "catalog:dev",
@@ -99,10 +99,10 @@
     "express": "catalog:dev",
     "express-fileupload": "catalog:dev",
     "http-errors": "catalog:dev",
-    "node-forge": "^1.3.2",
+    "node-forge": "^1.3.3",
     "snakify-ts": "^2.3.0",
     "typescript": "catalog:dev",
-    "undici": "^7.10.0",
+    "undici": "^7.16.0",
     "zod": "catalog:dev"
   },
   "keywords": [

express-zod-api/src/typescript-api.ts

@@ -187,9 +187,15 @@ export class TypescriptAPI {
     value: Typeable,
     {
       isOptional,
+      hasUndefined = isOptional,
       isDeprecated,
       comment,
-    }: { isOptional?: boolean; isDeprecated?: boolean; comment?: string } = {},
+    }: {
+      isOptional?: boolean;
+      hasUndefined?: boolean;
+      isDeprecated?: boolean;
+      comment?: string;
+    } = {},
   ) => {
     const propType = this.ensureTypeNode(value);
     const node = this.f.createPropertySignature(
@@ -198,7 +204,7 @@ export class TypescriptAPI {
       isOptional
         ? this.f.createToken(this.ts.SyntaxKind.QuestionToken)
         : undefined,
-      isOptional
+      hasUndefined
         ? this.makeUnion([
             propType,
             this.ensureTypeNode(this.ts.SyntaxKind.UndefinedKeyword),

express-zod-api/src/zts.ts

@@ -76,11 +76,15 @@ const onObject: Producer = (
       ([key, value]) => {
         const { description: comment, deprecated: isDeprecated } =
           globalRegistry.get(value) || {};
+        const isOptional =
+          (isResponse ? value._zod.optout : value._zod.optin) === "optional";
+        const hasUndefined =
+          isOptional && !(value instanceof z.core.$ZodExactOptional);
         return api.makeInterfaceProp(key, next(value), {
           comment,
           isDeprecated,
-          isOptional:
-            (isResponse ? value._zod.optout : value._zod.optin) === "optional",
+          isOptional,
+          hasUndefined,
         });
       },
     );
@@ -124,7 +128,16 @@ const onTuple: Producer = (
 const onRecord: Producer = (
   { _zod: { def } }: z.core.$ZodRecord,
   { next, api },
-) => api.ensureTypeNode("Record", [def.keyType, def.valueType].map(next));
+) => {
+  const [keyNode, valueNode] = [def.keyType, def.valueType].map(next);
+  const primary = api.ensureTypeNode("Record", [keyNode, valueNode]);
+  const isLoose = def.mode === "loose";
+  if (!isLoose) return primary;
+  return api.f.createIntersectionTypeNode([
+    primary,
+    api.ensureTypeNode("Record", ["PropertyKey", valueNode]),
+  ]);
+};
 
 const intersect = R.tryCatch(
   (api: TypescriptAPI, nodes: ts.TypeNode[]) => {
@@ -170,7 +183,8 @@ const onWrapped: Producer = (
     | z.core.$ZodCatch
     | z.core.$ZodDefault
     | z.core.$ZodOptional
-    | z.core.$ZodNonOptional,
+    | z.core.$ZodNonOptional
+    | z.core.$ZodExactOptional,
   { next },
 ) => next(def.innerType);
 

express-zod-api/tests/__snapshots__/zts.spec.ts.snap

@@ -53,6 +53,7 @@ exports[`zod-to-ts > Example > should produce the expected results 1`] = `
             ] | bigint)[];
         };
     }>;
+    looseRecord: Record<"one" | "two", boolean> & Record<PropertyKey, boolean>;
     map: any;
     set: any;
     intersection: (string & number) | bigint;
@@ -76,6 +77,13 @@ exports[`zod-to-ts > Example > should produce the expected results 1`] = `
     catch: number;
     pipeline: string;
     readonly: string;
+    extended: {
+        hex: string;
+        hash: string;
+    };
+    codec: string;
+    slug: string;
+    xor: string | number;
 }"
 `;
 
@@ -283,6 +291,7 @@ exports[`zod-to-ts > z.optional() > Zod 4: should add question mark only to opti
             required: string;
         }
     ] | undefined;
+    exact?: string;
 }"
 `;
 

express-zod-api/tests/zts.spec.ts

@@ -150,6 +150,7 @@ describe("zod-to-ts", () => {
           }),
         }),
       ),
+      looseRecord: z.looseRecord(z.literal(["one", "two"]), z.boolean()),
       map: z.map(z.string(), z.array(z.object({ string: z.string() }))),
       set: z.set(z.string()),
       intersection: z.intersection(z.string(), z.number()).or(z.bigint()),
@@ -171,6 +172,13 @@ describe("zod-to-ts", () => {
       catch: z.number().catch(123),
       pipeline: z.string().regex(/\d+/).transform(Number).pipe(z.number()),
       readonly: z.string().readonly(),
+      extended: z.object({}).extend({ hex: z.hex(), hash: z.hash("sha256") }),
+      codec: z.codec(z.string(), z.number(), {
+        encode: String,
+        decode: Number,
+      }),
+      slug: z.string().slugify(),
+      xor: z.xor([z.string(), z.number()]),
     });
 
     test("should produce the expected results", () => {
@@ -199,6 +207,7 @@ describe("zod-to-ts", () => {
           }),
         ])
         .optional(),
+      exact: z.string().exactOptional(),
     });
 
     test("Zod 4: does not add undefined to it, unwrap as is", () => {

package.json

@@ -15,19 +15,19 @@
   },
   "devDependencies": {
     "@arethetypeswrong/core": "^0.18.2",
-    "@tsconfig/node20": "^20.1.5",
-    "@types/node": "^24.0.0",
-    "@vitest/coverage-v8": "^4.0.1",
-    "eslint": "^9.28.0",
-    "eslint-config-prettier": "^10.1.5",
-    "eslint-plugin-allowed-dependencies": "^2.0.0",
-    "eslint-plugin-prettier": "^5.4.1",
-    "husky": "^9.0.5",
+    "@tsconfig/node20": "^20.1.8",
+    "@types/node": "^24.10.4",
+    "@vitest/coverage-v8": "^4.0.16",
+    "eslint": "^9.39.2",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-allowed-dependencies": "^2.0.1",
+    "eslint-plugin-prettier": "^5.5.4",
+    "husky": "^9.1.7",
     "prettier": "3.7.4",
-    "tsdown": "^0.18.0",
-    "tsx": "^4.19.4",
+    "tsdown": "^0.18.4",
+    "tsx": "^4.21.0",
     "typescript-eslint": "catalog:dev",
-    "vitest": "^4.0.1"
+    "vitest": "^4.0.16"
   },
   "packageManager": "[email protected]+sha512.72d699da16b1179c14ba9e64dc71c9a40988cbdc65c264cb0e489db7de917f20dcf4d64d8723625f2969ba52d4b7e2a1170682d9ac2a5dcaeaab732b7e16f04a"
 }