@cerios/openapi-to-zod 1.1.1 → 1.2.0

package/dist/cli.mjs

@@ -5241,14 +5241,17 @@ function escapeJSDoc(str) {
 function wrapNullable(validation, isNullable2) {
   return isNullable2 ? `${validation}.nullable()` : validation;
 }
-function isNullable(schema) {
+function isNullable(schema, defaultNullable = false) {
   if (schema.nullable === true) {
     return true;
   }
+  if (schema.nullable === false) {
+    return false;
+  }
   if (Array.isArray(schema.type)) {
     return schema.type.includes("null");
   }
-  return false;
+  return defaultNullable;
 }
 function getPrimaryType(schema) {
   if (Array.isArray(schema.type)) {
@@ -5434,6 +5437,22 @@ function stripPrefix(input, pattern, ensureLeadingChar) {
   }
   return input;
 }
+function stripPathPrefix(path2, pattern) {
+  if (!pattern) {
+    return path2;
+  }
+  if (!isGlobPattern(pattern)) {
+    let normalizedPattern = pattern.trim();
+    if (!normalizedPattern.startsWith("/")) {
+      normalizedPattern = `/${normalizedPattern}`;
+    }
+    if (normalizedPattern.endsWith("/") && normalizedPattern !== "/") {
+      normalizedPattern = normalizedPattern.slice(0, -1);
+    }
+    return stripPrefix(path2, normalizedPattern, "/");
+  }
+  return stripPrefix(path2, pattern, "/");
+}
 var init_pattern_utils = __esm({
   "src/utils/pattern-utils.ts"() {
     "use strict";
@@ -5999,6 +6018,26 @@ function configurePatternCache(size) {
     PATTERN_CACHE = new LRUCache(size);
   }
 }
+function configureDateTimeFormat(pattern) {
+  if (!pattern) {
+    FORMAT_MAP["date-time"] = "z.iso.datetime()";
+    return;
+  }
+  const patternStr = pattern instanceof RegExp ? pattern.source : pattern;
+  if (patternStr === "") {
+    FORMAT_MAP["date-time"] = "z.iso.datetime()";
+    return;
+  }
+  try {
+    new RegExp(patternStr);
+  } catch (error) {
+    throw new Error(
+      `Invalid regular expression pattern for customDateTimeFormatRegex: ${patternStr}. ${error instanceof Error ? error.message : "Pattern is malformed"}`
+    );
+  }
+  const escapedPattern = escapePattern(patternStr);
+  FORMAT_MAP["date-time"] = `z.string().regex(/${escapedPattern}/)`;
+}
 function generateStringValidation(schema, useDescribe) {
   let validation = FORMAT_MAP[schema.format || ""] || "z.string()";
   if (schema.minLength !== void 0) {
@@ -6064,7 +6103,7 @@ function generateStringValidation(schema, useDescribe) {
   }
   return addDescription(validation, schema.description, useDescribe);
 }
-var PATTERN_CACHE, FORMAT_MAP;
+var PATTERN_CACHE, DEFAULT_FORMAT_MAP, FORMAT_MAP;
 var init_string_validator = __esm({
   "src/validators/string-validator.ts"() {
     "use strict";
@@ -6072,7 +6111,7 @@ var init_string_validator = __esm({
     init_lru_cache();
     init_string_utils();
     PATTERN_CACHE = new LRUCache(1e3);
-    FORMAT_MAP = {
+    DEFAULT_FORMAT_MAP = {
       uuid: "z.uuid()",
       email: "z.email()",
       uri: "z.url()",
@@ -6082,7 +6121,6 @@ var init_string_validator = __esm({
       byte: "z.base64()",
       binary: "z.string()",
       date: "z.iso.date()",
-      "date-time": "z.iso.datetime()",
       time: "z.iso.time()",
       duration: 'z.string().refine((val) => /^P(?:(?:\\d+Y)?(?:\\d+M)?(?:\\d+D)?(?:T(?:\\d+H)?(?:\\d+M)?(?:\\d+(?:\\.\\d+)?S)?)?|\\d+W)$/.test(val) && !/^PT?$/.test(val), { message: "Must be a valid ISO 8601 duration" })',
       ipv4: "z.ipv4()",
@@ -6101,6 +6139,10 @@ var init_string_validator = __esm({
       "json-pointer": 'z.string().refine((val) => val === "" || /^(\\/([^~/]|~0|~1)+)+$/.test(val), { message: "Must be a valid JSON Pointer (RFC 6901)" })',
       "relative-json-pointer": 'z.string().refine((val) => /^(0|[1-9]\\d*)(#|(\\/([^~/]|~0|~1)+)*)$/.test(val), { message: "Must be a valid relative JSON Pointer" })'
     };
+    FORMAT_MAP = {
+      ...DEFAULT_FORMAT_MAP,
+      "date-time": "z.iso.datetime()"
+    };
   }
 });
 
@@ -6341,7 +6383,8 @@ var init_property_generator = __esm({
         if ((this.context.schemaType === "request" || this.context.schemaType === "response") && schema.properties) {
           schema = this.filterNestedProperties(schema);
         }
-        const nullable = isNullable(schema);
+        const effectiveDefaultNullable = isTopLevel ? false : this.context.defaultNullable;
+        const nullable = isNullable(schema, effectiveDefaultNullable);
         if (hasMultipleTypes(schema)) {
           const union = this.generateMultiTypeUnion(schema, currentSchema);
           return wrapNullable(union, nullable);
@@ -6685,7 +6728,7 @@ var init_openapi_generator = __esm({
         this.schemaUsageMap = /* @__PURE__ */ new Map();
         this.needsZodImport = true;
         this.filterStats = createFilterStatistics();
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g;
         if (!options.input) {
           throw new ConfigurationError("Input path is required", { providedOptions: options });
         }
@@ -6695,21 +6738,27 @@ var init_openapi_generator = __esm({
           output: options.output,
           includeDescriptions: (_a = options.includeDescriptions) != null ? _a : true,
           useDescribe: (_b = options.useDescribe) != null ? _b : false,
+          defaultNullable: (_c = options.defaultNullable) != null ? _c : false,
           schemaType: options.schemaType || "all",
           prefix: options.prefix,
           suffix: options.suffix,
           stripSchemaPrefix: options.stripSchemaPrefix,
-          showStats: (_c = options.showStats) != null ? _c : true,
+          stripPathPrefix: options.stripPathPrefix,
+          showStats: (_d = options.showStats) != null ? _d : true,
           request: options.request,
           response: options.response,
           operationFilters: options.operationFilters,
           ignoreHeaders: options.ignoreHeaders,
-          cacheSize: (_d = options.cacheSize) != null ? _d : 1e3,
-          batchSize: (_e = options.batchSize) != null ? _e : 10
+          cacheSize: (_e = options.cacheSize) != null ? _e : 1e3,
+          batchSize: (_f = options.batchSize) != null ? _f : 10,
+          customDateTimeFormatRegex: options.customDateTimeFormatRegex
         };
         if (this.options.cacheSize) {
           configurePatternCache(this.options.cacheSize);
         }
+        if (this.options.customDateTimeFormatRegex) {
+          configureDateTimeFormat(this.options.customDateTimeFormatRegex);
+        }
         try {
           const fs = __require("fs");
           if (!fs.existsSync(this.options.input)) {
@@ -6772,6 +6821,7 @@ var init_openapi_generator = __esm({
           mode: this.requestOptions.mode,
           includeDescriptions: this.requestOptions.includeDescriptions,
           useDescribe: this.requestOptions.useDescribe,
+          defaultNullable: (_g = this.options.defaultNullable) != null ? _g : false,
           namingOptions: {
             prefix: this.options.prefix,
             suffix: this.options.suffix
@@ -7125,7 +7175,7 @@ var init_openapi_generator = __esm({
        * Generate schema for a component
        */
       generateComponentSchema(name, schema) {
-        var _a, _b;
+        var _a, _b, _c;
         if (!this.schemaDependencies.has(name)) {
           this.schemaDependencies.set(name, /* @__PURE__ */ new Set());
         }
@@ -7157,14 +7207,14 @@ ${typeCode}`;
           mode: resolvedOptions.mode,
           includeDescriptions: resolvedOptions.includeDescriptions,
           useDescribe: resolvedOptions.useDescribe,
+          defaultNullable: (_b = this.options.defaultNullable) != null ? _b : false,
           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);
+        const zodSchema = this.propertyGenerator.generatePropertySchema(schema, name, true);
         const zodSchemaCode = `${jsdoc}export const ${schemaName} = ${zodSchema};`;
         if (zodSchema.includes("z.discriminatedUnion(")) {
           const match = zodSchema.match(/z\.discriminatedUnion\([^,]+,\s*\[([^\]]+)\]/);
@@ -7174,7 +7224,7 @@ ${typeCode}`;
               const depMatch = ref.match(/^([a-z][a-zA-Z0-9]*?)Schema$/);
               if (depMatch) {
                 const depName = depMatch[1].charAt(0).toUpperCase() + depMatch[1].slice(1);
-                (_b = this.schemaDependencies.get(name)) == null ? void 0 : _b.add(depName);
+                (_c = this.schemaDependencies.get(name)) == null ? void 0 : _c.add(depName);
               }
             }
           }
@@ -7198,7 +7248,7 @@ ${typeCode}`;
             if (!shouldIncludeOperation(operation, path2, method, this.options.operationFilters)) {
               continue;
             }
-            if (!operation.operationId || !operation.parameters || !Array.isArray(operation.parameters)) {
+            if (!operation.parameters || !Array.isArray(operation.parameters)) {
               continue;
             }
             const queryParams = operation.parameters.filter(
@@ -7207,7 +7257,13 @@ ${typeCode}`;
             if (queryParams.length === 0) {
               continue;
             }
-            const pascalOperationId = operation.operationId.includes("-") ? toPascalCase(operation.operationId) : operation.operationId.charAt(0).toUpperCase() + operation.operationId.slice(1);
+            let pascalOperationId;
+            if (operation.operationId) {
+              pascalOperationId = operation.operationId.includes("-") ? toPascalCase(operation.operationId) : operation.operationId.charAt(0).toUpperCase() + operation.operationId.slice(1);
+            } else {
+              const strippedPath = stripPathPrefix(path2, this.options.stripPathPrefix);
+              pascalOperationId = this.generateMethodNameFromPath(method, strippedPath);
+            }
             const schemaName = `${pascalOperationId}QueryParams`;
             if (!this.schemaDependencies.has(schemaName)) {
               this.schemaDependencies.set(schemaName, /* @__PURE__ */ new Set());
@@ -7255,8 +7311,9 @@ ${propsCode}
             const prefixedName = this.options.prefix ? `${toPascalCase(this.options.prefix)}${operationName}` : operationName;
             const suffixedName = this.options.suffix ? `${prefixedName}${toPascalCase(this.options.suffix)}` : prefixedName;
             const camelCaseSchemaName = `${suffixedName.charAt(0).toLowerCase() + suffixedName.slice(1)}QueryParamsSchema`;
+            const jsdocOperationName = operation.operationId || `${method.toUpperCase()} ${path2}`;
             const jsdoc = `/**
- * Query parameters for ${operation.operationId}
+ * Query parameters for ${jsdocOperationName}
  */
 `;
             const fullSchemaCode = `${jsdoc}export const ${camelCaseSchemaName} = ${schemaCode};`;
@@ -7265,6 +7322,35 @@ ${propsCode}
           }
         }
       }
+      /**
+       * Generate a PascalCase method name from HTTP method and path
+       * Used as fallback when operationId is not available
+       * @internal
+       */
+      generateMethodNameFromPath(method, path2) {
+        const segments = path2.split("/").filter(Boolean).map((segment) => {
+          if (segment.startsWith("{") && segment.endsWith("}")) {
+            const paramName = segment.slice(1, -1);
+            return `By${this.capitalizeSegment(paramName)}`;
+          }
+          return this.capitalizeSegment(segment);
+        }).join("");
+        const capitalizedMethod = method.charAt(0).toUpperCase() + method.slice(1).toLowerCase();
+        return `${capitalizedMethod}${segments}`;
+      }
+      /**
+       * Capitalizes a path segment, handling special characters like dashes, underscores, and dots
+       * @internal
+       */
+      capitalizeSegment(str) {
+        if (str.includes("-") || str.includes("_") || str.includes(".")) {
+          return str.split(/[-_.]/).map((part) => {
+            if (!part) return "";
+            return part.charAt(0).toUpperCase() + part.slice(1).toLowerCase();
+          }).join("");
+        }
+        return str.charAt(0).toUpperCase() + str.slice(1);
+      }
       /**
        * Check if a header should be ignored based on filter patterns
        * @internal
@@ -7301,7 +7387,7 @@ ${propsCode}
             if (!shouldIncludeOperation(operation, path2, method, this.options.operationFilters)) {
               continue;
             }
-            if (!operation.operationId || !operation.parameters || !Array.isArray(operation.parameters)) {
+            if (!operation.parameters || !Array.isArray(operation.parameters)) {
               continue;
             }
             const headerParams = operation.parameters.filter(
@@ -7310,7 +7396,13 @@ ${propsCode}
             if (headerParams.length === 0) {
               continue;
             }
-            const pascalOperationId = operation.operationId.includes("-") ? toPascalCase(operation.operationId) : operation.operationId.charAt(0).toUpperCase() + operation.operationId.slice(1);
+            let pascalOperationId;
+            if (operation.operationId) {
+              pascalOperationId = operation.operationId.includes("-") ? toPascalCase(operation.operationId) : operation.operationId.charAt(0).toUpperCase() + operation.operationId.slice(1);
+            } else {
+              const strippedPath = stripPathPrefix(path2, this.options.stripPathPrefix);
+              pascalOperationId = this.generateMethodNameFromPath(method, strippedPath);
+            }
             const schemaName = `${pascalOperationId}HeaderParams`;
             if (!this.schemaDependencies.has(schemaName)) {
               this.schemaDependencies.set(schemaName, /* @__PURE__ */ new Set());
@@ -7347,8 +7439,9 @@ ${propsCode}
             const prefixedName = this.options.prefix ? `${toPascalCase(this.options.prefix)}${operationName}` : operationName;
             const suffixedName = this.options.suffix ? `${prefixedName}${toPascalCase(this.options.suffix)}` : prefixedName;
             const camelCaseSchemaName = `${suffixedName.charAt(0).toLowerCase() + suffixedName.slice(1)}HeaderParamsSchema`;
+            const jsdocOperationName = operation.operationId || `${method.toUpperCase()} ${path2}`;
             const jsdoc = `/**
- * Header parameters for ${operation.operationId}
+ * Header parameters for ${jsdocOperationName}
  */
 `;
             const fullSchemaCode = `${jsdoc}export const ${camelCaseSchemaName} = ${schemaCode};`;
@@ -7529,7 +7622,8 @@ var init_config_schemas = __esm({
     RequestResponseOptionsSchema = z.strictObject({
       mode: z.enum(["strict", "normal", "loose"]).optional(),
       useDescribe: z.boolean().optional(),
-      includeDescriptions: z.boolean().optional()
+      includeDescriptions: z.boolean().optional(),
+      defaultNullable: z.boolean().optional()
     });
     OperationFiltersSchema = z.strictObject({
       includeTags: z.array(z.string()).optional(),
@@ -7660,10 +7754,12 @@ function mergeConfigWithDefaults(config) {
       mode: defaults.mode,
       includeDescriptions: defaults.includeDescriptions,
       useDescribe: defaults.useDescribe,
+      defaultNullable: defaults.defaultNullable,
       schemaType: defaults.schemaType,
       prefix: defaults.prefix,
       suffix: defaults.suffix,
       showStats: defaults.showStats,
+      customDateTimeFormatRegex: defaults.customDateTimeFormatRegex,
       // Override with spec-specific values (including required input/output)
       ...spec
     };
@@ -7684,6 +7780,7 @@ var init_config_loader = __esm({
       output: z2.string(),
       includeDescriptions: z2.boolean().optional(),
       useDescribe: z2.boolean().optional(),
+      defaultNullable: z2.boolean().optional(),
       schemaType: z2.enum(["all", "request", "response"]).optional(),
       prefix: z2.string().optional(),
       suffix: z2.string().optional(),
@@ -7694,13 +7791,28 @@ var init_config_loader = __esm({
       name: z2.string().optional(),
       operationFilters: OperationFiltersSchema.optional(),
       cacheSize: z2.number().positive().optional(),
-      batchSize: z2.number().positive().optional()
+      batchSize: z2.number().positive().optional(),
+      customDateTimeFormatRegex: z2.union([
+        z2.string().refine(
+          (pattern) => {
+            try {
+              new RegExp(pattern);
+              return true;
+            } catch {
+              return false;
+            }
+          },
+          { message: "Must be a valid regular expression pattern" }
+        ),
+        z2.instanceof(RegExp)
+      ]).optional()
     });
     ConfigFileSchema = z2.strictObject({
       defaults: z2.strictObject({
         mode: z2.enum(["strict", "normal", "loose"]).optional(),
         includeDescriptions: z2.boolean().optional(),
         useDescribe: z2.boolean().optional(),
+        defaultNullable: z2.boolean().optional(),
         schemaType: z2.enum(["all", "request", "response"]).optional(),
         prefix: z2.string().optional(),
         suffix: z2.string().optional(),
@@ -7710,7 +7822,21 @@ var init_config_loader = __esm({
         response: RequestResponseOptionsSchema.optional(),
         operationFilters: OperationFiltersSchema.optional(),
         cacheSize: z2.number().positive().optional(),
-        batchSize: z2.number().positive().optional()
+        batchSize: z2.number().positive().optional(),
+        customDateTimeFormatRegex: z2.union([
+          z2.string().refine(
+            (pattern) => {
+              try {
+                new RegExp(pattern);
+                return true;
+              } catch {
+                return false;
+              }
+            },
+            { message: "Must be a valid regular expression pattern" }
+          ),
+          z2.instanceof(RegExp)
+        ]).optional()
       }).optional(),
       specs: z2.array(OpenApiGeneratorOptionsSchema).min(1, {
         message: "Configuration must include at least one specification. Each specification should have 'input' and 'output' paths."