@gabrielbryk/json-schema-to-zod 2.7.2 → 2.7.3

package/.changeset/README.md

@@ -0,0 +1,8 @@
+# Changesets
+
+Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works
+with multi-package repos, or single-package repos to help you version and publish your code. You can
+find the full documentation for it [in our repository](https://github.com/changesets/changesets)
+
+We have a quick list of common questions to get you started engaging with this project in
+[our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md)

package/.changeset/config.json

@@ -0,0 +1,11 @@
+{
+  "$schema": "https://unpkg.com/@changesets/config@3.1.2/schema.json",
+  "changelog": "@changesets/cli/changelog",
+  "commit": false,
+  "fixed": [],
+  "linked": [],
+  "access": "public",
+  "baseBranch": "main",
+  "updateInternalDependencies": "patch",
+  "ignore": []
+}

package/.github/workflows/release.yml

@@ -0,0 +1,50 @@
+name: Release
+
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  pull-requests: write
+  id-token: write
+
+jobs:
+  release:
+    environment: npm-publish
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+
+      - uses: pnpm/action-setup@v4
+        with:
+          run_install: false
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 24
+          cache: pnpm
+          registry-url: https://registry.npmjs.org
+
+      - name: Update npm (trusted publishing requires >=11.5.1)
+        run: npm install -g npm@latest
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Build
+        run: pnpm build
+
+      - name: Release with Changesets
+        uses: changesets/action@v1
+        with:
+          commit: "ci: release"
+          title: "ci: release"
+          version: pnpm changeset version
+          publish: pnpm changeset publish --access public
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NPM_TOKEN: ""
+          NODE_AUTH_TOKEN: ""

package/CHANGELOG.md

@@ -0,0 +1,7 @@
+# @gabrielbryk/json-schema-to-zod
+
+## 2.7.3
+
+### Patch Changes
+
+- d727121: Fix internal logic; publish patched release.

package/dist/cjs/parsers/parseIfThenElse.js

@@ -17,7 +17,7 @@ const parseIfThenElse = (schema, refs) => {
     ? ${$then}.safeParse(value)
     : ${$else}.safeParse(value);
   if (!result.success) {
-    result.error.issues.forEach((issue) => ctx.addIssue({...issue}))
+    result.error.errors.forEach((error) => ctx.addIssue(error))
   }
 })`;
     // Store original if/then/else for JSON Schema round-trip

package/dist/cjs/parsers/parseObject.js

@@ -78,16 +78,16 @@ function parseObject(objectSchema, refs) {
         }
         else {
             if (additionalProperties) {
-                patternProperties += `z.record(z.string(), z.union([${[
+                patternProperties += `z.record(z.union([${[
                     ...Object.values(parsedPatternProperties),
                     additionalProperties,
                 ].join(", ")}]))`;
             }
             else if (Object.keys(parsedPatternProperties).length > 1) {
-                patternProperties += `z.record(z.string(), z.union([${Object.values(parsedPatternProperties).join(", ")}]))`;
+                patternProperties += `z.record(z.union([${Object.values(parsedPatternProperties).join(", ")}]))`;
             }
             else {
-                patternProperties += `z.record(z.string(), ${Object.values(parsedPatternProperties)})`;
+                patternProperties += `z.record(${Object.values(parsedPatternProperties)})`;
             }
         }
         patternProperties += ".superRefine((value, ctx) => {\n";
@@ -103,8 +103,9 @@ function parseObject(objectSchema, refs) {
             }
         }
         for (const key in objectSchema.patternProperties) {
+            const escapedPattern = key.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
             patternProperties +=
-                "if (key.match(new RegExp(" + JSON.stringify(key) + "))) {\n";
+                "if (key.match(new RegExp(" + JSON.stringify(escapedPattern) + "))) {\n";
             if (additionalProperties) {
                 patternProperties += "evaluated = true\n";
             }
@@ -114,7 +115,7 @@ function parseObject(objectSchema, refs) {
                     ".safeParse(value[key])\n";
             patternProperties += "if (!result.success) {\n";
             patternProperties += `ctx.addIssue({
-          path: [key],
+          path: [...ctx.path, key],
           code: 'custom',
           message: \`Invalid input: Key matching regex /\${key}/ must match schema\`,
           params: {
@@ -130,7 +131,7 @@ function parseObject(objectSchema, refs) {
                 "const result = " + additionalProperties + ".safeParse(value[key])\n";
             patternProperties += "if (!result.success) {\n";
             patternProperties += `ctx.addIssue({
-          path: [key],
+          path: [...ctx.path, key],
           code: 'custom',
           message: \`Invalid input: must match catchall schema\`,
           params: {
@@ -151,10 +152,10 @@ function parseObject(objectSchema, refs) {
             patternProperties += `.meta({ __jsonSchema: { patternProperties: ${patternPropsJson} } })`;
         }
     }
-    // Check if there will be an .and() call that adds properties from oneOf/anyOf/allOf
+    // Check if there will be an .and() call that adds properties from oneOf/anyOf/allOf/if-then-else
     // In that case, we should NOT use .strict() because it will reject the additional keys
     // before the union gets a chance to validate them.
-    const hasCompositionKeywords = parseSchema_js_1.its.an.anyOf(objectSchema) || parseSchema_js_1.its.a.oneOf(objectSchema) || parseSchema_js_1.its.an.allOf(objectSchema);
+    const hasCompositionKeywords = parseSchema_js_1.its.an.anyOf(objectSchema) || parseSchema_js_1.its.a.oneOf(objectSchema) || parseSchema_js_1.its.an.allOf(objectSchema) || parseSchema_js_1.its.a.conditional(objectSchema);
     let output = properties
         ? patternProperties
             ? properties + patternProperties
@@ -169,8 +170,8 @@ function parseObject(objectSchema, refs) {
         : patternProperties
             ? patternProperties
             : additionalProperties
-                ? `z.record(z.string(), ${additionalProperties})`
-                : `z.record(z.string(), ${(0, anyOrUnknown_js_1.anyOrUnknown)(refs)})`;
+                ? `z.record(${additionalProperties})`
+                : `z.record(${(0, anyOrUnknown_js_1.anyOrUnknown)(refs)})`;
     if (unevaluated === false && properties && !hasCompositionKeywords) {
         output += ".strict()";
     }

package/dist/cjs/parsers/parseSimpleDiscriminatedOneOf.js

@@ -5,25 +5,17 @@ const parseSchema_js_1 = require("./parseSchema.js");
 const anyOrUnknown_js_1 = require("../utils/anyOrUnknown.js");
 const parseSimpleDiscriminatedOneOf = (schema, refs) => {
     const discriminator = schema.discriminator.propertyName;
-    const entries = schema.oneOf.map((option, i) => {
-        const opt = option;
-        const discriminatorSchema = opt.properties[discriminator];
-        const value = discriminatorSchema.const ??
-            (discriminatorSchema.enum && discriminatorSchema.enum[0]);
-        const parsed = (0, parseSchema_js_1.parseSchema)(option, {
-            ...refs,
-            path: [...refs.path, "oneOf", i],
-        });
-        const key = typeof value === "string" ? JSON.stringify(value) : JSON.stringify(String(value));
-        return `${key}: ${parsed}`;
-    });
+    const options = schema.oneOf.map((option, i) => (0, parseSchema_js_1.parseSchema)(option, {
+        ...refs,
+        path: [...refs.path, "oneOf", i],
+    }));
     return schema.oneOf.length
         ? schema.oneOf.length === 1
             ? (0, parseSchema_js_1.parseSchema)(schema.oneOf[0], {
                 ...refs,
                 path: [...refs.path, "oneOf", 0],
             })
-            : `z.discriminatedUnion("${discriminator}", { ${entries.join(", ")} })`
+            : `z.discriminatedUnion("${discriminator}", [${options.join(", ")}])`
         : (0, anyOrUnknown_js_1.anyOrUnknown)(refs);
 };
 exports.parseSimpleDiscriminatedOneOf = parseSimpleDiscriminatedOneOf;

package/dist/esm/parsers/parseIfThenElse.js

@@ -14,7 +14,7 @@ export const parseIfThenElse = (schema, refs) => {
     ? ${$then}.safeParse(value)
     : ${$else}.safeParse(value);
   if (!result.success) {
-    result.error.issues.forEach((issue) => ctx.addIssue({...issue}))
+    result.error.errors.forEach((error) => ctx.addIssue(error))
   }
 })`;
     // Store original if/then/else for JSON Schema round-trip

package/dist/esm/parsers/parseObject.js

@@ -75,16 +75,16 @@ export function parseObject(objectSchema, refs) {
         }
         else {
             if (additionalProperties) {
-                patternProperties += `z.record(z.string(), z.union([${[
+                patternProperties += `z.record(z.union([${[
                     ...Object.values(parsedPatternProperties),
                     additionalProperties,
                 ].join(", ")}]))`;
             }
             else if (Object.keys(parsedPatternProperties).length > 1) {
-                patternProperties += `z.record(z.string(), z.union([${Object.values(parsedPatternProperties).join(", ")}]))`;
+                patternProperties += `z.record(z.union([${Object.values(parsedPatternProperties).join(", ")}]))`;
             }
             else {
-                patternProperties += `z.record(z.string(), ${Object.values(parsedPatternProperties)})`;
+                patternProperties += `z.record(${Object.values(parsedPatternProperties)})`;
             }
         }
         patternProperties += ".superRefine((value, ctx) => {\n";
@@ -100,8 +100,9 @@ export function parseObject(objectSchema, refs) {
             }
         }
         for (const key in objectSchema.patternProperties) {
+            const escapedPattern = key.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
             patternProperties +=
-                "if (key.match(new RegExp(" + JSON.stringify(key) + "))) {\n";
+                "if (key.match(new RegExp(" + JSON.stringify(escapedPattern) + "))) {\n";
             if (additionalProperties) {
                 patternProperties += "evaluated = true\n";
             }
@@ -111,7 +112,7 @@ export function parseObject(objectSchema, refs) {
                     ".safeParse(value[key])\n";
             patternProperties += "if (!result.success) {\n";
             patternProperties += `ctx.addIssue({
-          path: [key],
+          path: [...ctx.path, key],
           code: 'custom',
           message: \`Invalid input: Key matching regex /\${key}/ must match schema\`,
           params: {
@@ -127,7 +128,7 @@ export function parseObject(objectSchema, refs) {
                 "const result = " + additionalProperties + ".safeParse(value[key])\n";
             patternProperties += "if (!result.success) {\n";
             patternProperties += `ctx.addIssue({
-          path: [key],
+          path: [...ctx.path, key],
           code: 'custom',
           message: \`Invalid input: must match catchall schema\`,
           params: {
@@ -148,10 +149,10 @@ export function parseObject(objectSchema, refs) {
             patternProperties += `.meta({ __jsonSchema: { patternProperties: ${patternPropsJson} } })`;
         }
     }
-    // Check if there will be an .and() call that adds properties from oneOf/anyOf/allOf
+    // Check if there will be an .and() call that adds properties from oneOf/anyOf/allOf/if-then-else
     // In that case, we should NOT use .strict() because it will reject the additional keys
     // before the union gets a chance to validate them.
-    const hasCompositionKeywords = its.an.anyOf(objectSchema) || its.a.oneOf(objectSchema) || its.an.allOf(objectSchema);
+    const hasCompositionKeywords = its.an.anyOf(objectSchema) || its.a.oneOf(objectSchema) || its.an.allOf(objectSchema) || its.a.conditional(objectSchema);
     let output = properties
         ? patternProperties
             ? properties + patternProperties
@@ -166,8 +167,8 @@ export function parseObject(objectSchema, refs) {
         : patternProperties
             ? patternProperties
             : additionalProperties
-                ? `z.record(z.string(), ${additionalProperties})`
-                : `z.record(z.string(), ${anyOrUnknown(refs)})`;
+                ? `z.record(${additionalProperties})`
+                : `z.record(${anyOrUnknown(refs)})`;
     if (unevaluated === false && properties && !hasCompositionKeywords) {
         output += ".strict()";
     }

package/dist/esm/parsers/parseSimpleDiscriminatedOneOf.js

@@ -2,24 +2,16 @@ import { parseSchema } from "./parseSchema.js";
 import { anyOrUnknown } from "../utils/anyOrUnknown.js";
 export const parseSimpleDiscriminatedOneOf = (schema, refs) => {
     const discriminator = schema.discriminator.propertyName;
-    const entries = schema.oneOf.map((option, i) => {
-        const opt = option;
-        const discriminatorSchema = opt.properties[discriminator];
-        const value = discriminatorSchema.const ??
-            (discriminatorSchema.enum && discriminatorSchema.enum[0]);
-        const parsed = parseSchema(option, {
-            ...refs,
-            path: [...refs.path, "oneOf", i],
-        });
-        const key = typeof value === "string" ? JSON.stringify(value) : JSON.stringify(String(value));
-        return `${key}: ${parsed}`;
-    });
+    const options = schema.oneOf.map((option, i) => parseSchema(option, {
+        ...refs,
+        path: [...refs.path, "oneOf", i],
+    }));
     return schema.oneOf.length
         ? schema.oneOf.length === 1
             ? parseSchema(schema.oneOf[0], {
                 ...refs,
                 path: [...refs.path, "oneOf", 0],
             })
-            : `z.discriminatedUnion("${discriminator}", { ${entries.join(", ")} })`
+            : `z.discriminatedUnion("${discriminator}", [${options.join(", ")}])`
         : anyOrUnknown(refs);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gabrielbryk/json-schema-to-zod",
-  "version": "2.7.2",
+  "version": "2.7.3",
   "description": "Converts JSON schema objects or files into Zod schemas",
   "types": "./dist/types/index.d.ts",
   "bin": "./dist/cjs/cli.js",
@@ -61,6 +61,7 @@
     "access": "public"
   },
   "devDependencies": {
+    "@changesets/cli": "^2.29.8",
     "@types/json-schema": "^7.0.15",
     "@types/node": "^20.9.0",
     "fast-diff": "^1.3.0",