api-core-lib 12.0.53 → 12.0.54

package/dist/cli.cjs

@@ -69,28 +69,22 @@ function parseSpecToModules(spec) {
   }
   return modules;
 }
-function extractTypeNameFromSchema(schema) {
-  if (!schema) return "unknown";
-  if (schema.title && schema.type === "object") {
-    return schema.title;
-  }
-  if (schema.type === "array" && schema.items) {
-    const itemTypeName = extractTypeNameFromSchema(schema.items);
-    return itemTypeName !== "unknown" ? `${itemTypeName}[]` : "unknown";
-  }
-  if (schema.$ref) {
-    return refToTypeName(schema.$ref);
-  }
-  return "unknown";
-}
 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;
-  let outputType = extractTypeNameFromSchema(successResponseSchema);
+  let outputType = "unknown";
+  if (successResponseSchema) {
+    if (successResponseSchema.$ref) {
+      outputType = refToTypeName(successResponseSchema.$ref);
+    } else if (successResponseSchema.type === "array" && successResponseSchema.items?.$ref) {
+      outputType = `${refToTypeName(successResponseSchema.items.$ref)}[]`;
+    }
+  }
   let inputType = "undefined";
   if (requestBodySchema) {
-    inputType = extractTypeNameFromSchema(requestBodySchema);
-    if (inputType === "unknown" && requestBodySchema.type === "object") {
+    if (requestBodySchema.$ref) {
+      inputType = refToTypeName(requestBodySchema.$ref);
+    } else if (requestBodySchema.type === "object") {
       inputType = "any";
     }
   } else if ((endpoint.parameters || []).some((p) => p.in === "query")) {
@@ -129,7 +123,7 @@ Generating module: ${moduleName}`));
 async function generateTypesFile(moduleFolderPath, moduleName, typeNames, spec) {
   const typesCount = typeNames.size;
   if (typesCount === 0) {
-    console.log(import_chalk.default.yellow(`  - Warning: 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_chalk.default.gray(`  - Found ${typesCount} types to generate for types.ts...`));
   }
@@ -160,7 +154,7 @@ async function generateTypesFile(moduleFolderPath, moduleName, typeNames, spec)
         console.error(import_chalk.default.red(`    ${compileError.message}`));
       }
     } else {
-      console.log(import_chalk.default.yellow(`  - Warning: Schema not found for type "${typeName}", 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");
@@ -211,16 +205,16 @@ async function runGenerator(options) {
   try {
     console.log("\n" + import_chalk2.default.blue(`Step 2: Fetching OpenAPI spec from ${specUrl}...`));
     const response = await import_axios.default.get(specUrl, { timeout: 15e3 });
-    let spec = response.data;
-    if (!spec.openapi || !spec.paths) {
+    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_chalk2.default.green("\u2713 OpenAPI spec fetched successfully."));
     console.log(import_chalk2.default.blue("Step 2.5: Dereferencing all $refs in the spec..."));
-    spec = await import_json_schema_ref_parser.default.dereference(spec);
+    const dereferencedSpec = await import_json_schema_ref_parser.default.dereference(originalSpec);
     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(spec);
+    const modules = parseSpecToModules(originalSpec);
     const modulesCount = Object.keys(modules).length;
     console.log(import_chalk2.default.gray(`Found ${modulesCount} modules to generate...`));
     if (modulesCount === 0) {
@@ -229,7 +223,7 @@ async function runGenerator(options) {
     const modulesOutputPath = import_path2.default.join(options.output, "modules");
     for (const moduleName in modules) {
       const moduleData = modules[moduleName];
-      await generateModuleFiles(moduleName, moduleData, spec, modulesOutputPath);
+      await generateModuleFiles(moduleName, moduleData, dereferencedSpec, modulesOutputPath);
     }
     if (modulesCount > 0) {
       console.log(import_chalk2.default.green("\u2713 All custom modules generated."));

package/package.json

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