api-core-lib 12.0.44 → 12.0.46

package/dist/cli.cjs

@@ -55,7 +55,7 @@ function parseSpecToModules(spec) {
       const moduleName = tagName.replace(/[^a-zA-Z0-9]/g, "").replace(/Central|Tenant/g, "") + "Api";
       if (!modules[moduleName]) {
         const commonPath = apiPath.substring(0, apiPath.lastIndexOf("/"));
-        modules[moduleName] = { baseEndpoint: commonPath || "/", actions: {} };
+        modules[moduleName] = { baseEndpoint: commonPath || "/", actions: {}, types: /* @__PURE__ */ new Set() };
       }
       const requestBody = endpoint.requestBody?.content?.["application/json"]?.schema;
       const successResponse = endpoint.responses["200"] || endpoint.responses["201"];
@@ -78,6 +78,11 @@ function parseSpecToModules(spec) {
       } else if ((endpoint.parameters || []).some((p) => p.in === "query")) {
         inputType = "QueryOptions";
       }
+      [inputType, outputType].forEach((t) => {
+        if (t && t !== "unknown" && t !== "undefined" && t !== "any" && t !== "QueryOptions") {
+          modules[moduleName].types.add(t.replace("[]", ""));
+        }
+      });
       const actionName = sanitizeActionName(endpoint.operationId);
       const relativePath = apiPath.replace(modules[moduleName].baseEndpoint, "") || "/";
       modules[moduleName].actions[actionName] = {
@@ -154,39 +159,42 @@ README.md`;
     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 moduleFolderPath = import_path.default.join(modulesOutputPath, moduleName);
+      if (!import_fs.default.existsSync(moduleFolderPath)) {
+        import_fs.default.mkdirSync(moduleFolderPath, { recursive: true });
+      }
+      const typesFilePath = import_path.default.join(moduleFolderPath, "types.ts");
+      const typesContent = moduleData.types.size ? `export type { ${[...moduleData.types].join(", ")} } from '../../types';` : `// No types used in this module`;
+      import_fs.default.writeFileSync(typesFilePath, typesContent);
+      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 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 = `
+      const configFilePath = import_path.default.join(moduleFolderPath, "config.ts");
+      const configContent = `
 import type { ApiModuleConfig, ActionConfigModule, QueryOptions } from 'api-core-lib';
-import type { ${[...allModelTypes].join(", ")} } from '../types'; 
+import type { ${[...moduleData.types].join(", ")} } from './types';
 
 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.writeFileSync(configFilePath, configContent);
+      console.log(import_chalk.default.green(`\u2713 Module generated: ${moduleName}/`));
     }
     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:"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api-core-lib",
-  "version": "12.0.44",
+  "version": "12.0.46",
   "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",