api-core-lib 12.0.73 → 12.0.75

package/dist/cli.cjs

@@ -74,6 +74,110 @@ var import_chalk = __toESM(require("chalk"), 1);
 var import_dotenv = __toESM(require("dotenv"), 1);
 var import_swagger_parser = __toESM(require("@apidevtools/swagger-parser"), 1);
 var import_openapi_types = __toESM(require_dist(), 1);
+
+// src/generator/core/_propToZod.ts
+function _propToZod(prop) {
+  let zodChain;
+  const getRuleMessage = (rule, defaultKey) => {
+    const customMessages = prop.errorMessages;
+    const message = customMessages?.[rule] || defaultKey;
+    return `{ "message": "${message}" }`;
+  };
+  switch (prop.type) {
+    case "string": {
+      if (prop.enum && prop.enum.length > 0) {
+        const messages = {
+          required_error: prop.errorMessages?.required || "validation.required",
+          invalid_type_error: prop.errorMessages?.invalid_type || "validation.string.enum"
+        };
+        zodChain = `z.enum(${JSON.stringify(prop.enum)}, ${JSON.stringify(messages)})`;
+      } else {
+        zodChain = "z.string()";
+        if (prop.isRequired) {
+          zodChain += `.min(1, ${getRuleMessage("minLength", "validation.string.nonempty")})`;
+        }
+        if (prop.maxLength !== void 0) {
+          zodChain += `.max(${prop.maxLength}, ${getRuleMessage("maxLength", "validation.string.max")})`;
+        }
+        if (prop.pattern) {
+          zodChain += `.regex(/${prop.pattern}/, ${getRuleMessage("pattern", "validation.string.regex")})`;
+        }
+        if (prop.format) {
+          const msg = getRuleMessage("format", `validation.string.${prop.format}`);
+          if (prop.format === "email") zodChain += `.email(${msg})`;
+          if (prop.format === "url") zodChain += `.url(${msg})`;
+          if (prop.format === "uuid") zodChain += `.uuid(${msg})`;
+          if (prop.format === "datetime") zodChain += `.datetime(${msg})`;
+        }
+      }
+      break;
+    }
+    case "integer": {
+      zodChain = `z.number().int(${getRuleMessage("integer", "validation.number.integer")})`;
+      if (prop.minimum !== void 0) {
+        zodChain += `.min(${prop.minimum}, ${getRuleMessage("minimum", "validation.number.min")})`;
+      }
+      if (prop.maximum !== void 0) {
+        zodChain += `.max(${prop.maximum}, ${getRuleMessage("maximum", "validation.number.max")})`;
+      }
+      break;
+    }
+    case "number": {
+      zodChain = "z.number()";
+      if (prop.minimum !== void 0) {
+        zodChain += `.min(${prop.minimum}, ${getRuleMessage("minimum", "validation.number.min")})`;
+      }
+      if (prop.maximum !== void 0) {
+        zodChain += `.max(${prop.maximum}, ${getRuleMessage("maximum", "validation.number.max")})`;
+      }
+      break;
+    }
+    case "boolean": {
+      zodChain = "z.boolean()";
+      break;
+    }
+    case "array": {
+      const itemSchema = prop.items ? _propToZod(prop.items) : "z.any()";
+      zodChain = `z.array(${itemSchema})`;
+      if (prop.minItems !== void 0) {
+        zodChain += `.min(${prop.minItems}, ${getRuleMessage("minItems", "validation.array.min")})`;
+      }
+      if (prop.maxItems !== void 0) {
+        zodChain += `.max(${prop.maxItems}, ${getRuleMessage("maxItems", "validation.array.max")})`;
+      }
+      break;
+    }
+    case "object": {
+      if (prop.properties && prop.properties.length > 0) {
+        const shape = prop.properties.map((p) => `  ${p.name}: ${_propToZod(p)}`).join(",\n");
+        zodChain = `z.object({
+${shape}
+})`;
+      } else {
+        zodChain = "z.record(z.unknown())";
+      }
+      break;
+    }
+    default:
+      zodChain = "z.any()";
+      break;
+  }
+  if (prop.description) {
+    zodChain += `.describe(${JSON.stringify(prop.description)})`;
+  }
+  if (!prop.isRequired) {
+    zodChain += ".optional()";
+  }
+  if (prop.isNullable) {
+    zodChain += ".nullable()";
+  }
+  if (prop.defaultValue !== void 0) {
+    zodChain += `.default(${JSON.stringify(prop.defaultValue)})`;
+  }
+  return zodChain;
+}
+
+// src/generator/index.ts
 var DEBUG_MODE = process.env.DEBUG === "true";
 var debugLog = (title, data) => DEBUG_MODE && console.log(import_chalk.default.yellow(`
 [DEBUG: ${title}]`), import_util.default.inspect(data, { depth: 5, colors: true }));
