api-core-lib 12.0.36 → 12.0.38

package/dist/cli.cjs

@@ -33,8 +33,18 @@ var import_path = __toESM(require("path"), 1);
 var import_axios = __toESM(require("axios"), 1);
 var import_chalk = __toESM(require("chalk"), 1);
 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";
+  return ref.split("/").pop() || "unknown";
+}
 function parseSpecToModules(spec) {
   const modules = {};
   for (const apiPath in spec.paths) {
@@ -44,22 +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] = {
-          baseEndpoint: "",
-          // سيتم ملء المسار الكامل في path
-          actions: {}
-        };
+        const commonPath = apiPath.substring(0, apiPath.lastIndexOf("/"));
+        modules[moduleName] = { baseEndpoint: commonPath || "/", actions: {} };
+      }
+      const requestBody = endpoint.requestBody?.content?.["application/json"]?.schema;
+      const successResponse = endpoint.responses["200"] || endpoint.responses["201"];
+      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)}[]`;
+        }
       }
-      const actionName = endpoint.operationId || method + apiPath.replace(/[\/{}]+/g, "_");
+      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: []
-        // يمكن تركه فارغًا
+        invalidates: [],
+        _inputType: inputType,
+        _outputType: outputType
       };
     }
   }
@@ -67,44 +92,121 @@ function parseSpecToModules(spec) {
 }
 
 // src/generator/index.ts
-var import_child_process = require("child_process");
 async function runGenerator(options) {
-  console.log(import_chalk.default.cyan(`Starting API module generation...`));
+  console.log(import_chalk.default.cyan.bold("\u{1F680} Starting API Core Lib Code Generator..."));
   console.log(import_chalk.default.gray(`Output directory: ${options.output}`));
   console.log(import_chalk.default.gray(`.env path: ${options.envPath}`));
+  console.log("\n" + import_chalk.default.blue("Step 1: Loading environment variables..."));
   import_dotenv.default.config({ path: options.envPath });
-  const apiUrl = process.env.API_URL_CONFIG;
-  if (!apiUrl) {
-    console.error(import_chalk.default.red("Error: API_URL or NEXT_PUBLIC_API_URL not found in .env file."));
+  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_chalk.default.red.bold("\n\u274C Error: API specification URL not found."));
+    console.error(import_chalk.default.red("Please define either OPENAPI_SPEC_URL (recommended) or API_URL/NEXT_PUBLIC_API_URL in your .env file."));
     process.exit(1);
   }
+  console.log(import_chalk.default.green("\u2713 Environment variables loaded."));
+  const tempSpecPath = import_path.default.join(process.cwd(), `swagger-${Date.now()}.json`);
   try {
-    const specUrl = `${apiUrl}/docs-json`;
-    console.log(`Fetching OpenAPI spec from ${specUrl}...`);
-    const response = await import_axios.default.get(specUrl);
+    console.log("\n" + import_chalk.default.blue(`Step 2: Fetching OpenAPI spec from ${specUrl}...`));
+    const response = await import_axios.default.get(specUrl, { timeout: 15e3 });
     const spec = response.data;
-    const specPath = import_path.default.join(process.cwd(), "swagger.json");
-    import_fs.default.writeFileSync(specPath, JSON.stringify(spec, null, 2));
-    console.log(import_chalk.default.green(`\u2713 OpenAPI spec saved to ${specPath}`));
-    console.log("Generating organized TypeScript types and services...");
+    if (!spec.openapi || !spec.paths) {
+      throw new Error('Invalid OpenAPI specification file. "openapi" or "paths" property is missing.');
+    }
+    import_fs.default.writeFileSync(tempSpecPath, JSON.stringify(spec, null, 2));
+    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 ${specPath} -g typescript-axios -o ${typesOutputPath} --additional-properties=supportsES6=true,useSingleRequestParameter=true,withInterfaces=true`;
-    (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("Generating API modules for api-core-lib...");
+    console.log("\n" + import_chalk.default.blue("Step 4: Generating custom API modules..."));
     const modules = parseSpecToModules(spec);
     const modulesOutputPath = import_path.default.join(options.output, "modules");
     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]) => {
+        return `  ${actionName}: ActionConfigModule<${actionData._inputType}, ${actionData._outputType}>;`;
+      });
+      const actionsTypeDefinition = `{
+${actionsTypeParts.join("\n")}
+}`;
+      const actionsValueParts = Object.entries(moduleData.actions).map(([actionName, actionData]) => {
+        const { _inputType, _outputType, ...config } = actionData;
+        return `    ${actionName}: ${JSON.stringify(config, null, 2).replace(/\n/g, "\n    ")}`;
+      });
+      const actionsValueDefinition = `{
+${actionsValueParts.join(",\n")}
+  }`;
+      const fileContent = `/**
+ * This file is auto-generated by api-core-lib.
+ * Do not edit this file directly.
+ * @module ${moduleName}
+ */
+
+import type { ApiModuleConfig, ActionConfigModule, QueryOptions } from 'api-core-lib';
+// [\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.
+ */
+export const ${moduleName}Module: ApiModuleConfig<${actionsTypeDefinition}> = {
+  baseEndpoint: '${moduleData.baseEndpoint}',
+  actions: ${actionsValueDefinition},
+};
+`;
+      import_fs.default.writeFileSync(filePath, fileContent);
+      console.log(import_chalk.default.green(`\u2713 Module generated: ${fileName}`));
     }
-    import_fs.default.unlinkSync(specPath);
-    console.log(import_chalk.default.bold.green("\n\u{1F389} API generation complete!"));
+    console.log(import_chalk.default.green("\u2713 All custom modules generated."));
+    console.log(import_chalk.default.bold.green("\n\u{1F389} API generation complete! All files are located in:"));
+    console.log(import_chalk.default.bold.cyan(options.output));
   } catch (error) {
-    console.error(import_chalk.default.red("\nAn error occurred during generation:"));
-    console.error(error.message);
+    console.error(import_chalk.default.red.bold("\n\u274C An error occurred during generation:"));
+    if (error.response) {
+      console.error(import_chalk.default.red(`Network Error: ${error.message} (Status: ${error.response.status})`));
+    } else if (error.stderr) {
+      console.error(import_chalk.default.red(`Command Execution Error: ${error.message}`));
+      console.error(import_chalk.default.gray(error.stderr.toString()));
+    } else {
+      console.error(import_chalk.default.red(error.message));
+    }
     process.exit(1);
+  } finally {
+    if (import_fs.default.existsSync(tempSpecPath)) {
+      import_fs.default.unlinkSync(tempSpecPath);
+      console.log(import_chalk.default.gray("\nTemporary spec file cleaned up."));
+    }
   }
 }
 

package/package.json

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