zod-to-x 2.0.0 → 2.0.1-dev.4

package/README.md

@@ -60,7 +60,7 @@ Automate the transpilation of data models to save time, reduce errors, and let y
 ```bash
 npm install zod-to-x zod
 ```
-(*) [`zod@3.25.0`](https://www.npmjs.com/package/zod/v/3.25.0) version or greather is required.
+(*) [`zod@3.25.28`](https://www.npmjs.com/package/zod/v/3.25.0) version or greather is required.
 
 ### 2) Extend Zod using the `extendZod` method after the first [`@zod`](https://github.com/colinhacks/zod) import:
 ```ts

package/dist/core/ast_node.js

@@ -58,6 +58,11 @@ class Zod2Ast {
                         aliasOf: metadata === null || metadata === void 0 ? void 0 : metadata.aliasOf,
                     };
                 }
+                else {
+                    return {
+                        aliasOf: metadata === null || metadata === void 0 ? void 0 : metadata.aliasOf,
+                    };
+                }
             }
             else {
                 // Case 3: Only layer exists and belongs to a different file

package/dist/layered-modeling/layer.js

@@ -81,7 +81,6 @@ function Layer(opt) {
                             zodItem["_zod2x"] = metadata;
                         }
                         else if (!metadata.typeName) {
-                            // Only possible if `zod2xExtendable` is used.
                             metadata.typeName = name;
                         }
                         if (metadata.layer === undefined) {
@@ -89,8 +88,9 @@ function Layer(opt) {
                             // zod2x was used before.
                             metadata.layer = opt;
                         }
-                        if (opt.externalInheritance !== false && metadata.layer.file !== opt.file) {
-                            // Type used from another layer. A new type is created inheriting the
+                        if (opt.externalInheritance !== false &&
+                            (metadata.layer.file !== opt.file || name !== metadata.typeName)) {
+                            // Using an existing type. A new type is created that inherits from the
                             // original type.
                             zodItem = zod_helpers_1.ZodHelpers.cloneZod(zodItem);
                             zodItem._zod2x = {

package/dist/lib/zod_ext.d.ts

@@ -84,9 +84,8 @@ export interface IZod2xMetadata {
     layer?: IZod2xLayerMetadata;
     /**
      * For Layered Modeling.
-     * When a type of another file is used without modifying it, by default it is sustituted by
-     * the import without creating a new type. If wanted. it can be forced to create a new type
-     * which will be the extension of the original type if `zod2xExtendable` is used.
+     * When a type of another file is used without modifying it, it is sustituted by its import
+     * instead of creating a new type.
      */
     aliasOf?: string;
     parentLayer?: IZod2xLayerMetadata;

package/dist/transpilers/cpp/runner.d.ts

@@ -1,4 +1,4 @@
-import { ASTAliasedTypes, ASTEnum, ASTIntersection, ASTObject, ASTUnion, Zod2X } from "../../core";
+import { ASTAliasedTypes, ASTEnum, ASTIntersection, ASTNode, ASTObject, ASTUnion, Zod2X } from "../../core";
 import { IZod2CppOpt } from "./options";
 /**
  * @description Transpiler for Zod schemas to C++11 code.
@@ -25,7 +25,9 @@ export declare class Zod2Cpp extends Zod2X<IZod2CppOpt> {
     protected getTypeFromExternalNamespace(namespace: string, typeName: string): string;
     protected addExtendedType(name: string, parentNamespace: string, aliasOf: string, opt?: {
         type?: "union" | "alias";
+        isInternal?: boolean;
     }): void;
+    protected checkExtendedTypeInclusion(data: ASTNode, type?: "union" | "alias"): boolean;
     protected runAfter(): void;
     protected getComment: (data: string, indent?: string) => string;
     protected getDateType: () => string;

package/dist/transpilers/cpp/runner.js

@@ -44,7 +44,8 @@ class Zod2Cpp extends core_1.Zod2X {
         /** Ex: boost::variant<TypeA, TypeB> */
         this.getUnionType = (itemsType) => {
             this.imports.add(this.lib.variant);
-            return `boost::variant<${itemsType.join(", ")}>`;
+            const unionLines = itemsType.map((type) => `${this.indent[2]}${type}`).join(",\n");
+            return `boost::variant<\n${unionLines}\n${this.indent[1]}>`;
         };
         /** Ex: depends on number range (if any). One of:
          *  - std::uint32_t
@@ -94,7 +95,9 @@ class Zod2Cpp extends core_1.Zod2X {
         return `${namespace}::${typeName}`;
     }
     addExtendedType(name, parentNamespace, aliasOf, opt) {
-        const extendedType = this.getTypeFromExternalNamespace(parentNamespace, aliasOf);
+        const extendedType = (opt === null || opt === void 0 ? void 0 : opt.isInternal)
+            ? aliasOf
+            : this.getTypeFromExternalNamespace(parentNamespace, aliasOf);
         if ((opt === null || opt === void 0 ? void 0 : opt.type) === "union" || (opt === null || opt === void 0 ? void 0 : opt.type) === "alias") {
             this.push0(`using ${name} = ${extendedType};\n`);
         }
@@ -107,6 +110,25 @@ class Zod2Cpp extends core_1.Zod2X {
             }
         }
     }
+    checkExtendedTypeInclusion(data, type) {
+        if (this.isExternalTypeImport(data)) {
+            if (data.aliasOf) {
+                this.addExtendedType(data.name, data.parentNamespace, data.aliasOf, {
+                    type,
+                });
+                this.addExternalTypeImport(data);
+            }
+            return true;
+        }
+        else if (data.aliasOf) {
+            this.addExtendedType(data.name, data.parentNamespace, data.aliasOf, {
+                type,
+                isInternal: true,
+            });
+            return true;
+        }
+        return false;
+    }
     runAfter() {
         this.preImports.add("#pragma once");
         // Add the output inside the namespace
@@ -159,12 +181,7 @@ class Zod2Cpp extends core_1.Zod2X {
         return `boost::optional<${type}>`;
     }
     transpileAliasedType(data) {
-        if (this.isExternalTypeImport(data)) {
-            if (data.aliasOf) {
-                this.addExtendedType(data.name, data.parentNamespace, data.aliasOf, {
-                    type: "alias",
-                });
-            }
+        if (this.checkExtendedTypeInclusion(data, "alias")) {
             return;
         }
         let extendedType = undefined;
@@ -185,12 +202,7 @@ class Zod2Cpp extends core_1.Zod2X {
      *  }
      */
     transpileEnum(data) {
-        if (this.isExternalTypeImport(data)) {
-            if (data.aliasOf) {
-                this.addExtendedType(data.name, data.parentNamespace, data.aliasOf, {
-                    type: "alias",
-                });
-            }
+        if (this.checkExtendedTypeInclusion(data, "alias")) {
             return;
         }
         this.addComment(data.description);
@@ -220,10 +232,7 @@ class Zod2Cpp extends core_1.Zod2X {
      *  }
      */
     transpileIntersection(data) {
-        if (this.isExternalTypeImport(data)) {
-            if (data.aliasOf) {
-                this.addExtendedType(data.name, data.parentNamespace, data.aliasOf);
-            }
+        if (this.checkExtendedTypeInclusion(data)) {
             return;
         }
         console.warn(`${data.name}: use zod's merge instead of intersection whenever possible.`);
@@ -253,12 +262,7 @@ class Zod2Cpp extends core_1.Zod2X {
     }
     /** Ex: using TypeC = boost::variant<TypeA, TypeB> */
     transpileUnion(data) {
-        if (this.isExternalTypeImport(data)) {
-            if (data.aliasOf) {
-                this.addExtendedType(data.name, data.parentNamespace, data.aliasOf, {
-                    type: "union",
-                });
-            }
+        if (this.checkExtendedTypeInclusion(data, "union")) {
             return;
         }
         this.addComment(data.description);
@@ -275,10 +279,7 @@ class Zod2Cpp extends core_1.Zod2X {
         this._createUnionDeserializer(data.name, attributesData, data.discriminantKey);
     }
     transpileStruct(data) {
-        if (this.isExternalTypeImport(data)) {
-            if (data.aliasOf) {
-                this.addExtendedType(data.name, data.parentNamespace, data.aliasOf);
-            }
+        if (this.checkExtendedTypeInclusion(data)) {
             return;
         }
         this.addComment(data.description);
@@ -730,7 +731,8 @@ class Zod2Cpp17 extends Zod2Cpp {
         /** Ex: std::variant<TypeA, TypeB> */
         this.getUnionType = (itemsType) => {
             this.imports.add(this.lib.variant);
-            return `std::variant<${itemsType.join(", ")}>`;
+            const unionLines = itemsType.map((type) => `${this.indent[2]}${type}`).join(",\n");
+            return `std::variant<\n${unionLines}\n${this.indent[1]}>`;
         };
         this.useBoost = false;
         this.lib = (0, libs_1.getLibs)(this.useBoost);

package/dist/transpilers/typescript/runner.d.ts

@@ -1,4 +1,4 @@
-import { ASTAliasedTypes, ASTEnum, ASTIntersection, ASTObject, ASTUnion, Zod2X } from "../../core";
+import { ASTAliasedTypes, ASTEnum, ASTIntersection, ASTNode, ASTObject, ASTUnion, Zod2X } from "../../core";
 import { IZod2TsOpt } from "./options";
 export declare class Zod2Ts extends Zod2X<IZod2TsOpt> {
     constructor(opt?: IZod2TsOpt);
@@ -8,7 +8,9 @@ export declare class Zod2Ts extends Zod2X<IZod2TsOpt> {
     protected getTypeFromExternalNamespace(namespace: string, typeName: string): string;
     protected addExtendedType(name: string, parentNamespace: string, aliasOf: string, opt?: {
         type?: "union" | "d-union" | "alias";
+        isInternal?: boolean;
     }): void;
+    protected checkExtendedTypeInclusion(data: ASTNode, type?: "alias" | "union" | "d-union"): boolean;
     protected getComment: (data: string, indent?: string) => string;
     protected getAnyType: () => string;
     protected getBooleanType: () => string;

package/dist/transpilers/typescript/runner.js

@@ -20,7 +20,7 @@ class Zod2Ts extends core_1.Zod2X {
         /** Ex: [TypeA, TypeB] */
         this.getTupleType = (itemsType) => `[${itemsType.join(", ")}]`;
         /** Ex: TypeA | TypeB */
-        this.getUnionType = (itemsType) => itemsType.join(" | ");
+        this.getUnionType = (itemsType) => itemsType.map((type) => `${this.indent[1]}| ${type}`).join("\n");
         /** Ex: TypeA & TypeB */
         this.getIntersectionType = (itemsType) => itemsType.join(" & ");
         this.getNumberType = () => "number";
@@ -37,7 +37,9 @@ class Zod2Ts extends core_1.Zod2X {
         return `${namespace}.${typeName}`;
     }
     addExtendedType(name, parentNamespace, aliasOf, opt) {
-        const extendedType = this.getTypeFromExternalNamespace(parentNamespace, aliasOf);
+        const extendedType = (opt === null || opt === void 0 ? void 0 : opt.isInternal)
+            ? aliasOf
+            : this.getTypeFromExternalNamespace(parentNamespace, aliasOf);
         if ((opt === null || opt === void 0 ? void 0 : opt.type) === "alias") {
             this.push0(`export type ${name} = ${extendedType};\n`);
         }
@@ -58,6 +60,25 @@ class Zod2Ts extends core_1.Zod2X {
             }
         }
     }
+    checkExtendedTypeInclusion(data, type) {
+        if (this.isExternalTypeImport(data)) {
+            if (data.aliasOf) {
+                this.addExtendedType(data.name, data.parentNamespace, data.aliasOf, {
+                    type,
+                });
+                this.addExternalTypeImport(data);
+            }
+            return true;
+        }
+        else if (data.aliasOf) {
+            this.addExtendedType(data.name, data.parentNamespace, data.aliasOf, {
+                type,
+                isInternal: true,
+            });
+            return true;
+        }
+        return false;
+    }
     /** Ex: Array<Array<TypeA[]>> */
     getArrayType(arrayType, arrayDeep) {
         let output = arrayType.includes("|") || arrayType.includes("&")
@@ -84,12 +105,7 @@ class Zod2Ts extends core_1.Zod2X {
         return `Record<${keyType}, ${valueType}>`;
     }
     transpileAliasedType(data) {
-        if (this.isExternalTypeImport(data)) {
-            if (data.aliasOf) {
-                this.addExtendedType(data.name, data.parentNamespace, data.aliasOf, {
-                    type: "alias",
-                });
-            }
+        if (this.checkExtendedTypeInclusion(data, "alias")) {
             return;
         }
         let extendedType = undefined;
@@ -110,12 +126,7 @@ class Zod2Ts extends core_1.Zod2X {
      *  }
      */
     transpileEnum(data) {
-        if (this.isExternalTypeImport(data)) {
-            if (data.aliasOf) {
-                this.addExtendedType(data.name, data.parentNamespace, data.aliasOf, {
-                    type: "alias",
-                });
-            }
+        if (this.checkExtendedTypeInclusion(data, "alias")) {
             return;
         }
         this.addComment(data.description);
@@ -147,10 +158,7 @@ class Zod2Ts extends core_1.Zod2X {
      * */
     transpileIntersection(data) {
         var _a;
-        if (this.isExternalTypeImport(data)) {
-            if (data.aliasOf) {
-                this.addExtendedType(data.name, data.parentNamespace, data.aliasOf);
-            }
+        if (this.checkExtendedTypeInclusion(data)) {
             return;
         }
         if (this.opt.outType === "class" && data.newObject) {
@@ -164,10 +172,7 @@ class Zod2Ts extends core_1.Zod2X {
         }
     }
     transpileStruct(data) {
-        if (this.isExternalTypeImport(data)) {
-            if (data.aliasOf) {
-                this.addExtendedType(data.name, data.parentNamespace, data.aliasOf);
-            }
+        if (this.checkExtendedTypeInclusion(data)) {
             return;
         }
         this.addComment(data.description);
@@ -195,12 +200,7 @@ class Zod2Ts extends core_1.Zod2X {
      * */
     transpileUnion(data) {
         var _a;
-        if (this.isExternalTypeImport(data)) {
-            if (data.aliasOf) {
-                this.addExtendedType(data.name, data.parentNamespace, data.aliasOf, {
-                    type: data.discriminantKey === undefined ? "union" : "d-union",
-                });
-            }
+        if (this.checkExtendedTypeInclusion(data, data.discriminantKey === undefined ? "union" : "d-union")) {
             return;
         }
         if (this.opt.outType === "class" && data.newObject) {
@@ -210,7 +210,7 @@ class Zod2Ts extends core_1.Zod2X {
         else {
             this.addComment(data.description);
             const attributesTypes = data.options.map(this.getAttributeType.bind(this));
-            this.push0(`export type ${data.name} = ${this.getUnionType(attributesTypes)};\n`);
+            this.push0(`export type ${data.name} =\n${this.getUnionType(attributesTypes)};\n`);
         }
     }
     /** Ex:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zod-to-x",
-  "version": "2.0.0",
+  "version": "2.0.1-dev.4",
   "description": "Multi language types generation from Zod schemas.",
   "main": "dist/index.js",
   "files": [
@@ -45,7 +45,7 @@
     "*.ts": "prettier --write"
   },
   "peerDependencies": {
-    "zod": ">=3.25.0"
+    "zod": ">=3.25.28"
   },
   "dependencies": {
     "case": "1.6.3"