zod-to-x 2.0.1 → 2.0.2-dev.5

package/dist/converters/protobuf_v3/runner.d.ts

@@ -1,5 +1,5 @@
 import { IZod2AstOpt } from "../../core";
-import { ZodObject } from "../../lib/zod_helpers";
+import { ZodObject, ZodDiscriminatedUnion, ZodUnion } from "../../lib/zod_helpers";
 import { IZod2ProtoV3Opt } from "./options";
 /**
  * Converts a Zod schema into a Protocol Buffers v3 definition.
@@ -16,4 +16,5 @@ import { IZod2ProtoV3Opt } from "./options";
  *                              definition.
  * @returns The Protocol Buffers v3 definition as a string.
  */
-export declare function zod2ProtoV3(schema: ZodObject<any>, opt?: Pick<IZod2AstOpt, "strict"> & Pick<IZod2ProtoV3Opt, "packageName" | "keepKeys" | "header" | "indent" | "includeComments" | "encodeDoubleAsInt">): string;
+export declare function zod2ProtoV3(schema: ZodObject<any> | ZodDiscriminatedUnion | ZodUnion<any>, // TODO: fix any to force only ZodObjects
+opt?: Pick<IZod2AstOpt, "strict"> & Pick<IZod2ProtoV3Opt, "packageName" | "keepKeys" | "header" | "indent" | "includeComments" | "encodeDoubleAsInt">): string;

package/dist/converters/protobuf_v3/runner.js

