@ng-openapi/zod 0.0.2-pr-26-feature-zod-c60713a.0 → 0.0.2-pr-32-feature-zod-5c9aca1.0

package/index.cjs

@@ -48,78 +48,6 @@ function pascalCase(str2) {
 }
 __name(pascalCase, "pascalCase");
 
-// ../../shared/src/utils/functions/collect-used-types.ts
-function collectUsedTypes(operations) {
-  const usedTypes = /* @__PURE__ */ new Set();
-  usedTypes.add("RequestOptions");
-  operations.forEach((operation) => {
-    operation.parameters?.forEach((param) => {
-      collectTypesFromSchema(param.schema || param, usedTypes);
-    });
-    if (operation.requestBody) {
-      collectTypesFromRequestBody(operation.requestBody, usedTypes);
-    }
-    if (operation.responses) {
-      Object.values(operation.responses).forEach((response) => {
-        collectTypesFromResponse(response, usedTypes);
-      });
-    }
-  });
-  return usedTypes;
-}
-__name(collectUsedTypes, "collectUsedTypes");
-function collectTypesFromSchema(schema2, usedTypes) {
-  if (!schema2) return;
-  if (schema2.$ref) {
-    const refName = schema2.$ref.split("/").pop();
-    if (refName) {
-      usedTypes.add(pascalCase(refName));
-    }
-  }
-  if (schema2.type === "array" && schema2.items) {
-    collectTypesFromSchema(schema2.items, usedTypes);
-  }
-  if (schema2.type === "object" && schema2.properties) {
-    Object.values(schema2.properties).forEach((prop) => {
-      collectTypesFromSchema(prop, usedTypes);
-    });
-  }
-  if (schema2.allOf) {
-    schema2.allOf.forEach((subSchema) => {
-      collectTypesFromSchema(subSchema, usedTypes);
-    });
-  }
-  if (schema2.oneOf) {
-    schema2.oneOf.forEach((subSchema) => {
-      collectTypesFromSchema(subSchema, usedTypes);
-    });
-  }
-  if (schema2.anyOf) {
-    schema2.anyOf.forEach((subSchema) => {
-      collectTypesFromSchema(subSchema, usedTypes);
-    });
-  }
-}
-__name(collectTypesFromSchema, "collectTypesFromSchema");
-function collectTypesFromRequestBody(requestBody, usedTypes) {
-  const content = requestBody.content || {};
-  Object.values(content).forEach((mediaType) => {
-    if (mediaType.schema) {
-      collectTypesFromSchema(mediaType.schema, usedTypes);
-    }
-  });
-}
-__name(collectTypesFromRequestBody, "collectTypesFromRequestBody");
-function collectTypesFromResponse(response, usedTypes) {
-  const content = response.content || {};
-  Object.values(content).forEach((mediaType) => {
-    if (mediaType.schema) {
-      collectTypesFromSchema(mediaType.schema, usedTypes);
-    }
-  });
-}
-__name(collectTypesFromResponse, "collectTypesFromResponse");
-
 // ../../shared/src/utils/functions/extract-paths.ts
 function extractPaths(swaggerPaths = {}, methods = [
   "get",
@@ -195,6 +123,14 @@ var PROVIDER_GENERATOR_HEADER_COMMENT = defaultHeaderComment + `* Generated prov
 * Do not edit this file manually
 */
 `;
+var ZOD_PLUGIN_GENERATOR_HEADER_COMMENT = /* @__PURE__ */ __name((validatorName) => defaultHeaderComment + `* Generated Zod Schemas for ${validatorName}
+* Do not edit this file manually
+*/
+`, "ZOD_PLUGIN_GENERATOR_HEADER_COMMENT");
+var ZOD_PLUGIN_INDEX_GENERATOR_HEADER_COMMENT = defaultHeaderComment + `* Generated Zod Schemas exports
+* Do not edit this file manually
+*/
+`;
 
 // ../../../node_modules/js-yaml/dist/js-yaml.mjs
 function isNothing(subject) {
@@ -2894,11 +2830,13 @@ var safeLoad = renamed("safeLoad", "load");
 var safeLoadAll = renamed("safeLoadAll", "loadAll");
 var safeDump = renamed("safeDump", "dump");
 
-// src/lib/zod-schema.builder.ts
+// src/lib/utils/is-reference-object.ts
 function isReferenceObject(obj) {
   return obj && typeof obj === "object" && "$ref" in obj;
 }
 __name(isReferenceObject, "isReferenceObject");
+
+// src/lib/zod-schema.builder.ts
 var ZodSchemaBuilder = class {
   static {
     __name(this, "ZodSchemaBuilder");
@@ -2906,7 +2844,6 @@ var ZodSchemaBuilder = class {
   parser;
   config;
   options;
-  constsCounter = {};
   constructor(parser, config, options) {
     this.parser = parser;
     this.config = config;
@@ -2944,7 +2881,7 @@ var ZodSchemaBuilder = class {
         zodSchema = "z.any()";
     }
     if (!buildOptions.required && schema2.default !== void 0) {
-      const defaultValue = this.generateDefaultValue(schema2.default, name);
+      const defaultValue = this.generateDefaultValue(schema2.default);
       zodSchema = `${zodSchema}.default(${defaultValue})`;
     } else if (!buildOptions.required && nullable) {
       zodSchema = `${zodSchema}.nullish()`;
@@ -2970,15 +2907,17 @@ var ZodSchemaBuilder = class {
             return buildOptions.coerce ? "z.coerce.date()" : "z.date()";
           }
           return buildOptions.coerce ? "z.coerce.string().date()" : "z.string().date()";
-        case "date-time":
+        case "date-time": {
           if (this.config.options?.dateType === "Date") {
             return buildOptions.coerce ? "z.coerce.date()" : "z.date()";
           }
           const datetimeOptions = this.options.dateTime ? `, ${JSON.stringify(this.options.dateTime)}` : "";
           return buildOptions.coerce ? `z.coerce.string().datetime(${datetimeOptions})` : `z.string().datetime(${datetimeOptions})`;
-        case "time":
+        }
+        case "time": {
           const timeOptions = this.options.time ? `, ${JSON.stringify(this.options.time)}` : "";
           return buildOptions.coerce ? `z.coerce.string().time(${timeOptions})` : `z.string().time(${timeOptions})`;
+        }
         case "email":
           return buildOptions.coerce ? "z.coerce.string().email()" : "z.string().email()";
         case "uri":
@@ -3128,7 +3067,7 @@ ${properties.join(",\n")}
     }
     return schema2.type || "any";
   }
-  generateDefaultValue(defaultValue, name) {
+  generateDefaultValue(defaultValue) {
     if (typeof defaultValue === "string") {
       return `'${this.escapeString(defaultValue)}'`;
     }
@@ -3161,10 +3100,6 @@ ${properties.join(",\n")}
 };
 
 // src/lib/zod-schema.generator.ts
-function isReferenceObject2(obj) {
-  return obj && typeof obj === "object" && "$ref" in obj;
-}
-__name(isReferenceObject2, "isReferenceObject");
 var ZodSchemaGenerator = class {
   static {
     __name(this, "ZodSchemaGenerator");
@@ -3302,21 +3237,21 @@ var ZodSchemaGenerator = class {
     };
   }
   resolveRequestBody(requestBody) {
-    if (isReferenceObject2(requestBody)) {
+    if (isReferenceObject(requestBody)) {
       const resolved = this.parser.resolveReference(requestBody.$ref);
       return resolved;
     }
     return requestBody;
   }
   resolveResponse(response) {
-    if (isReferenceObject2(response)) {
+    if (isReferenceObject(response)) {
       const resolved = this.parser.resolveReference(response.$ref);
       return resolved;
     }
     return response;
   }
   resolveSchema(schema2) {
-    if (isReferenceObject2(schema2)) {
+    if (isReferenceObject(schema2)) {
       const resolved = this.parser.resolveReference(schema2.$ref);
       return resolved;
     }
@@ -3324,11 +3259,11 @@ var ZodSchemaGenerator = class {
   }
   shouldCoerce(type2) {
     const typeMap = {
-      "path": "param",
-      "query": "query",
-      "header": "header",
-      "body": "body",
-      "response": "response"
+      path: "param",
+      query: "query",
+      header: "header",
+      body: "body",
+      response: "response"
     };
     const mappedType = typeMap[type2] || type2;
     if (typeof this.options.coerce === "boolean") {
@@ -3338,11 +3273,11 @@ var ZodSchemaGenerator = class {
   }
   isStrict(type2) {
     const typeMap = {
-      "path": "param",
-      "query": "query",
-      "header": "header",
-      "body": "body",
-      "response": "response"
+      path: "param",
+      query: "query",
+      header: "header",
+      body: "body",
+      response: "response"
     };
     const mappedType = typeMap[type2] || type2;
     if (typeof this.options.strict === "boolean") {
@@ -3369,31 +3304,19 @@ var ZodIndexGenerator = class {
     const sourceFile = this.project.createSourceFile(indexPath, "", {
       overwrite: true
     });
-    sourceFile.insertText(0, this.generateHeaderComment());
+    sourceFile.insertText(0, ZOD_PLUGIN_INDEX_GENERATOR_HEADER_COMMENT);
     const validatorFiles = fs.readdirSync(validatorsDir).filter((file) => file.endsWith(".validator.ts")).map((file) => file.replace(".validator.ts", ""));
     validatorFiles.forEach((fileName) => {
       sourceFile.addExportDeclaration({
-        namedExports: [
-          "*"
-        ],
         moduleSpecifier: `./${fileName}.validator`
       });
     });
     sourceFile.formatText();
     sourceFile.saveSync();
   }
-  generateHeaderComment() {
-    return `/**
- * Validators Index
- * Generated by ng-openapi
- * Do not edit manually
- */
-
-`;
-  }
 };
 
-// src/lib/zod.generator.ts
+// src/lib/utils/default-options.ts
 var DEFAULT_OPTIONS = {
   strict: false,
   coerce: false,
@@ -3405,6 +3328,8 @@ var DEFAULT_OPTIONS = {
     response: true
   }
 };
+
+// src/lib/zod.generator.ts
 var ZodGenerator = class {
   static {
     __name(this, "ZodGenerator");
@@ -3471,23 +3396,14 @@ var ZodGenerator = class {
     const sourceFile = this.project.createSourceFile(filePath, "", {
       overwrite: true
     });
-    sourceFile.insertText(0, this.generateHeaderComment(validatorName));
+    sourceFile.insertText(0, ZOD_PLUGIN_GENERATOR_HEADER_COMMENT(validatorName));
     this.addImports(sourceFile, operations);
     for (const operation of operations) {
       await this.generateOperationValidators(sourceFile, operation);
     }
-    sourceFile.formatText();
+    sourceFile.fixMissingImports().organizeImports().fixUnusedIdentifiers().formatText();
     sourceFile.saveSync();
   }
-  generateHeaderComment(validatorName) {
-    return `/**
- * ${validatorName} Validators
- * Generated by ng-openapi
- * Do not edit manually
- */
-
-`;
-  }
   addImports(sourceFile, operations) {
     sourceFile.addImportDeclaration({
       namedImports: [
@@ -3495,13 +3411,6 @@ var ZodGenerator = class {
       ],
       moduleSpecifier: "zod"
     });
-    const usedTypes = collectUsedTypes(operations);
-    if (usedTypes.size > 0) {
-      sourceFile.addImportDeclaration({
-        namedImports: Array.from(usedTypes).sort(),
-        moduleSpecifier: "../models"
-      });
-    }
   }
   async generateOperationValidators(sourceFile, operation) {
     const operationName = this.getOperationName(operation);

package/index.d.ts

@@ -168,6 +168,7 @@ interface ZodPluginOptions {
         precision?: -1 | 0 | 1 | 2 | 3;
     };
 }
+
 declare class ZodGenerator implements IPluginGenerator {
     private project;
     private parser;
@@ -180,7 +181,6 @@ declare class ZodGenerator implements IPluginGenerator {
     generate(outputRoot: string): Promise<void>;
     private groupPathsByController;
     private generateValidatorFile;
-    private generateHeaderComment;
     private addImports;
     private generateOperationValidators;
     private generateParameterValidators;

package/index.js

@@ -14,78 +14,6 @@ function pascalCase(str2) {
 }
 __name(pascalCase, "pascalCase");
 
-// ../../shared/src/utils/functions/collect-used-types.ts
-function collectUsedTypes(operations) {
-  const usedTypes = /* @__PURE__ */ new Set();
-  usedTypes.add("RequestOptions");
-  operations.forEach((operation) => {
-    operation.parameters?.forEach((param) => {
-      collectTypesFromSchema(param.schema || param, usedTypes);
-    });
-    if (operation.requestBody) {
-      collectTypesFromRequestBody(operation.requestBody, usedTypes);
-    }
-    if (operation.responses) {
-      Object.values(operation.responses).forEach((response) => {
-        collectTypesFromResponse(response, usedTypes);
-      });
-    }
-  });
-  return usedTypes;
-}
-__name(collectUsedTypes, "collectUsedTypes");
-function collectTypesFromSchema(schema2, usedTypes) {
-  if (!schema2) return;
-  if (schema2.$ref) {
-    const refName = schema2.$ref.split("/").pop();
-    if (refName) {
-      usedTypes.add(pascalCase(refName));
-    }
-  }
-  if (schema2.type === "array" && schema2.items) {
-    collectTypesFromSchema(schema2.items, usedTypes);
-  }
-  if (schema2.type === "object" && schema2.properties) {
-    Object.values(schema2.properties).forEach((prop) => {
-      collectTypesFromSchema(prop, usedTypes);
-    });
-  }
-  if (schema2.allOf) {
-    schema2.allOf.forEach((subSchema) => {
-      collectTypesFromSchema(subSchema, usedTypes);
-    });
-  }
-  if (schema2.oneOf) {
-    schema2.oneOf.forEach((subSchema) => {
-      collectTypesFromSchema(subSchema, usedTypes);
-    });
-  }
-  if (schema2.anyOf) {
-    schema2.anyOf.forEach((subSchema) => {
-      collectTypesFromSchema(subSchema, usedTypes);
-    });
-  }
-}
-__name(collectTypesFromSchema, "collectTypesFromSchema");
-function collectTypesFromRequestBody(requestBody, usedTypes) {
-  const content = requestBody.content || {};
-  Object.values(content).forEach((mediaType) => {
-    if (mediaType.schema) {
-      collectTypesFromSchema(mediaType.schema, usedTypes);
-    }
-  });
-}
-__name(collectTypesFromRequestBody, "collectTypesFromRequestBody");
-function collectTypesFromResponse(response, usedTypes) {
-  const content = response.content || {};
-  Object.values(content).forEach((mediaType) => {
-    if (mediaType.schema) {
-      collectTypesFromSchema(mediaType.schema, usedTypes);
-    }
-  });
-}
-__name(collectTypesFromResponse, "collectTypesFromResponse");
-
 // ../../shared/src/utils/functions/extract-paths.ts
 function extractPaths(swaggerPaths = {}, methods = [
   "get",
@@ -161,6 +89,14 @@ var PROVIDER_GENERATOR_HEADER_COMMENT = defaultHeaderComment + `* Generated prov
 * Do not edit this file manually
 */
 `;
+var ZOD_PLUGIN_GENERATOR_HEADER_COMMENT = /* @__PURE__ */ __name((validatorName) => defaultHeaderComment + `* Generated Zod Schemas for ${validatorName}
+* Do not edit this file manually
+*/
+`, "ZOD_PLUGIN_GENERATOR_HEADER_COMMENT");
+var ZOD_PLUGIN_INDEX_GENERATOR_HEADER_COMMENT = defaultHeaderComment + `* Generated Zod Schemas exports
+* Do not edit this file manually
+*/
+`;
 
 // ../../../node_modules/js-yaml/dist/js-yaml.mjs
 function isNothing(subject) {
@@ -2860,11 +2796,13 @@ var safeLoad = renamed("safeLoad", "load");
 var safeLoadAll = renamed("safeLoadAll", "loadAll");
 var safeDump = renamed("safeDump", "dump");
 
-// src/lib/zod-schema.builder.ts
+// src/lib/utils/is-reference-object.ts
 function isReferenceObject(obj) {
   return obj && typeof obj === "object" && "$ref" in obj;
 }
 __name(isReferenceObject, "isReferenceObject");
+
+// src/lib/zod-schema.builder.ts
 var ZodSchemaBuilder = class {
   static {
     __name(this, "ZodSchemaBuilder");
@@ -2872,7 +2810,6 @@ var ZodSchemaBuilder = class {
   parser;
   config;
   options;
-  constsCounter = {};
   constructor(parser, config, options) {
     this.parser = parser;
     this.config = config;
@@ -2910,7 +2847,7 @@ var ZodSchemaBuilder = class {
         zodSchema = "z.any()";
     }
     if (!buildOptions.required && schema2.default !== void 0) {
-      const defaultValue = this.generateDefaultValue(schema2.default, name);
+      const defaultValue = this.generateDefaultValue(schema2.default);
       zodSchema = `${zodSchema}.default(${defaultValue})`;
     } else if (!buildOptions.required && nullable) {
       zodSchema = `${zodSchema}.nullish()`;
@@ -2936,15 +2873,17 @@ var ZodSchemaBuilder = class {
             return buildOptions.coerce ? "z.coerce.date()" : "z.date()";
           }
           return buildOptions.coerce ? "z.coerce.string().date()" : "z.string().date()";
-        case "date-time":
+        case "date-time": {
           if (this.config.options?.dateType === "Date") {
             return buildOptions.coerce ? "z.coerce.date()" : "z.date()";
           }
           const datetimeOptions = this.options.dateTime ? `, ${JSON.stringify(this.options.dateTime)}` : "";
           return buildOptions.coerce ? `z.coerce.string().datetime(${datetimeOptions})` : `z.string().datetime(${datetimeOptions})`;
-        case "time":
+        }
+        case "time": {
           const timeOptions = this.options.time ? `, ${JSON.stringify(this.options.time)}` : "";
           return buildOptions.coerce ? `z.coerce.string().time(${timeOptions})` : `z.string().time(${timeOptions})`;
+        }
         case "email":
           return buildOptions.coerce ? "z.coerce.string().email()" : "z.string().email()";
         case "uri":
@@ -3094,7 +3033,7 @@ ${properties.join(",\n")}
     }
     return schema2.type || "any";
   }
-  generateDefaultValue(defaultValue, name) {
+  generateDefaultValue(defaultValue) {
     if (typeof defaultValue === "string") {
       return `'${this.escapeString(defaultValue)}'`;
     }
@@ -3127,10 +3066,6 @@ ${properties.join(",\n")}
 };
 
 // src/lib/zod-schema.generator.ts
-function isReferenceObject2(obj) {
-  return obj && typeof obj === "object" && "$ref" in obj;
-}
-__name(isReferenceObject2, "isReferenceObject");
 var ZodSchemaGenerator = class {
   static {
     __name(this, "ZodSchemaGenerator");
@@ -3268,21 +3203,21 @@ var ZodSchemaGenerator = class {
     };
   }
   resolveRequestBody(requestBody) {
-    if (isReferenceObject2(requestBody)) {
+    if (isReferenceObject(requestBody)) {
       const resolved = this.parser.resolveReference(requestBody.$ref);
       return resolved;
     }
     return requestBody;
   }
   resolveResponse(response) {
-    if (isReferenceObject2(response)) {
+    if (isReferenceObject(response)) {
       const resolved = this.parser.resolveReference(response.$ref);
       return resolved;
     }
     return response;
   }
   resolveSchema(schema2) {
-    if (isReferenceObject2(schema2)) {
+    if (isReferenceObject(schema2)) {
       const resolved = this.parser.resolveReference(schema2.$ref);
       return resolved;
     }
@@ -3290,11 +3225,11 @@ var ZodSchemaGenerator = class {
   }
   shouldCoerce(type2) {
     const typeMap = {
-      "path": "param",
-      "query": "query",
-      "header": "header",
-      "body": "body",
-      "response": "response"
+      path: "param",
+      query: "query",
+      header: "header",
+      body: "body",
+      response: "response"
     };
     const mappedType = typeMap[type2] || type2;
     if (typeof this.options.coerce === "boolean") {
@@ -3304,11 +3239,11 @@ var ZodSchemaGenerator = class {
   }
   isStrict(type2) {
     const typeMap = {
-      "path": "param",
-      "query": "query",
-      "header": "header",
-      "body": "body",
-      "response": "response"
+      path: "param",
+      query: "query",
+      header: "header",
+      body: "body",
+      response: "response"
     };
     const mappedType = typeMap[type2] || type2;
     if (typeof this.options.strict === "boolean") {
@@ -3335,31 +3270,19 @@ var ZodIndexGenerator = class {
     const sourceFile = this.project.createSourceFile(indexPath, "", {
       overwrite: true
     });
-    sourceFile.insertText(0, this.generateHeaderComment());
+    sourceFile.insertText(0, ZOD_PLUGIN_INDEX_GENERATOR_HEADER_COMMENT);
     const validatorFiles = fs.readdirSync(validatorsDir).filter((file) => file.endsWith(".validator.ts")).map((file) => file.replace(".validator.ts", ""));
     validatorFiles.forEach((fileName) => {
       sourceFile.addExportDeclaration({
-        namedExports: [
-          "*"
-        ],
         moduleSpecifier: `./${fileName}.validator`
       });
     });
     sourceFile.formatText();
     sourceFile.saveSync();
   }
-  generateHeaderComment() {
-    return `/**
- * Validators Index
- * Generated by ng-openapi
- * Do not edit manually
- */
-
-`;
-  }
 };
 
-// src/lib/zod.generator.ts
+// src/lib/utils/default-options.ts
 var DEFAULT_OPTIONS = {
   strict: false,
   coerce: false,
@@ -3371,6 +3294,8 @@ var DEFAULT_OPTIONS = {
     response: true
   }
 };
+
+// src/lib/zod.generator.ts
 var ZodGenerator = class {
   static {
     __name(this, "ZodGenerator");
@@ -3437,23 +3362,14 @@ var ZodGenerator = class {
     const sourceFile = this.project.createSourceFile(filePath, "", {
       overwrite: true
     });
-    sourceFile.insertText(0, this.generateHeaderComment(validatorName));
+    sourceFile.insertText(0, ZOD_PLUGIN_GENERATOR_HEADER_COMMENT(validatorName));
     this.addImports(sourceFile, operations);
     for (const operation of operations) {
       await this.generateOperationValidators(sourceFile, operation);
     }
-    sourceFile.formatText();
+    sourceFile.fixMissingImports().organizeImports().fixUnusedIdentifiers().formatText();
     sourceFile.saveSync();
   }
-  generateHeaderComment(validatorName) {
-    return `/**
- * ${validatorName} Validators
- * Generated by ng-openapi
- * Do not edit manually
- */
-
-`;
-  }
   addImports(sourceFile, operations) {
     sourceFile.addImportDeclaration({
       namedImports: [
@@ -3461,13 +3377,6 @@ var ZodGenerator = class {
       ],
       moduleSpecifier: "zod"
     });
-    const usedTypes = collectUsedTypes(operations);
-    if (usedTypes.size > 0) {
-      sourceFile.addImportDeclaration({
-        namedImports: Array.from(usedTypes).sort(),
-        moduleSpecifier: "../models"
-      });
-    }
   }
   async generateOperationValidators(sourceFile, operation) {
     const operationName = this.getOperationName(operation);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ng-openapi/zod",
-  "version": "0.0.2-pr-26-feature-zod-c60713a.0",
+  "version": "0.0.2-pr-32-feature-zod-5c9aca1.0",
   "description": "Zod validation plugin for ng-openapi - Generate Zod schemas from OpenAPI specifications",
   "keywords": [
     "angular",