zod-to-x 2.1.0-dev.2 → 2.1.0

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

@@ -15,10 +15,5 @@ export interface IZod2ProtoV3Opt extends IZodToXOpt {
      * output will be more compact. Default is false.
      */
     encodeDoubleAsInt?: boolean;
-    /**
-     * ProtoV3 fields are optional by default, but this setting makes the "optional" keyword
-     * explicit improving compatibility with ProtoV2. Default is false.
-     */
-    useExplicitOptional?: boolean;
 }
 export declare const defaultOpts: IZod2ProtoV3Opt;

package/dist/converters/protobuf_v3/options.js

@@ -6,6 +6,5 @@ exports.defaultOpts = {
     indent: 4,
     keepKeys: false,
     encodeDoubleAsInt: false,
-    useExplicitOptional: false,
     useImports: false, // Not required for protobuf files
 };

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

@@ -17,4 +17,4 @@ import { IZod2ProtoV3Opt } from "./options";
  * @returns The Protocol Buffers v3 definition as a 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" | "useExplicitOptional">): string;
+opt?: Pick<IZod2AstOpt, "strict"> & Pick<IZod2ProtoV3Opt, "packageName" | "keepKeys" | "header" | "indent" | "includeComments" | "encodeDoubleAsInt">): string;

package/dist/converters/protobuf_v3/runner.js

