zod-to-x 2.2.1-dev.0 → 2.4.0

package/dist/transpilers/typescript/runner.js

@@ -37,28 +37,29 @@ class Zod2Ts extends core_1.Zod2X {
         return `${namespace}.${typeName}`;
     }
     addExtendedType(name, parentNamespace, aliasOf, opt) {
-        var _a;
+        var _a, _b;
         const extendedType = (opt === null || opt === void 0 ? void 0 : opt.isInternal)
             ? aliasOf
             : this.getTypeFromExternalNamespace(parentNamespace, aliasOf);
         const templates = (_a = opt === null || opt === void 0 ? void 0 : opt.templates) !== null && _a !== void 0 ? _a : "";
+        const declaredName = `${name}${(_b = opt === null || opt === void 0 ? void 0 : opt.declaredTemplates) !== null && _b !== void 0 ? _b : ""}`;
         if ((opt === null || opt === void 0 ? void 0 : opt.type) === "alias") {
-            this.push0(`export type ${name} = ${extendedType}${templates};\n`);
+            this.push0(`export type ${declaredName} = ${extendedType}${templates};\n`);
         }
         else if (this.opt.outType === "class") {
             if ((opt === null || opt === void 0 ? void 0 : opt.type) === "d-union") {
-                this.push0(`export type ${name} = ${extendedType}${templates};\n`);
+                this.push0(`export type ${declaredName} = ${extendedType}${templates};\n`);
             }
             else {
-                this.push0(`export class ${name} extends ${extendedType}${templates} {}\n`);
+                this.push0(`export class ${declaredName} extends ${extendedType}${templates} {}\n`);
             }
         }
         else {
             if ((opt === null || opt === void 0 ? void 0 : opt.type) === "union" || (opt === null || opt === void 0 ? void 0 : opt.type) === "d-union") {
-                this.push0(`export type ${name} = ${extendedType}${templates};\n`);
+                this.push0(`export type ${declaredName} = ${extendedType}${templates};\n`);
             }
             else {
-                this.push0(`export interface ${name} extends ${extendedType}${templates} {}\n`);
+                this.push0(`export interface ${declaredName} extends ${extendedType}${templates} {}\n`);
             }
         }
     }
@@ -80,12 +81,24 @@ class Zod2Ts extends core_1.Zod2X {
                 ">");
         }
     }
+    /**
+     * Emits an alias/extension declaration early when a node references another layered type.
+     * It preserves concrete template translations and falls back to declared templates (e.g. <T>)
+     * for aliases of generic templates.
+     */
     checkExtendedTypeInclusion(data, type) {
+        const declaredTemplatesFallback = data instanceof core_1.ASTObject && data.templates.size > 0
+            ? `<${[...data.templates].join(", ")}>`
+            : undefined;
+        const translatedTemplates = this.getGenericTemplatesTranslation(data);
+        const templates = translatedTemplates || declaredTemplatesFallback;
+        const declaredTemplates = translatedTemplates ? undefined : declaredTemplatesFallback;
         if (this.isExternalTypeImport(data)) {
             if (data.aliasOf) {
                 this.addExtendedType(data.name, data.parentNamespace, data.aliasOf, {
                     type,
-                    templates: this.getGenericTemplatesTranslation(data),
+                    templates,
+                    declaredTemplates,
                 });
                 this.addExternalTypeImport(data);
             }
@@ -95,7 +108,8 @@ class Zod2Ts extends core_1.Zod2X {
             this.addExtendedType(data.name, data.parentNamespace, data.aliasOf, {
                 type,
                 isInternal: true,
-                templates: this.getGenericTemplatesTranslation(data),
+                templates,
+                declaredTemplates,
             });
             return true;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zod-to-x",
-  "version": "2.2.1-dev.0",
+  "version": "2.4.0",
   "description": "Multi language types generation from Zod schemas.",
   "main": "dist/index.js",
   "files": [
@@ -11,10 +11,13 @@
     "build": "npm run clear_dist && tsc && tsc-alias",
     "build:debug": "npm run clear_dist && tsc --project tsconfig.dev.json && tsc-alias",
     "format:check": "prettier --check .",
+    "swap": "npm install && npm run build",
     "test": "find ./test -name \"err-*\" -delete && vitest --run",
     "test:cpp": "bash ./test/test_zod2cpp/test_cpp.sh",
     "test:py": "bash ./test/test_zod2py/test_py.sh",
-    "test:all": "npm run test:cpp && npm run test:py",
+    "test:go": "bash ./test/test_zod2go/test_go.sh",
+    "test:dart": "bash ./test/test_zod2dart/test_dart.sh",
+    "test:all": "npm run test:cpp && npm run test:py && npm run test:go && npm run test:dart",
     "ts-run": "ts-node -r tsconfig-paths/register",
     "prepare": "husky"
   },
@@ -29,7 +32,7 @@
     "type",
     "generator",
     "zod-to-cpp",
-    "zpd-to-c++",
+    "zod-to-c++",
     "zod-to-ts",
     "zod-to-typescript",
     "typescript",
@@ -59,7 +62,7 @@
     "husky": "^9.1.7",
     "lint-staged": "^15.2.11",
     "prettier": "^3.4.2",
-    "protobufjs": "7.4.0",
+    "protobufjs": "7.6.5",
     "ts-node": "^10.9.2",
     "tsc-alias": "^1.8.10",
     "tsconfig-paths": "4.2.0",