api-core-lib 12.0.74 → 12.0.75

package/dist/cli.cjs

@@ -77,95 +77,73 @@ var import_openapi_types = __toESM(require_dist(), 1);
 
 // src/generator/core/_propToZod.ts
 function _propToZod(prop) {
-  const getMessages = (keys, customErrorMessages) => {
-    const messages = {};
-    const keyMap = {
-      required: "required_error",
-      invalid_type: "invalid_type_error"
-    };
-    for (const key of keys) {
-      const zodKey = keyMap[key] || "message";
-      const customMessage = customErrorMessages?.[key];
-      messages[zodKey] = customMessage || `validation.${key}`;
-    }
-    return messages;
-  };
   let zodChain;
+  const getRuleMessage = (rule, defaultKey) => {
+    const customMessages = prop.errorMessages;
+    const message = customMessages?.[rule] || defaultKey;
+    return `{ "message": "${message}" }`;
+  };
   switch (prop.type) {
     case "string": {
-      const messages = getMessages(["required", "invalid_type"], prop.errorMessages);
-      zodChain = `z.string(${JSON.stringify(messages)})`;
       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 {
-        if (prop.minLength !== void 0) {
-          const msg = { message: prop.errorMessages?.minLength || "validation.string.min" };
-          zodChain += `.min(${prop.minLength}, ${JSON.stringify(msg)})`;
-        } else if (prop.isRequired) {
-          const msg = { message: prop.errorMessages?.minLength || "validation.string.nonempty" };
-          zodChain += `.min(1, ${JSON.stringify(msg)})`;
+        zodChain = "z.string()";
+        if (prop.isRequired) {
+          zodChain += `.min(1, ${getRuleMessage("minLength", "validation.string.nonempty")})`;
         }
         if (prop.maxLength !== void 0) {
-          const msg = { message: prop.errorMessages?.maxLength || "validation.string.max" };
-          zodChain += `.max(${prop.maxLength}, ${JSON.stringify(msg)})`;
+          zodChain += `.max(${prop.maxLength}, ${getRuleMessage("maxLength", "validation.string.max")})`;
         }
         if (prop.pattern) {
-          const msg = { message: prop.errorMessages?.pattern || "validation.string.regex" };
-          zodChain += `.regex(/${prop.pattern}/, ${JSON.stringify(msg)})`;
+          zodChain += `.regex(/${prop.pattern}/, ${getRuleMessage("pattern", "validation.string.regex")})`;
         }
         if (prop.format) {
-          const msg = { message: prop.errorMessages?.format || `validation.string.${prop.format}` };
-          if (prop.format === "email") zodChain += `.email(${JSON.stringify(msg)})`;
-          if (prop.format === "url") zodChain += `.url(${JSON.stringify(msg)})`;
-          if (prop.format === "uuid") zodChain += `.uuid(${JSON.stringify(msg)})`;
-          if (prop.format === "datetime") zodChain += `.datetime(${JSON.stringify(msg)})`;
+          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": {
-      const messages = getMessages(["required", "invalid_type"], prop.errorMessages);
-      const intMessage = { message: prop.errorMessages?.integer || "validation.number.integer" };
-      zodChain = `z.number(${JSON.stringify(messages)}).int(${JSON.stringify(intMessage)})`;
+      zodChain = `z.number().int(${getRuleMessage("integer", "validation.number.integer")})`;
       if (prop.minimum !== void 0) {
-        const msg = { message: prop.errorMessages?.minimum || "validation.number.min" };
-        zodChain += `.min(${prop.minimum}, ${JSON.stringify(msg)})`;
+        zodChain += `.min(${prop.minimum}, ${getRuleMessage("minimum", "validation.number.min")})`;
       }
       if (prop.maximum !== void 0) {
-        const msg = { message: prop.errorMessages?.maximum || "validation.number.max" };
-        zodChain += `.max(${prop.maximum}, ${JSON.stringify(msg)})`;
+        zodChain += `.max(${prop.maximum}, ${getRuleMessage("maximum", "validation.number.max")})`;
       }
       break;
     }
     case "number": {
-      const messages = getMessages(["required", "invalid_type"], prop.errorMessages);
-      zodChain = `z.number(${JSON.stringify(messages)})`;
+      zodChain = "z.number()";
       if (prop.minimum !== void 0) {
-        const msg = { message: prop.errorMessages?.minimum || "validation.number.min" };
-        zodChain += `.min(${prop.minimum}, ${JSON.stringify(msg)})`;
+        zodChain += `.min(${prop.minimum}, ${getRuleMessage("minimum", "validation.number.min")})`;
       }
       if (prop.maximum !== void 0) {
-        const msg = { message: prop.errorMessages?.maximum || "validation.number.max" };
-        zodChain += `.max(${prop.maximum}, ${JSON.stringify(msg)})`;
+        zodChain += `.max(${prop.maximum}, ${getRuleMessage("maximum", "validation.number.max")})`;
       }
       break;
     }
     case "boolean": {
-      const messages = getMessages(["required", "invalid_type"], prop.errorMessages);
-      zodChain = `z.boolean(${JSON.stringify(messages)})`;
+      zodChain = "z.boolean()";
       break;
     }
     case "array": {
       const itemSchema = prop.items ? _propToZod(prop.items) : "z.any()";
-      const messages = getMessages(["required", "invalid_type"], prop.errorMessages);
-      zodChain = `z.array(${itemSchema}, ${JSON.stringify(messages)})`;
+      zodChain = `z.array(${itemSchema})`;
       if (prop.minItems !== void 0) {
-        const msg = { message: prop.errorMessages?.minItems || "validation.array.min" };
-        zodChain += `.min(${prop.minItems}, ${JSON.stringify(msg)})`;
+        zodChain += `.min(${prop.minItems}, ${getRuleMessage("minItems", "validation.array.min")})`;
       }
       if (prop.maxItems !== void 0) {
-        const msg = { message: prop.errorMessages?.maxItems || "validation.array.max" };
-        zodChain += `.max(${prop.maxItems}, ${JSON.stringify(msg)})`;
+        zodChain += `.max(${prop.maxItems}, ${getRuleMessage("maxItems", "validation.array.max")})`;
       }
       break;
     }
@@ -402,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';

package/package.json

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