zod-to-x 1.4.2 → 1.4.3

package/dist/core/ast_node.d.ts

@@ -44,9 +44,13 @@ export declare class Zod2Ast {
     private _getTranspilerableFile;
     /**
      * Transpilerable items are treated as references in the AST
-     * @param ref
-     * @param refType
-     * @param discriminantValue
+     * @param ref - Output type name
+     * @param refType - Type of the output type
+     * @param discriminantValue - Discriminant value (for ZodDiscriminatedUnion)
+     * @param parentNamespace - For Layered modeling, the namespace of the parent type if does not
+     *                          belong to the same file.
+     * @param parentFile - For Layered modeling, the file of the parent type if does not belong to
+     *                      the same file.
      * @returns
      */
     private _createDefinition;

package/dist/core/ast_node.js

@@ -27,17 +27,38 @@ class Zod2Ast {
      */
     _getTranspilerableFile(itemName, metadata) {
         var _a;
-        const layer = (_a = metadata === null || metadata === void 0 ? void 0 : metadata.parentLayer) !== null && _a !== void 0 ? _a : metadata === null || metadata === void 0 ? void 0 : metadata.layer;
-        if (this.opt.layer && layer) {
-            if (this.opt.layer.index < layer.index) {
-                throw new errors_1.BadLayerDefinitionError(`${itemName}: Layer with number ${this.opt.layer.index} can only use models` +
-                    `from the same or lower layer. Found layer with number ${layer.index}`);
+        let layer;
+        if (this.opt.layer !== undefined && (metadata === null || metadata === void 0 ? void 0 : metadata.layer) !== undefined) {
+            if (metadata.layer.file === this.opt.layer.file) {
+                // Case 1: Only layer exists and belongs to the same file
+                // Case 2: Layer (belongs to same file) and parentLayer exist
+                // Behaviour: New type is created extending the parent layer (if any)
+                layer = (_a = metadata.parentLayer) !== null && _a !== void 0 ? _a : metadata.layer;
+                if (this.opt.layer.index < layer.index) {
+                    throw new errors_1.BadLayerDefinitionError(`${itemName}: Layer with number ${this.opt.layer.index} can only use models` +
+                        `from the same or lower layer. Found layer with number ${layer.index}`);
+                }
+                if (this.opt.layer.file !== layer.file) {
+                    return {
+                        parentFile: layer.file,
+                        parentNamespace: layer.namespace,
+                        parentTypeName: metadata === null || metadata === void 0 ? void 0 : metadata.parentTypeName,
+                    };
+                }
             }
-            if (this.opt.layer.file !== layer.file) {
+            else {
+                // Case 3: Only layer exists and belongs to a different file
+                // Case 4: Layer (belongs to different file) and parentLayer exist
+                // Behaviour: Type is imported from Layer file
+                layer = metadata.layer;
+                if (this.opt.layer.index < layer.index) {
+                    throw new errors_1.BadLayerDefinitionError(`${itemName}: Layer with number ${this.opt.layer.index} can only use models` +
+                        `from the same or lower layer. Found layer with number ${layer.index}`);
+                }
                 return {
                     parentFile: layer.file,
                     parentNamespace: layer.namespace,
-                    parentTypeName: metadata === null || metadata === void 0 ? void 0 : metadata.parentTypeName,
+                    parentTypeName: undefined,
                 };
             }
         }
@@ -45,18 +66,23 @@ class Zod2Ast {
     }
     /**
      * Transpilerable items are treated as references in the AST
-     * @param ref
-     * @param refType
-     * @param discriminantValue
+     * @param ref - Output type name
+     * @param refType - Type of the output type
+     * @param discriminantValue - Discriminant value (for ZodDiscriminatedUnion)
+     * @param parentNamespace - For Layered modeling, the namespace of the parent type if does not
+     *                          belong to the same file.
+     * @param parentFile - For Layered modeling, the file of the parent type if does not belong to
+     *                      the same file.
      * @returns
      */
-    _createDefinition(ref, refType, discriminantValue, parentNamespace) {
+    _createDefinition(ref, refType, discriminantValue, parentNamespace, parentFile) {
         return {
             type: "definition",
             reference: ref,
             referenceType: refType,
             discriminantValue,
             parentNamespace,
+            parentFile,
         };
     }
     /**
@@ -170,7 +196,7 @@ class Zod2Ast {
         if (!this.nodes.has(name)) {
             this.nodes.set(name, item);
         }
-        return this._createDefinition(name, zodTypeName, undefined, parentNamespace);
+        return this._createDefinition(name, zodTypeName, undefined, parentNamespace, parentFile);
     }
     _getObjectAst(schema, opt) {
         const { name, zodTypeName, parentFile, parentNamespace, parentTypeName } = this._getNames(schema, "ZodObject type must have a typeName. Use zod2x method to provide one.");
@@ -205,7 +231,7 @@ class Zod2Ast {
                 }
             }
         }
-        return this._createDefinition(name, zodTypeName, discriminantValue, parentTypeName ? undefined : parentNamespace);
+        return this._createDefinition(name, zodTypeName, discriminantValue, parentTypeName ? undefined : parentNamespace, parentTypeName ? undefined : parentFile);
     }
     _getUnionAst(schema) {
         const def = schema._def;
@@ -241,7 +267,7 @@ class Zod2Ast {
         if (name && !this.nodes.has(name)) {
             this.nodes.set(name, item);
         }
-        return this._createDefinition(name, zodTypeName, undefined, parentTypeName ? undefined : parentNamespace);
+        return this._createDefinition(name, zodTypeName, undefined, parentTypeName ? undefined : parentNamespace, parentTypeName ? undefined : parentFile);
     }
     _getIntersectionAst(schema) {
         const def = schema._def;
@@ -274,7 +300,7 @@ class Zod2Ast {
         if (name && !this.nodes.has(name)) {
             this.nodes.set(name, item);
         }
-        return this._createDefinition(name, zodTypeName, undefined, parentTypeName ? undefined : parentNamespace);
+        return this._createDefinition(name, zodTypeName, undefined, parentTypeName ? undefined : parentNamespace, parentTypeName ? undefined : parentFile);
     }
     /**
      * Build the AST node of provided Zod Schema

package/dist/core/ast_types.d.ts

@@ -116,12 +116,7 @@ export type ASTDefintion = ASTCommon & {
     reference: string;
     referenceType: ZodFirstPartyTypeKind;
     discriminantValue?: string;
-    /**
-     * Namespace where the transpilerable model is defined. Used to use import statements in the
-     * transpiled code.
-     */
-    parentNamespace?: string;
-};
+} & Omit<ASTLayerMetadata, "parentTypeName">;
 /**
  * Represents a general AST node, encompassing various Zod schema types.
  */

package/dist/core/transpiler.d.ts

@@ -187,6 +187,14 @@ export declare abstract class Zod2X<T extends IZodToXOpt> {
      * @returns A string representing the type in the target language.
      */
     protected getAttributeType(token: ASTNode | TranspilerableTypes): string;
+    /**
+     * Determines whether a given type is an external type import.
+     *
+     * @param item - An object containing the `parentFile` and `parentNamespace`
+     *               properties of the type to evaluate.
+     * @returns `true` if the type is an external type import; otherwise, `false`.
+     */
+    protected isExternalTypeImport(item: Pick<TranspilerableTypes, "parentFile" | "parentNamespace">): boolean;
     /**
      * Adds an external type import to the transpiler's imports if the provided transpiled item
      * is located into another file and namespace, and if the `useImports` option is not disabled.
@@ -195,7 +203,7 @@ export declare abstract class Zod2X<T extends IZodToXOpt> {
      *                  about the type to be imported, including its parent file and namespace.
      * @returns `true` if the import was successfully added, otherwise `false`.
      */
-    protected addExternalTypeImport(item: TranspilerableTypes): boolean;
+    protected addExternalTypeImport(item: Pick<TranspilerableTypes, "parentFile" | "parentNamespace">): boolean;
     /**
      * Transpiles a single item from the transpiler queue.
      * @param item - The transpilerable type to transpile.

package/dist/core/transpiler.js

@@ -55,10 +55,16 @@ class Zod2X {
             varType = token.name;
         }
         else if (token.type === "definition") {
-            varType =
-                this.opt.useImports === true && token.parentNamespace
-                    ? this.getTypeFromExternalNamespace(token.parentNamespace, token.reference)
-                    : token.reference;
+            if (this.opt.useImports === true && token.parentNamespace) {
+                varType = this.getTypeFromExternalNamespace(token.parentNamespace, token.reference);
+                this.addExternalTypeImport({
+                    parentNamespace: token.parentNamespace,
+                    parentFile: token.parentFile,
+                });
+            }
+            else {
+                varType = token.reference;
+            }
         }
         else if (token.type === zod_1.ZodFirstPartyTypeKind.ZodString) {
             varType = this.getStringType();
@@ -106,6 +112,18 @@ class Zod2X {
         }
         return token.arrayDimension ? this.getArrayType(varType, token.arrayDimension) : varType;
     }
+    /**
+     * Determines whether a given type is an external type import.
+     *
+     * @param item - An object containing the `parentFile` and `parentNamespace`
+     *               properties of the type to evaluate.
+     * @returns `true` if the type is an external type import; otherwise, `false`.
+     */
+    isExternalTypeImport(item) {
+        return (item.parentFile !== undefined &&
+            item.parentNamespace !== undefined &&
+            this.opt.useImports !== false);
+    }
     /**
      * Adds an external type import to the transpiler's imports if the provided transpiled item
      * is located into another file and namespace, and if the `useImports` option is not disabled.
@@ -115,7 +133,7 @@ class Zod2X {
      * @returns `true` if the import was successfully added, otherwise `false`.
      */
     addExternalTypeImport(item) {
-        if (item.parentFile && item.parentNamespace && this.opt.useImports !== false) {
+        if (this.isExternalTypeImport(item)) {
             this.imports.add(this.addImportFromFile(item.parentFile, item.parentNamespace));
             return true;
         }

package/dist/transpilers/cpp/runner.js

@@ -166,7 +166,7 @@ class Zod2Cpp extends core_1.Zod2X {
      *  }
      */
     transpileEnum(data) {
-        if (this.addExternalTypeImport(data)) {
+        if (this.isExternalTypeImport(data)) {
             return;
         }
         this.addComment(data.description);
@@ -196,7 +196,7 @@ class Zod2Cpp extends core_1.Zod2X {
      *  }
      */
     transpileIntersection(data) {
-        if (this.addExternalTypeImport(data)) {
+        if (this.isExternalTypeImport(data)) {
             if (data.parentTypeName) {
                 this.addExtendedType(data.name, data.parentNamespace, data.parentTypeName);
             }
@@ -232,7 +232,7 @@ class Zod2Cpp extends core_1.Zod2X {
     }
     /** Ex: using TypeC = boost::variant<TypeA, TypeB> */
     transpileUnion(data) {
-        if (this.addExternalTypeImport(data)) {
+        if (this.isExternalTypeImport(data)) {
             if (data.parentTypeName) {
                 this.addExtendedType(data.name, data.parentNamespace, data.parentTypeName, true);
             }
@@ -251,7 +251,7 @@ class Zod2Cpp extends core_1.Zod2X {
         this._createUnionDeserializer(data.name, attributesData, data.discriminantKey);
     }
     transpileStruct(data) {
-        if (this.addExternalTypeImport(data)) {
+        if (this.isExternalTypeImport(data)) {
             if (data.parentTypeName) {
                 this.addExtendedType(data.name, data.parentNamespace, data.parentTypeName);
             }

package/dist/transpilers/typescript/runner.js

@@ -91,7 +91,7 @@ class Zod2Ts extends core_1.Zod2X {
      *  }
      */
     transpileEnum(data) {
-        if (this.addExternalTypeImport(data)) {
+        if (this.isExternalTypeImport(data)) {
             return;
         }
         this.addComment(data.description);
@@ -123,7 +123,7 @@ class Zod2Ts extends core_1.Zod2X {
      * */
     transpileIntersection(data) {
         var _a;
-        if (this.addExternalTypeImport(data)) {
+        if (this.isExternalTypeImport(data)) {
             if (data.parentTypeName) {
                 this.addExtendedType(data.name, data.parentNamespace, data.parentTypeName);
             }
@@ -140,7 +140,7 @@ class Zod2Ts extends core_1.Zod2X {
         }
     }
     transpileStruct(data) {
-        if (this.addExternalTypeImport(data)) {
+        if (this.isExternalTypeImport(data)) {
             if (data.parentTypeName) {
                 this.addExtendedType(data.name, data.parentNamespace, data.parentTypeName);
             }
@@ -171,7 +171,7 @@ class Zod2Ts extends core_1.Zod2X {
      * */
     transpileUnion(data) {
         var _a;
-        if (this.addExternalTypeImport(data)) {
+        if (this.isExternalTypeImport(data)) {
             if (data.parentTypeName) {
                 this.addExtendedType(data.name, data.parentNamespace, data.parentTypeName, {
                     isUnion: data.type === zod_1.ZodFirstPartyTypeKind.ZodUnion,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zod-to-x",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "description": "Multi language types generation from Zod schemas.",
   "main": "dist/index.js",
   "files": [