api-core-lib 12.0.43 → 12.0.45

package/dist/cli.cjs

@@ -28,7 +28,7 @@ var import_commander = require("commander");
 var import_path2 = __toESM(require("path"), 1);
 
 // src/generator/index.ts
-var import_fs = __toESM(require("fs"), 1);
+var import_fs_extra = __toESM(require("fs-extra"), 1);
 var import_path = __toESM(require("path"), 1);
 var import_axios = __toESM(require("axios"), 1);
 var import_chalk = __toESM(require("chalk"), 1);
@@ -70,7 +70,11 @@ function parseSpecToModules(spec) {
       }
       let inputType = "undefined";
       if (requestBody) {
-        inputType = refToTypeName(requestBody.$ref);
+        if (requestBody.$ref) {
+          inputType = refToTypeName(requestBody.$ref);
+        } else if (requestBody.type === "object") {
+          inputType = "any";
+        }
       } else if ((endpoint.parameters || []).some((p) => p.in === "query")) {
         inputType = "QueryOptions";
       }
@@ -94,137 +98,61 @@ function parseSpecToModules(spec) {
 // src/generator/index.ts
 async function runGenerator(options) {
   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 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);
+  const specUrl = process.env.OPENAPI_SPEC_URL || (process.env.API_URL ? `${process.env.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."));
+    console.error(import_chalk.default.red.bold("\n\u274C Error: OPENAPI_SPEC_URL or API_URL not found in .env file."));
     process.exit(1);
   }
-  console.log(import_chalk.default.green("\u2713 Environment variables loaded."));
   let tempSpecPath = "";
-  let ignoreFilePath = "";
+  let tempOutputPath = "";
   try {
-    console.log("\n" + import_chalk.default.blue(`Step 2: Fetching OpenAPI spec from ${specUrl}...`));
+    console.log("\n" + import_chalk.default.blue(`Step 1: Fetching OpenAPI spec from ${specUrl}...`));
     tempSpecPath = import_path.default.join(process.cwd(), `swagger-${Date.now()}.json`);
     const response = await import_axios.default.get(specUrl, { timeout: 15e3 });
     const spec = response.data;
-    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");
-    ignoreFilePath = import_path.default.join(process.cwd(), `.openapi-generator-ignore-${Date.now()}`);
-    const ignoreContent = `
-# Main generator metadata
-.openapi-generator/
-# Documentation files
-docs/
-# Git helper files
-.gitignore
-git_push.sh
-# NPM helper files
-.npmignore
-README.md
-`;
-    import_fs.default.writeFileSync(ignoreFilePath, ignoreContent);
-    console.log(import_chalk.default.gray("\u2713 Created temporary .openapi-generator-ignore file."));
+    import_fs_extra.default.writeFileSync(tempSpecPath, JSON.stringify(spec, null, 2));
+    console.log(import_chalk.default.green("\u2713 OpenAPI spec saved temporarily."));
+    console.log("\n" + import_chalk.default.blue("Step 2: Generating full API client in a temporary location..."));
+    tempOutputPath = import_path.default.join(process.cwd(), `api-temp-${Date.now()}`);
     const generatorCommand = [
       "npx --yes @openapitools/openapi-generator-cli generate",
       `-i "${tempSpecPath}"`,
       `-g typescript-axios`,
-      `-o "${typesOutputPath}"`,
-      `--ignore-file-override "${ignoreFilePath}"`,
-      // ==========================================================
-      // ## البداية: التعديل النهائي والنهج الصحيح ##
-      // ==========================================================
-      // [إصلاح] هذا هو النهج الصحيح لتوليد النماذج فقط.
-      // نحن نحدد بالضبط ما نريد توليده (Models) وما لا نريده (APIs, Supporting Files).
-      "--global-property models,apis=false,supportingFiles=false",
-      // ==========================================================
-      // ## النهاية: التعديل النهائي والنهج الصحيح ##
-      // ==========================================================
-      `--additional-properties=supportsES6=true,useSingleRequestParameter=true,withInterfaces=true,modelPropertyNaming=original`
+      `-o "${tempOutputPath}"`,
+      `--additional-properties=supportsES6=true,withInterfaces=true,modelPropertyNaming=original`
     ].join(" ");
-    console.log(import_chalk.default.gray(`Executing command: npx @openapitools/openapi-generator-cli...`));
     (0, import_child_process.execSync)(generatorCommand, { stdio: "inherit" });
-    console.log(import_chalk.default.green(`\u2713 Types generated successfully at ${typesOutputPath}`));
+    console.log(import_chalk.default.green("\u2713 Full client generated successfully."));
+    console.log("\n" + import_chalk.default.blue("Step 3: Restructuring and copying necessary files..."));
+    const finalTypesPath = import_path.default.join(options.output, "types");
+    const tempModelsPath = import_path.default.join(tempOutputPath, "models");
+    const tempIndexPath = import_path.default.join(tempOutputPath, "index.ts");
+    import_fs_extra.default.ensureDirSync(finalTypesPath);
+    import_fs_extra.default.emptyDirSync(finalTypesPath);
+    if (import_fs_extra.default.existsSync(tempModelsPath)) {
+      import_fs_extra.default.copySync(tempModelsPath, import_path.default.join(finalTypesPath, "models"));
+      console.log(import_chalk.default.gray("\u2713 Copied models directory."));
+    }
+    if (import_fs_extra.default.existsSync(tempIndexPath)) {
+      import_fs_extra.default.copySync(tempIndexPath, import_path.default.join(finalTypesPath, "index.ts"));
+      console.log(import_chalk.default.gray("\u2713 Copied main index file."));
+    }
+    console.log(import_chalk.default.green("\u2713 Necessary type files have been structured."));
     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]) => `  ${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';
-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_extra.default.ensureDirSync(modulesOutputPath);
     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));
+    console.log(import_chalk.default.bold.green("\n\u{1F389} API generation complete!"));
   } catch (error) {
     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));
-    }
+    console.error(error.message);
     process.exit(1);
   } finally {
-    if (tempSpecPath && import_fs.default.existsSync(tempSpecPath)) {
-      import_fs.default.unlinkSync(tempSpecPath);
-      console.log(import_chalk.default.gray("\nTemporary spec file cleaned up."));
-    }
-    if (ignoreFilePath && import_fs.default.existsSync(ignoreFilePath)) {
-      import_fs.default.unlinkSync(ignoreFilePath);
-      console.log(import_chalk.default.gray("Temporary ignore file cleaned up."));
-    }
+    if (import_fs_extra.default.existsSync(tempSpecPath)) import_fs_extra.default.unlinkSync(tempSpecPath);
+    if (import_fs_extra.default.existsSync(tempOutputPath)) import_fs_extra.default.rmSync(tempOutputPath, { recursive: true, force: true });
+    console.log(import_chalk.default.gray("\nTemporary files and folders cleaned up."));
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api-core-lib",
-  "version": "12.0.43",
+  "version": "12.0.45",
   "description": "A flexible and powerful API client library for modern web applications.",
   "type": "module",
   "exports": {
@@ -42,12 +42,14 @@
     "commander": "^9.4.1",
     "dotenv": "^16.0.3",
     "fast-deep-equal": "^3.1.3",
+    "fs-extra": "^11.3.1",
     "openapi-typescript": "^6.2.4",
     "path": "^0.12.7",
     "uuid": "^9.0.1"
   },
   "devDependencies": {
     "@openapitools/openapi-generator-cli": "^2.23.1",
+    "@types/fs-extra": "^11.0.4",
     "@types/jest": "^30.0.0",
     "@types/node": "^24.2.1",
     "@types/react": "^18.3.2",