fullstacked 0.12.1-1359 → 0.12.1-1366

package/fullstacked_modules/zod/v4/core/to-json-schema.cjs

@@ -83,7 +83,9 @@ class JSONSchemaGenerator {
                             else if (regexes.length > 1) {
                                 result.schema.allOf = [
                                     ...regexes.map((regex) => ({
-                                        ...(this.target === "draft-7" ? { type: "string" } : {}),
+                                        ...(this.target === "draft-7" || this.target === "draft-4" || this.target === "openapi-3.0"
+                                            ? { type: "string" }
+                                            : {}),
                                         pattern: regex.source,
                                     })),
                                 ];
@@ -98,22 +100,36 @@ class JSONSchemaGenerator {
                             json.type = "integer";
                         else
                             json.type = "number";
-                        if (typeof exclusiveMinimum === "number")
-                            json.exclusiveMinimum = exclusiveMinimum;
+                        if (typeof exclusiveMinimum === "number") {
+                            if (this.target === "draft-4" || this.target === "openapi-3.0") {
+                                json.minimum = exclusiveMinimum;
+                                json.exclusiveMinimum = true;
+                            }
+                            else {
+                                json.exclusiveMinimum = exclusiveMinimum;
+                            }
+                        }
                         if (typeof minimum === "number") {
                             json.minimum = minimum;
-                            if (typeof exclusiveMinimum === "number") {
+                            if (typeof exclusiveMinimum === "number" && this.target !== "draft-4") {
                                 if (exclusiveMinimum >= minimum)
                                     delete json.minimum;
                                 else
                                     delete json.exclusiveMinimum;
                             }
                         }
-                        if (typeof exclusiveMaximum === "number")
-                            json.exclusiveMaximum = exclusiveMaximum;
+                        if (typeof exclusiveMaximum === "number") {
+                            if (this.target === "draft-4" || this.target === "openapi-3.0") {
+                                json.maximum = exclusiveMaximum;
+                                json.exclusiveMaximum = true;
+                            }
+                            else {
+                                json.exclusiveMaximum = exclusiveMaximum;
+                            }
+                        }
                         if (typeof maximum === "number") {
                             json.maximum = maximum;
-                            if (typeof exclusiveMaximum === "number") {
+                            if (typeof exclusiveMaximum === "number" && this.target !== "draft-4") {
                                 if (exclusiveMaximum <= maximum)
                                     delete json.maximum;
                                 else
@@ -142,7 +158,13 @@ class JSONSchemaGenerator {
                         break;
                     }
                     case "null": {
-                        _json.type = "null";
+                        if (this.target === "openapi-3.0") {
+                            _json.type = "string";
+                            _json.nullable = true;
+                            _json.enum = [null];
+                        }
+                        else
+                            _json.type = "null";
                         break;
                     }
                     case "any": {
@@ -230,10 +252,11 @@ class JSONSchemaGenerator {
                     }
                     case "union": {
                         const json = _json;
-                        json.anyOf = def.options.map((x, i) => this.process(x, {
+                        const options = def.options.map((x, i) => this.process(x, {
                             ...params,
                             path: [...params.path, "anyOf", i],
                         }));
+                        json.anyOf = options;
                         break;
                     }
                     case "intersection": {
@@ -257,32 +280,42 @@ class JSONSchemaGenerator {
                     case "tuple": {
                         const json = _json;
                         json.type = "array";
-                        const prefixItems = def.items.map((x, i) => this.process(x, { ...params, path: [...params.path, "prefixItems", i] }));
+                        const prefixPath = this.target === "draft-2020-12" ? "prefixItems" : "items";
+                        const restPath = this.target === "draft-2020-12" ? "items" : this.target === "openapi-3.0" ? "items" : "additionalItems";
+                        const prefixItems = def.items.map((x, i) => this.process(x, {
+                            ...params,
+                            path: [...params.path, prefixPath, i],
+                        }));
+                        const rest = def.rest
+                            ? this.process(def.rest, {
+                                ...params,
+                                path: [...params.path, restPath, ...(this.target === "openapi-3.0" ? [def.items.length] : [])],
+                            })
+                            : null;
                         if (this.target === "draft-2020-12") {
                             json.prefixItems = prefixItems;
+                            if (rest) {
+                                json.items = rest;
+                            }
+                        }
+                        else if (this.target === "openapi-3.0") {
+                            json.items = {
+                                anyOf: prefixItems,
+                            };
+                            if (rest) {
+                                json.items.anyOf.push(rest);
+                            }
+                            json.minItems = prefixItems.length;
+                            if (!rest) {
+                                json.maxItems = prefixItems.length;
+                            }
                         }
                         else {
                             json.items = prefixItems;
-                        }
-                        if (def.rest) {
-                            const rest = this.process(def.rest, {
-                                ...params,
-                                path: [...params.path, "items"],
-                            });
-                            if (this.target === "draft-2020-12") {
-                                json.items = rest;
-                            }
-                            else {
+                            if (rest) {
                                 json.additionalItems = rest;
                             }
                         }
-                        // additionalItems
-                        if (def.rest) {
-                            json.items = this.process(def.rest, {
-                                ...params,
-                                path: [...params.path, "items"],
-                            });
-                        }
                         // length
                         const { minimum, maximum } = schema._zod.bag;
                         if (typeof minimum === "number")
@@ -294,7 +327,12 @@ class JSONSchemaGenerator {
                     case "record": {
                         const json = _json;
                         json.type = "object";
-                        json.propertyNames = this.process(def.keyType, { ...params, path: [...params.path, "propertyNames"] });
+                        if (this.target === "draft-7" || this.target === "draft-2020-12") {
+                            json.propertyNames = this.process(def.keyType, {
+                                ...params,
+                                path: [...params.path, "propertyNames"],
+                            });
+                        }
                         json.additionalProperties = this.process(def.valueType, {
                             ...params,
                             path: [...params.path, "additionalProperties"],
@@ -354,7 +392,12 @@ class JSONSchemaGenerator {
                         else if (vals.length === 1) {
                             const val = vals[0];
                             json.type = val === null ? "null" : typeof val;
-                            json.const = val;
+                            if (this.target === "draft-4" || this.target === "openapi-3.0") {
+                                json.enum = [val];
+                            }
+                            else {
+                                json.const = val;
+                            }
                         }
                         else {
                             if (vals.every((v) => typeof v === "number"))
@@ -409,7 +452,13 @@ class JSONSchemaGenerator {
                     }
                     case "nullable": {
                         const inner = this.process(def.innerType, params);
-                        _json.anyOf = [inner, { type: "null" }];
+                        if (this.target === "openapi-3.0") {
+                            result.ref = def.innerType;
+                            _json.nullable = true;
+                        }
+                        else {
+                            _json.anyOf = [inner, { type: "null" }];
+                        }
                         break;
                     }
                     case "nonoptional": {
@@ -499,6 +548,12 @@ class JSONSchemaGenerator {
                         }
                         break;
                     }
+                    case "function": {
+                        if (this.unrepresentable === "throw") {
+                            throw new Error("Function types cannot be represented in JSON Schema");
+                        }
+                        break;
+                    }
                     default: {
                         def;
                     }
@@ -650,7 +705,8 @@ class JSONSchemaGenerator {
                 flattenRef(ref, params);
                 // merge referenced schema into current
                 const refSchema = this.seen.get(ref).schema;
-                if (refSchema.$ref && params.target === "draft-7") {
+                if (refSchema.$ref &&
+                    (params.target === "draft-7" || params.target === "draft-4" || params.target === "openapi-3.0")) {
                     schema.allOf = schema.allOf ?? [];
                     schema.allOf.push(refSchema);
                 }
@@ -677,7 +733,14 @@ class JSONSchemaGenerator {
         else if (this.target === "draft-7") {
             result.$schema = "http://json-schema.org/draft-07/schema#";
         }
+        else if (this.target === "draft-4") {
+            result.$schema = "http://json-schema.org/draft-04/schema#";
+        }
+        else if (this.target === "openapi-3.0") {
+            // OpenAPI 3.0 schema objects should not include a $schema property
+        }
         else {
+            // @ts-ignore
             console.warn(`Invalid target: ${this.target}`);
         }
         if (params.external?.uri) {
@@ -847,6 +910,9 @@ function isTransforming(_schema, _ctx) {
         case "catch": {
             return false;
         }
+        case "function": {
+            return false;
+        }
         default:
             def;
     }

package/fullstacked_modules/zod/v4/core/to-json-schema.d.cts

@@ -7,8 +7,10 @@ interface JSONSchemaGeneratorParams {
     metadata?: $ZodRegistry<Record<string, any>>;
     /** The JSON Schema version to target.
      * - `"draft-2020-12"` — Default. JSON Schema Draft 2020-12
-     * - `"draft-7"` — JSON Schema Draft 7 */
-    target?: "draft-7" | "draft-2020-12";
+     * - `"draft-7"` — JSON Schema Draft 7
+     * - `"draft-4"` — JSON Schema Draft 4
+     * - `"openapi-3.0"` — OpenAPI 3.0 Schema Object */
+    target?: "draft-4" | "draft-7" | "draft-2020-12" | "openapi-3.0";
     /** How to handle unrepresentable types.
      * - `"throw"` — Default. Unrepresentable types throw an error
      * - `"any"` — Unrepresentable types become `{}` */
@@ -60,7 +62,7 @@ interface Seen {
 }
 export declare class JSONSchemaGenerator {
     metadataRegistry: $ZodRegistry<Record<string, any>>;
-    target: "draft-7" | "draft-2020-12";
+    target: "draft-4" | "draft-7" | "draft-2020-12" | "openapi-3.0";
     unrepresentable: "throw" | "any";
     override: (ctx: {
         zodSchema: schemas.$ZodTypes;

package/fullstacked_modules/zod/v4/core/to-json-schema.d.ts

@@ -7,8 +7,10 @@ interface JSONSchemaGeneratorParams {
     metadata?: $ZodRegistry<Record<string, any>>;
     /** The JSON Schema version to target.
      * - `"draft-2020-12"` — Default. JSON Schema Draft 2020-12
-     * - `"draft-7"` — JSON Schema Draft 7 */
-    target?: "draft-7" | "draft-2020-12";
+     * - `"draft-7"` — JSON Schema Draft 7
+     * - `"draft-4"` — JSON Schema Draft 4
+     * - `"openapi-3.0"` — OpenAPI 3.0 Schema Object */
+    target?: "draft-4" | "draft-7" | "draft-2020-12" | "openapi-3.0";
     /** How to handle unrepresentable types.
      * - `"throw"` — Default. Unrepresentable types throw an error
      * - `"any"` — Unrepresentable types become `{}` */
@@ -60,7 +62,7 @@ interface Seen {
 }
 export declare class JSONSchemaGenerator {
     metadataRegistry: $ZodRegistry<Record<string, any>>;
-    target: "draft-7" | "draft-2020-12";
+    target: "draft-4" | "draft-7" | "draft-2020-12" | "openapi-3.0";
     unrepresentable: "throw" | "any";
     override: (ctx: {
         zodSchema: schemas.$ZodTypes;

package/fullstacked_modules/zod/v4/core/to-json-schema.js

@@ -79,7 +79,9 @@ export class JSONSchemaGenerator {
                             else if (regexes.length > 1) {
                                 result.schema.allOf = [
                                     ...regexes.map((regex) => ({
-                                        ...(this.target === "draft-7" ? { type: "string" } : {}),
+                                        ...(this.target === "draft-7" || this.target === "draft-4" || this.target === "openapi-3.0"
+                                            ? { type: "string" }
+                                            : {}),
                                         pattern: regex.source,
                                     })),
                                 ];
@@ -94,22 +96,36 @@ export class JSONSchemaGenerator {
                             json.type = "integer";
                         else
                             json.type = "number";
-                        if (typeof exclusiveMinimum === "number")
-                            json.exclusiveMinimum = exclusiveMinimum;
+                        if (typeof exclusiveMinimum === "number") {
+                            if (this.target === "draft-4" || this.target === "openapi-3.0") {
+                                json.minimum = exclusiveMinimum;
+                                json.exclusiveMinimum = true;
+                            }
+                            else {
+                                json.exclusiveMinimum = exclusiveMinimum;
+                            }
+                        }
                         if (typeof minimum === "number") {
                             json.minimum = minimum;
-                            if (typeof exclusiveMinimum === "number") {
+                            if (typeof exclusiveMinimum === "number" && this.target !== "draft-4") {
                                 if (exclusiveMinimum >= minimum)
                                     delete json.minimum;
                                 else
                                     delete json.exclusiveMinimum;
                             }
                         }
-                        if (typeof exclusiveMaximum === "number")
-                            json.exclusiveMaximum = exclusiveMaximum;
+                        if (typeof exclusiveMaximum === "number") {
+                            if (this.target === "draft-4" || this.target === "openapi-3.0") {
+                                json.maximum = exclusiveMaximum;
+                                json.exclusiveMaximum = true;
+                            }
+                            else {
+                                json.exclusiveMaximum = exclusiveMaximum;
+                            }
+                        }
                         if (typeof maximum === "number") {
                             json.maximum = maximum;
-                            if (typeof exclusiveMaximum === "number") {
+                            if (typeof exclusiveMaximum === "number" && this.target !== "draft-4") {
                                 if (exclusiveMaximum <= maximum)
                                     delete json.maximum;
                                 else
@@ -138,7 +154,13 @@ export class JSONSchemaGenerator {
                         break;
                     }
                     case "null": {
-                        _json.type = "null";
+                        if (this.target === "openapi-3.0") {
+                            _json.type = "string";
+                            _json.nullable = true;
+                            _json.enum = [null];
+                        }
+                        else
+                            _json.type = "null";
                         break;
                     }
                     case "any": {
@@ -226,10 +248,11 @@ export class JSONSchemaGenerator {
                     }
                     case "union": {
                         const json = _json;
-                        json.anyOf = def.options.map((x, i) => this.process(x, {
+                        const options = def.options.map((x, i) => this.process(x, {
                             ...params,
                             path: [...params.path, "anyOf", i],
                         }));
+                        json.anyOf = options;
                         break;
                     }
                     case "intersection": {
@@ -253,32 +276,42 @@ export class JSONSchemaGenerator {
                     case "tuple": {
                         const json = _json;
                         json.type = "array";
-                        const prefixItems = def.items.map((x, i) => this.process(x, { ...params, path: [...params.path, "prefixItems", i] }));
+                        const prefixPath = this.target === "draft-2020-12" ? "prefixItems" : "items";
+                        const restPath = this.target === "draft-2020-12" ? "items" : this.target === "openapi-3.0" ? "items" : "additionalItems";
+                        const prefixItems = def.items.map((x, i) => this.process(x, {
+                            ...params,
+                            path: [...params.path, prefixPath, i],
+                        }));
+                        const rest = def.rest
+                            ? this.process(def.rest, {
+                                ...params,
+                                path: [...params.path, restPath, ...(this.target === "openapi-3.0" ? [def.items.length] : [])],
+                            })
+                            : null;
                         if (this.target === "draft-2020-12") {
                             json.prefixItems = prefixItems;
+                            if (rest) {
+                                json.items = rest;
+                            }
+                        }
+                        else if (this.target === "openapi-3.0") {
+                            json.items = {
+                                anyOf: prefixItems,
+                            };
+                            if (rest) {
+                                json.items.anyOf.push(rest);
+                            }
+                            json.minItems = prefixItems.length;
+                            if (!rest) {
+                                json.maxItems = prefixItems.length;
+                            }
                         }
                         else {
                             json.items = prefixItems;
-                        }
-                        if (def.rest) {
-                            const rest = this.process(def.rest, {
-                                ...params,
-                                path: [...params.path, "items"],
-                            });
-                            if (this.target === "draft-2020-12") {
-                                json.items = rest;
-                            }
-                            else {
+                            if (rest) {
                                 json.additionalItems = rest;
                             }
                         }
-                        // additionalItems
-                        if (def.rest) {
-                            json.items = this.process(def.rest, {
-                                ...params,
-                                path: [...params.path, "items"],
-                            });
-                        }
                         // length
                         const { minimum, maximum } = schema._zod.bag;
                         if (typeof minimum === "number")
@@ -290,7 +323,12 @@ export class JSONSchemaGenerator {
                     case "record": {
                         const json = _json;
                         json.type = "object";
-                        json.propertyNames = this.process(def.keyType, { ...params, path: [...params.path, "propertyNames"] });
+                        if (this.target === "draft-7" || this.target === "draft-2020-12") {
+                            json.propertyNames = this.process(def.keyType, {
+                                ...params,
+                                path: [...params.path, "propertyNames"],
+                            });
+                        }
                         json.additionalProperties = this.process(def.valueType, {
                             ...params,
                             path: [...params.path, "additionalProperties"],
@@ -350,7 +388,12 @@ export class JSONSchemaGenerator {
                         else if (vals.length === 1) {
                             const val = vals[0];
                             json.type = val === null ? "null" : typeof val;
-                            json.const = val;
+                            if (this.target === "draft-4" || this.target === "openapi-3.0") {
+                                json.enum = [val];
+                            }
+                            else {
+                                json.const = val;
+                            }
                         }
                         else {
                             if (vals.every((v) => typeof v === "number"))
@@ -405,7 +448,13 @@ export class JSONSchemaGenerator {
                     }
                     case "nullable": {
                         const inner = this.process(def.innerType, params);
-                        _json.anyOf = [inner, { type: "null" }];
+                        if (this.target === "openapi-3.0") {
+                            result.ref = def.innerType;
+                            _json.nullable = true;
+                        }
+                        else {
+                            _json.anyOf = [inner, { type: "null" }];
+                        }
                         break;
                     }
                     case "nonoptional": {
@@ -495,6 +544,12 @@ export class JSONSchemaGenerator {
                         }
                         break;
                     }
+                    case "function": {
+                        if (this.unrepresentable === "throw") {
+                            throw new Error("Function types cannot be represented in JSON Schema");
+                        }
+                        break;
+                    }
                     default: {
                         def;
                     }
@@ -646,7 +701,8 @@ export class JSONSchemaGenerator {
                 flattenRef(ref, params);
                 // merge referenced schema into current
                 const refSchema = this.seen.get(ref).schema;
-                if (refSchema.$ref && params.target === "draft-7") {
+                if (refSchema.$ref &&
+                    (params.target === "draft-7" || params.target === "draft-4" || params.target === "openapi-3.0")) {
                     schema.allOf = schema.allOf ?? [];
                     schema.allOf.push(refSchema);
                 }
@@ -673,7 +729,14 @@ export class JSONSchemaGenerator {
         else if (this.target === "draft-7") {
             result.$schema = "http://json-schema.org/draft-07/schema#";
         }
+        else if (this.target === "draft-4") {
+            result.$schema = "http://json-schema.org/draft-04/schema#";
+        }
+        else if (this.target === "openapi-3.0") {
+            // OpenAPI 3.0 schema objects should not include a $schema property
+        }
         else {
+            // @ts-ignore
             console.warn(`Invalid target: ${this.target}`);
         }
         if (params.external?.uri) {
@@ -842,6 +905,9 @@ function isTransforming(_schema, _ctx) {
         case "catch": {
             return false;
         }
+        case "function": {
+            return false;
+        }
         default:
             def;
     }