@@ -276,25 +380,109 @@ ${prop.example ? `   * @example ${JSON.stringify(prop.example)}
     import_fs.default.writeFileSync(import_path.default.join(moduleOutputPath, "types.ts"), typesContent);
     console.log(import_chalk.default.gray(`    \u2713 types.ts`));
     indexContent.push(`export * from './types';`);
-    let validationContent = `// This file is auto-generated.
-import { z } from 'zod';
-`;
-    if (enumsToImport.length > 0) validationContent += `import { ${enumsToImport.join(", ")} } from './enums';
+    const validationFileHeader = `// This file is auto-generated.
+import { z, ZodIssueCode, ZodError } from 'zod';
+${enumsToImport.length > 0 ? `import { ${enumsToImport.join(", ")} } from './enums';
+` : ""}
+// =============================================================================
+// I. \u0625\u0639\u062F\u0627\u062F \u062E\u0631\u064A\u0637\u0629 \u0623\u062E\u0637\u0627\u0621 \u0639\u0627\u0644\u0645\u064A\u0629 (Global Error Map) \u0644\u062F\u0639\u0645 \u0627\u0644\u062A\u0631\u062C\u0645\u0629
+// =============================================================================
+//
+// \u0645\u0644\u0627\u062D\u0638\u0629 \u0647\u0627\u0645\u0629: \u0641\u064A \u062A\u0637\u0628\u064A\u0642 \u062D\u0642\u064A\u0642\u064A\u060C \u064A\u062C\u0628 \u062A\u0639\u0631\u064A\u0641 \u0647\u0630\u0647 \u0627\u0644\u062E\u0631\u064A\u0637\u0629 \u0645\u0631\u0629 \u0648\u0627\u062D\u062F\u0629 \u0641\u0642\u0637
+// \u0641\u064A \u0646\u0642\u0637\u0629 \u0627\u0644\u062F\u062E\u0648\u0644 \u0644\u062A\u0637\u0628\u064A\u0642\u0643 (entry-point). \u062A\u0645 \u0648\u0636\u0639\u0647\u0627 \u0647\u0646\u0627 \u0644\u0644\u062A\u0648\u0636\u064A\u062D.
+//
+// \u0627\u0644\u0647\u062F\u0641: \u0631\u0628\u0637 \u0645\u0641\u0627\u062A\u064A\u062D \u0627\u0644\u062A\u0631\u062C\u0645\u0629 (\u0645\u062B\u0644 "validation.required") \u0627\u0644\u062A\u064A \u062A\u0645 \u062A\u0648\u0644\u064A\u062F\u0647\u0627
+// \u0641\u064A \u0627\u0644\u0645\u062E\u0637\u0637\u0627\u062A \u0623\u062F\u0646\u0627\u0647 \u0628\u0631\u0633\u0627\u0626\u0644 \u062D\u0642\u064A\u0642\u064A\u0629 \u064A\u0645\u0643\u0646 \u0639\u0631\u0636\u0647\u0627 \u0644\u0644\u0645\u0633\u062A\u062E\u062F\u0645.
+
+// 1. \u0645\u062B\u0627\u0644 \u0628\u0633\u064A\u0637 \u0644\u062F\u0627\u0644\u0629 \u062A\u0631\u062C\u0645\u0629 (\u0641\u064A \u062A\u0637\u0628\u064A\u0642\u0643 \u0633\u062A\u0633\u062A\u062E\u062F\u0645 \u0645\u0643\u062A\u0628\u0629 \u0645\u062B\u0644 i18next)
+const t = (key: string, args?: any): string => {
+  // \u0647\u0646\u0627 \u062A\u0636\u0639 \u0645\u0646\u0637\u0642 \u0627\u0644\u062A\u0631\u062C\u0645\u0629 \u0627\u0644\u062D\u0642\u064A\u0642\u064A \u0627\u0644\u062E\u0627\u0635 \u0628\u0643.
+  // \u0647\u0630\u0627 \u0645\u062C\u0631\u062F \u0645\u062B\u0627\u0644 \u0628\u0633\u064A\u0637.
+  if (key === 'validation.string.nonempty') return '\u0647\u0630\u0627 \u0627\u0644\u062D\u0642\u0644 \u0645\u0637\u0644\u0648\u0628 \u0648\u0644\u0627 \u064A\u0645\u0643\u0646 \u0623\u0646 \u064A\u0643\u0648\u0646 \u0641\u0627\u0631\u063A\u064B\u0627.';
+  if (key === 'validation.string.email') return '\u0627\u0644\u0631\u062C\u0627\u0621 \u0625\u062F\u062E\u0627\u0644 \u0628\u0631\u064A\u062F \u0625\u0644\u0643\u062A\u0631\u0648\u0646\u064A \u0635\u0627\u0644\u062D.';
+  if (key === 'validation.required') return '\u0647\u0630\u0627 \u0627\u0644\u062D\u0642\u0644 \u0625\u0644\u0632\u0627\u0645\u064A.';
+  // \u0631\u0633\u0627\u0644\u0629 \u0627\u062D\u062A\u064A\u0627\u0637\u064A\u0629
+  return key.split('.').pop()?.replace(/_/g, ' ') || key;
+};
+
+// 2. \u062A\u0639\u0631\u064A\u0641 \u062E\u0631\u064A\u0637\u0629 \u0627\u0644\u0623\u062E\u0637\u0627\u0621 \u0627\u0644\u0645\u062E\u0635\u0635\u0629
+const customErrorMap: z.ZodErrorMap = (issue, ctx) => {
+  if (issue.message) {
+    // \u0625\u0630\u0627 \u0643\u0627\u0646\u062A \u0627\u0644\u0631\u0633\u0627\u0644\u0629 \u0647\u064A \u0645\u0641\u062A\u0627\u062D \u062A\u0631\u062C\u0645\u0629\u060C \u0642\u0645 \u0628\u062A\u0631\u062C\u0645\u062A\u0647\u0627
+    if (issue.message.startsWith('validation.')) {
+      return { message: t(issue.message) };
+    }
+    // \u0648\u0625\u0644\u0627\u060C \u0641\u0647\u064A \u0631\u0633\u0627\u0644\u0629 \u0645\u062E\u0635\u0635\u0629 \u0645\u0628\u0627\u0634\u0631\u0629
+    return { message: issue.message };
+  }
+
+  // \u062A\u0631\u062C\u0645\u0629 \u0627\u0644\u0623\u062E\u0637\u0627\u0621 \u0627\u0644\u0627\u0641\u062A\u0631\u0627\u0636\u064A\u0629 \u0627\u0644\u0639\u0627\u0645\u0629
+  if (issue.code === ZodIssueCode.invalid_type) {
+    return { message: t('validation.required') };
+  }
+
+  return { message: ctx.defaultError };
+};
+
+// 3. \u0642\u0645 \u0628\u062A\u0639\u064A\u064A\u0646 \u0627\u0644\u062E\u0631\u064A\u0637\u0629 \u0627\u0644\u0645\u062E\u0635\u0635\u0629 \u0639\u0627\u0644\u0645\u064A\u064B\u0627 (\u064A\u062C\u0628 \u0639\u0645\u0644 \u0630\u0644\u0643 \u0645\u0631\u0629 \u0648\u0627\u062D\u062F\u0629 \u0641\u064A \u0627\u0644\u062A\u0637\u0628\u064A\u0642)
+z.setErrorMap(customErrorMap);
 
+// =============================================================================
+// II. \u0645\u062E\u0637\u0637\u0627\u062A \u0627\u0644\u062A\u062D\u0642\u0642 \u0627\u0644\u0645\u0648\u0644\u062F\u0629 \u062A\u0644\u0642\u0627\u0626\u064A\u064B\u0627 (Generated Validation Schemas)
+// =============================================================================
 `;
+    let validationContent = validationFileHeader;
     for (const typeName of schemasToImport) {
       const parsedSchema = allSchemas.get(typeName);
       if (parsedSchema) {
         let zodShape = parsedSchema.properties.map((p) => `  ${p.name}: ${_propToZod(p)}`).join(",\n");
+        validationContent += `
+/**
+ * Schema for validating ${typeName} objects.
+ * @description ${parsedSchema.description || ""}
+ */
+`;
         validationContent += `export const ${typeName}Schema = z.object({
 ${zodShape}
 });
-
+`;
+        validationContent += `export type ${typeName}Schema = z.infer<typeof ${typeName}Schema>;
 `;
       }
     }
+    if (schemasToImport.length > 0) {
+      const firstSchemaName = schemasToImport[0];
+      validationContent += `
+// =============================================================================
+// III. \u0645\u062B\u0627\u0644 \u0639\u0644\u0649 \u0643\u064A\u0641\u064A\u0629 \u0627\u0633\u062A\u062E\u062F\u0627\u0645 \u0627\u0644\u0645\u062E\u0637\u0637 \u0641\u064A \u0627\u0644\u0643\u0648\u062F
+// =============================================================================
+/*
+function
+ 
+validate${firstSchemaName}(data: unknown) {
+  try {
+    const validatedData = ${firstSchemaName}Schema.parse(data);
+    console.log("\u2705 Validation successful:", validatedData);
+    return { success: true, data: validatedData };
+  } catch (error) {
+    if (error instanceof ZodError) {
+      console.error("\u274C Validation failed:");
+      // .format() is great for getting a structured error object
+      console.log(JSON.stringify(error.format(), null, 2));
+      return { success: false, errors: error.format() };
+    }
+    throw error; // Rethrow other unexpected errors
+  }
+}
+
+// Example usage with invalid data:
+const invalidData = { /* ... \u0628\u064A\u0627\u0646\u0627\u062A \u063A\u064A\u0631 \u0643\u0627\u0645\u0644\u0629 \u0623\u0648 \u062E\u0627\u0637\u0626\u0629 ... */ };
+// validate${firstSchemaName}(invalidData);
+*/
+`;
+    }
     import_fs.default.writeFileSync(import_path.default.join(moduleOutputPath, "validation.ts"), validationContent);
-    console.log(import_chalk.default.gray(`    \u2713 validation.ts`));
+    console.log(import_chalk.default.gray(`    \u2713 validation.ts (with integrated usage example)`));
     indexContent.push(`export * from './validation';`);
     let mocksContent = `// This file is auto-generated.
 import type { ${schemasToImport.join(", ")} } from './types';
@@ -321,71 +509,6 @@ import type { ${schemasToImport.join(", ")} } from './types';
   import_fs.default.writeFileSync(import_path.default.join(moduleOutputPath, "index.ts"), indexContent.join("\n"));
   console.log(import_chalk.default.gray(`    \u2713 index.ts`));
 }
-function _propToZod(prop) {
-  let chain;
-  const requiredErrorMessage = { required_error: `${prop.name} is required.` };
-  switch (prop.type) {
-    case "string":
-      chain = `z.string({ ...requiredErrorMessage, invalid_type_error: "Expected a string for ${prop.name}" })`;
-      if (prop.format === "email") chain += `.email({ message: "Invalid email address for ${prop.name}" })`;
-      if (prop.format === "uuid") chain += `.uuid({ message: "Invalid UUID for ${prop.name}" })`;
-      if (prop.format === "url") chain += `.url({ message: "Invalid URL for ${prop.name}" })`;
-      if (prop.format === "datetime") chain += `.datetime({ message: "Invalid datetime format for ${prop.name}" })`;
-      if (prop.minLength !== void 0) chain += `.min(${prop.minLength}, { message: "${prop.name} must be at least ${prop.minLength} characters long" })`;
-      if (prop.maxLength !== void 0) chain += `.max(${prop.maxLength}, { message: "${prop.name} must be at most ${prop.maxLength} characters long" })`;
-      if (prop.pattern) chain += `.regex(/${prop.pattern}/, { message: "Invalid format for ${prop.name}" })`;
-      if (prop.enum) {
-        if (prop.enum.length > 0) {
-          chain = `z.enum(${JSON.stringify(prop.enum)})`;
-        } else {
-          chain = `z.string().refine(() => false, { message: "Enum for ${prop.name} is empty" })`;
-        }
-      }
-      break;
-    case "integer":
-      chain = `z.number({ ...requiredErrorMessage, invalid_type_error: "Expected a number for ${prop.name}" }).int({ message: "${prop.name} must be an integer" })`;
-      if (prop.minimum !== void 0) chain += `.min(${prop.minimum}, { message: "${prop.name} must be at least ${prop.minimum}" })`;
-      if (prop.maximum !== void 0) chain += `.max(${prop.maximum}, { message: "${prop.name} must be at most ${prop.maximum}" })`;
-      break;
-    case "number":
-      chain = `z.number({ ...requiredErrorMessage, invalid_type_error: "Expected a number for ${prop.name}" })`;
-      if (prop.minimum !== void 0) chain += `.min(${prop.minimum}, { message: "${prop.name} must be at least ${prop.minimum}" })`;
-      if (prop.maximum !== void 0) chain += `.max(${prop.maximum}, { message: "${prop.name} must be at most ${prop.maximum}" })`;
-      break;
-    case "boolean":
-      chain = `z.boolean({ ...requiredErrorMessage, invalid_type_error: "Expected a boolean for ${prop.name}" })`;
-      break;
-    case "array":
-      const itemSchema = prop.items ? _propToZod(prop.items) : "z.any()";
-      chain = `z.array(${itemSchema})`;
-      if (prop.minItems !== void 0) chain += `.min(${prop.minItems}, { message: "${prop.name} must contain at least ${prop.minItems} item(s)" })`;
-      if (prop.maxItems !== void 0) chain += `.max(${prop.maxItems}, { message: "${prop.name} must contain at most ${prop.maxItems} item(s)" })`;
-      break;
-    case "object":
-      if (prop.properties && prop.properties.length > 0) {
-        const shape = prop.properties.map((p) => `  ${p.name}: ${_propToZod(p)}`).join(",\n");
-        chain = `z.object({
-${shape}
-})`;
-      } else {
-        chain = "z.record(z.unknown())";
-      }
-      break;
-    default:
-      chain = "z.any()";
-      break;
-  }
-  if (prop.description) {
-    chain += `.describe(${JSON.stringify(prop.description)})`;
-  }
-  if (!prop.isRequired) {
-    chain += ".optional()";
-  }
-  if (prop.isNullable) {
-    chain += ".nullable()";
-  }
-  return chain;
-}
 function _propToMock(prop) {
   if (prop.example) return prop.example;
   if (prop.name.match(/image|avatar|logo|url/i)) return "https://via.placeholder.com/150";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api-core-lib",
-  "version": "12.0.73",
+  "version": "12.0.75",
   "description": "A flexible and powerful API client library for modern web applications.",
   "type": "module",
   "exports": {