api-core-lib 12.0.65 → 12.0.66

package/dist/cli.cjs

@@ -76,32 +76,34 @@ var import_openapi_types = __toESM(require_dist(), 1);
 var import_json_schema_to_typescript = require("json-schema-to-typescript");
 function parseSpecToModules(spec) {
   const modules = {};
+  const modulePaths = {};
   if (!spec.components) spec.components = {};
   if (!spec.components.schemas) spec.components.schemas = {};
+  const allSchemas = spec.components.schemas;
   for (const apiPath in spec.paths) {
     const pathItem = spec.paths[apiPath];
     if (!pathItem) continue;
     for (const method in pathItem) {
       if (!Object.values(import_openapi_types.OpenAPIV3.HttpMethods).includes(method)) continue;
       const endpoint = pathItem[method];
-      if (!endpoint.tags || endpoint.tags.length === 0) continue;
-      const tagName = endpoint.tags[0];
-      const moduleName = _sanitizeTagName(tagName) + "Api";
+      if (!endpoint.operationId) continue;
+      const moduleName = _getModuleNameFromOperationId(endpoint.operationId);
       if (!modules[moduleName]) {
-        modules[moduleName] = { baseEndpoint: _findCommonBasePath(spec, tagName), actions: {}, types: /* @__PURE__ */ new Set() };
+        modules[moduleName] = { baseEndpoint: "", actions: {}, types: /* @__PURE__ */ new Set() };
+        modulePaths[moduleName] = [];
       }
-      const currentModule = modules[moduleName];
-      const { inputType, outputType } = _extractInputOutputTypes(endpoint, spec.components.schemas);
+      modulePaths[moduleName].push(apiPath);
+      const { inputType, outputType } = _extractInputOutputTypes(endpoint, allSchemas);
       [inputType, outputType].forEach((t) => {
         if (t && !["unknown", "undefined", "void", "any", "QueryOptions", "Promise"].includes(t)) {
-          currentModule.types.add(t.replace("[]", ""));
+          modules[moduleName].types.add(t.replace("[]", ""));
         }
       });
-      const actionName = _sanitizeActionName(endpoint.operationId, method, apiPath);
-      const relativePath = apiPath.replace(currentModule.baseEndpoint, "").replace(/^\//, "");
-      currentModule.actions[actionName] = {
+      const actionName = _sanitizeActionName(endpoint.operationId);
+      modules[moduleName].actions[actionName] = {
         method: method.toUpperCase(),
-        path: relativePath === "" ? "/" : relativePath,
+        path: apiPath,
+        // سنقوم بتعديل هذا لاحقًا ليصبح نسبيًا
         description: endpoint.summary || "",
         hasQuery: (endpoint.parameters || []).some((p) => p.in === "query"),
         autoFetch: method.toUpperCase() === "GET" && !apiPath.includes("{"),
@@ -111,6 +113,15 @@ function parseSpecToModules(spec) {
       };
     }
   }
+  for (const moduleName in modules) {
+    const basePath = _findCommonBasePath(modulePaths[moduleName]);
+    modules[moduleName].baseEndpoint = basePath;
+    for (const actionName in modules[moduleName].actions) {
+      const action = modules[moduleName].actions[actionName];
+      const relativePath = action.path.replace(basePath, "").replace(/^\//, "");
+      action.path = relativePath === "" ? "/" : relativePath;
+    }
+  }
   return modules;
 }
 function _extractInputOutputTypes(endpoint, schemas) {
@@ -136,7 +147,7 @@ function _schemaToTypeName(schema, name, schemas) {
     return `${itemTypeName}[]`;
   }
   if (schema.type === "object" || schema.properties || schema.allOf) {
-    const typeName = _toPascalCase(name) + "Dto";
+    const typeName = _toPascalCase(name);
     if (!schemas[typeName]) {
       schemas[typeName] = schema;
     }
@@ -145,6 +156,13 @@ function _schemaToTypeName(schema, name, schemas) {
   if (schema.type && ["string", "number", "boolean", "integer"].includes(schema.type)) {
     return schema.type === "integer" ? "number" : schema.type;
   }
+  if (Object.keys(schema).length === 0) {
+    const typeName = _toPascalCase(name);
+    if (!schemas[typeName]) {
+      schemas[typeName] = { type: "object", properties: {}, description: "Represents a dynamic or empty object." };
+    }
+    return typeName;
+  }
   return "unknown";
 }
 async function generateModuleFiles(moduleName, moduleData, allSchemas, outputDir) {
@@ -156,7 +174,7 @@ async function generateModuleFiles(moduleName, moduleData, allSchemas, outputDir
 }
 async function _generateTypesFile(moduleFolderPath, moduleName, typeNames, allSchemas) {
   if (typeNames.size === 0) {
-    console.log(import_chalk.default.yellow(`    - No types found for module "${moduleName}". Skipping types.ts generation.`));
+    console.log(import_chalk.default.yellow(`    - No types for module "${moduleName}". Skipping types.ts.`));
     return;
   }
   console.log(import_chalk.default.gray(`    - Generating types.ts with ${typeNames.size} types...`));
@@ -178,7 +196,7 @@ async function _generateTypesFile(moduleFolderPath, moduleName, typeNames, allSc
         console.error(import_chalk.default.red(`    - Error compiling type "${typeName}": ${compileError.message}`));
       }
     } else {
-      console.log(import_chalk.default.yellow(`    - Warning: Schema for type "${typeName}" not found, skipping.`));
+      console.log(import_chalk.default.yellow(`    - Warning: Schema for type "${typeName}" not found.`));
     }
   }
   const typesFilePath = import_path.default.join(moduleFolderPath, "types.ts");
@@ -219,54 +237,42 @@ export const ${moduleName}Module: ApiModuleConfig<${actionsTypeDefinition}> = {
 function _toPascalCase(str) {
   return str.replace(/[^a-zA-Z0-9]/g, " ").replace(/(?:^\w|[A-Z]|\b\w)/g, (w) => w.toUpperCase()).replace(/\s+/g, "");
 }
-function _sanitizeTagName(tagName) {
-  return tagName.replace(/[^a-zA-Z0-9]/g, "").replace(/Central|Tenant/g, "");
+function _getModuleNameFromOperationId(operationId) {
+  const controllerName = operationId.split("_")[0].replace(/Controller$/, "");
+  return `${controllerName}Api`;
 }
-function _sanitizeActionName(operationId, method, path3) {
-  if (operationId) {
-    const name = operationId.split("_").slice(1).join("_");
-    const sanitized = name.charAt(0).toLowerCase() + name.slice(1).replace(/_v\d+$/, "");
-    return sanitized || "action";
-  }
-  const pathPart = path3.replace(/[\/{}]/g, "_").replace(/^_|_$/g, "");
-  return `${method.toLowerCase()}_${pathPart}`;
+function _sanitizeActionName(operationId) {
+  const nameParts = operationId.split("_");
+  if (nameParts.length <= 1) return operationId;
+  const actionPart = nameParts[1];
+  return actionPart.charAt(0).toLowerCase() + actionPart.slice(1);
 }
-function _findCommonBasePath(spec, tagName) {
-  const paths = Object.keys(spec.paths).filter((p) => {
-    const pathItem = spec.paths[p];
-    if (!pathItem) return false;
-    for (const method in pathItem) {
-      const endpoint = pathItem[method];
-      if (endpoint.tags?.includes(tagName)) return true;
-    }
-    return false;
-  });
-  if (paths.length === 0) return "/";
-  let commonPrefix = paths[0];
-  for (let i = 1; i < paths.length; i++) {
-    while (paths[i].indexOf(commonPrefix) !== 0) {
-      commonPrefix = commonPrefix.substring(0, commonPrefix.length - 1);
-    }
+function _findCommonBasePath(paths) {
+  if (!paths || paths.length === 0) return "/";
+  const sortedPaths = [...paths].sort();
+  const first = sortedPaths[0];
+  const last = sortedPaths[sortedPaths.length - 1];
+  let i = 0;
+  while (i < first.length && first.charAt(i) === last.charAt(i)) {
+    i++;
   }
-  return commonPrefix.substring(0, commonPrefix.lastIndexOf("/") + 1) || "/";
+  let prefix = first.substring(0, i);
+  return prefix.substring(0, prefix.lastIndexOf("/") + 1) || "/";
 }
 async function runGenerator(options) {
   console.log(import_chalk.default.cyan.bold("\u{1F680} Starting API Core Lib Code Generator..."));
   import_dotenv.default.config({ path: options.envPath });
-  const specUrl = getSpecUrl();
+  const specUrl = process.env.OPENAPI_SPEC_URL || "./swagger.json";
   console.log(import_chalk.default.blue("\u2713 Step 1: Environment variables loaded."));
   try {
     console.log(import_chalk.default.blue(`
 \u23F3 Step 2: Fetching and fully dereferencing spec from ${specUrl}...`));
     const dereferencedSpec = await import_swagger_parser.default.dereference(specUrl);
     console.log(import_chalk.default.green("\u2713 Spec fetched and fully dereferenced successfully."));
-    console.log(import_chalk.default.blue("\n\u23F3 Step 3: Parsing spec and generating API modules structure..."));
+    console.log(import_chalk.default.blue("\n\u23F3 Step 3: Parsing spec using intelligent grouping..."));
     const modules = parseSpecToModules(dereferencedSpec);
     const modulesCount = Object.keys(modules).length;
-    console.log(import_chalk.default.green(`\u2713 Found ${modulesCount} modules to generate.`));
-    if (modulesCount === 0) {
-      console.log(import_chalk.default.yellow("Warning: No modules were found in the spec."));
-    }
+    console.log(import_chalk.default.green(`\u2713 Found and grouped ${modulesCount} logical modules.`));
     console.log(import_chalk.default.blue("\n\u23F3 Step 4: Generating module files..."));
     const modulesOutputPath = import_path.default.join(options.output, "modules");
     const allSchemas = dereferencedSpec.components?.schemas || {};
@@ -278,24 +284,11 @@ async function runGenerator(options) {
     console.log(import_chalk.default.bold.green("\n\u{1F389} API generation complete!"));
     console.log(import_chalk.default.bold.cyan(`   Output directory: ${options.output}`));
   } catch (error) {
-    handleGenerationError(error);
-  }
-}
-function getSpecUrl() {
-  const specUrl = process.env.OPENAPI_SPEC_URL || "./swagger.json";
-  if (!specUrl) {
-    console.error(import_chalk.default.red.bold("\n\u274C Error: API specification URL not found."));
+    console.error(import_chalk.default.red.bold("\n\u274C An error occurred during generation:"));
+    console.error(import_chalk.default.red(`Error Message: ${error.message}`));
+    if (error.stack) console.error(import_chalk.default.gray(error.stack));
     process.exit(1);
   }
-  return specUrl;
-}
-function handleGenerationError(error) {
-  console.error(import_chalk.default.red.bold("\n\u274C An error occurred during generation:"));
-  console.error(import_chalk.default.red(`Error Message: ${error.message}`));
-  if (error.stack) {
-    console.error(import_chalk.default.gray(error.stack));
-  }
-  process.exit(1);
 }
 
 // src/cli.ts

package/package.json

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