api-core-lib 12.0.39 → 12.0.41

package/dist/cli.cjs

@@ -105,9 +105,11 @@ async function runGenerator(options) {
     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`);
+  let tempSpecPath = "";
+  let ignoreFilePath = "";
   try {
     console.log("\n" + import_chalk.default.blue(`Step 2: 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) {
@@ -117,31 +119,33 @@ 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 ignoreFilePath = import_path.default.join(typesOutputPath, ".openapi-generator-ignore");
+    ignoreFilePath = import_path.default.join(process.cwd(), `.openapi-generator-ignore-${Date.now()}`);
     const ignoreContent = `
-# Ignore helper files and documentation that we don't need in a TypeScript project.
-
 # Main generator metadata
 .openapi-generator/
-
 # Documentation files
 docs/
-
 # Git helper files
 .gitignore
 git_push.sh
-
 # NPM helper files
 .npmignore
 README.md
 `;
-    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.gray("\u2713 Created temporary .openapi-generator-ignore file."));
+    const generatorCommand = [
+      "npx --yes @openapitools/openapi-generator-cli generate",
+      `-i "${tempSpecPath}"`,
+      `-g typescript-axios`,
+      `-o "${typesOutputPath}"`,
+      `--ignore-file-override "${ignoreFilePath}"`,
+      // **الخيار السحري**: أخبر المولد بتوليد النماذج فقط
+      `--global-property models`,
+      `--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("\n" + import_chalk.default.blue("Step 4: Generating custom API modules..."));
     const modules = parseSpecToModules(spec);
@@ -160,9 +164,7 @@ README.md
       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 actionsTypeParts = Object.entries(moduleData.actions).map(([actionName, actionData]) => `  ${actionName}: ActionConfigModule<${actionData._inputType}, ${actionData._outputType}>;`);
       const actionsTypeDefinition = `{
 ${actionsTypeParts.join("\n")}
 }`;
@@ -180,7 +182,6 @@ ${actionsValueParts.join(",\n")}
  */
 
 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'; 
 
 /**
@@ -209,10 +210,14 @@ export const ${moduleName}Module: ApiModuleConfig<${actionsTypeDefinition}> = {
     }
     process.exit(1);
   } finally {
-    if (import_fs.default.existsSync(tempSpecPath)) {
+    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."));
+    }
   }
 }
 

package/package.json

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