@cerios/openapi-to-zod 1.0.0 → 1.1.1

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { O as OpenApiGeneratorOptions } from './types-BjoP91vk.mjs';
-export { C as CommonSchemaOptions, a as ConfigFile, E as ExecutionMode, b as OpenAPISchema, c as OpenAPISpec, d as OperationFilters, R as RequestOptions, e as ResponseOptions, f as defineConfig } from './types-BjoP91vk.mjs';
+import { O as OpenApiGeneratorOptions } from './types-CI48CjiU.mjs';
+export { C as CommonSchemaOptions, a as ConfigFile, E as ExecutionMode, b as OpenAPISchema, c as OpenAPISpec, d as OperationFilters, R as RequestOptions, e as ResponseOptions, f as defineConfig } from './types-CI48CjiU.mjs';
 
 /**
  * Custom error classes for better error handling and debugging

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { O as OpenApiGeneratorOptions } from './types-BjoP91vk.js';
-export { C as CommonSchemaOptions, a as ConfigFile, E as ExecutionMode, b as OpenAPISchema, c as OpenAPISpec, d as OperationFilters, R as RequestOptions, e as ResponseOptions, f as defineConfig } from './types-BjoP91vk.js';
+import { O as OpenApiGeneratorOptions } from './types-CI48CjiU.js';
+export { C as CommonSchemaOptions, a as ConfigFile, E as ExecutionMode, b as OpenAPISchema, c as OpenAPISpec, d as OperationFilters, R as RequestOptions, e as ResponseOptions, f as defineConfig } from './types-CI48CjiU.js';
 
 /**
  * Custom error classes for better error handling and debugging

package/dist/index.js

@@ -94,12 +94,24 @@ var ConfigurationError = class extends GeneratorError {
 // src/openapi-generator.ts
 var import_node_fs = require("fs");
 var import_node_path = require("path");
-var import_minimatch2 = require("minimatch");
+var import_minimatch3 = require("minimatch");
 var import_yaml = require("yaml");
 
 // src/utils/name-utils.ts
+function sanitizeIdentifier(str) {
+  return str.replace(/[^a-zA-Z0-9._\-\s]+/g, "_");
+}
 function toCamelCase(str, options) {
-  let name = str.charAt(0).toLowerCase() + str.slice(1);
+  const sanitized = sanitizeIdentifier(str);
+  const words = sanitized.split(/[.\-_\s]+/).filter((word) => word.length > 0);
+  let name;
+  if (words.length === 0) {
+    name = str.charAt(0).toLowerCase() + str.slice(1);
+  } else if (words.length === 1) {
+    name = words[0].charAt(0).toLowerCase() + words[0].slice(1);
+  } else {
+    name = words[0].charAt(0).toLowerCase() + words[0].slice(1) + words.slice(1).map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join("");
+  }
   if (options == null ? void 0 : options.prefix) {
     const prefix = options.prefix.toLowerCase();
     name = prefix + name.charAt(0).toUpperCase() + name.slice(1);
@@ -112,12 +124,23 @@ function toCamelCase(str, options) {
 }
 function toPascalCase(str) {
   const stringValue = String(str);
-  let result = stringValue.replace(/[^a-zA-Z0-9_]+/g, "_").split(/[-_]+/).filter((word) => word.length > 0).map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()).join("");
+  const isAlreadyValidCase = /^[a-zA-Z][a-zA-Z0-9]*$/.test(stringValue);
+  if (isAlreadyValidCase) {
+    return stringValue.charAt(0).toUpperCase() + stringValue.slice(1);
+  }
+  const sanitized = sanitizeIdentifier(stringValue);
+  const words = sanitized.split(/[.\-_\s]+/).filter((word) => word.length > 0);
+  let result;
+  if (words.length === 0) {
+    result = "Value";
+  } else {
+    result = words.map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join("");
+  }
   if (/^\d/.test(result)) {
     result = `N${result}`;
   }
   if (!result || /^_+$/.test(result)) {
-    result = "Value";
+    return "Value";
   }
   return result;
 }
@@ -129,9 +152,28 @@ function resolveRef(ref) {
 // src/generators/enum-generator.ts
 function generateEnum(name, values, options) {
   const schemaName = `${toCamelCase(name, options)}Schema`;
-  const enumValues = values.map((v) => `"${v}"`).join(", ");
-  const schemaCode = `export const ${schemaName} = z.enum([${enumValues}]);`;
-  const typeCode = `export type ${name} = z.infer<typeof ${schemaName}>;`;
+  const typeName = toPascalCase(name);
+  const allBooleans = values.every((v) => typeof v === "boolean");
+  if (allBooleans) {
+    const schemaCode2 = `export const ${schemaName} = z.boolean();`;
+    const typeCode2 = `export type ${typeName} = z.infer<typeof ${schemaName}>;`;
+    return { schemaCode: schemaCode2, typeCode: typeCode2 };
+  }
+  const allStrings = values.every((v) => typeof v === "string");
+  if (allStrings) {
+    const enumValues = values.map((v) => `"${v}"`).join(", ");
+    const schemaCode2 = `export const ${schemaName} = z.enum([${enumValues}]);`;
+    const typeCode2 = `export type ${typeName} = z.infer<typeof ${schemaName}>;`;
+    return { schemaCode: schemaCode2, typeCode: typeCode2 };
+  }
+  const literalValues = values.map((v) => {
+    if (typeof v === "string") {
+      return `z.literal("${v}")`;
+    }
+    return `z.literal(${v})`;
+  }).join(", ");
+  const schemaCode = `export const ${schemaName} = z.union([${literalValues}]);`;
+  const typeCode = `export type ${typeName} = z.infer<typeof ${schemaName}>;`;
   return { schemaCode, typeCode };
 }
 
@@ -140,7 +182,7 @@ function escapeDescription(str) {
   return str.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\n");
 }
 function escapePattern(str) {
-  return str.replace(/\\/g, "\\\\").replace(/'/g, "\\'");
+  return str.replace(/\//g, "\\/");
 }
 function escapeJSDoc(str) {
   return str.replace(/\*\//g, "*\\/");
@@ -264,6 +306,64 @@ var LRUCache = class {
   }
 };
 
+// src/utils/pattern-utils.ts
+var import_minimatch = require("minimatch");
+function isValidGlobPattern(pattern) {
+  try {
+    new import_minimatch.minimatch.Minimatch(pattern);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function isGlobPattern(pattern) {
+  return /[*?[\]{}!]/.test(pattern);
+}
+function stripPrefix(input, pattern, ensureLeadingChar) {
+  if (!pattern) {
+    return input;
+  }
+  if (isGlobPattern(pattern) && !isValidGlobPattern(pattern)) {
+    console.warn(`\u26A0\uFE0F  Invalid glob pattern "${pattern}": Pattern is malformed`);
+    return input;
+  }
+  if (isGlobPattern(pattern)) {
+    let longestMatch = -1;
+    for (let i = 1; i <= input.length; i++) {
+      const testPrefix = input.substring(0, i);
+      if ((0, import_minimatch.minimatch)(testPrefix, pattern)) {
+        longestMatch = i;
+      }
+    }
+    if (longestMatch > 0) {
+      const stripped = input.substring(longestMatch);
+      if (ensureLeadingChar) {
+        if (stripped === "") {
+          return ensureLeadingChar;
+        }
+        if (!stripped.startsWith(ensureLeadingChar)) {
+          return `${ensureLeadingChar}${stripped}`;
+        }
+      }
+      return stripped === "" && !ensureLeadingChar ? input : stripped;
+    }
+    return input;
+  }
+  if (input.startsWith(pattern)) {
+    const stripped = input.substring(pattern.length);
+    if (ensureLeadingChar) {
+      if (stripped === "") {
+        return ensureLeadingChar;
+      }
+      if (!stripped.startsWith(ensureLeadingChar)) {
+        return `${ensureLeadingChar}${stripped}`;
+      }
+    }
+    return stripped;
+  }
+  return input;
+}
+
 // src/validators/array-validator.ts
 function generateArrayValidation(schema, context) {
   var _a;
@@ -1120,8 +1220,9 @@ var _PropertyGenerator = class _PropertyGenerator {
         }
         (_a = this.context.schemaDependencies.get(currentSchema)) == null ? void 0 : _a.add(refName);
       }
-      const schemaName = `${toCamelCase(resolvedRefName, this.context.namingOptions)}Schema`;
-      if (currentSchema && this.isCircularThroughAlias(currentSchema, refName)) {
+      const strippedRefName = stripPrefix(resolvedRefName, this.context.stripSchemaPrefix);
+      const schemaName = `${toCamelCase(strippedRefName, this.context.namingOptions)}Schema`;
+      if (currentSchema && (refName === currentSchema || this.isCircularThroughAlias(currentSchema, refName))) {
         const lazySchema = `z.lazy((): z.ZodTypeAny => ${schemaName})`;
         return wrapNullable(lazySchema, nullable);
       }
@@ -1133,9 +1234,25 @@ var _PropertyGenerator = class _PropertyGenerator {
       return wrapNullable(zodLiteral, nullable);
     }
     if (schema.enum) {
-      const enumValues = schema.enum.map((v) => `"${v}"`).join(", ");
-      const zodEnum = `z.enum([${enumValues}])`;
-      return wrapNullable(zodEnum, nullable);
+      const allBooleans = schema.enum.every((v) => typeof v === "boolean");
+      if (allBooleans) {
+        const zodBoolean = "z.boolean()";
+        return wrapNullable(zodBoolean, nullable);
+      }
+      const allStrings = schema.enum.every((v) => typeof v === "string");
+      if (allStrings) {
+        const enumValues = schema.enum.map((v) => `"${v}"`).join(", ");
+        const zodEnum = `z.enum([${enumValues}])`;
+        return wrapNullable(zodEnum, nullable);
+      }
+      const literalValues = schema.enum.map((v) => {
+        if (typeof v === "string") {
+          return `z.literal("${v}")`;
+        }
+        return `z.literal(${v})`;
+      }).join(", ");
+      const zodUnion = `z.union([${literalValues}])`;
+      return wrapNullable(zodUnion, nullable);
     }
     if (schema.allOf) {
       let composition = generateAllOf(
@@ -1266,7 +1383,7 @@ _PropertyGenerator.INCLUSION_RULES = {
 var PropertyGenerator = _PropertyGenerator;
 
 // src/utils/operation-filters.ts
-var import_minimatch = require("minimatch");
+var import_minimatch2 = require("minimatch");
 function createFilterStatistics() {
   return {
     totalOperations: 0,
@@ -1285,7 +1402,7 @@ function matchesAnyPattern(value, patterns) {
   if (!value) {
     return false;
   }
-  return patterns.some((pattern) => (0, import_minimatch.minimatch)(value, pattern));
+  return patterns.some((pattern) => (0, import_minimatch2.minimatch)(value, pattern));
 }
 function containsAny(arr, values) {
   if (!values || values.length === 0) {
@@ -1421,6 +1538,7 @@ var OpenApiGenerator = class {
       schemaType: options.schemaType || "all",
       prefix: options.prefix,
       suffix: options.suffix,
+      stripSchemaPrefix: options.stripSchemaPrefix,
       showStats: (_c = options.showStats) != null ? _c : true,
       request: options.request,
       response: options.response,
@@ -1497,7 +1615,8 @@ var OpenApiGenerator = class {
       namingOptions: {
         prefix: this.options.prefix,
         suffix: this.options.suffix
-      }
+      },
+      stripSchemaPrefix: this.options.stripSchemaPrefix
     });
   }
   /**
@@ -1510,6 +1629,9 @@ var OpenApiGenerator = class {
       throw new SpecValidationError("No schemas found in OpenAPI spec", { filePath: this.options.input });
     }
     for (const [name, schema] of Object.entries(this.spec.components.schemas)) {
+      if (this.options.operationFilters && this.schemaUsageMap.size > 0 && !this.schemaUsageMap.has(name)) {
+        continue;
+      }
       this.generateComponentSchema(name, schema);
     }
     this.generateQueryParameterSchemas();
@@ -1531,9 +1653,11 @@ var OpenApiGenerator = class {
       const typeCode = this.types.get(name);
       if (schemaCode) {
         output.push(schemaCode);
-        if (!schemaCode.includes(`export type ${name}`)) {
-          const schemaName = `${toCamelCase(name, { prefix: this.options.prefix, suffix: this.options.suffix })}Schema`;
-          output.push(`export type ${name} = z.infer<typeof ${schemaName}>;`);
+        const strippedName = stripPrefix(name, this.options.stripSchemaPrefix);
+        const typeName = toPascalCase(strippedName);
+        if (!schemaCode.includes(`export type ${typeName}`)) {
+          const schemaName = `${toCamelCase(strippedName, { prefix: this.options.prefix, suffix: this.options.suffix })}Schema`;
+          output.push(`export type ${typeName} = z.infer<typeof ${schemaName}>;`);
         }
         output.push("");
       } else if (typeCode) {
@@ -1849,7 +1973,8 @@ var OpenApiGenerator = class {
     const resolvedOptions = context === "response" ? this.responseOptions : this.requestOptions;
     if (schema.enum) {
       const jsdoc2 = generateJSDoc(schema, name, { includeDescriptions: resolvedOptions.includeDescriptions });
-      const { schemaCode, typeCode } = generateEnum(name, schema.enum, {
+      const strippedName2 = stripPrefix(name, this.options.stripSchemaPrefix);
+      const { schemaCode, typeCode } = generateEnum(strippedName2, schema.enum, {
         prefix: this.options.prefix,
         suffix: this.options.suffix
       });
@@ -1858,7 +1983,8 @@ ${typeCode}`;
       this.schemas.set(name, enumSchemaCode);
       return;
     }
-    const schemaName = `${toCamelCase(name, { prefix: this.options.prefix, suffix: this.options.suffix })}Schema`;
+    const strippedName = stripPrefix(name, this.options.stripSchemaPrefix);
+    const schemaName = `${toCamelCase(strippedName, { prefix: this.options.prefix, suffix: this.options.suffix })}Schema`;
     const jsdoc = generateJSDoc(schema, name, { includeDescriptions: resolvedOptions.includeDescriptions });
     if (schema.allOf && schema.allOf.length === 1 && schema.allOf[0].$ref) {
       const refName = resolveRef(schema.allOf[0].$ref);
@@ -1874,7 +2000,8 @@ ${typeCode}`;
       namingOptions: {
         prefix: this.options.prefix,
         suffix: this.options.suffix
-      }
+      },
+      stripSchemaPrefix: this.options.stripSchemaPrefix
     });
     const isAlias = !!(schema.$ref && !schema.properties && !schema.allOf && !schema.oneOf && !schema.anyOf);
     const zodSchema = this.propertyGenerator.generatePropertySchema(schema, name, isAlias);
@@ -1993,7 +2120,7 @@ ${propsCode}
     const headerLower = headerName.toLowerCase();
     return ignorePatterns.some((pattern) => {
       const patternLower = pattern.toLowerCase();
-      return (0, import_minimatch2.minimatch)(headerLower, patternLower);
+      return (0, import_minimatch3.minimatch)(headerLower, patternLower);
     });
   }
   /**
@@ -2076,12 +2203,27 @@ ${propsCode}
   generateQueryParamType(schema, param) {
     if (schema.$ref) {
       const refName = resolveRef(schema.$ref);
-      const schemaName = toCamelCase(refName, { prefix: this.options.prefix, suffix: this.options.suffix });
+      const strippedRefName = stripPrefix(refName, this.options.stripSchemaPrefix);
+      const schemaName = toCamelCase(strippedRefName, { prefix: this.options.prefix, suffix: this.options.suffix });
       return `${schemaName}Schema`;
     }
     if (schema.enum) {
-      const enumValues = schema.enum.map((v) => typeof v === "string" ? `"${v}"` : v).join(", ");
-      return `z.enum([${enumValues}])`;
+      const allBooleans = schema.enum.every((v) => typeof v === "boolean");
+      if (allBooleans) {
+        return "z.boolean()";
+      }
+      const allStrings = schema.enum.every((v) => typeof v === "string");
+      if (allStrings) {
+        const enumValues = schema.enum.map((v) => `"${v}"`).join(", ");
+        return `z.enum([${enumValues}])`;
+      }
+      const literalValues = schema.enum.map((v) => {
+        if (typeof v === "string") {
+          return `z.literal("${v}")`;
+        }
+        return `z.literal(${v})`;
+      }).join(", ");
+      return `z.union([${literalValues}])`;
     }
     const type = schema.type;
     if (type === "string") {