@vc-shell/api-client-generator 1.1.7 → 1.1.9

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+## [1.1.9](https://github.com/VirtoCommerce/vc-shell/compare/v1.1.8...v1.1.9) (2025-05-15)
+
+
+
+## [1.1.8](https://github.com/VirtoCommerce/vc-shell/compare/v1.1.7...v1.1.8) (2025-05-15)
+
+
+### Features
+
+* **generate-api-client:** enhance API client generation with new features and improvements ([fcf85db](https://github.com/VirtoCommerce/vc-shell/commit/fcf85db675390abc218b4cd1fa3f204be9a50da3))
+
+
+
 ## [1.1.7](https://github.com/VirtoCommerce/vc-shell/compare/v1.1.6...v1.1.7) (2025-05-12)
 
 

package/README.md

@@ -1,83 +1,198 @@
-# Platform Manager REST Client
-
-# Generate API client
-
-This guide describes the process of generating an API client to access the VC Platform API from your custom application.
-
-!!! note
-    Platform Manager REST Client offers generated REST API methods that make it easy to interact with the existing VirtoCommerce Platform API.
-
-## Prerequisites
-
-* .NET Core 6.0, particularly if you are using MacOS or Linux.
-
-## Generate TypeScript API clients
-
-To enable TypeScript API client generation in your project:
-
-1. Add dependencies to your project:
-
-Using command
-
-```bash
-yarn add @vc-shell/api-client-generator cross-env
-```
-<br>
-
-`cross-env` runs scripts that set and use environment variables across platforms.
-
-Manually
-
-Add the dependencies to your project's **package.json**:
-
-```json title="vc-app/package.json" linenums="1"
-{
-    ...
-    "devDependencies": {
-        ...
-        "@vc-shell/api-client-generator": "latest",
-        "cross-env": "latest",
-        ...
-    }
-}
-```
-
-2. Configure client generation in your project. Inside your project's **package.json** file, add a `"generate-api-client"` command to the list of scripts:
-
-    ```title="vc-app-extend/package.json" linenums="1"
-    {
-        "scripts": {
-        ...
-        "generate-api-client": cross-env api-client-generator --APP_PLATFORM_MODULES='[MarketplaceVendor,Catalog,Orders]' --APP_API_CLIENT_DIRECTORY=./src/api_client/
-        }
-    }
-    ```
-
-    The options are listed in the table below:
-
-    |          Options           	|                        Description                            	|                          Example                          	|
-    |-----------------------------	|----------------------------------------------------------------	|------------------------------------------------------------	|
-    | `--APP_PLATFORM_MODULES`     	| Platform modules to generate API client.<br>{==string[]==} <br> Customize the `--APP_PLATFORM_MODULES` list<br>to match your project's requirements.	| `--APP_PLATFORM_MODULES='[MarketplaceVendor,Orders,Catalog]'` 	|
-    | `--APP_API_CLIENT_DIRECTORY` 	| Output directory for generated API clients. <br>{==string==} 	| `--APP_API_CLIENT_DIRECTORY=./src/api_client/`                	|
-    | `--APP_PLATFORM_URL`         	| Platform URL to obtain client API configs. <br>{==string==} 	    | `--APP_PLATFORM_URL=https://vcmp-dev.govirto.com/`       	|
-    | `--APP_PACKAGE_NAME`         	| Package name for generated API clients. <br>{==string==} 	    | `--APP_PACKAGE_NAME=vc-app-extend`       	|
-    | `--APP_PACKAGE_VERSION`         	| Package version for generated API clients. <br>{==string==} 	    | `--APP_PACKAGE_VERSION=1.0.0`       	|
-    | `--APP_OUT_DIR`         	| Output directory for generated API clients. <br>{==string==} 	    | `--APP_OUT_DIR=./src/api_client/`       	|
-    | `--SKIP_BUILD`         	| Skip build step. <br>{==boolean==} 	    | `--SKIP_BUILD=true`       	|
-
-3. Configure Platform URL to ensure your project can access the platform's API configurations. Add the platform URL to your project's **.env** file:
-
-    ```title="vc-app-extend/.env"
-    APP_PLATFORM_URL=https://vcmp-dev.govirto.com/
-    ```
-
-    !!! note
-        Alternatively, you can specify the Platform URL as a command option in the previous step when running the `"generate-api-client"` command.
-
-4. Generate the API clients using the following command:
-
-    ```
-    yarn generate-api-client
-    ```
-
-This command generates the required API clients for your custom application. Now you can effortlessly access the VC Platform API from your custom application using the generated API client.
+# Platform Manager REST Client
+
+# Generate API client
+
+This guide describes the process of generating an API client to access the VC Platform API from your custom application.
+
+!!! note
+    Platform Manager REST Client offers generated REST API methods that make it easy to interact with the existing VirtoCommerce Platform API.
+
+## Prerequisites
+
+* .NET Core 6.0, particularly if you are using MacOS or Linux.
+
+## Generate TypeScript API clients
+
+To enable TypeScript API client generation in your project:
+
+1. Add dependencies to your project:
+
+Using command
+
+```bash
+yarn add @vc-shell/api-client-generator cross-env
+```
+<br>
+
+`cross-env` runs scripts that set and use environment variables across platforms.
+
+Manually
+
+Add the dependencies to your project's **package.json**:
+
+```json title="vc-app/package.json" linenums="1"
+{
+    ...
+    "devDependencies": {
+        ...
+        "@vc-shell/api-client-generator": "latest",
+        "cross-env": "latest",
+        ...
+    }
+}
+```
+
+2. Configure client generation in your project. Inside your project's **package.json** file, add a `"generate-api-client"` command to the list of scripts:
+
+    ```title="vc-app-extend/package.json" linenums="1"
+    {
+        "scripts": {
+        ...
+        "generate-api-client": cross-env api-client-generator --APP_PLATFORM_MODULES='[Virtocommerce.MarketplaceVendor,Virtocommerce.Catalog,Virtocommerce.Orders]' --APP_API_CLIENT_DIRECTORY=./src/api_client/
+        }
+    }
+    ```
+
+    The options are listed in the table below:
+
+    |          Options           	|                        Description                            	|                          Example                          	|
+    |-----------------------------	|----------------------------------------------------------------	|------------------------------------------------------------	|
+    | `--APP_PLATFORM_MODULES`     	| Platform modules to generate API client.<br>{==string[]==} <br> Customize the `--APP_PLATFORM_MODULES` list<br>to match your project's requirements.	| `--APP_PLATFORM_MODULES='[Virtocommerce.MarketplaceVendor,Virtocommerce.Orders,Virtocommerce.Catalog]'` 	|
+    | `--APP_API_CLIENT_DIRECTORY` 	| Output directory for generated API clients. <br>{==string==} 	| `--APP_API_CLIENT_DIRECTORY=./src/api_client/`                	|
+    | `--APP_PLATFORM_URL`         	| Platform URL to obtain client API configs. <br>{==string==} 	    | `--APP_PLATFORM_URL=https://vcmp-dev.govirto.com/`       	|
+    | `--APP_PACKAGE_NAME`         	| Package name for generated API clients. <br>{==string==} 	    | `--APP_PACKAGE_NAME=@api-client`       	|
+    | `--APP_PACKAGE_VERSION`         	| Package version for generated API clients. <br>{==string==} 	    | `--APP_PACKAGE_VERSION=1.1.0`       	|
+    | `--APP_OUT_DIR`         	| Output directory for generated API clients. <br>{==string==} 	    | `--APP_OUT_DIR=./src/api_client/`       	|
+    | `--APP_BUILD_DIR`         	| Directory where TypeScript files will be compiled. <br>{==string==} 	    | `--APP_BUILD_DIR=lib` (default is "dist")      	|
+    | `--SKIP_BUILD`         	| Skip build step. <br>{==boolean==} 	    | `--SKIP_BUILD=true`       	|
+    | `--VERBOSE`         	| Enable verbose logging. <br>{==boolean==} 	    | `--VERBOSE=true`       	|
+
+3. Configure Platform URL to ensure your project can access the platform's API configurations. Add the platform URL to your project's **.env** file:
+
+    ```title="vc-app-extend/.env"
+    APP_PLATFORM_URL=https://vcmp-dev.govirto.com/
+    ```
+
+    !!! note
+        Alternatively, you can specify the Platform URL as a command option in the previous step when running the `"generate-api-client"` command.
+
+4. Generate the API clients using the following command:
+
+    ```
+    yarn generate-api-client
+    ```
+
+This command generates the required API clients for your custom application. Now you can effortlessly access the VC Platform API from your custom application using the generated API client.
+
+## Features
+
+### Smart Configuration Merging
+
+The generator now intelligently merges configuration files to preserve your custom settings. When you update an existing API client:
+
+- Custom package.json fields like name, version, description, keywords, author and license are preserved
+- Custom tsconfig.json settings are maintained
+- Exports are intelligently updated to preserve existing paths
+
+### Metadata Tracking
+
+API client now includes metadata to track the generation:
+
+```json
+{
+  "apiClientGenerator": {
+    "version": "1.1.0",
+    "generatedAt": "2025-04-01T12:30:45.123Z"
+  }
+}
+```
+
+### Multiple API Exports
+
+The generator handles multiple API clients effectively:
+
+- Creates standardized exports with both short names (`./{moduleName}`) and full names (`./virtocommerce.{moduleName}`) 
+- Prevents duplicate module exports by intelligently merging with existing ones
+- Automatically removes `module` and `types` fields that conflict with multiple exports
+- Works properly with incremental generation (can add new APIs without breaking existing ones)
+
+### Smart Root Export Handling
+
+The generator now intelligently handles root exports based on the number of API modules:
+
+- **Single API Module**: When only one API module is generated, it automatically becomes the root export (`.`) and `module`/`types` fields are maintained
+- **Multiple API Modules**: When multiple API modules are generated, only subpath exports are used (e.g., `./moduleA`, `./moduleB`)
+- **Preserving Preferences**: If a root export already exists, it will be preserved as long as it points to one of the generated modules
+
+This enables both simple usage for single-API packages and proper subpath exporting for multi-API packages:
+
+```js
+// Single API package (using root export)
+import { MyClient } from '@myapp/api';
+
+// Multi-API package (using subpath exports)
+import { ClientA } from '@myapp/api/moduleA';
+import { ClientB } from '@myapp/api/moduleB';
+```
+
+### Directory Creation
+
+Target directories are automatically created if they don't exist.
+
+### Verbose Logging
+
+Enable detailed logging to troubleshoot generation issues:
+
+```
+yarn generate-api-client --VERBOSE=true
+```
+
+### Custom Build Directory
+
+You can specify a custom build directory where TypeScript files will be compiled:
+
+```
+yarn generate-api-client --APP_BUILD_DIR=lib
+```
+
+By default, the build directory is "dist".
+
+### Error Handling Improvements
+
+Better error handling and reporting make it easier to diagnose issues during client generation.
+
+## Recent Improvements (v1.1.8)
+
+### Fixed Issues
+
+- **Configuration Preservation**: Fixed issue where package.json and tsconfig.json user settings were being overwritten
+- **Export Path Management**: Improved export path handling to prevent incorrect paths with duplicated prefixes
+- **Path Normalization**: Added better path normalization to handle edge cases correctly
+- **Export Deduplication**: Implemented smarter export merging to prevent duplicate exports with different path formats
+- **Build Directory Support**: Added proper support for custom build directories via APP_BUILD_DIR parameter
+- **Declaration Files Location**: Fixed issue with TypeScript declaration files location to match the build directory
+- **Error Handling**: Improved JSON parsing error handling with better fallback strategies
+- **Root Export Handling**: Fixed issue with root exports being ignored or improperly handled
+
+### New Features
+
+- **Intelligent Config Merging**: Complete rewrite of configuration merging logic to better preserve user settings
+- **Export Path Standardization**: New system for standardizing export paths to improve consistency
+- **Path Validation**: Added strict validation of export paths to prevent invalid configurations
+- **Improved Logging**: Added more detailed logging for better debugging
+- **Extended User Fields Preservation**: Expanded the list of user-defined fields that are preserved during updates
+- **Better Directory Management**: Improved directory creation and validation process
+- **Smart Single/Multi API Detection**: Automatically detects single API scenarios and creates appropriate root exports
+- **Module/Types Field Handling**: Preserves module and types fields for single API packages while removing them for multi-API packages
+
+## Troubleshooting
+
+If you encounter issues during API client generation:
+
+1. Enable verbose logging with `--VERBOSE=true`
+2. Ensure target directories have proper permissions
+3. Check your connectivity to the platform URL
+4. Verify that the specified platform modules exist
+5. If you encounter JSON parsing errors in tsconfig.json or package.json, try using the `--VERBOSE=true` flag to see detailed error messages
+6. Check for duplicate exports in your package.json which might cause conflicts
+7. If you manually modified exports in package.json, ensure they follow the correct format

package/dist/api-client-generator.js

@@ -1,186 +1,316 @@
-import g from "chalk";
-import { sync as O } from "cross-spawn";
-import { resolveConfig as I } from "vite";
-import { existsSync as D, readFileSync as C, writeFileSync as T } from "node:fs";
-import A, { dirname as b, resolve as L, join as m, relative as _ } from "node:path";
-import { fileURLToPath as R } from "node:url";
-import { cwd as S } from "node:process";
-const k = R(import.meta.url), E = b(k);
-class j {
+import e from "chalk";
+import { sync as D } from "cross-spawn";
+import { resolveConfig as j } from "vite";
+import { existsSync as w, mkdirSync as I, writeFileSync as R, readFileSync as O } from "node:fs";
+import h, { dirname as B, resolve as E, join as A, relative as C } from "node:path";
+import { fileURLToPath as b } from "node:url";
+import { cwd as x } from "node:process";
+import L from "mri";
+const S = b(import.meta.url), N = B(S);
+class k {
   workingDirectory;
   generatorDirectory;
   assetsDirectory;
   apiClientDirectory;
   nswagPaths;
-  constructor(e) {
-    this.workingDirectory = S(), this.generatorDirectory = L(E, ".."), this.assetsDirectory = m(this.generatorDirectory, "public", "assets"), this.apiClientDirectory = L(this.workingDirectory, e), this.nswagPaths = {
-      configuration: m(_(this.workingDirectory, this.assetsDirectory), "config.nswag"),
+  constructor(r) {
+    this.workingDirectory = x(), this.generatorDirectory = E(N, ".."), this.assetsDirectory = A(this.generatorDirectory, "public", "assets"), this.apiClientDirectory = E(this.workingDirectory, r), this.nswagPaths = {
+      configuration: A(C(this.workingDirectory, this.assetsDirectory), "config.nswag"),
       authApiBase: "authApiBase.ts",
       templates: "templates"
     };
   }
-  resolveApiClientPaths(e) {
-    const i = `${e.toLowerCase()}.ts`;
+  resolveApiClientPaths(r) {
+    const p = `${r.toLowerCase()}.ts`;
     return {
-      fileName: i,
-      nswag: m(_(this.assetsDirectory, this.apiClientDirectory), i),
-      console: m(_(this.workingDirectory, this.apiClientDirectory), i)
+      fileName: p,
+      nswag: A(C(this.assetsDirectory, this.apiClientDirectory), p),
+      console: A(C(this.workingDirectory, this.apiClientDirectory), p)
     };
   }
 }
+function T(t, r, p = []) {
+  const n = { ...t };
+  for (const a of p)
+    a in r && (n[a] = r[a]);
+  for (const [a, i] of Object.entries(r)) {
+    const l = a;
+    a in n && typeof n[l] == "object" && !Array.isArray(n[l]) && typeof i == "object" && !Array.isArray(i) && i !== null ? n[l] = { ...n[l], ...i } : p.includes(a) || (n[l] = i);
+  }
+  return n;
+}
+function M(t, r, p, n) {
+  const a = {
+    extends: "@vc-shell/ts-config/tsconfig.json",
+    compilerOptions: {
+      baseUrl: ".",
+      declarationDir: h.join(p, "types"),
+      outDir: n,
+      rootDir: "./"
+    },
+    files: [],
+    include: ["*.ts"]
+  };
+  let i = { ...a };
+  if (w(t))
+    try {
+      const l = O(t, "utf-8");
+      try {
+        const o = JSON.parse(l);
+        i = T(a, o), o.compilerOptions && typeof o.compilerOptions == "object" && (i.compilerOptions = {
+          ...a.compilerOptions,
+          ...o.compilerOptions
+        }, i.compilerOptions.outDir = n, i.compilerOptions.declarationDir = h.join(n, "types"));
+        const s = Array.isArray(o.files) ? o.files : [];
+        i.files = Array.from(/* @__PURE__ */ new Set([...r, ...s])), console.log("api-client-generator %s Updated existing tsconfig.json", e.greenBright("success"));
+      } catch (o) {
+        console.error(
+          "api-client-generator %s Failed to parse existing tsconfig.json, creating new one",
+          e.yellow("warning"),
+          o
+        ), i = { ...a }, i.files = r;
+      }
+    } catch (l) {
+      console.error("api-client-generator %s Failed to read existing tsconfig.json", e.red("error"), l);
+    }
+  else
+    i.files = r, console.log("api-client-generator %s Created new tsconfig.json", e.greenBright("success"));
+  return i;
+}
+function _(t) {
+  return t = t.replace(/\.(js|ts)$/i, ""), t = t.replace(/\/\.\//g, "/"), t !== "." && !t.startsWith("./") && (t = "./" + t), t = t.replace(/\/+/g, "/"), t = t.replace(/\.\.\//g, ""), t;
+}
 function y(t) {
-  return t == null ? [] : Array.isArray(t) ? t : [t];
+  const r = _(t);
+  return r === "." ? "" : r.replace(/^\.\//, "").toLowerCase();
 }
-function $(t, e, i, n) {
-  var c, s = t[e], u = ~n.string.indexOf(e) ? i == null || i === !0 ? "" : String(i) : typeof i == "boolean" ? i : ~n.boolean.indexOf(e) ? i === "false" ? !1 : i === "true" || (t._.push((c = +i, c * 0 === 0 ? c : i)), !!i) : (c = +i, c * 0 === 0 ? c : i);
-  t[e] = s == null ? u : Array.isArray(s) ? s.concat(u) : [s, u];
+function v(t) {
+  const r = y(t);
+  return r ? [`./${r}`] : [];
 }
-function B(t, e) {
-  t = t || [], e = e || {};
-  var i, n, c, s, u, o = { _: [] }, r = 0, a = 0, l = 0, f = t.length;
-  const P = e.alias !== void 0, h = e.unknown !== void 0, p = e.default !== void 0;
-  if (e.alias = e.alias || {}, e.string = y(e.string), e.boolean = y(e.boolean), P)
-    for (i in e.alias)
-      for (n = e.alias[i] = y(e.alias[i]), r = 0; r < n.length; r++)
-        (e.alias[n[r]] = n.concat(i)).splice(r, 1);
-  for (r = e.boolean.length; r-- > 0; )
-    for (n = e.alias[e.boolean[r]] || [], a = n.length; a-- > 0; ) e.boolean.push(n[a]);
-  for (r = e.string.length; r-- > 0; )
-    for (n = e.alias[e.string[r]] || [], a = n.length; a-- > 0; ) e.string.push(n[a]);
-  if (p) {
-    for (i in e.default)
-      if (s = typeof e.default[i], n = e.alias[i] = e.alias[i] || [], e[s] !== void 0)
-        for (e[s].push(i), r = 0; r < n.length; r++)
-          e[s].push(n[r]);
+function F(t, r, p, n) {
+  const a = {}, i = /* @__PURE__ */ new Set(), l = [];
+  for (const o of t) {
+    const s = y(o);
+    if (!s) continue;
+    l.includes(s) || l.push(s);
+    const c = `./${r}/${s}.js`, g = `./${r}/types/${s}.d.ts`, f = {
+      import: c,
+      types: g
+    }, m = v(s);
+    for (const P of m)
+      a[P] = f, i.add(s), n && console.log(
+        "api-client-generator %s Created export: %s -> %s, %s",
+        e.blue("debug"),
+        e.whiteBright(P),
+        e.whiteBright(c),
+        e.whiteBright(g)
+      );
   }
-  const d = h ? Object.keys(e.alias) : [];
-  for (r = 0; r < f; r++) {
-    if (c = t[r], c === "--") {
-      o._ = o._.concat(t.slice(++r));
-      break;
-    }
-    for (a = 0; a < c.length && c.charCodeAt(a) === 45; a++)
-      ;
-    if (a === 0)
-      o._.push(c);
-    else if (c.substring(a, a + 3) === "no-") {
-      if (s = c.substring(a + 3), h && !~d.indexOf(s))
-        return e.unknown(c);
-      o[s] = !1;
-    } else {
-      for (l = a + 1; l < c.length && c.charCodeAt(l) !== 61; l++)
-        ;
-      for (s = c.substring(a, l), u = c.substring(++l) || r + 1 === f || ("" + t[r + 1]).charCodeAt(0) === 45 || t[++r], n = a === 2 ? [s] : s, l = 0; l < n.length; l++) {
-        if (s = n[l], h && !~d.indexOf(s)) return e.unknown("-".repeat(a) + s);
-        $(o, s, l + 1 < n.length || u, e);
+  if (p)
+    for (const [o, s] of Object.entries(p)) {
+      if (o === ".") {
+        if (typeof s == "object" && s !== null) {
+          const f = s;
+          f.import && f.types && n && console.log("api-client-generator %s Found existing root export", e.blue("debug"));
+        }
+        continue;
       }
+      const c = y(o);
+      if (!c || i.has(c)) continue;
+      const g = _(o);
+      if (typeof s == "object" && s !== null) {
+        const f = s;
+        f.import && f.types && (a[g] = {
+          import: _(f.import) + ".js",
+          types: _(f.types) + ".d.ts"
+        }, i.add(c), l.includes(c) || l.push(c), n && console.log(
+          "api-client-generator %s Preserved custom export: %s",
+          e.blue("debug"),
+          e.whiteBright(g)
+        ));
+      }
+    }
+  if (l.length === 1) {
+    const o = l[0], s = `./${r}/${o}.js`, c = `./${r}/types/${o}.d.ts`;
+    a["."] = {
+      import: s,
+      types: c
+    }, n && console.log(
+      "api-client-generator %s Created root export for single module: %s",
+      e.blue("debug"),
+      e.whiteBright(o)
+    );
+  } else if (p && "." in p) {
+    const o = p["."];
+    if (o && typeof o == "object" && o.import) {
+      const s = y(o.import);
+      if (l.includes(s)) {
+        const c = `./${r}/${s}.js`, g = `./${r}/types/${s}.d.ts`;
+        a["."] = {
+          import: c,
+          types: g
+        }, n && console.log(
+          "api-client-generator %s Preserved existing root export pointing to module: %s",
+          e.blue("debug"),
+          e.whiteBright(s)
+        );
+      } else n && console.log(
+        "api-client-generator %s Removed root export that pointed to non-existing module",
+        e.yellow("warning")
+      );
     }
   }
-  if (p)
-    for (i in e.default)
-      o[i] === void 0 && (o[i] = e.default[i]);
-  if (P)
-    for (i in o)
-      for (n = e.alias[i] || []; n.length > 0; )
-        o[n.shift()] = o[i];
+  return a;
+}
+function $(t, r, p) {
+  const n = p.VERBOSE ?? !1, a = p.APP_BUILD_DIR ?? "dist", i = [];
+  a && i.push(a), i.push("package.json");
+  const l = {
+    name: p.APP_PACKAGE_NAME || "api-client",
+    version: p.APP_PACKAGE_VERSION || "1.0.0",
+    files: i,
+    exports: {},
+    // Add metadata to track generated content
+    apiClientGenerator: {
+      version: process.env.npm_package_version || "unknown",
+      generatedAt: (/* @__PURE__ */ new Date()).toISOString()
+    }
+  };
+  let o = { ...l }, s, c, g;
+  if (w(t))
+    try {
+      const u = O(t, "utf-8");
+      try {
+        const d = JSON.parse(u);
+        typeof d.module == "string" && (c = d.module), typeof d.types == "string" && (g = d.types), o = T(l, d, [
+          "name",
+          "version",
+          "description",
+          "keywords",
+          "author",
+          "license",
+          "private",
+          "scripts",
+          "devDependencies",
+          "dependencies"
+        ]), d.files && Array.isArray(d.files) && (o.files = Array.from(/* @__PURE__ */ new Set([...i, ...d.files]))), s = d.exports, console.log("api-client-generator %s Updated existing package.json", e.greenBright("success"));
+      } catch (d) {
+        console.error(
+          "api-client-generator %s Failed to parse existing package.json, creating new one",
+          e.yellow("warning"),
+          d
+        );
+      }
+    } catch (u) {
+      console.error("api-client-generator %s Failed to read existing package.json", e.red("error"), u);
+    }
+  else
+    console.log("api-client-generator %s Creating new package.json", e.greenBright("success"));
+  o.exports = F(r, a, s, n);
+  const f = r.map(y).filter(Boolean);
+  if (Array.from(new Set(f)).length === 1 && o.exports && "." in o.exports) {
+    const u = o.exports["."];
+    u && u.import && (o.module = u.import, n && console.log(
+      "api-client-generator %s Set module field to: %s",
+      e.blue("debug"),
+      e.whiteBright(u.import)
+    )), u && u.types && (o.types = u.types, n && console.log(
+      "api-client-generator %s Set types field to: %s",
+      e.blue("debug"),
+      e.whiteBright(u.types)
+    ));
+  } else
+    "module" in o && (delete o.module, n && console.log(
+      "api-client-generator %s Removed 'module' field from package.json as it conflicts with subpath exports",
+      e.blue("debug")
+    )), "types" in o && (delete o.types, n && console.log(
+      "api-client-generator %s Removed 'types' field from package.json as it conflicts with subpath exports",
+      e.blue("debug")
+    ));
   return o;
 }
-async function M() {
-  await I({}, "build");
-  const t = B(process.argv.slice(2)), e = process.env.APP_PLATFORM_URL ?? t.APP_PLATFORM_URL;
-  if (!e)
+async function U() {
+  await j({}, "build");
+  const t = L(process.argv.slice(2)), r = process.env.APP_PLATFORM_URL ?? t.APP_PLATFORM_URL, p = t.VERBOSE ?? !1;
+  if (!r)
     return console.log(
-      g.red("error"),
+      e.red("error"),
       "api-client-generator APP_PLATFORM_URL is required in .env config or as api-client-generator argument"
     );
   if (!t.APP_PLATFORM_MODULES)
-    return console.log(g.red("error"), "api-client-generator modules command is required");
+    return console.log(e.red("error"), "api-client-generator modules command is required");
   if (!t.APP_API_CLIENT_DIRECTORY)
-    return console.log(g.red("error"), "api-client-generator outDir command is required");
-  const i = t.APP_OUT_DIR ?? "./", n = new j(t.APP_API_CLIENT_DIRECTORY), c = t.APP_PLATFORM_MODULES.replace(/[[\]]/g, "").split(","), s = {};
-  let u, o;
-  if (!t.SKIP_BUILD && (u = A.join(t.APP_API_CLIENT_DIRECTORY, "tsconfig.json"), o = {
-    extends: "@vc-shell/ts-config/tsconfig.json",
-    compilerOptions: {
-      baseUrl: ".",
-      declarationDir: A.join(i, "types"),
-      outDir: i,
-      rootDir: "./"
-    },
-    files: [],
-    include: ["*.ts"]
-  }, D(u))) {
-    const r = JSON.parse(C(u, "utf-8"));
-    o = { ...o, ...r }, o && (o.compilerOptions = { ...o.compilerOptions, ...r.compilerOptions }, o.files = Array.from(new Set(o.files.concat(r.files || []))), o.include = Array.from(new Set(o.include.concat(r.include || [])))), console.log("api-client-generator %s Generated tsconfig.json", g.greenBright("success"));
-  }
-  for (const r of c) {
-    const a = n.resolveApiClientPaths(r);
+    return console.log(e.red("error"), "api-client-generator outDir command is required");
+  const n = t.APP_OUT_DIR ?? "./", a = t.APP_BUILD_DIR ?? "dist", i = new k(t.APP_API_CLIENT_DIRECTORY);
+  if (!w(t.APP_API_CLIENT_DIRECTORY))
+    try {
+      I(t.APP_API_CLIENT_DIRECTORY, { recursive: !0 }), console.log(
+        "api-client-generator %s Created directory %s",
+        e.greenBright("success"),
+        e.whiteBright(t.APP_API_CLIENT_DIRECTORY)
+      );
+    } catch (c) {
+      console.error(
+        "api-client-generator %s Failed to create directory %s",
+        e.red("error"),
+        e.whiteBright(t.APP_API_CLIENT_DIRECTORY),
+        c
+      );
+      return;
+    }
+  const l = h.join(t.APP_API_CLIENT_DIRECTORY, a);
+  if (!w(l))
+    try {
+      I(l, { recursive: !0 }), console.log(
+        "api-client-generator %s Created build directory %s",
+        e.greenBright("success"),
+        e.whiteBright(l)
+      );
+    } catch (c) {
+      console.error(
+        "api-client-generator %s Failed to create build directory %s",
+        e.red("error"),
+        e.whiteBright(l),
+        c
+      );
+    }
+  const o = t.APP_PLATFORM_MODULES.replace(/[[\]]/g, "").split(","), s = [];
+  for (const c of o) {
+    const g = i.resolveApiClientPaths(c);
     console.log(
       "api-client-generator %s Generating API client for %s module on %s environment",
-      g.green("info"),
-      g.whiteBright(r),
-      g.whiteBright(e)
+      e.green("info"),
+      e.whiteBright(c),
+      e.whiteBright(r)
     );
-    const l = O(
-      "npx nswag",
-      [
-        "run",
-        n.nswagPaths.configuration,
-        `/variables:APP_PLATFORM_URL=${e},APP_PLATFORM_MODULE=${r},APP_AUTH_API_BASE_PATH=${n.nswagPaths.authApiBase},APP_TEMPLATE_DIRECTORY=${n.nswagPaths.templates},APP_API_CLIENT_PATH=${a.nswag}`,
-        "/runtime:Net60"
-      ],
-      {
-        stdio: ["ignore", "inherit", "ignore"],
-        shell: !0
-      }
+    const f = [
+      "run",
+      i.nswagPaths.configuration,
+      `/variables:APP_PLATFORM_URL=${r},APP_PLATFORM_MODULE=${c},APP_AUTH_API_BASE_PATH=${i.nswagPaths.authApiBase},APP_TEMPLATE_DIRECTORY=${i.nswagPaths.templates},APP_API_CLIENT_PATH=${g.nswag}`,
+      "/runtime:Net60"
+    ];
+    p && console.log("api-client-generator %s Running command: npx nswag %s", e.blue("debug"), f.join(" ")), D("npx nswag", f, {
+      stdio: ["ignore", "inherit", "ignore"],
+      shell: !0
+    }).status === 0 ? (console.log(
+      "api-client-generator %s Successfully generated %s",
+      e.greenBright("success"),
+      e.whiteBright(g.console)
+    ), t.SKIP_BUILD || s.push(`${c.toLowerCase()}.ts`)) : console.error(
+      "api-client-generator %s Failed to generate %s",
+      e.red("error"),
+      e.whiteBright(g.console)
     );
-    if (l.status === 0) {
-      if (console.log(
-        "api-client-generator %s Successfully generated %s",
-        g.greenBright("success"),
-        g.whiteBright(a.console)
-      ), !t.SKIP_BUILD && o) {
-        const f = r.toLowerCase();
-        o.files.includes(`${f}.ts`) || o.files.push(`${f}.ts`);
-        const P = {
-          import: i !== "./" ? `./${i}/${f}.js` : `./${f}.js`,
-          types: i !== "./" ? `./${i}/types/${f}.d.ts` : `./types/${f}.d.ts`
-        }, h = Object.keys(s).find(
-          (p) => s[p].import.includes(`${f}.js`)
-        );
-        h ? s[h] = P : s[`./${f}`] = P;
-      }
-    } else
-      console.error(
-        "api-client-generator %s Failed to generate %s",
-        g.red("error"),
-        g.whiteBright(a.console),
-        l
-      );
   }
-  if (!t.SKIP_BUILD && u && o) {
-    T(u, JSON.stringify(o, null, 2)), console.log("api-client-generator %s Compiling TypeScript files to JavaScript", g.green("info")), O("npx tsc", ["--project", u], {
+  if (!t.SKIP_BUILD) {
+    const c = h.join(t.APP_API_CLIENT_DIRECTORY, "tsconfig.json"), g = M(c, s, n, a);
+    R(c, JSON.stringify(g, null, 2)), console.log("api-client-generator %s Compiling TypeScript files to JavaScript", e.green("info")), D("npx tsc", ["--project", c], {
       stdio: ["ignore", "inherit", "ignore"],
       shell: !0
-    }).status === 0 ? console.log("api-client-generator %s Successfully compiled TypeScript files", g.greenBright("success")) : console.error("api-client-generator %s Failed to compile TypeScript files", g.red("error"));
-    const a = A.join(t.APP_API_CLIENT_DIRECTORY, "package.json");
-    let l = {
-      name: t.APP_PACKAGE_NAME || "api-client",
-      version: t.APP_PACKAGE_VERSION || "1.0.0",
-      files: i !== "./" ? [i, "package.json"] : ["package.json"],
-      exports: s
-    };
-    if (D(a)) {
-      const f = JSON.parse(C(a, "utf-8"));
-      l = { ...l, ...f }, l.files = Array.from(new Set(l.files.concat(f.files || []))), l.exports = { ...f.exports, ...l.exports };
-      for (const [P, h] of Object.entries(s)) {
-        const p = h.import, d = A.basename(p), w = Object.keys(l.exports).find(
-          (x) => l.exports[x].import.includes(d)
-        );
-        w ? l.exports[w] = h : l.exports[P] = h;
-      }
-    }
-    T(a, JSON.stringify(l, null, 2)), console.log("api-client-generator %s Generated package.json", g.greenBright("success"));
+    }).status === 0 ? console.log("api-client-generator %s Successfully compiled TypeScript files", e.greenBright("success")) : console.error("api-client-generator %s Failed to compile TypeScript files", e.red("error"));
+    const m = h.join(t.APP_API_CLIENT_DIRECTORY, "package.json"), P = $(m, s, t);
+    R(m, JSON.stringify(P, null, 2)), console.log("api-client-generator %s Generated package.json", e.greenBright("success"));
   }
 }
-M();
+U();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vc-shell/api-client-generator",
   "description": "Tool for API clients generation",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "type": "module",
   "bin": "./dist/api-client-generator.js",
   "files": [
@@ -13,12 +13,13 @@
   },
   "devDependencies": {
     "@types/cross-spawn": "^6.0.6",
-    "@vc-shell/ts-config": "^1.1.7",
+    "@vc-shell/ts-config": "^1.1.9",
     "typescript": "^5.8.3"
   },
   "dependencies": {
     "chalk": "^2.4.2",
     "cross-spawn": "^7.0.3",
+    "mri": "^1.2.0",
     "nswag": "^13.20.0",
     "vite": "^6.3.3",
     "vite-plugin-dts": "^3.6.4"