@@ -26,11 +26,11 @@ const allowedKeyTypes = [
 class Zod2ProtoV3 extends core_1.Zod2X {
     constructor(opt = {}) {
         super(Object.assign(Object.assign({}, options_1.defaultOpts), opt));
-        this.commentKey = "//";
         this.getUnionType = () => {
             /** Covered by "transpileUnion" method */
             return "";
         };
+        this.getComment = (data, indent = "") => `${indent}// ${data}`;
         this.getBooleanType = () => "bool";
         this.getStringType = () => "string";
         this.getNumberType = (isInt, range) => {
@@ -171,10 +171,7 @@ class Zod2ProtoV3 extends core_1.Zod2X {
                 // Avoid duplicated descriptions for transpiled items.
                 this.addComment(value.description, `\n${this.indent[1]}`);
             }
-            const fieldType = value.isOptional && this.opt.useExplicitOptional
-                ? `optional ${this.getAttributeType(value)}`
-                : this.getAttributeType(value);
-            this.push1(`${fieldType} ${this._adaptField(key)} = ${index + 1};`);
+            this.push1(`${this.getAttributeType(value)} ${this._adaptField(key)} = ${index + 1};`);
         });
         this.push0("}\n");
     }

package/dist/core/transpiler.d.ts

@@ -35,7 +35,6 @@ export declare abstract class Zod2X<T extends IZodToXOpt> {
     protected preImports: Set<string>;
     protected imports: Set<string>;
     protected postImports: Set<string>;
-    protected abstract readonly commentKey: string;
     protected opt: Partial<T>;
     protected constructor(opt: Partial<T>);
     /**
@@ -69,6 +68,10 @@ export declare abstract class Zod2X<T extends IZodToXOpt> {
      * @param aliasOf
      */
     protected abstract addExtendedType(name: string, parentNamespace: string, aliasOf: string): void;
+    /**
+     * Returns a comment.
+     */
+    protected abstract getComment(data: string, indent?: string): string;
     /**
      * Returns the keyword representing a string type in the target language.
      */
@@ -171,10 +174,6 @@ export declare abstract class Zod2X<T extends IZodToXOpt> {
      * @param data - The AST node representing the aliased type.
      */
     protected abstract transpileAliasedType(data: ASTAliasedTypes): void;
-    /**
-     * Returns a comment.
-     */
-    protected getComment: (data: string, indent?: string) => string;
     /**
      * Determines if the given type token can be transpiled into the target language.
      * @param token - The type token to check.

package/dist/core/transpiler.js

@@ -13,15 +13,6 @@ const string_utils_1 = __importDefault(require("../utils/string_utils"));
  */
 class Zod2X {
     constructor(opt) {
-        /**
-         * Returns a comment.
-         */
-        this.getComment = (data, indent = "") => {
-            return data
-                .split("\n")
-                .map((line) => `${indent}${this.commentKey} ${line}`)
-                .join("\n");
-        };
         // Push with indentation helpers
         this.push0 = (data) => this.output.push(`${this.indent[0]}${data}`);
         this.push1 = (data) => this.output.push(`${this.indent[1]}${data}`);
@@ -217,7 +208,7 @@ class Zod2X {
     _getHeader() {
         const header = [];
         if (this.opt.header) {
-            header.push(this.getComment(this.opt.header));
+            header.push(...this.opt.header.split("\n").map((i) => this.getComment(i)));
             header.push("");
         }
         if (this.preImports.size > 0) {

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

@@ -4,7 +4,6 @@ import { IZod2CppOpt } from "./options";
  * @description Transpiler for Zod schemas to C++11 code.
  */
 export declare class Zod2Cpp extends Zod2X<IZod2CppOpt> {
-    protected readonly commentKey = "//";
     protected serializers: string[];
     protected useBoost: boolean;
     protected lib: {
@@ -32,6 +31,7 @@ export declare class Zod2Cpp extends Zod2X<IZod2CppOpt> {
     protected getGenericTemplatesTranslation(data: ASTNode): string | undefined;
     protected checkExtendedTypeInclusion(data: ASTNode, type?: "union" | "alias"): boolean;
     protected runAfter(): void;
+    protected getComment: (data: string, indent?: string) => string;
     protected getDateType: () => string;
     protected getBooleanType: () => string;
     protected getStringType: () => string;

package/dist/transpilers/cpp/runner.js

@@ -16,11 +16,11 @@ const options_1 = require("./options");
 class Zod2Cpp extends core_1.Zod2X {
     constructor(opt = {}) {
         super(Object.assign(Object.assign({}, options_1.defaultOpts), opt));
-        this.commentKey = "//";
         this.getIntersectionType = () => {
             /** Covered by "transpileIntersection" method */
             return "";
         };
+        this.getComment = (data, indent = "") => `${indent}// ${data}`;
         this.getDateType = () => this.getStringType(); // Representing ISO date as a string
         this.getBooleanType = () => "bool";
         this.getStringType = () => {

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

@@ -1,7 +1,6 @@
 import { ASTAliasedTypes, ASTEnum, ASTIntersection, ASTNode, ASTObject, ASTUnion, Zod2X } from "../../core";
 import { IZod2TsOpt } from "./options";
 export declare class Zod2Ts extends Zod2X<IZod2TsOpt> {
-    protected readonly commentKey = "//";
     constructor(opt?: IZod2TsOpt);
     protected runAfter(): void;
     protected runBefore(): void;
@@ -14,6 +13,7 @@ export declare class Zod2Ts extends Zod2X<IZod2TsOpt> {
     }): void;
     protected getGenericTemplatesTranslation(data: ASTNode): string | undefined;
     protected checkExtendedTypeInclusion(data: ASTNode, type?: "alias" | "union" | "d-union"): boolean;
+    protected getComment: (data: string, indent?: string) => string;
     protected getAnyType: () => string;
     protected getBooleanType: () => string;
     protected getDateType: () => string;

package/dist/transpilers/typescript/runner.js

@@ -10,7 +10,7 @@ const options_1 = require("./options");
 class Zod2Ts extends core_1.Zod2X {
     constructor(opt = {}) {
         super(Object.assign(Object.assign({}, options_1.defaultOpts), opt));
-        this.commentKey = "//";
+        this.getComment = (data, indent = "") => `${indent}// ${data}`;
         this.getAnyType = () => "any";
         this.getBooleanType = () => "boolean";
         this.getDateType = () => "Date";

package/package.json

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