@@ -160,7 +160,10 @@ class Zod2ProtoV3 extends core_1.Zod2X {
         this.addComment(data.description);
         this.push0(`message ${data.name} {`);
         Object.entries(data.properties).forEach(([key, value], index) => {
-            if (value.description && !this.isTranspilerable(value)) {
+            if (this.opt.includeComments &&
+                value.description &&
+                !value.name &&
+                !this.isTranspilerable(value)) {
                 // Avoid duplicated descriptions for transpiled items.
                 this.addComment(value.description, `\n${this.indent[1]}`);
             }
@@ -243,7 +246,8 @@ class Zod2ProtoV3 extends core_1.Zod2X {
  *                              definition.
  * @returns The Protocol Buffers v3 definition as a string.
  */
-function zod2ProtoV3(schema, opt = {}) {
+function zod2ProtoV3(schema, // TODO: fix any to force only ZodObjects
+opt = {}) {
     const astNode = new core_1.Zod2Ast({ strict: opt.strict }).build(schema);
     return new Zod2ProtoV3(opt).transpile(astNode);
 }

package/dist/core/ast_node.js

@@ -315,7 +315,7 @@ class Zod2Ast {
         var _a, _b, _c;
         const def = schema.def;
         const discriminator = zod_helpers_1.ZodHelpers.isZodDiscriminatedUnion(schema)
-            ? schema.def.discriminator
+            ? schema._zod.def.discriminator
             : undefined;
         const { name, parentFile, parentNamespace, aliasOf } = this._getNames(schema);
         const item = new core_1.ASTUnion({

package/dist/lib/zod_ext.d.ts

@@ -118,7 +118,8 @@ declare module "zod/v4" {
          */
         zod2x<K extends keyof Pick<IZod2xMetadata, "typeName">>(this: ZodObject<Shape, Config>, key: K, value: IZod2xMetadata[K]): this;
     }
-    interface ZodEnum<T extends util.EnumLike = util.EnumLike> extends ZodType {
+    /** @ts-ignore Cast variance */
+    interface ZodEnum<out T extends util.EnumLike = util.EnumLike> extends ZodType<core.$ZodEnumInternals<T>>, core.$ZodEnum<T> {
         /**
          * Creates a new Zod enum with the specified `typeName` metadata property.
          *
@@ -166,7 +167,7 @@ declare module "zod/v4" {
          */
         zod2x<K extends keyof Pick<IZod2xMetadata, "typeName">>(this: ZodDiscriminatedUnion<Options>, key: K, value: IZod2xMetadata[K]): this;
     }
-    interface ZodUnion<T extends readonly core.$ZodType[] = readonly core.$ZodType[]> extends ZodType {
+    interface ZodUnion<T extends readonly core.SomeType[] = readonly core.$ZodType[]> extends ZodType {
         /**
          * Creates a new Zod union with the specified `typeName` metadata property.
          *
@@ -190,7 +191,7 @@ declare module "zod/v4" {
          */
         zod2x<K extends keyof Pick<IZod2xMetadata, "typeName">>(this: ZodUnion<T>, key: K, value: IZod2xMetadata[K]): this;
     }
-    interface ZodIntersection<A extends core.$ZodType = core.$ZodType, B extends core.$ZodType = core.$ZodType> extends ZodType {
+    interface ZodIntersection<A extends core.SomeType = core.$ZodType, B extends core.SomeType = core.$ZodType> extends ZodType {
         /**
          * Creates a new Zod intersection with the specified `typeName` metadata property.
          *
@@ -214,7 +215,7 @@ declare module "zod/v4" {
          */
         zod2x<K extends keyof Pick<IZod2xMetadata, "typeName">>(this: ZodIntersection<A, B>, key: K, value: IZod2xMetadata[K]): this;
     }
-    interface ZodLiteral<T extends util.Primitive = util.Primitive> extends ZodType {
+    interface ZodLiteral<T extends util.Literal = util.Literal> extends ZodType {
         /**
          * Creates a new Zod literal with the specified `parentEnum` metadata property.
          *

package/dist/lib/zod_helpers.d.ts

@@ -1,5 +1,5 @@
 import { z, ZodEnum, ZodNumber, ZodObject, ZodType } from "zod/v4";
-export type { ZodArray, ZodType, ZodIntersection, ZodObject, ZodEnum } from "zod/v4";
+export type { ZodArray, ZodType, ZodIntersection, ZodObject, ZodEnum, ZodDiscriminatedUnion, ZodUnion, } from "zod/v4";
 export type ZodAnyUnionType = z.ZodUnion<any> | z.ZodDiscriminatedUnion<any>;
 type ZodNumberConstraints = {
     min?: number;
@@ -54,7 +54,7 @@ export declare class ZodHelpers {
     static isZodOptional(i: ZodType): i is z.ZodOptional<any>;
     static isZodNullable(i: ZodType): i is z.ZodNullable<any>;
     static isZodDefault(i: ZodType): i is z.ZodDefault<any>;
-    static isZodAnyUnionType(i: ZodType): i is z.ZodUnion<any> | z.ZodDiscriminatedUnion<readonly z.core.$ZodType<unknown, unknown>[]>;
+    static isZodAnyUnionType(i: ZodType): i is z.ZodUnion<any> | z.ZodDiscriminatedUnion<readonly z.core.$ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>[], string>;
     static isZodAnyNumberType(i: ZodType): i is z.ZodNumber | z.ZodBigInt;
     static isZodAnyMapType(i: ZodType): i is z.ZodRecord<any, any> | z.ZodMap<any, any>;
     /**
@@ -72,7 +72,7 @@ export declare class ZodHelpers {
      * @returns
      */
     static isTranspilerableAliasedZodType(zodType: string | ZodType, onlyArray?: boolean): boolean;
-    static cloneZod(i: ZodType): z.ZodType<unknown, unknown>;
+    static cloneZod(i: ZodType): z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>;
     static createZodObject(properties: Map<string, ZodType>): ZodObject<any>;
     static getZodNumberConstraints(i: ZodNumber | z.ZodBigInt): ZodNumberConstraints;
 }

package/dist/lib/zod_helpers.js

@@ -66,14 +66,14 @@ class ZodHelpers {
         return ((_a = i === null || i === void 0 ? void 0 : i.def) === null || _a === void 0 ? void 0 : _a.type) === ZodFirstPartyTypeKind.ZodEnum;
     }
     static isZodUnion(i) {
-        var _a;
+        var _a, _b, _c;
         return (((_a = i === null || i === void 0 ? void 0 : i.def) === null || _a === void 0 ? void 0 : _a.type) === ZodFirstPartyTypeKind.ZodUnion &&
-            i.def.discriminator === undefined);
+            ((_c = (_b = i._zod) === null || _b === void 0 ? void 0 : _b.def) === null || _c === void 0 ? void 0 : _c.discriminator) === undefined);
     }
     static isZodDiscriminatedUnion(i) {
-        var _a;
+        var _a, _b, _c;
         return (((_a = i === null || i === void 0 ? void 0 : i.def) === null || _a === void 0 ? void 0 : _a.type) === ZodFirstPartyTypeKind.ZodUnion &&
-            i.def.discriminator !== undefined);
+            ((_c = (_b = i._zod) === null || _b === void 0 ? void 0 : _b.def) === null || _c === void 0 ? void 0 : _c.discriminator) !== undefined);
     }
     static isZodIntersection(i) {
         var _a;

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

@@ -15,6 +15,3 @@ export declare function getLibs(useBoost: boolean): {
     optional: string;
     variant: string;
 };
-export declare const USING: {
-    nlohmann: string;
-};

package/dist/transpilers/cpp/libs.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.USING = void 0;
 exports.getLibs = getLibs;
 /**
  * @description C++ standard library imports
@@ -23,6 +22,3 @@ function getLibs(useBoost) {
         variant: useBoost ? "#include <boost/variant.hpp>" : "#include <variant>",
     };
 }
-exports.USING = {
-    nlohmann: "using nlohmann::json;",
-};

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

@@ -1,3 +1,4 @@
+export declare const NLOHMANN = "nlohmann::json";
 /**
  * @description Generates a reusable C++ utility for handling optional fields in JSON serialization
  *              and deserialization using the nlohmann::json library and boost::optional.

package/dist/transpilers/cpp/nlohmann.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.NLOHMANN = void 0;
 exports.getNlohmannOptionalHelper = getNlohmannOptionalHelper;
+exports.NLOHMANN = "nlohmann::json";
 /**
  * @description Generates a reusable C++ utility for handling optional fields in JSON serialization
  *              and deserialization using the nlohmann::json library and boost::optional.
@@ -15,7 +17,7 @@ function getNlohmannOptionalHelper(indent, includeNulls, useBoost, namespace) {
     const setOpt = includeNulls
         ? [
             `template <typename T>`,
-            `void set_opt(json& j, const std::string& key, const ${optType}<T>& opt) {`,
+            `void set_opt(${exports.NLOHMANN}& j, const std::string& key, const ${optType}<T>& opt) {`,
             `${" ".repeat(indent)}if (opt) {`,
             `${" ".repeat(indent * 2)}j[key] = *opt;`,
             `${" ".repeat(indent)}}`,
@@ -27,7 +29,7 @@ function getNlohmannOptionalHelper(indent, includeNulls, useBoost, namespace) {
         ]
         : [
             `template <typename T>`,
-            `void set_opt(json& j, const std::string& key, const ${optType}<T>& opt) {`,
+            `void set_opt(${exports.NLOHMANN}& j, const std::string& key, const ${optType}<T>& opt) {`,
             `${" ".repeat(indent)}if (opt) {`,
             `${" ".repeat(indent * 2)}j[key] = *opt;`,
             `${" ".repeat(indent)}}`,
@@ -38,7 +40,7 @@ function getNlohmannOptionalHelper(indent, includeNulls, useBoost, namespace) {
         `#ifndef NLOHMANN_OPTIONAL_HELPER_${namespace}`,
         `#define NLOHMANN_OPTIONAL_HELPER_${namespace}`,
         "template <typename T>",
-        `${optType}<T> get_opt(const json& j, const std::string& key) {`,
+        `${optType}<T> get_opt(const ${exports.NLOHMANN}& j, const std::string& key) {`,
         `${" ".repeat(indent)}auto it = j.find(key);`,
         `${" ".repeat(indent)}if (it != j.end() && !it->is_null()) {`,
         `${" ".repeat(indent * 2)}return it->get<T>();`,

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

@@ -131,7 +131,7 @@ export declare class Zod2Cpp extends Zod2X<IZod2CppOpt> {
      * @description Generates a JSON serializer for a struct. Each required field is serialized
      *              directly, and optional fields are checked for existence before serialization.
      * Ex:
-     *      inline void to_json(json& j, const MyStruct& x) {
+     *      inline void to_json(nlohmann::json& j, const MyStruct& x) {
      *          j["requiredField"] = x.required_field;
      *          if (x.optional_field) {
      *              j["optionalField"] = x.optional_field;
@@ -145,7 +145,7 @@ export declare class Zod2Cpp extends Zod2X<IZod2CppOpt> {
      * @description Generates a JSON deserializer for a struct. Each required field is deserialized
      *              using at, while optional fields are handled with get_opt.
      * Ex:
-     *      inline void from_json(const json& j, MyStruct& x) {
+     *      inline void from_json(const nlohmann::json& j, MyStruct& x) {
      *          x.required_field(j.at("requiredField").get<int>());
      *          x.optional_field(get_opt<std::string>(j, "optionalField"));
      *      }
@@ -158,7 +158,7 @@ export declare class Zod2Cpp extends Zod2X<IZod2CppOpt> {
      *              access class attributes. Optional fields are checked for existence before
      *              serialization.
      * Ex:
-     *      inline void to_json(json& j, const MyClass& x) {
+     *      inline void to_json(nlohmann::json& j, const MyClass& x) {
      *          j["requiredField"] = x.get_required_field();
      *          if (x.get_optional_field()) {
      *              j["optionalField"] = x.get_optional_field();
@@ -172,7 +172,7 @@ export declare class Zod2Cpp extends Zod2X<IZod2CppOpt> {
      * @description Generates a JSON deserializer for a class. The deserializer uses setter methods
      *              to populate class attributes.
      * Ex:
-     *      inline void from_json(const json& j, MyClass& x) {
+     *      inline void from_json(const nlohmann::json& j, MyClass& x) {
      *          x.set_required_field(j.at("requiredField").get<int>());
      *          x.set_optional_field(get_opt<std::string>(j, "optionalField"));
      *      }
@@ -184,7 +184,7 @@ export declare class Zod2Cpp extends Zod2X<IZod2CppOpt> {
      * @description Generates a JSON serializer for an enum. Maps enum values to strings for
      *              serialization, with a default case for unexpected values.
      * Ex:
-     *      inline void to_json(json& j, const MyEnum& x) {
+     *      inline void to_json(nlohmann::json& j, const MyEnum& x) {
      *      switch (x) {
      *          case MyEnum::Value1: j = "VALUE_1"; break;
      *          case MyEnum::Value2: j = "VALUE_2"; break;
@@ -200,7 +200,7 @@ export declare class Zod2Cpp extends Zod2X<IZod2CppOpt> {
      * @description Generates a JSON deserializer for an enum. Maps strings to enum values, with an
      *              error for unexpected strings.
      * Ex:
-     *      inline void from_json(const json& j, MyEnum& x) {
+     *      inline void from_json(const nlohmann::json& j, MyEnum& x) {
      *          if (j == "VALUE_1") x = MyEnum::Value1;
      *          else if (j == "VALUE_2") x = MyEnum::Value2;
      *          else {
@@ -216,7 +216,7 @@ export declare class Zod2Cpp extends Zod2X<IZod2CppOpt> {
      *              multiple types.
      *
      * @example
-     * // inline void to_json(json& j, const DerivedType& x) {
+     * // inline void to_json(nlohmann::json& j, const DerivedType& x) {
      * //     to_json(j, static_cast<const BaseType1&>(x));
      * //     to_json(j, static_cast<const BaseType2&>(x));
      * // }
@@ -230,7 +230,7 @@ export declare class Zod2Cpp extends Zod2X<IZod2CppOpt> {
      *              multiple types.
      *
      * @example
-     * // inline void from_json(const json& j, DerivedType& x) {
+     * // inline void from_json(const nlohmann::json& j, DerivedType& x) {
      * //     from_json(j, static_cast<BaseType1&>(x));
      * //     from_json(j, static_cast<BaseType2&>(x));
      * // }
@@ -250,7 +250,7 @@ export declare class Zod2Cpp extends Zod2X<IZod2CppOpt> {
      * // Given: unionName = "MyUnion", itemsType = {"int", "std::string"}
      * // The generated output might look like:
      * //
-     * // inline void to_json(json& j, const MyUnion& x) {
+     * // inline void to_json(nlohmann::json& j, const MyUnion& x) {
      * //     if (x.type() == typeid(int)) {
      * //         j = boost::get<int>(x);
      * //     } else if (x.type() == typeid(std::string)) {
@@ -281,7 +281,7 @@ export declare class Zod2Cpp extends Zod2X<IZod2CppOpt> {
      * //           {"type": "PhoneContact", "discriminantValue": "phone"} }
      * //
      * // The generated output might look like:
-     * // inline void from_json(const json& j, MyUnion& x) {
+     * // inline void from_json(const nlohmann::json& j, MyUnion& x) {
      * //     const auto& k = j.at("type").get<std::string>();
      * //     if (k == "email") {
      * //         x = j.get<EmailContact>();
@@ -297,7 +297,7 @@ export declare class Zod2Cpp extends Zod2X<IZod2CppOpt> {
      * // Given: unionName = "MyUnion", items = { {"type": "int"}, {"type": "std::string"} }
      * //
      * // The generated output might look like:
-     * // inline void from_json(const json& j, MyUnion& x) {
+     * // inline void from_json(const nlohmann::json& j, MyUnion& x) {
      * //     try {
      * //         // Try to deserialize as int
      * //         x = j.get<int>();
@@ -342,7 +342,7 @@ export declare class Zod2Cpp17 extends Zod2Cpp {
      * // Given: unionName = "MyUnion", itemsType = {"int", "std::string"}
      * // The generated output might look like:
      * //
-     * // inline void to_json(json& j, const MyUnion& x) {
+     * // inline void to_json(nlohmann::json& j, const MyUnion& x) {
      * //     std::visit(
      * //         [&j](auto&& arg) {
      * //             using T = std::decay_t<decltype(arg)>;

package/dist/transpilers/cpp/runner.js

@@ -34,7 +34,7 @@ class Zod2Cpp extends core_1.Zod2X {
         };
         this.getAnyType = () => {
             this.imports.add(this.lib.nlohmann);
-            return "json";
+            return nlohmann_1.NLOHMANN;
         };
         /** Ex: std::set<TypeA> */
         this.getSetType = (itemType) => {
@@ -146,9 +146,6 @@ class Zod2Cpp extends core_1.Zod2X {
             this.output.push(...this.serializers);
             this.output.push("}");
         }
-        if (this.imports.has(this.lib.nlohmann)) {
-            this.postImports.add(`${libs_1.USING.nlohmann}`);
-        }
     }
     /** Ex: std::vector<std::vector<TypeA>> */
     getArrayType(arrayType, arrayDeep) {
@@ -185,6 +182,7 @@ class Zod2Cpp extends core_1.Zod2X {
             return;
         }
         let extendedType = undefined;
+        this.addComment(data.description);
         if (data instanceof core_1.ASTArray) {
             extendedType = this.getAttributeType(data.item);
         }
@@ -366,7 +364,10 @@ class Zod2Cpp extends core_1.Zod2X {
     _transpileMember(memberName, memberNode) {
         let keyType = this.getAttributeType(memberNode);
         const origType = keyType;
-        if (memberNode.description && !memberNode.name && !this.isTranspilerable(memberNode)) {
+        if (this.opt.includeComments &&
+            memberNode.description &&
+            !memberNode.name &&
+            !this.isTranspilerable(memberNode)) {
             // Avoid duplicated descriptions for transpiled items.
             this.push1("");
             this.addComment(memberNode.description, `${this.indent[1]}`);
@@ -405,7 +406,7 @@ class Zod2Cpp extends core_1.Zod2X {
      * @description Generates a JSON serializer for a struct. Each required field is serialized
      *              directly, and optional fields are checked for existence before serialization.
      * Ex:
-     *      inline void to_json(json& j, const MyStruct& x) {
+     *      inline void to_json(nlohmann::json& j, const MyStruct& x) {
      *          j["requiredField"] = x.required_field;
      *          if (x.optional_field) {
      *              j["optionalField"] = x.optional_field;
@@ -415,13 +416,14 @@ class Zod2Cpp extends core_1.Zod2X {
      * @param childs - Structure attributes data.
      */
     _createStructSerializer(parent, childs) {
-        this._push0(this.serializers, `inline void to_json(json& j, const ${parent}& x) {`);
+        const prefix = this.opt.namespace ? `${this.opt.namespace}::` : "";
+        this._push0(this.serializers, `inline void to_json(${nlohmann_1.NLOHMANN}& j, const ${parent}& x) {`);
         childs.forEach((i) => {
             if (i.required) {
                 this._push1(this.serializers, `j["${i.origName}"] = x.${i.snakeName};`);
             }
             else {
-                this._push1(this.serializers, `set_opt<${i.typeName}>(j, "${i.origName}", x.${i.snakeName});`);
+                this._push1(this.serializers, `${prefix}set_opt<${i.typeName}>(j, "${i.origName}", x.${i.snakeName});`);
             }
         });
         this._push0(this.serializers, "}\n");
@@ -430,7 +432,7 @@ class Zod2Cpp extends core_1.Zod2X {
      * @description Generates a JSON deserializer for a struct. Each required field is deserialized
      *              using at, while optional fields are handled with get_opt.
      * Ex:
-     *      inline void from_json(const json& j, MyStruct& x) {
+     *      inline void from_json(const nlohmann::json& j, MyStruct& x) {
      *          x.required_field(j.at("requiredField").get<int>());
      *          x.optional_field(get_opt<std::string>(j, "optionalField"));
      *      }
@@ -438,13 +440,14 @@ class Zod2Cpp extends core_1.Zod2X {
      * @param childs - Structure attributes data.
      */
     _createStructDeserializer(parent, childs) {
-        this._push0(this.serializers, `inline void from_json(const json& j, ${parent}& x) {`);
+        const prefix = this.opt.namespace ? `${this.opt.namespace}::` : "";
+        this._push0(this.serializers, `inline void from_json(const ${nlohmann_1.NLOHMANN}& j, ${parent}& x) {`);
         childs.forEach((i) => {
             if (i.required) {
                 this._push1(this.serializers, `x.${i.snakeName} = j.at("${i.origName}").get<${i.typeName}>();`);
             }
             else {
-                this._push1(this.serializers, `x.${i.snakeName} = get_opt<${i.typeName}>(j, "${i.origName}");`);
+                this._push1(this.serializers, `x.${i.snakeName} = ${prefix}get_opt<${i.typeName}>(j, "${i.origName}");`);
             }
         });
         this._push0(this.serializers, "}\n");
@@ -454,7 +457,7 @@ class Zod2Cpp extends core_1.Zod2X {
      *              access class attributes. Optional fields are checked for existence before
      *              serialization.
      * Ex:
-     *      inline void to_json(json& j, const MyClass& x) {
+     *      inline void to_json(nlohmann::json& j, const MyClass& x) {
      *          j["requiredField"] = x.get_required_field();
      *          if (x.get_optional_field()) {
      *              j["optionalField"] = x.get_optional_field();
@@ -464,13 +467,14 @@ class Zod2Cpp extends core_1.Zod2X {
      * @param childs - Structure attributes data.
      */
     _createClassSerializer(parent, childs) {
-        this._push0(this.serializers, `inline void to_json(json& j, const ${parent}& x) {`);
+        const prefix = this.opt.namespace ? `${this.opt.namespace}::` : "";
+        this._push0(this.serializers, `inline void to_json(${nlohmann_1.NLOHMANN}& j, const ${parent}& x) {`);
         childs.forEach((i) => {
             if (i.required) {
                 this._push1(this.serializers, `j["${i.origName}"] = x.get_${i.snakeName}();`);
             }
             else {
-                this._push1(this.serializers, `set_opt<${i.typeName}>(j, "${i.origName}", x.get_${i.snakeName}());`);
+                this._push1(this.serializers, `${prefix}set_opt<${i.typeName}>(j, "${i.origName}", x.get_${i.snakeName}());`);
             }
         });
         this._push0(this.serializers, "}\n");
@@ -479,7 +483,7 @@ class Zod2Cpp extends core_1.Zod2X {
      * @description Generates a JSON deserializer for a class. The deserializer uses setter methods
      *              to populate class attributes.
      * Ex:
-     *      inline void from_json(const json& j, MyClass& x) {
+     *      inline void from_json(const nlohmann::json& j, MyClass& x) {
      *          x.set_required_field(j.at("requiredField").get<int>());
      *          x.set_optional_field(get_opt<std::string>(j, "optionalField"));
      *      }
@@ -487,13 +491,14 @@ class Zod2Cpp extends core_1.Zod2X {
      * @param childs - Structure attributes data.
      */
     _createClassDeserializer(parent, childs) {
-        this._push0(this.serializers, `inline void from_json(const json& j, ${parent}& x) {`);
+        const prefix = this.opt.namespace ? `${this.opt.namespace}::` : "";
+        this._push0(this.serializers, `inline void from_json(const ${nlohmann_1.NLOHMANN}& j, ${parent}& x) {`);
         childs.forEach((i) => {
             if (i.required) {
                 this._push1(this.serializers, `x.set_${i.snakeName}(j.at("${i.origName}").get<${i.typeName}>());`);
             }
             else {
-                this._push1(this.serializers, `x.set_${i.snakeName}(get_opt<${i.typeName}>(j, "${i.origName}"));`);
+                this._push1(this.serializers, `x.set_${i.snakeName}(${prefix}get_opt<${i.typeName}>(j, "${i.origName}"));`);
             }
         });
         this._push0(this.serializers, "}\n");
@@ -502,7 +507,7 @@ class Zod2Cpp extends core_1.Zod2X {
      * @description Generates a JSON serializer for an enum. Maps enum values to strings for
      *              serialization, with a default case for unexpected values.
      * Ex:
-     *      inline void to_json(json& j, const MyEnum& x) {
+     *      inline void to_json(nlohmann::json& j, const MyEnum& x) {
      *      switch (x) {
      *          case MyEnum::Value1: j = "VALUE_1"; break;
      *          case MyEnum::Value2: j = "VALUE_2"; break;
@@ -515,7 +520,7 @@ class Zod2Cpp extends core_1.Zod2X {
      */
     _createEnumSerializer(parent, childs) {
         this.imports.add(this.lib.exceptions);
-        this._push0(this.serializers, `inline void to_json(json& j, const ${parent}& x) {`);
+        this._push0(this.serializers, `inline void to_json(${nlohmann_1.NLOHMANN}& j, const ${parent}& x) {`);
         this._push1(this.serializers, `switch (x) {`);
         childs.forEach((i) => {
             const value = isNaN(Number(i.origValue)) ? `"${i.origValue}"` : i.origValue;
@@ -530,7 +535,7 @@ class Zod2Cpp extends core_1.Zod2X {
      * @description Generates a JSON deserializer for an enum. Maps strings to enum values, with an
      *              error for unexpected strings.
      * Ex:
-     *      inline void from_json(const json& j, MyEnum& x) {
+     *      inline void from_json(const nlohmann::json& j, MyEnum& x) {
      *          if (j == "VALUE_1") x = MyEnum::Value1;
      *          else if (j == "VALUE_2") x = MyEnum::Value2;
      *          else {
@@ -542,7 +547,7 @@ class Zod2Cpp extends core_1.Zod2X {
      */
     _createEnumDeserializer(parent, childs) {
         this.imports.add(this.lib.exceptions);
-        this._push0(this.serializers, `inline void from_json(const json& j, ${parent}& x) {`);
+        this._push0(this.serializers, `inline void from_json(const ${nlohmann_1.NLOHMANN}& j, ${parent}& x) {`);
         childs.forEach((i, index) => {
             const value = isNaN(Number(i.origValue)) ? `"${i.origValue}"` : i.origValue;
             if (index === 0) {
@@ -560,7 +565,7 @@ class Zod2Cpp extends core_1.Zod2X {
      *              multiple types.
      *
      * @example
-     * // inline void to_json(json& j, const DerivedType& x) {
+     * // inline void to_json(nlohmann::json& j, const DerivedType& x) {
      * //     to_json(j, static_cast<const BaseType1&>(x));
      * //     to_json(j, static_cast<const BaseType2&>(x));
      * // }
@@ -569,7 +574,7 @@ class Zod2Cpp extends core_1.Zod2X {
      * @param itemsType - An array of strings representing the names of the base types to serialize.
      */
     _createIntersectionSerializer(intersectName, itemsType) {
-        this._push0(this.serializers, `inline void to_json(json& j, const ${intersectName}& x) {`);
+        this._push0(this.serializers, `inline void to_json(${nlohmann_1.NLOHMANN}& j, const ${intersectName}& x) {`);
         itemsType.forEach((i) => this._push1(this.serializers, `to_json(j, static_cast<const ${i}&>(x));`));
         this._push0(this.serializers, `}\n`);
     }
@@ -578,7 +583,7 @@ class Zod2Cpp extends core_1.Zod2X {
      *              multiple types.
      *
      * @example
-     * // inline void from_json(const json& j, DerivedType& x) {
+     * // inline void from_json(const nlohmann::json& j, DerivedType& x) {
      * //     from_json(j, static_cast<BaseType1&>(x));
      * //     from_json(j, static_cast<BaseType2&>(x));
      * // }
@@ -587,7 +592,7 @@ class Zod2Cpp extends core_1.Zod2X {
      * @param itemsType - An array of strings representing the names of the base types to deserialize.
      */
     _createIntersectionDeserializer(intersectName, itemsType) {
-        this._push0(this.serializers, `inline void from_json(const json& j, ${intersectName}& x) {`);
+        this._push0(this.serializers, `inline void from_json(const ${nlohmann_1.NLOHMANN}& j, ${intersectName}& x) {`);
         itemsType.forEach((i) => this._push1(this.serializers, `from_json(j, static_cast<${i}&>(x));`));
         this._push0(this.serializers, `}\n`);
     }
@@ -602,7 +607,7 @@ class Zod2Cpp extends core_1.Zod2X {
      * // Given: unionName = "MyUnion", itemsType = {"int", "std::string"}
      * // The generated output might look like:
      * //
-     * // inline void to_json(json& j, const MyUnion& x) {
+     * // inline void to_json(nlohmann::json& j, const MyUnion& x) {
      * //     if (x.type() == typeid(int)) {
      * //         j = boost::get<int>(x);
      * //     } else if (x.type() == typeid(std::string)) {
@@ -614,7 +619,7 @@ class Zod2Cpp extends core_1.Zod2X {
      */
     _createUnionSerializer(unionName, itemsType) {
         this.imports.add(this.lib.exceptions);
-        this._push0(this.serializers, `inline void to_json(json& j, const ${unionName}& x) {`);
+        this._push0(this.serializers, `inline void to_json(${nlohmann_1.NLOHMANN}& j, const ${unionName}& x) {`);
         itemsType.forEach((i, index) => {
             const condition = index === 0 ? "if" : "else if";
             this._push1(this.serializers, `${condition} (x.type() == typeid(${i})) {`);
@@ -646,7 +651,7 @@ class Zod2Cpp extends core_1.Zod2X {
      * //           {"type": "PhoneContact", "discriminantValue": "phone"} }
      * //
      * // The generated output might look like:
-     * // inline void from_json(const json& j, MyUnion& x) {
+     * // inline void from_json(const nlohmann::json& j, MyUnion& x) {
      * //     const auto& k = j.at("type").get<std::string>();
      * //     if (k == "email") {
      * //         x = j.get<EmailContact>();
@@ -662,7 +667,7 @@ class Zod2Cpp extends core_1.Zod2X {
      * // Given: unionName = "MyUnion", items = { {"type": "int"}, {"type": "std::string"} }
      * //
      * // The generated output might look like:
-     * // inline void from_json(const json& j, MyUnion& x) {
+     * // inline void from_json(const nlohmann::json& j, MyUnion& x) {
      * //     try {
      * //         // Try to deserialize as int
      * //         x = j.get<int>();
@@ -683,7 +688,7 @@ class Zod2Cpp extends core_1.Zod2X {
      */
     _createUnionDeserializer(unionName, items, discriminator) {
         this.imports.add(this.lib.exceptions);
-        this._push0(this.serializers, `inline void from_json(const json& j, ${unionName}& x) {`);
+        this._push0(this.serializers, `inline void from_json(const ${nlohmann_1.NLOHMANN}& j, ${unionName}& x) {`);
         const useDiscriminator = discriminator && items.every((i) => i.discriminantValue);
         if (useDiscriminator) {
             this._push1(this.serializers, `const auto& k = j.at("${discriminator}").get<std::string>();`);
@@ -752,7 +757,7 @@ class Zod2Cpp17 extends Zod2Cpp {
      * // Given: unionName = "MyUnion", itemsType = {"int", "std::string"}
      * // The generated output might look like:
      * //
-     * // inline void to_json(json& j, const MyUnion& x) {
+     * // inline void to_json(nlohmann::json& j, const MyUnion& x) {
      * //     std::visit(
      * //         [&j](auto&& arg) {
      * //             using T = std::decay_t<decltype(arg)>;
@@ -770,7 +775,7 @@ class Zod2Cpp17 extends Zod2Cpp {
      */
     _createUnionSerializer(unionName, itemsType) {
         this.imports.add(this.lib.exceptions);
-        this._push0(this.serializers, `inline void to_json(json& j, const ${unionName}& x) {`);
+        this._push0(this.serializers, `inline void to_json(${nlohmann_1.NLOHMANN}& j, const ${unionName}& x) {`);
         this._push1(this.serializers, `std::visit(`);
         this._push2(this.serializers, `[&j](auto&& arg) {`);
         this._push3(this.serializers, `using T = std::decay_t<decltype(arg)>;`);

package/dist/transpilers/typescript/runner.js

@@ -109,6 +109,7 @@ class Zod2Ts extends core_1.Zod2X {
             return;
         }
         let extendedType = undefined;
+        this.addComment(data.description);
         if (data instanceof core_1.ASTArray) {
             extendedType = this.getAttributeType(data.item);
         }

package/package.json

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