api-core-lib 12.0.77 → 12.0.78

package/dist/cli.cjs

@@ -78,72 +78,44 @@ 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}" }`;
-  };
+  const getMsg = (key) => `{ "message": "validation.${key}" }`;
   switch (prop.type) {
-    case "string": {
-      if (prop.enum && prop.enum.length > 0) {
-        zodChain = `z.enum(${JSON.stringify(prop.enum)})`;
+    case "string":
+      if (prop.enumName) {
+        zodChain = `z.enum(${prop.enumName})`;
       } 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})`;
+          zodChain += `.min(1, ${getMsg("string.nonempty")})`;
         }
+        if (prop.maxLength !== void 0) zodChain += `.max(${prop.maxLength}, ${getMsg("string.max")})`;
+        if (prop.pattern) zodChain += `.regex(/${prop.pattern}/, ${getMsg("string.regex")})`;
+        if (prop.format === "email") zodChain += `.email(${getMsg("string.email")})`;
+        if (prop.format === "url") zodChain += `.url(${getMsg("string.url")})`;
+        if (prop.format === "uuid") zodChain += `.uuid(${getMsg("string.uuid")})`;
+        if (prop.format === "datetime") zodChain += `.datetime(${getMsg("string.datetime")})`;
       }
       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")})`;
-      }
+    case "integer":
+      zodChain = `z.number().int(${getMsg("number.integer")})`;
+      if (prop.minimum !== void 0) zodChain += `.min(${prop.minimum}, ${getMsg("number.min")})`;
+      if (prop.maximum !== void 0) zodChain += `.max(${prop.maximum}, ${getMsg("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")})`;
-      }
+    case "number":
+      zodChain = `z.number()`;
+      if (prop.minimum !== void 0) zodChain += `.min(${prop.minimum}, ${getMsg("number.min")})`;
+      if (prop.maximum !== void 0) zodChain += `.max(${prop.maximum}, ${getMsg("number.max")})`;
       break;
-    }
-    case "boolean": {
-      zodChain = "z.boolean()";
+    case "boolean":
+      zodChain = `z.boolean()`;
       break;
-    }
-    case "array": {
+    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")})`;
-      }
+      if (prop.minItems !== void 0) zodChain += `.min(${prop.minItems}, ${getMsg("array.min")})`;
+      if (prop.maxItems !== void 0) zodChain += `.max(${prop.maxItems}, ${getMsg("array.max")})`;
       break;
-    }
-    case "object": {
+    case "object":
       if (prop.properties && prop.properties.length > 0) {
         const shape = prop.properties.map((p) => `  ${p.name}: ${_propToZod(p)}`).join(",\n");
         zodChain = `z.object({
@@ -153,7 +125,6 @@ ${shape}
         zodChain = "z.record(z.unknown())";
       }
       break;
-    }
     default:
       zodChain = "z.any()";
       break;
@@ -167,9 +138,6 @@ ${shape}
   if (prop.isNullable) {
     zodChain += ".nullable()";
   }
-  if (prop.defaultValue !== void 0) {
-    zodChain += `.default(${JSON.stringify(prop.defaultValue)})`;
-  }
   return zodChain;
 }
 
@@ -201,6 +169,7 @@ function parseSchema(name, schema, allEnums) {
     for (const propName in schema.properties) {
       const propSchema = schema.properties[propName];
       let itemSchema;
+      let generatedEnumName;
       if (propSchema.type === "array" && propSchema.items) {
         const itemTypeName = `${toPascalCase(name)}${toPascalCase(propName)}Item`;
         itemSchema = parseSchema(itemTypeName, propSchema.items, allEnums).properties[0];
@@ -208,7 +177,10 @@ function parseSchema(name, schema, allEnums) {
       if (propSchema.enum) {
         const enumName = `${toPascalCase(name)}${toPascalCase(propName)}Enum`;
         enums[propName] = propSchema.enum;
-        if (!allEnums.has(enumName)) allEnums.set(enumName, { name: enumName, values: propSchema.enum });
+        if (!allEnums.has(enumName)) {
+          allEnums.set(enumName, { name: enumName, values: propSchema.enum });
+        }
+        generatedEnumName = enumName;
       }
       properties.push({
         name: propName,
@@ -218,9 +190,18 @@ function parseSchema(name, schema, allEnums) {
         description: propSchema.description,
         example: propSchema.example,
         enum: propSchema.enum,
+        enumName: generatedEnumName,
+        // <-- Pass the enum name to the property
         format: propSchema.format,
         items: itemSchema,
-        properties: propSchema.properties ? parseSchema(`${name}${toPascalCase(propName)}`, propSchema, allEnums).properties : void 0
+        properties: propSchema.properties ? parseSchema(`${name}${toPascalCase(propName)}`, propSchema, allEnums).properties : void 0,
+        minLength: propSchema.minLength,
+        maxLength: propSchema.maxLength,
+        pattern: propSchema.pattern,
+        minimum: propSchema.minimum,
+        maximum: propSchema.maximum,
+        minItems: propSchema.minItems,
+        maxItems: propSchema.maxItems
       });
     }
   }
@@ -294,243 +275,50 @@ async function generateModuleFiles(module2, allSchemas, allEnums, outputDir) {
   Generating module: ${import_chalk.default.bold(module2.moduleName)}`));
   const schemasToImport = [...module2.schemas].sort();
   const enumsToImport = [...module2.enums].sort();
