api-core-lib 12.0.54 → 12.0.56

package/dist/cli.cjs

@@ -193,6 +193,61 @@ 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_chalk2.default.cyan.bold("\u{1F680} Starting API Core Lib Code Generator..."));
@@ -210,15 +265,18 @@ async function runGenerator(options) {
       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.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(originalSpec);
+    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(originalSpec);
+    const modules = parseSpecToModules(normalizedSpec);
     const modulesCount = Object.keys(modules).length;
     console.log(import_chalk2.default.gray(`Found ${modulesCount} modules to generate...`));
     if (modulesCount === 0) {
-      console.log(import_chalk2.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) {
@@ -238,7 +296,6 @@ 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_chalk2.default.red.bold("\n\u274C Error: API specification URL not found."));
-    console.error(import_chalk2.default.red("Please define either OPENAPI_SPEC_URL or API_URL/NEXT_PUBLIC_API_URL in your .env file."));
     process.exit(1);
   }
   return specUrl;

package/package.json

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