api-core-lib 12.0.69 → 12.0.70

package/dist/cli.cjs

@@ -76,14 +76,14 @@ var import_swagger_parser = __toESM(require("@apidevtools/swagger-parser"), 1);
 var import_openapi_types = __toESM(require_dist(), 1);
 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, colors: true }));
+[DEBUG: ${title}]`), import_util.default.inspect(data, { depth: 5, colors: true }));
 var toPascalCase = (str) => str.replace(/[^a-zA-Z0-9_]/g, " ").replace(/(?:^\w|[A-Z]|\b\w)/g, (w) => w.toUpperCase()).replace(/\s+/g, "");
 var toCamelCase = (str) => {
   const s = toPascalCase(str);
   return s.charAt(0).toLowerCase() + s.slice(1);
 };
 var getModuleName = (opId) => `${opId.split("_")[0].replace(/Controller$/, "")}Api`;
-var getActionName = (opId) => toCamelCase(opId.split("_")[1] || opId);
+var getActionName = (opId) => toCamelCase(opId.split("_")[1] || opId).replace(/V\d+$/, "");
 var findCommonPath = (paths) => {
   if (!paths || paths.length === 0) return "/";
   const sorted = [...paths].sort();
@@ -94,16 +94,18 @@ var findCommonPath = (paths) => {
   const prefix = first.substring(0, i);
   return prefix.substring(0, prefix.lastIndexOf("/") + 1) || "/";
 };
-var generateFriendlyMessage = (fieldName, validation) => {
-  const friendlyName = fieldName.replace(/([A-Z])/g, " $1").replace(/^./, (str) => str.toUpperCase());
-  return `${friendlyName} is required.`;
-};
+var generateFriendlyMessage = (fieldName) => `${fieldName.replace(/([A-Z])/g, " $1").replace(/^./, (str) => str.toUpperCase())} is required.`;
 function parseSchema(name, schema, allEnums) {
   const properties = [];
   const enums = {};
   if (schema.properties) {
     for (const propName in schema.properties) {
       const propSchema = schema.properties[propName];
+      let itemSchema;
+      if (propSchema.type === "array" && propSchema.items) {
+        const itemTypeName = `${toPascalCase(name)}${toPascalCase(propName)}Item`;
+        itemSchema = parseSchema(itemTypeName, propSchema.items, allEnums).properties[0];
+      }
       if (propSchema.enum) {
         const enumName = `${toPascalCase(name)}${toPascalCase(propName)}Enum`;
         enums[propName] = propSchema.enum;
@@ -118,7 +120,7 @@ function parseSchema(name, schema, allEnums) {
         example: propSchema.example,
         enum: propSchema.enum,
         format: propSchema.format,
-        items: propSchema.type === "array" && propSchema.items ? parseSchema(`${name}${toPascalCase(propName)}Item`, propSchema.items, allEnums).properties[0] : void 0,
+        items: itemSchema,
         properties: propSchema.properties ? parseSchema(`${name}${toPascalCase(propName)}`, propSchema, allEnums).properties : void 0
       });
     }
@@ -132,7 +134,14 @@ function parseSpecToModules(spec) {
   const modulePaths = /* @__PURE__ */ new Map();
   const registerSchema = (schema, baseName) => {
     if (!schema) return "unknown";
-    if (schema.type === "array" && schema.items) return `${registerSchema(schema.items, `${baseName}Item`)}[]`;
+    if (schema.type === "array" && schema.items) {
+      const itemSchema = schema.items;
+      const itemBaseName = `${baseName}Item`;
+      if (itemSchema.properties || itemSchema.type === "object") {
+        return `${registerSchema(itemSchema, itemBaseName)}[]`;
+      }
+      return `${itemSchema.type || "unknown"}[]`;
+    }
     if (schema.type === "object" || schema.properties || schema.allOf || !schema.type) {
       const typeName = toPascalCase(baseName.replace(/_v\d+(Request|Response)$/, "$1"));
       if (!allSchemas.has(typeName)) allSchemas.set(typeName, parseSchema(typeName, schema, allEnums));
@@ -186,6 +195,9 @@ 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.
+
+export * from './config';`];
   let configContent = `/* eslint-disable */
 // This file is auto-generated.
 
@@ -210,9 +222,6 @@ ${actionsValue}
 `;
   import_fs.default.writeFileSync(import_path.default.join(moduleOutputPath, "config.ts"), configContent.trim());
   console.log(import_chalk.default.gray(`    \u2713 config.ts`));
