@cerios/openapi-to-zod 1.0.0 → 1.1.1

package/dist/cli.mjs

@@ -5136,8 +5136,20 @@ var init_batch_executor = __esm({
 });
 
 // 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);
@@ -5150,12 +5162,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;
 }
@@ -5173,9 +5196,28 @@ var init_name_utils = __esm({
 // 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 };
 }
 var init_enum_generator = __esm({
@@ -5191,7 +5233,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, "*\\/");
@@ -5335,6 +5377,70 @@ var init_lru_cache = __esm({
   }
 });
 
+// src/utils/pattern-utils.ts
+import { minimatch } from "minimatch";
+function isValidGlobPattern(pattern) {
+  try {
+    new 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 (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;
+}
+var init_pattern_utils = __esm({
+  "src/utils/pattern-utils.ts"() {
+    "use strict";
+    init_esm_shims();
+  }
+});
+
 // src/validators/array-validator.ts
 function generateArrayValidation(schema, context) {
   var _a;
@@ -6006,6 +6112,7 @@ var init_property_generator = __esm({
     init_esm_shims();
     init_lru_cache();
     init_name_utils();
+    init_pattern_utils();
     init_string_utils();
     init_array_validator();
     init_composition_validator();
@@ -6248,8 +6355,9 @@ var init_property_generator = __esm({
             }
             (_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);
           }
@@ -6261,9 +6369,25 @@ var init_property_generator = __esm({
           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(
@@ -6396,7 +6520,7 @@ var init_property_generator = __esm({
 });
 
 // src/utils/operation-filters.ts
-import { minimatch } from "minimatch";
+import { minimatch as minimatch2 } from "minimatch";
 function createFilterStatistics() {
   return {
     totalOperations: 0,
@@ -6415,7 +6539,7 @@ function matchesAnyPattern(value, patterns) {
   if (!value) {
     return false;
   }
-  return patterns.some((pattern) => minimatch(value, pattern));
+  return patterns.some((pattern) => minimatch2(value, pattern));
 }
 function containsAny(arr, values) {
   if (!values || values.length === 0) {
@@ -6538,7 +6662,7 @@ var init_operation_filters = __esm({
 // src/openapi-generator.ts
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
 import { dirname, normalize } from "path";
-import { minimatch as minimatch2 } from "minimatch";
+import { minimatch as minimatch3 } from "minimatch";
 import { parse } from "yaml";
 var OpenApiGenerator;
 var init_openapi_generator = __esm({
@@ -6551,6 +6675,7 @@ var init_openapi_generator = __esm({
     init_property_generator();
     init_name_utils();
     init_operation_filters();
+    init_pattern_utils();
     init_string_validator();
     OpenApiGenerator = class {
       constructor(options) {
@@ -6573,6 +6698,7 @@ var init_openapi_generator = __esm({
           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,
@@ -6649,7 +6775,8 @@ var init_openapi_generator = __esm({
           namingOptions: {
             prefix: this.options.prefix,
             suffix: this.options.suffix
-          }
+          },
+          stripSchemaPrefix: this.options.stripSchemaPrefix
         });
       }
       /**
@@ -6662,6 +6789,9 @@ var init_openapi_generator = __esm({
           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();
@@ -6683,9 +6813,11 @@ var init_openapi_generator = __esm({
           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) {
@@ -7001,7 +7133,8 @@ var init_openapi_generator = __esm({
         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
           });
@@ -7010,7 +7143,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);
@@ -7026,7 +7160,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);
@@ -7145,7 +7280,7 @@ ${propsCode}
         const headerLower = headerName.toLowerCase();
         return ignorePatterns.some((pattern) => {
           const patternLower = pattern.toLowerCase();
-          return minimatch2(headerLower, patternLower);
+          return minimatch3(headerLower, patternLower);
         });
       }
       /**
@@ -7228,12 +7363,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") {
@@ -7485,7 +7635,7 @@ async function loadConfig(configPath) {
   }
   if (!result || !result.config) {
     throw new Error(
-      configPath ? `Config file not found at: ${configPath}` : "No config file found. Searched for: openapi-to-zod.config.ts, openapi-to-zod.config.json, package.json (openapi-to-zod key)"
+      configPath ? `Config file not found at: ${configPath}` : "No config file found. Searched for: openapi-to-zod.config.ts, openapi-to-zod.config.json, package.json (openapi-to-zod key)\nRun 'openapi-to-zod init' to create a new config file."
     );
   }
   try {
@@ -7537,6 +7687,7 @@ var init_config_loader = __esm({
       schemaType: z2.enum(["all", "request", "response"]).optional(),
       prefix: z2.string().optional(),
       suffix: z2.string().optional(),
+      stripSchemaPrefix: z2.string().optional(),
       showStats: z2.boolean().optional(),
       request: RequestResponseOptionsSchema.optional(),
       response: RequestResponseOptionsSchema.optional(),
@@ -7553,6 +7704,7 @@ var init_config_loader = __esm({
         schemaType: z2.enum(["all", "request", "response"]).optional(),
         prefix: z2.string().optional(),
         suffix: z2.string().optional(),
+        stripSchemaPrefix: z2.string().optional(),
         showStats: z2.boolean().optional(),
         request: RequestResponseOptionsSchema.optional(),
         response: RequestResponseOptionsSchema.optional(),
@@ -7652,14 +7804,7 @@ Examples:
     }
     async function executeConfigMode(options) {
       var _a, _b;
-      let config;
-      try {
-        config = await loadConfig(options.config);
-      } catch {
-        throw new CliOptionsError("No config file found. Run 'openapi-to-zod init' to create one.", {
-          configPath: options.config
-        });
-      }
+      const config = await loadConfig(options.config);
       const specs = mergeConfigWithDefaults(config);
       const executionMode = config.executionMode || "parallel";
       const batchSize = (_b = (_a = specs[0]) == null ? void 0 : _a.batchSize) != null ? _b : 10;