api-core-lib 12.0.35 → 12.0.37

package/dist/cli.cjs

@@ -33,9 +33,14 @@ 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_openapi_typescript = __toESM(require("openapi-typescript"), 1);
+var import_child_process = require("child_process");
 
 // src/generator/module-parser.ts
+function refToTypeName(ref) {
+  if (!ref) return "unknown";
+  const parts = ref.replace(/^#\/components\//, "").split("/");
+  return `components["${parts.join('"]["')}"]`;
+}
 function parseSpecToModules(spec) {
   const modules = {};
   for (const apiPath in spec.paths) {
@@ -45,22 +50,23 @@ 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: {}
-        };
+        modules[moduleName] = { actions: {} };
       }
-      const actionName = endpoint.operationId || method + apiPath.replace(/[\/{}]+/g, "_");
+      const requestBodyRef = endpoint.requestBody?.content["application/json"]?.schema?.$ref;
+      const successResponse = endpoint.responses["200"] || endpoint.responses["201"];
+      const responseRef = successResponse?.content?.["application/json"]?.schema?.$ref;
+      const actionName = endpoint.operationId || `${method}${apiPath.replace(/[\/{}]+/g, "_")}`;
       modules[moduleName].actions[actionName] = {
         method: method.toUpperCase(),
         path: apiPath,
         description: endpoint.summary || "No description available.",
         hasQuery: (endpoint.parameters || []).some((p) => p.in === "query"),
         autoFetch: method.toUpperCase() === "GET" && !apiPath.includes("{"),
-        // افتراض ذكي
-        invalidates: []
-        // يمكن تركه فارغًا
+        invalidates: [],
+        // [ميزة جديدة] إضافة الأنواع المستخرجة إلى الكائن
+        // سنستخدمها لاحقًا لتوليد الكود الصحيح
+        _inputType: refToTypeName(requestBodyRef),
+        _outputType: refToTypeName(responseRef)
       };
     }
   }
@@ -69,53 +75,110 @@ function parseSpecToModules(spec) {
 
 // src/generator/index.ts
 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}`;
-    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;
-    if (!import_fs.default.existsSync(options.output)) {
-      import_fs.default.mkdirSync(options.output, { recursive: true });
+    if (!spec.openapi || !spec.paths) {
+      throw new Error('Invalid OpenAPI specification file. "openapi" or "paths" property is missing.');
     }
-    console.log("Generating TypeScript types...");
-    const typesContent = await (0, import_openapi_typescript.default)(spec);
-    const typesPath = import_path.default.join(options.output, "api-types.generated.ts");
-    import_fs.default.writeFileSync(typesPath, typesContent);
-    console.log(import_chalk.default.green(`\u2713 Types generated successfully at ${typesPath}`));
-    console.log("Generating API modules...");
+    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",
+      `"${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" });
+    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);
+    const modulesOutputPath = import_path.default.join(options.output, "modules");
+    if (!import_fs.default.existsSync(modulesOutputPath)) {
+      import_fs.default.mkdirSync(modulesOutputPath, { recursive: true });
+    }
     for (const moduleName in modules) {
-      const moduleConfig = modules[moduleName];
+      const moduleData = modules[moduleName];
       const fileName = `${moduleName}.module.ts`;
-      const filePath = import_path.default.join(options.output, fileName);
-      const fileContent = `
-// This file is auto-generated by api-core-lib.
-// Do not edit this file directly.
+      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}>;`;
+      });
+      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 } from 'api-core-lib';
-import type { paths } from './api-types.generated'; // \u0631\u0628\u0637 \u0627\u0644\u0623\u0646\u0648\u0627\u0639 \u0627\u0644\u0645\u0648\u0644\u062F\u0629
+import type { ApiModuleConfig, ActionConfigModule, QueryOptions } from 'api-core-lib';
+import type { components } from '../types/api-types.generated'; 
 
-// A more advanced generator could automatically map the correct input/output types.
-// For now, we use 'any' as a placeholder.
-export const ${moduleName}Module: ApiModuleConfig<any> = ${JSON.stringify(moduleConfig, null, 2)};
+/**
+ * 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
+  actions: ${actionsValueDefinition},
+};
 `;
       import_fs.default.writeFileSync(filePath, fileContent);
       console.log(import_chalk.default.green(`\u2713 Module generated: ${fileName}`));
     }
-    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,11 +1,10 @@
 {
   "name": "api-core-lib",
-  "version": "12.0.35",
+  "version": "12.0.37",
   "description": "A flexible and powerful API client library for modern web applications.",
   "type": "module",
-
   "exports": {
-    ".": { 
+    ".": {
       "types": "./dist/index.d.ts",
       "import": "./dist/index.js",
       "require": "./dist/index.cjs"
@@ -21,50 +20,48 @@
       "require": "./dist/client.cjs"
     }
   },
-
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "bin": {
-     "api-core-generate": "./bin/cli-launcher.cjs" 
+    "api-core-generate": "./bin/cli-launcher.cjs"
   },
   "scripts": {
-    "build": "tsup", 
+    "build": "tsup",
     "dev": "tsup --watch"
   },
-
   "peerDependencies": {
     "react": ">=19.0.0",
     "react-dom": ">=19.0.0"
   },
-
   "dependencies": {
     "axios": "^1.6.8",
     "axios-retry": "^4.1.0",
-    "colorette": "^2.0.20",
-    "fast-deep-equal": "^3.1.3",
-    "path": "^0.12.7",
-    "uuid": "^9.0.1",
-
     "chalk": "^4.1.2",
+    "colorette": "^2.0.20",
     "commander": "^9.4.1",
     "dotenv": "^16.0.3",
-    "openapi-typescript": "^6.2.4"
+    "fast-deep-equal": "^3.1.3",
+    "openapi-typescript": "^6.2.4",
+    "path": "^0.12.7",
+    "uuid": "^9.0.1"
   },
-
   "devDependencies": {
-    "react": "19.1.0",
-    "react-dom": "19.1.0",
+    "@openapitools/openapi-generator-cli": "^2.23.1",
     "@types/jest": "^30.0.0",
     "@types/node": "^24.2.1",
     "@types/react": "^18.3.2",
     "@types/uuid": "^9.0.8",
     "javascript-obfuscator": "^4.1.1",
     "jest": "^30.0.5",
+    "react": "19.1.0",
+    "react-dom": "19.1.0",
     "ts-jest": "^29.4.1",
     "tsup": "^8.0.2",
     "typescript": "^5.4.5"
   },
-
-  "files": ["dist" , "bin"]
+  "files": [
+    "dist",
+    "bin"
+  ]
 }