-  const indexContent = [`// This file is auto-generated.
-
-export * from './config';`];
   if (schemasToImport.length > 0) {
     if (enumsToImport.length > 0) {
       let enumsContent = `// This file is auto-generated.
@@ -255,8 +264,10 @@ ${prop.example ? `   * @example ${JSON.stringify(prop.example)}
 `;
           let propType = prop.type;
           if (prop.enum) propType = `${toPascalCase(typeName)}${toPascalCase(prop.name)}Enum`;
-          else if (prop.items) propType = prop.items.properties ? `${toPascalCase(`${typeName}${toPascalCase(prop.name)}Item`)}[]` : `${prop.items.type}[]`;
-          else if (prop.properties) propType = `Record<string, unknown>`;
+          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 ? `{
+${prop.properties.map((p) => `    ${p.name}${p.isRequired ? "" : "?"}: ${p.type};
+`).join("")}  }` : `Record<string, unknown>`;
           typesContent += `  ${prop.name}${prop.isRequired ? "" : "?"}: ${propType};
 `;
         }
@@ -291,7 +302,7 @@ ${zodShape}
     let mocksContent = `// This file is auto-generated.
 import type { ${schemasToImport.join(", ")} } from './types';
 `;
-    if (enumsToImport.length > 0) mocksContent += `import { ${enumsToImport.map((e) => e.replace(/Enum$/, "")).join(", ")} } from './enums';
+    if (enumsToImport.length > 0) mocksContent += `import { ${enumsToImport.join(", ")} } from './enums';
 
 `;
     for (const typeName of schemasToImport) {
@@ -315,20 +326,20 @@ import type { ${schemasToImport.join(", ")} } from './types';
 }
 function _propToZod(prop, parentName) {
   let zodString = "z.any()";
-  const errorMapParams = { errorMap: () => ({ message: prop.description || generateFriendlyMessage(prop.name, "required") }) };
+  const errorParams = { required_error: prop.description || generateFriendlyMessage(prop.name) };
   switch (prop.type) {
     case "string":
-      zodString = `z.string(${JSON.stringify(errorMapParams)})`;
-      if (prop.format === "email") zodString += `.email({ message: "${generateFriendlyMessage(prop.name, "email")}" })`;
+      zodString = `z.string(${JSON.stringify(errorParams)})`;
+      if (prop.format === "email") zodString += `.email({ message: "Invalid email address" })`;
       if (prop.format === "uuid") zodString += `.uuid()`;
-      if (prop.enum) zodString = `z.enum(${toPascalCase(parentName)}${toPascalCase(prop.name)}Enum)`;
+      if (prop.enum) zodString = `z.enum(${toPascalCase(parentName)}${toPascalCase(prop.name)}Enum, ${JSON.stringify(errorParams)})`;
       break;
     case "integer":
     case "number":
-      zodString = `z.number(${JSON.stringify(errorMapParams)})`;
+      zodString = `z.number(${JSON.stringify(errorParams)})`;
       break;
     case "boolean":
-      zodString = `z.boolean(${JSON.stringify(errorMapParams)})`;
+      zodString = `z.boolean(${JSON.stringify(errorParams)})`;
       break;
     case "array":
       zodString = `z.array(${prop.items ? _propToZod(prop.items, `${parentName}${toPascalCase(prop.name)}Item`) : "z.any()"})`;
@@ -341,7 +352,7 @@ ${prop.properties.map((p) => `    ${p.name}: ${_propToZod(p, `${parentName}${toP
       zodString = shape;
       break;
   }
-  if (!prop.isRequired) zodString += ".optional()";
+  if (!prop.isRequired) zodString = zodString.replace(/\(.*\)/, "").trim() + ".optional()";
   if (prop.isNullable) zodString += ".nullable()";
   return zodString;
 }

package/package.json

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