-  const indexContent = [`// This file is auto-generated.
+  const indexContent = [`// This file is auto-generated. Do not edit directly.
 
 export * from './config';`];
-  let configContent = `/* eslint-disable */
-// This file is auto-generated.
-
-import type { ApiModuleConfig, ActionConfigModule, QueryOptions } from 'api-core-lib';
-`;
-  if (schemasToImport.length > 0) configContent += `import type { ${schemasToImport.join(", ")} } from './types';
-`;
-  const actionsType = Object.values(module2.actions).map((a) => `  ${a.name}: ActionConfigModule<${a.inputType}, ${a.outputType}>;`).join("\n");
-  const actionsValue = Object.values(module2.actions).map((a) => {
-    const { inputType, outputType, name, ...c } = a;
-    return `    ${name}: ${JSON.stringify(c, null, 2).replace(/\n/g, "\n    ")}`;
-  }).join(",\n");
-  configContent += `
-export const ${module2.moduleName}Module: ApiModuleConfig<{
-${actionsType}
-}> = {
-  baseEndpoint: '${module2.baseEndpoint}',
-  actions: {
-${actionsValue}
-  },
-};
-`;
-  import_fs.default.writeFileSync(import_path.default.join(moduleOutputPath, "config.ts"), configContent.trim());
-  console.log(import_chalk.default.gray(`    \u2713 config.ts`));
   if (schemasToImport.length > 0) {
-    if (enumsToImport.length > 0) {
-      let enumsContent = `// This file is auto-generated.
+    indexContent.push(`export * from './types';`);
+    indexContent.push(`export * from './enums';`);
+    let validationContent = `// This file is auto-generated by the API generator. Do not edit directly.
 
+import { z } from 'zod';
 `;
-      for (const enumName of enumsToImport) {
-        const enumDef = allEnums.get(enumName);
-        if (enumDef) {
-          enumsContent += `export const ${enumName} = ${JSON.stringify(enumDef.values)} as const;
-`;
-          enumsContent += `export type ${enumName} = typeof ${enumName}[number];
-
+    if (enumsToImport.length > 0) {
+      validationContent += `import { ${enumsToImport.join(", ")} } from './enums';
 `;
-        }
-      }
-      import_fs.default.writeFileSync(import_path.default.join(moduleOutputPath, "enums.ts"), enumsContent);
-      console.log(import_chalk.default.gray(`    \u2713 enums.ts`));
-      indexContent.push(`export * from './enums';`);
     }
-    let typesContent = `// This file is auto-generated.
-
-`;
-    if (enumsToImport.length > 0) typesContent += `import type { ${enumsToImport.join(", ")} } from './enums';
-
-`;
     for (const typeName of schemasToImport) {
       const parsedSchema = allSchemas.get(typeName);
       if (parsedSchema) {
-        if (parsedSchema.description) typesContent += `/**
- * ${parsedSchema.description}
- */
-`;
-        typesContent += `export interface ${typeName} {
-`;
-        for (const prop of parsedSchema.properties) {
-          if (prop.description) typesContent += `  /**
-   * ${prop.description}
-${prop.example ? `   * @example ${JSON.stringify(prop.example)}
-` : ""}   */
+        const zodShape = parsedSchema.properties.map((p) => `  ${p.name}: ${_propToZod(p)}`).join(",\n");
+        validationContent += `
+/**
+ * Zod schema for {@link ${typeName}}.
 `;
-          let propType = prop.type;
-          if (prop.enum) propType = `${toPascalCase(typeName)}${toPascalCase(prop.name)}Enum`;
-          else if (prop.items) propType = prop.items.name ? `${toPascalCase(prop.items.name)}[]` : `${prop.items.type || "unknown"}[]`;
-          else if (prop.type === "object") propType = prop.properties && prop.properties.length > 0 ? `Record<string, unknown>` : `Record<string, unknown>`;
-          typesContent += `  ${prop.name}${prop.isRequired ? "" : "?"}: ${propType};
+        if (parsedSchema.description) {
+          validationContent += ` * @description ${parsedSchema.description.replace(/\*\//g, "*\\/")}
 `;
         }
-        typesContent += `}
-
-`;
-      }
-    }
-    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';`);
-    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 += ` */
 `;
         validationContent += `export const ${typeName}Schema = z.object({
 ${zodShape}
 });
+
 `;
-        validationContent += `export type ${typeName}Schema = z.infer<typeof ${typeName}Schema>;
+        validationContent += `export type ${typeName}Validated = 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 (with integrated usage example)`));
+    console.log(import_chalk.default.gray(`    \u2713 validation.ts`));
     indexContent.push(`export * from './validation';`);
-    let mocksContent = `// This file is auto-generated.
-import type { ${schemasToImport.join(", ")} } from './types';
-`;
-    if (enumsToImport.length > 0) mocksContent += `import { ${enumsToImport.join(", ")} } from './enums';
-
-`;
-    for (const typeName of schemasToImport) {
-      const parsedSchema = allSchemas.get(typeName);
-      if (parsedSchema) {
-        let mockObject = {};
-        parsedSchema.properties.forEach((p) => {
-          mockObject[p.name] = _propToMock(p);
-        });
-        mocksContent += `export const mock${typeName}: ${typeName} = ${JSON.stringify(mockObject, null, 2)};
-
-`;
-      }
-    }
-    import_fs.default.writeFileSync(import_path.default.join(moduleOutputPath, "mocks.ts"), mocksContent);
-    console.log(import_chalk.default.gray(`    \u2713 mocks.ts`));
-    indexContent.push(`export * from './mocks';`);
   }
   import_fs.default.writeFileSync(import_path.default.join(moduleOutputPath, "index.ts"), indexContent.join("\n"));
   console.log(import_chalk.default.gray(`    \u2713 index.ts`));
 }
-function _propToMock(prop) {
-  if (prop.example) return prop.example;
-  if (prop.name.match(/image|avatar|logo|url/i)) return "https://via.placeholder.com/150";
-  if (prop.enum) return prop.enum[0];
-  switch (prop.type) {
-    case "string":
-      if (prop.format === "email") return "test@example.com";
-      if (prop.format === "uuid") return "a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11";
-      return `Mock ${toPascalCase(prop.name)}`;
-    case "integer":
-    case "number":
-      return 1;
-    case "boolean":
-      return true;
-    case "array":
-      return prop.items ? [_propToMock(prop.items)] : [];
-    case "object":
-      const mock = {};
-      if (prop.properties) prop.properties.forEach((p) => {
-        mock[p.name] = _propToMock(p);
-      });
-      return mock;
-    default:
-      return null;
-  }
-}
 async function runGenerator(options) {
   console.log(import_chalk.default.cyan.bold("\u{1F680} Starting API Development Platform Generator (Sapphire Edition)..."));
   import_dotenv.default.config({ path: options.envPath });

package/package.json

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