api-core-lib 12.0.37 → 12.0.38

package/dist/cli.cjs

@@ -36,10 +36,14 @@ var import_dotenv = __toESM(require("dotenv"), 1);
 var import_child_process = require("child_process");
 
 // src/generator/module-parser.ts
+function sanitizeActionName(operationId) {
+  if (!operationId) return `unnamedAction_${Date.now()}`;
+  const name = operationId.split("_").slice(1).join("_");
+  return name.charAt(0).toLowerCase() + name.slice(1).replace(/_v\d+$/, "");
+}
 function refToTypeName(ref) {
   if (!ref) return "unknown";
-  const parts = ref.replace(/^#\/components\//, "").split("/");
-  return `components["${parts.join('"]["')}"]`;
+  return ref.split("/").pop() || "unknown";
 }
 function parseSpecToModules(spec) {
   const modules = {};
@@ -50,23 +54,37 @@ function parseSpecToModules(spec) {
       const tagName = endpoint.tags[0];
       const moduleName = tagName.replace(/[^a-zA-Z0-9]/g, "").replace(/Central|Tenant/g, "") + "Api";
       if (!modules[moduleName]) {
-        modules[moduleName] = { actions: {} };
+        const commonPath = apiPath.substring(0, apiPath.lastIndexOf("/"));
+        modules[moduleName] = { baseEndpoint: commonPath || "/", actions: {} };
       }
-      const requestBodyRef = endpoint.requestBody?.content["application/json"]?.schema?.$ref;
+      const requestBody = endpoint.requestBody?.content?.["application/json"]?.schema;
       const successResponse = endpoint.responses["200"] || endpoint.responses["201"];
-      const responseRef = successResponse?.content?.["application/json"]?.schema?.$ref;
-      const actionName = endpoint.operationId || `${method}${apiPath.replace(/[\/{}]+/g, "_")}`;
+      const responseSchema = successResponse?.content?.["application/json"]?.schema;
+      let outputType = "unknown";
+      if (responseSchema) {
+        if (responseSchema.$ref) {
+          outputType = refToTypeName(responseSchema.$ref);
+        } else if (responseSchema.type === "array" && responseSchema.items?.$ref) {
+          outputType = `${refToTypeName(responseSchema.items.$ref)}[]`;
+        }
+      }
+      let inputType = "undefined";
+      if (requestBody) {
+        inputType = refToTypeName(requestBody.$ref);
+      } else if ((endpoint.parameters || []).some((p) => p.in === "query")) {
+        inputType = "QueryOptions";
+      }
+      const actionName = sanitizeActionName(endpoint.operationId);
+      const relativePath = apiPath.replace(modules[moduleName].baseEndpoint, "") || "/";
       modules[moduleName].actions[actionName] = {
         method: method.toUpperCase(),
-        path: apiPath,
+        path: relativePath,
         description: endpoint.summary || "No description available.",
         hasQuery: (endpoint.parameters || []).some((p) => p.in === "query"),
         autoFetch: method.toUpperCase() === "GET" && !apiPath.includes("{"),
         invalidates: [],
-        // [ميزة جديدة] إضافة الأنواع المستخرجة إلى الكائن
-        // سنستخدمها لاحقًا لتوليد الكود الصحيح
-        _inputType: refToTypeName(requestBodyRef),
-        _outputType: refToTypeName(responseRef)
+        _inputType: inputType,
+        _outputType: outputType
       };
     }
   }
@@ -99,20 +117,25 @@ async function runGenerator(options) {
     console.log(import_chalk.default.green(`\u2713 OpenAPI spec saved temporarily to ${tempSpecPath}`));
     console.log("\n" + import_chalk.default.blue("Step 3: Generating organized TypeScript types..."));
     const typesOutputPath = import_path.default.join(options.output, "types");
-    const generatorCommand = [
-      "npx",
-      "@openapitools/openapi-generator-cli",
-      "generate",
-      "-i",
-      `"${tempSpecPath}"`,
-      "-g",
-      "typescript-axios",
-      "-o",
-      `"${typesOutputPath}"`,
-      "--additional-properties=supportsES6=true,useSingleRequestParameter=true,withInterfaces=true,modelPropertyNaming=original"
-    ].join(" ");
-    console.log(import_chalk.default.gray(`Executing: ${generatorCommand}`));
-    (0, import_child_process.execSync)(generatorCommand, { stdio: "inherit" });
+    const ignoreFilePath = import_path.default.join(typesOutputPath, ".openapi-generator-ignore");
+    const ignoreContent = `
+# Ignore all documentation files
+docs/
+# Ignore git and helper files
+.openapi-generator-ignore
+.npmignore
+git_push.sh
+# Ignore the main generator metadata
+.openapi-generator/
+# We only want the generated models and apis
+    `;
+    if (!import_fs.default.existsSync(typesOutputPath)) {
+      import_fs.default.mkdirSync(typesOutputPath, { recursive: true });
+    }
+    import_fs.default.writeFileSync(ignoreFilePath, ignoreContent);
+    console.log(import_chalk.default.gray("\u2713 Created .openapi-generator-ignore to ensure clean output."));
+    console.log(import_chalk.default.gray(`Executing: ${ignoreContent}`));
+    (0, import_child_process.execSync)(ignoreContent, { stdio: "inherit" });
     console.log(import_chalk.default.green(`\u2713 Types generated successfully at ${typesOutputPath}`));
     console.log("\n" + import_chalk.default.blue("Step 4: Generating custom API modules..."));
     const modules = parseSpecToModules(spec);
@@ -120,14 +143,19 @@ async function runGenerator(options) {
     if (!import_fs.default.existsSync(modulesOutputPath)) {
       import_fs.default.mkdirSync(modulesOutputPath, { recursive: true });
     }
+    const allModelTypes = /* @__PURE__ */ new Set();
+    Object.values(modules).forEach((mod) => {
+      Object.values(mod.actions).forEach((action) => {
+        if (action._inputType && !["unknown", "undefined", "QueryOptions"].includes(action._inputType)) allModelTypes.add(action._inputType.replace("[]", ""));
+        if (action._outputType && !["unknown"].includes(action._outputType)) allModelTypes.add(action._outputType.replace("[]", ""));
+      });
+    });
     for (const moduleName in modules) {
       const moduleData = modules[moduleName];
       const fileName = `${moduleName}.module.ts`;
       const filePath = import_path.default.join(modulesOutputPath, fileName);
       const actionsTypeParts = Object.entries(moduleData.actions).map(([actionName, actionData]) => {
-        const inputType = actionData._inputType !== "unknown" ? actionData._inputType : actionData.hasQuery ? "QueryOptions" : "undefined";
-        const outputType = actionData._outputType;
-        return `  ${actionName}: ActionConfigModule<${inputType}, ${outputType}>;`;
+        return `  ${actionName}: ActionConfigModule<${actionData._inputType}, ${actionData._outputType}>;`;
       });
       const actionsTypeDefinition = `{
 ${actionsTypeParts.join("\n")}
@@ -146,14 +174,14 @@ ${actionsValueParts.join(",\n")}
  */
 
 import type { ApiModuleConfig, ActionConfigModule, QueryOptions } from 'api-core-lib';
-import type { components } from '../types/api-types.generated'; 
+// [\u0625\u0635\u0644\u0627\u062D] \u0627\u0633\u062A\u064A\u0631\u0627\u062F \u0627\u0644\u0623\u0646\u0648\u0627\u0639 \u0645\u0646 \u0627\u0644\u0645\u0644\u0641 \u0627\u0644\u0631\u0626\u064A\u0633\u064A \u0627\u0644\u0645\u0646\u0638\u0645
+import type { ${[...allModelTypes].join(", ")} } from '../types'; 
 
 /**
  * Defines the configuration for the ${moduleName} API module.
- * This is a strongly-typed configuration object that ensures type safety.
  */
-export const ${moduleName}Module: ApiModuleCodeConfig<${actionsTypeDefinition}> = {
-  baseEndpoint: '/api/v1', // \u064A\u0645\u0643\u0646\u0643 \u062C\u0639\u0644\u0647 \u062F\u064A\u0646\u0627\u0645\u064A\u0643\u064A\u064B\u0627
+export const ${moduleName}Module: ApiModuleConfig<${actionsTypeDefinition}> = {
+  baseEndpoint: '${moduleData.baseEndpoint}',
   actions: ${actionsValueDefinition},
 };
 `;

package/package.json

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