api-core-lib 12.0.55 → 12.0.56

package/dist/cli.cjs

@@ -30,12 +30,11 @@ var import_path3 = __toESM(require("path"), 1);
 // src/generator/index.ts
 var import_path2 = __toESM(require("path"), 1);
 var import_axios = __toESM(require("axios"), 1);
-var import_chalk3 = __toESM(require("chalk"), 1);
+var import_chalk2 = __toESM(require("chalk"), 1);
 var import_dotenv = __toESM(require("dotenv"), 1);
 var import_json_schema_ref_parser = __toESM(require("@apidevtools/json-schema-ref-parser"), 1);
 
 // src/generator/spec-parser.ts
-var import_chalk = __toESM(require("chalk"), 1);
 function parseSpecToModules(spec) {
   const modules = {};
   for (const apiPath in spec.paths) {
@@ -48,7 +47,7 @@ function parseSpecToModules(spec) {
         const commonPath = apiPath.substring(0, apiPath.lastIndexOf("/"));
         modules[moduleName] = { baseEndpoint: commonPath || "/", actions: {}, types: /* @__PURE__ */ new Set() };
       }
-      const { inputType, outputType } = getInputOutputTypes(endpoint, apiPath);
+      const { inputType, outputType } = getInputOutputTypes(endpoint);
       [inputType, outputType].forEach((t) => {
         if (t && !["unknown", "undefined", "any", "QueryOptions", "Promise"].includes(t)) {
           modules[moduleName].types.add(t.replace("[]", ""));
@@ -70,23 +69,9 @@ function parseSpecToModules(spec) {
   }
   return modules;
 }
-function getInputOutputTypes(endpoint, apiPath) {
+function getInputOutputTypes(endpoint) {
   const requestBodySchema = endpoint.requestBody?.content?.["application/json"]?.schema;
   const successResponseSchema = endpoint.responses?.["200"]?.content?.["application/json"]?.schema || endpoint.responses?.["201"]?.content?.["application/json"]?.schema;
-  const operationId = endpoint.operationId || `(unknown operation at ${apiPath})`;
-  console.log(import_chalk.default.magenta(`
---- DIAGNOSING Operation: ${operationId} ---`));
-  if (successResponseSchema) {
-    console.log(import_chalk.default.blue("  Response Schema Structure:"));
-    console.log(JSON.stringify(successResponseSchema, null, 2));
-  } else {
-    console.log(import_chalk.default.gray("  - No success response schema found."));
-  }
-  if (requestBodySchema) {
-    console.log(import_chalk.default.blue("  Request Body Schema Structure:"));
-    console.log(JSON.stringify(requestBodySchema, null, 2));
-  }
-  console.log(import_chalk.default.magenta("---------------------------------------------------\n"));
   let outputType = "unknown";
   if (successResponseSchema) {
     if (successResponseSchema.$ref) {
@@ -123,10 +108,10 @@ function refToTypeName(ref) {
 // src/generator/file-generator.ts
 var import_fs = __toESM(require("fs"), 1);
 var import_path = __toESM(require("path"), 1);
-var import_chalk2 = __toESM(require("chalk"), 1);
+var import_chalk = __toESM(require("chalk"), 1);
 var import_json_schema_to_typescript = require("json-schema-to-typescript");
 async function generateModuleFiles(moduleName, moduleData, spec, outputDir) {
-  console.log(import_chalk2.default.cyan(`
+  console.log(import_chalk.default.cyan(`
 Generating module: ${moduleName}`));
   const moduleFolderPath = import_path.default.join(outputDir, moduleName);
   if (!import_fs.default.existsSync(moduleFolderPath)) {
@@ -138,9 +123,9 @@ Generating module: ${moduleName}`));
 async function generateTypesFile(moduleFolderPath, moduleName, typeNames, spec) {
   const typesCount = typeNames.size;
   if (typesCount === 0) {
-    console.log(import_chalk2.default.yellow(`  - No types found for this module. types.ts will be empty.`));
+    console.log(import_chalk.default.yellow(`  - No types found for this module. types.ts will be empty.`));
   } else {
-    console.log(import_chalk2.default.gray(`  - Found ${typesCount} types to generate for types.ts...`));
+    console.log(import_chalk.default.gray(`  - Found ${typesCount} types to generate for types.ts...`));
   }
   let typesContent = `// This file is auto-generated by the API generator. Do not edit.
 
@@ -165,11 +150,11 @@ async function generateTypesFile(moduleFolderPath, moduleName, typeNames, spec)
         });
         typesContent += tsType + "\n";
       } catch (compileError) {
-        console.error(import_chalk2.default.red(`  - Error compiling type "${typeName}" for module "${moduleName}":`));
-        console.error(import_chalk2.default.red(`    ${compileError.message}`));
+        console.error(import_chalk.default.red(`  - Error compiling type "${typeName}" for module "${moduleName}":`));
+        console.error(import_chalk.default.red(`    ${compileError.message}`));
       }
     } else {
-      console.log(import_chalk2.default.yellow(`  - Warning: Schema for type "${typeName}" not found in dereferenced spec, skipping.`));
+      console.log(import_chalk.default.yellow(`  - Warning: Schema for type "${typeName}" not found in dereferenced spec, skipping.`));
     }
   }
   const typesFilePath = import_path.default.join(moduleFolderPath, "types.ts");
@@ -178,7 +163,7 @@ async function generateTypesFile(moduleFolderPath, moduleName, typeNames, spec)
 async function generateConfigFile(moduleFolderPath, moduleName, moduleData) {
   const typeNamesArray = [...moduleData.types];
   const actionsCount = Object.keys(moduleData.actions).length;
-  console.log(import_chalk2.default.gray(`  - Found ${actionsCount} actions to generate for config.ts...`));
+  console.log(import_chalk.default.gray(`  - Found ${actionsCount} actions to generate for config.ts...`));
   const typesImportStatement = typeNamesArray.length > 0 ? `import type { ${typeNamesArray.join(", ")} } from './types';` : ``;
   const actionsTypeParts = Object.entries(moduleData.actions).map(
     ([actionName, actionData]) => `  ${actionName}: ActionConfigModule<${actionData._inputType}, ${actionData._outputType}>;`
@@ -208,32 +193,90 @@ export const ${moduleName}Module: ApiModuleConfig<${actionsTypeDefinition}> = {
   import_fs.default.writeFileSync(configFilePath, configContent);
 }
 
+// src/generator/spec-preprocessor.ts
+function toPascalCase(str) {
+  return str.replace(/_v\d+$/, "").split("_").map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join("");
+}
+function normalizeSchema(schema, schemas, baseName, suffix) {
+  if (!schema) return schema;
+  if (schema.$ref) return schema;
+  if (schema.type === "object" && schema.properties) {
+    const typeName = `${toPascalCase(baseName)}${suffix}Dto`;
+    if (!schemas[typeName]) {
+      schemas[typeName] = schema;
+    }
+    return { $ref: `#/components/schemas/${typeName}` };
+  }
+  if (schema.type === "array" && schema.items) {
+    schema.items = normalizeSchema(schema.items, schemas, baseName, suffix.replace("[]", ""));
+    return schema;
+  }
+  return schema;
+}
+function preprocessSpec(spec) {
+  if (!spec.components) spec.components = {};
+  if (!spec.components.schemas) spec.components.schemas = {};
+  for (const apiPath in spec.paths) {
+    for (const method in spec.paths[apiPath]) {
+      const endpoint = spec.paths[apiPath][method];
+      const operationId = endpoint.operationId;
+      if (!operationId) continue;
+      const requestBodySchema = endpoint.requestBody?.content?.["application/json"]?.schema;
+      if (requestBodySchema) {
+        endpoint.requestBody.content["application/json"].schema = normalizeSchema(
+          requestBodySchema,
+          spec.components.schemas,
+          operationId,
+          "Request"
+        );
+      }
+      if (endpoint.responses) {
+        for (const statusCode in endpoint.responses) {
+          const responseSchema = endpoint.responses[statusCode]?.content?.["application/json"]?.schema;
+          if (responseSchema) {
+            endpoint.responses[statusCode].content["application/json"].schema = normalizeSchema(
+              responseSchema,
+              spec.components.schemas,
+              operationId,
+              "Response"
+            );
+          }
+        }
+      }
+    }
+  }
+  return spec;
+}
+
 // src/generator/index.ts
 async function runGenerator(options) {
-  console.log(import_chalk3.default.cyan.bold("\u{1F680} Starting API Core Lib Code Generator..."));
-  console.log(import_chalk3.default.gray(`Output directory: ${options.output}`));
-  console.log(import_chalk3.default.gray(`.env path: ${options.envPath}`));
-  console.log("\n" + import_chalk3.default.blue("Step 1: Loading environment variables..."));
+  console.log(import_chalk2.default.cyan.bold("\u{1F680} Starting API Core Lib Code Generator..."));
+  console.log(import_chalk2.default.gray(`Output directory: ${options.output}`));
+  console.log(import_chalk2.default.gray(`.env path: ${options.envPath}`));
+  console.log("\n" + import_chalk2.default.blue("Step 1: Loading environment variables..."));
   import_dotenv.default.config({ path: options.envPath });
   const specUrl = getSpecUrl();
-  console.log(import_chalk3.default.green("\u2713 Environment variables loaded."));
+  console.log(import_chalk2.default.green("\u2713 Environment variables loaded."));
   try {
-    console.log("\n" + import_chalk3.default.blue(`Step 2: Fetching OpenAPI spec from ${specUrl}...`));
+    console.log("\n" + import_chalk2.default.blue(`Step 2: Fetching OpenAPI spec from ${specUrl}...`));
     const response = await import_axios.default.get(specUrl, { timeout: 15e3 });
     const originalSpec = response.data;
     if (!originalSpec.openapi || !originalSpec.paths) {
       throw new Error('Invalid OpenAPI specification file. "openapi" or "paths" property is missing.');
     }
-    console.log(import_chalk3.default.green("\u2713 OpenAPI spec fetched successfully."));
-    console.log(import_chalk3.default.blue("Step 2.5: Dereferencing all $refs in the spec..."));
-    const dereferencedSpec = await import_json_schema_ref_parser.default.dereference(originalSpec);
-    console.log(import_chalk3.default.green("\u2713 Spec dereferenced successfully."));
-    console.log("\n" + import_chalk3.default.blue("Step 3: Parsing spec and generating API modules..."));
-    const modules = parseSpecToModules(originalSpec);
+    console.log(import_chalk2.default.green("\u2713 OpenAPI spec fetched successfully."));
+    console.log(import_chalk2.default.blue("Step 2.2: Preprocessing spec to normalize schemas..."));
+    const normalizedSpec = preprocessSpec(originalSpec);
+    console.log(import_chalk2.default.green("\u2713 Spec has been normalized successfully."));
+    console.log(import_chalk2.default.blue("Step 2.5: Dereferencing all $refs in the spec..."));
+    const dereferencedSpec = await import_json_schema_ref_parser.default.dereference(normalizedSpec);
+    console.log(import_chalk2.default.green("\u2713 Spec dereferenced successfully."));
+    console.log("\n" + import_chalk2.default.blue("Step 3: Parsing spec and generating API modules..."));
+    const modules = parseSpecToModules(normalizedSpec);
     const modulesCount = Object.keys(modules).length;
-    console.log(import_chalk3.default.gray(`Found ${modulesCount} modules to generate...`));
+    console.log(import_chalk2.default.gray(`Found ${modulesCount} modules to generate...`));
     if (modulesCount === 0) {
-      console.log(import_chalk3.default.yellow("Warning: No modules found based on tags in the OpenAPI spec. No files will be generated."));
+      console.log(import_chalk2.default.yellow("Warning: No modules found."));
     }
     const modulesOutputPath = import_path2.default.join(options.output, "modules");
     for (const moduleName in modules) {
@@ -241,10 +284,10 @@ async function runGenerator(options) {
       await generateModuleFiles(moduleName, moduleData, dereferencedSpec, modulesOutputPath);
     }
     if (modulesCount > 0) {
-      console.log(import_chalk3.default.green("\u2713 All custom modules generated."));
+      console.log(import_chalk2.default.green("\u2713 All custom modules generated."));
     }
-    console.log(import_chalk3.default.bold.green("\n\u{1F389} API generation complete! All files are located in:"));
-    console.log(import_chalk3.default.bold.cyan(options.output));
+    console.log(import_chalk2.default.bold.green("\n\u{1F389} API generation complete! All files are located in:"));
+    console.log(import_chalk2.default.bold.cyan(options.output));
   } catch (error) {
     handleGenerationError(error);
   }
@@ -252,17 +295,16 @@ async function runGenerator(options) {
 function getSpecUrl() {
   const specUrl = process.env.OPENAPI_SPEC_URL || (process.env.API_URL ? `${process.env.API_URL}/docs-json` : null) || (process.env.NEXT_PUBLIC_API_URL ? `${process.env.NEXT_PUBLIC_API_URL}/docs-json` : null);
   if (!specUrl) {
-    console.error(import_chalk3.default.red.bold("\n\u274C Error: API specification URL not found."));
-    console.error(import_chalk3.default.red("Please define either OPENAPI_SPEC_URL or API_URL/NEXT_PUBLIC_API_URL in your .env file."));
+    console.error(import_chalk2.default.red.bold("\n\u274C Error: API specification URL not found."));
     process.exit(1);
   }
   return specUrl;
 }
 function handleGenerationError(error) {
-  console.error(import_chalk3.default.red.bold("\n\u274C An error occurred during generation:"));
-  console.error(import_chalk3.default.red(`Error Message: ${error.message}`));
+  console.error(import_chalk2.default.red.bold("\n\u274C An error occurred during generation:"));
+  console.error(import_chalk2.default.red(`Error Message: ${error.message}`));
   if (error.stack) {
-    console.error(import_chalk3.default.gray(error.stack));
+    console.error(import_chalk2.default.gray(error.stack));
   }
   process.exit(1);
 }

package/package.json

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