@vc-shell/api-client-generator 1.1.28 → 1.1.30

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+## [1.1.30](https://github.com/VirtoCommerce/vc-shell/compare/v1.1.29...v1.1.30) (2025-06-11)
+
+
+### Bug Fixes
+
+* **api-client-generator:** update import and types path construction for core modules to use path.join for improved path handling ([1d730a1](https://github.com/VirtoCommerce/vc-shell/commit/1d730a19c7c4aa4a309354875d34ba2e8fc3d335))
+
+
+
+## [1.1.29](https://github.com/VirtoCommerce/vc-shell/compare/v1.1.28...v1.1.29) (2025-06-05)
+
+
+
 ## [1.1.28](https://github.com/VirtoCommerce/vc-shell/compare/v1.1.27...v1.1.28) (2025-06-04)
 
 

package/dist/api-client-generator.js

@@ -1,20 +1,20 @@
 import t from "chalk";
 import { sync as E } from "cross-spawn";
-import { resolveConfig as T } from "vite";
-import { existsSync as _, mkdirSync as I, writeFileSync as B, readFileSync as D } from "node:fs";
-import y, { dirname as S, resolve as R, join as w, relative as x } from "node:path";
-import { fileURLToPath as j } from "node:url";
+import { resolveConfig as O } from "vite";
+import { existsSync as _, mkdirSync as B, writeFileSync as I, readFileSync as D } from "node:fs";
+import m, { dirname as T, resolve as R, join as w, relative as x } from "node:path";
+import { fileURLToPath as S } from "node:url";
 import { cwd as k } from "node:process";
 import L from "mri";
-const b = j(import.meta.url), F = S(b);
-class $ {
+const b = S(import.meta.url), $ = T(b);
+class v {
   workingDirectory;
   generatorDirectory;
   assetsDirectory;
   apiClientDirectory;
   nswagPaths;
   constructor(e) {
-    this.workingDirectory = k(), this.generatorDirectory = R(F, ".."), this.assetsDirectory = w(this.generatorDirectory, "public", "assets"), this.apiClientDirectory = R(this.workingDirectory, e), this.nswagPaths = {
+    this.workingDirectory = k(), this.generatorDirectory = R($, ".."), this.assetsDirectory = w(this.generatorDirectory, "public", "assets"), this.apiClientDirectory = R(this.workingDirectory, e), this.nswagPaths = {
       configuration: w(x(this.workingDirectory, this.assetsDirectory), "config.nswag"),
       authApiBase: "authApiBase.ts",
       templates: "templates"
@@ -29,22 +29,22 @@ class $ {
     };
   }
 }
-function O(o, e, p = []) {
+function j(o, e, p = []) {
   const r = { ...o };
   for (const a of p)
     a in e && (r[a] = e[a]);
   for (const [a, s] of Object.entries(e)) {
-    const c = a;
-    a in r && typeof r[c] == "object" && !Array.isArray(r[c]) && typeof s == "object" && !Array.isArray(s) && s !== null ? r[c] = { ...r[c], ...s } : p.includes(a) || (r[c] = s);
+    const l = a;
+    a in r && typeof r[l] == "object" && !Array.isArray(r[l]) && typeof s == "object" && !Array.isArray(s) && s !== null ? r[l] = { ...r[l], ...s } : p.includes(a) || (r[l] = s);
   }
   return r;
 }
-function v(o, e, p, r) {
+function F(o, e, p, r) {
   const a = {
     extends: "@vc-shell/ts-config/tsconfig.json",
     compilerOptions: {
       baseUrl: ".",
-      declarationDir: y.join(p, "types"),
+      declarationDir: m.join(p, "types"),
       outDir: r,
       rootDir: "./"
     },
@@ -54,13 +54,13 @@ function v(o, e, p, r) {
   let s = { ...a };
   if (_(o))
     try {
-      const c = D(o, "utf-8");
+      const l = D(o, "utf-8");
       try {
-        const n = JSON.parse(c);
-        s = O(a, n), n.compilerOptions && typeof n.compilerOptions == "object" && (s.compilerOptions = {
+        const n = JSON.parse(l);
+        s = j(a, n), n.compilerOptions && typeof n.compilerOptions == "object" && (s.compilerOptions = {
           ...a.compilerOptions,
           ...n.compilerOptions
-        }, s.compilerOptions.outDir = r, s.compilerOptions.declarationDir = y.join(r, "types"));
+        }, s.compilerOptions.outDir = r, s.compilerOptions.declarationDir = m.join(r, "types"));
         const h = Array.isArray(n.files) ? n.files : [];
         s.files = Array.from(/* @__PURE__ */ new Set([...e, ...h])), console.log("api-client-generator %s Updated existing tsconfig.json", t.greenBright("success"));
       } catch (n) {
@@ -70,8 +70,8 @@ function v(o, e, p, r) {
           n
         ), s = { ...a }, s.files = e;
       }
-    } catch (c) {
-      console.error("api-client-generator %s Failed to read existing tsconfig.json", t.red("error"), c);
+    } catch (l) {
+      console.error("api-client-generator %s Failed to read existing tsconfig.json", t.red("error"), l);
     }
   else
     s.files = e, console.log("api-client-generator %s Created new tsconfig.json", t.greenBright("success"));
@@ -89,37 +89,37 @@ function A(o) {
         break;
       }
   } while (r);
-  return e = e.replace(/\/\.\//g, "/"), e = e.replace(/\/+/g, "/"), e = e.replace(/\.\.\//g, ""), e !== "." && !e.startsWith("./") && !e.startsWith("/") && !y.isAbsolute(e) && (e = "./" + e), e.startsWith("//") && (e = "./" + e.substring(2)), e !== "." && e.startsWith("/") && !e.startsWith("./") && !y.isAbsolute(e) && (e = "." + e), e !== "." && e.startsWith("././") && (e = "./" + e.substring(3)), e;
+  return e = e.replace(/\/\.\//g, "/"), e = e.replace(/\/+/g, "/"), e = e.replace(/\.\.\//g, ""), e !== "." && !e.startsWith("./") && !e.startsWith("/") && !m.isAbsolute(e) && (e = "./" + e), e.startsWith("//") && (e = "./" + e.substring(2)), e !== "." && e.startsWith("/") && !e.startsWith("./") && !m.isAbsolute(e) && (e = "." + e), e !== "." && e.startsWith("././") && (e = "./" + e.substring(3)), e;
 }
 function P(o) {
   let e = A(o);
-  return e = y.basename(e), e = e.replace(/^virtocommerce\./i, ""), e.toLowerCase();
+  return e = m.basename(e), e = e.replace(/^virtocommerce\./i, ""), e.toLowerCase();
 }
 function M(o) {
   return o ? [`./${o}`, `./virtocommerce.${o}`] : [];
 }
-function U(o, e, p, r) {
+function N(o, e, p, r) {
   const a = {}, s = /* @__PURE__ */ new Set();
   for (const i of o) {
-    const l = P(i);
-    if (!l) continue;
-    const g = `virtocommerce.${l}`, d = `./${e}/${g}.js`, m = `./${e}/types/${g}.d.ts`, f = { import: d, types: m }, u = M(l);
+    const c = P(i);
+    if (!c) continue;
+    const f = `virtocommerce.${c}`, g = `./${m.join(e, `${f}.js`)}`, y = `./${m.join(e, "types", `${f}.d.ts`)}`, d = { import: g, types: y }, u = M(c);
     for (const C of u)
-      a[C] = f, r && console.log(
+      a[C] = d, r && console.log(
         "api-client-generator %s Generated standard export: %s -> { import: %s, types: %s }",
         t.blue("debug"),
         t.whiteBright(C),
-        t.whiteBright(d),
-        t.whiteBright(m)
+        t.whiteBright(g),
+        t.whiteBright(y)
       );
-    s.add(l);
+    s.add(c);
   }
-  const c = { ...a };
+  const l = { ...a };
   if (p)
-    for (const [i, l] of Object.entries(p)) {
+    for (const [i, c] of Object.entries(p)) {
       if (i === ".")
         continue;
-      if (typeof l != "object" || l === null) {
+      if (typeof c != "object" || c === null) {
         r && console.log(
           "api-client-generator %s Skipping malformed existing export value for key: %s",
           t.yellow("warning"),
@@ -127,8 +127,8 @@ function U(o, e, p, r) {
         );
         continue;
       }
-      const g = l;
-      if (!g.import || !g.types) {
+      const f = c;
+      if (!f.import || !f.types) {
         r && console.log(
           "api-client-generator %s Skipping existing export with missing import/types for key: %s",
           t.yellow("warning"),
@@ -136,74 +136,74 @@ function U(o, e, p, r) {
         );
         continue;
       }
-      const d = A(i);
-      if (!(!d || d === "."))
-        if (P(d), d in a)
+      const g = A(i);
+      if (!(!g || g === "."))
+        if (P(g), g in a)
           r && console.log(
             "api-client-generator %s Existing export key '%s' was handled by new generation.",
             t.blue("debug"),
-            t.whiteBright(d)
+            t.whiteBright(g)
           );
         else {
-          const m = A(g.import), f = A(g.types);
-          c[d] = {
-            import: `${m}.js`,
-            types: `${f}.d.ts`
+          const y = A(f.import), d = A(f.types);
+          l[g] = {
+            import: `${y}.js`,
+            types: `${d}.d.ts`
           }, r && console.log(
             "api-client-generator %s Preserved existing export: %s -> { import: %s, types: %s }",
             t.blue("debug"),
-            t.whiteBright(d),
-            t.whiteBright(`${m}.js`),
-            t.whiteBright(`${f}.d.ts`)
+            t.whiteBright(g),
+            t.whiteBright(`${y}.js`),
+            t.whiteBright(`${d}.d.ts`)
           );
         }
     }
   const n = /* @__PURE__ */ new Set();
-  for (const i in c) {
+  for (const i in l) {
     if (i === ".") continue;
-    const l = P(i);
-    l && n.add(l);
+    const c = P(i);
+    c && n.add(c);
   }
   const h = Array.from(n);
   if (h.length === 1) {
-    const i = h[0], l = `./${e}/${i}.js`, g = `./${e}/types/${i}.d.ts`;
-    c["."] = {
-      import: l,
+    const i = h[0], c = `virtocommerce.${i}`, f = `./${m.join(e, `${c}.js`)}`, g = `./${m.join(e, "types", `${c}.d.ts`)}`;
+    l["."] = {
+      import: f,
       types: g
     }, r && console.log(
       "api-client-generator %s Set root export for single module '%s': { import: %s, types: %s }",
       t.blue("debug"),
       t.whiteBright(i),
-      t.whiteBright(l),
+      t.whiteBright(f),
       t.whiteBright(g)
     );
   } else if (p && "." in p) {
     const i = p["."];
     if (typeof i == "object" && i !== null) {
-      const l = i;
-      if (l.import && l.types) {
-        const g = P(l.import);
-        if (g && h.includes(g)) {
-          const d = `./${e}/${g}.js`, m = `./${e}/types/${g}.d.ts`;
-          c["."] = { import: d, types: m }, r && console.log(
+      const c = i;
+      if (c.import && c.types) {
+        const f = P(c.import);
+        if (f && h.includes(f)) {
+          const g = `virtocommerce.${f}`, y = `./${m.join(e, `${g}.js`)}`, d = `./${m.join(e, "types", `${g}.d.ts`)}`;
+          l["."] = { import: y, types: d }, r && console.log(
             "api-client-generator %s Preserved and standardized existing root export pointing to module '%s'",
             t.blue("debug"),
-            t.whiteBright(g)
+            t.whiteBright(f)
           );
         } else r && console.log(
           "api-client-generator %s Removed existing root export as it pointed to an unknown or unhandled module '%s'",
           t.yellow("warning"),
-          g || "unknown"
+          f || "unknown"
         );
       } else r && console.log("api-client-generator %s Removed malformed existing root export.", t.yellow("warning"));
     }
   }
-  return c;
+  return l;
 }
-function N(o, e, p) {
+function U(o, e, p) {
   const r = p.VERBOSE ?? !1, a = p.APP_BUILD_DIR ?? "dist", s = [];
   a && s.push(a), s.push("package.json");
-  const c = {
+  const l = {
     name: p.APP_PACKAGE_NAME || "api-client",
     version: p.APP_PACKAGE_VERSION || "1.0.0",
     files: s,
@@ -214,13 +214,13 @@ function N(o, e, p) {
       generatedAt: (/* @__PURE__ */ new Date()).toISOString()
     }
   };
-  let n = { ...c }, h, i, l;
+  let n = { ...l }, h, i, c;
   if (_(o))
     try {
-      const f = D(o, "utf-8");
+      const d = D(o, "utf-8");
       try {
-        const u = JSON.parse(f);
-        typeof u.module == "string" && (i = u.module), typeof u.types == "string" && (l = u.types), n = O(c, u, [
+        const u = JSON.parse(d);
+        typeof u.module == "string" && (i = u.module), typeof u.types == "string" && (c = u.types), n = j(l, u, [
           "name",
           "version",
           "description",
@@ -231,7 +231,7 @@ function N(o, e, p) {
           "scripts",
           "devDependencies",
           "dependencies"
-        ]), n.apiClientGenerator = c.apiClientGenerator, u.files && Array.isArray(u.files) && (n.files = Array.from(/* @__PURE__ */ new Set([...s, ...u.files]))), h = u.exports, console.log("api-client-generator %s Updated existing package.json", t.greenBright("success"));
+        ]), n.apiClientGenerator = l.apiClientGenerator, u.files && Array.isArray(u.files) && (n.files = Array.from(/* @__PURE__ */ new Set([...s, ...u.files]))), h = u.exports, console.log("api-client-generator %s Updated existing package.json", t.greenBright("success"));
       } catch (u) {
         console.error(
           "api-client-generator %s Failed to parse existing package.json, creating new one",
@@ -239,35 +239,35 @@ function N(o, e, p) {
           u
         );
       }
-    } catch (f) {
-      console.error("api-client-generator %s Failed to read existing package.json", t.red("error"), f);
+    } catch (d) {
+      console.error("api-client-generator %s Failed to read existing package.json", t.red("error"), d);
     }
   else
     console.log("api-client-generator %s Creating new package.json", t.greenBright("success"));
-  n.exports = U(e, a, h, r);
-  const g = Object.keys(n.exports), d = /* @__PURE__ */ new Set();
-  for (const f of g) {
-    if (f === ".") continue;
-    const u = P(f);
-    u && d.add(u);
+  n.exports = N(e, a, h, r);
+  const f = Object.keys(n.exports), g = /* @__PURE__ */ new Set();
+  for (const d of f) {
+    if (d === ".") continue;
+    const u = P(d);
+    u && g.add(u);
   }
-  if (Array.from(d).length, n.exports && "." in n.exports) {
-    const f = n.exports["."];
-    f && f.import && (n.module = f.import, r && console.log(
+  if (Array.from(g).length, n.exports && "." in n.exports) {
+    const d = n.exports["."];
+    d && d.import && (n.module = d.import, r && console.log(
       "api-client-generator %s Set 'module' field from root export: %s",
       t.blue("debug"),
-      t.whiteBright(f.import)
-    )), f && f.types && (n.types = f.types, r && console.log(
+      t.whiteBright(d.import)
+    )), d && d.types && (n.types = d.types, r && console.log(
       "api-client-generator %s Set 'types' field from root export: %s",
       t.blue("debug"),
-      t.whiteBright(f.types)
+      t.whiteBright(d.types)
     ));
   } else
     "module" in n && (delete n.module, r && console.log("api-client-generator %s Removed 'module' field (no clear root export).", t.blue("debug"))), "types" in n && (delete n.types, r && console.log("api-client-generator %s Removed 'types' field (no clear root export).", t.blue("debug")));
   return n;
 }
 async function J() {
-  await T({}, "build");
+  await O({}, "build");
   const o = L(process.argv.slice(2)), e = process.env.APP_PLATFORM_URL ?? o.APP_PLATFORM_URL, p = o.VERBOSE ?? !1;
   if (!e)
     return console.log(
@@ -278,10 +278,10 @@ async function J() {
     return console.log(t.red("error"), "api-client-generator modules command is required");
   if (!o.APP_API_CLIENT_DIRECTORY)
     return console.log(t.red("error"), "api-client-generator outDir command is required");
-  const r = o.APP_OUT_DIR ?? "./", a = o.APP_BUILD_DIR ?? "dist", s = new $(o.APP_API_CLIENT_DIRECTORY);
+  const r = o.APP_OUT_DIR ?? "./", a = o.APP_BUILD_DIR ?? "dist", s = new v(o.APP_API_CLIENT_DIRECTORY);
   if (!_(o.APP_API_CLIENT_DIRECTORY))
     try {
-      I(o.APP_API_CLIENT_DIRECTORY, { recursive: !0 }), console.log(
+      B(o.APP_API_CLIENT_DIRECTORY, { recursive: !0 }), console.log(
         "api-client-generator %s Created directory %s",
         t.greenBright("success"),
         t.whiteBright(o.APP_API_CLIENT_DIRECTORY)
@@ -295,58 +295,58 @@ async function J() {
       );
       return;
     }
-  const c = y.join(o.APP_API_CLIENT_DIRECTORY, a);
-  if (!_(c))
+  const l = m.join(o.APP_API_CLIENT_DIRECTORY, a);
+  if (!_(l))
     try {
-      I(c, { recursive: !0 }), console.log(
+      B(l, { recursive: !0 }), console.log(
         "api-client-generator %s Created build directory %s",
         t.greenBright("success"),
-        t.whiteBright(c)
+        t.whiteBright(l)
       );
     } catch (i) {
       console.error(
         "api-client-generator %s Failed to create build directory %s",
         t.red("error"),
-        t.whiteBright(c),
+        t.whiteBright(l),
         i
       );
     }
   const n = o.APP_PLATFORM_MODULES.replace(/[[\]]/g, "").split(","), h = [];
   for (const i of n) {
-    const l = s.resolveApiClientPaths(i);
+    const c = s.resolveApiClientPaths(i);
     console.log(
       "api-client-generator %s Generating API client for %s module on %s environment",
       t.green("info"),
       t.whiteBright(i),
       t.whiteBright(e)
     );
-    const g = [
+    const f = [
       "run",
       s.nswagPaths.configuration,
-      `/variables:APP_PLATFORM_URL=${e},APP_PLATFORM_MODULE=${i},APP_AUTH_API_BASE_PATH=${s.nswagPaths.authApiBase},APP_TEMPLATE_DIRECTORY=${s.nswagPaths.templates},APP_API_CLIENT_PATH=${l.nswag}`,
+      `/variables:APP_PLATFORM_URL=${e},APP_PLATFORM_MODULE=${i},APP_AUTH_API_BASE_PATH=${s.nswagPaths.authApiBase},APP_TEMPLATE_DIRECTORY=${s.nswagPaths.templates},APP_API_CLIENT_PATH=${c.nswag}`,
       "/runtime:Net60"
     ];
-    p && console.log("api-client-generator %s Running command: npx nswag %s", t.blue("debug"), g.join(" ")), E("npx nswag", g, {
+    p && console.log("api-client-generator %s Running command: npx nswag %s", t.blue("debug"), f.join(" ")), E("npx nswag", f, {
       stdio: ["ignore", "inherit", "ignore"],
       shell: !0
     }).status === 0 ? (console.log(
       "api-client-generator %s Successfully generated %s",
       t.greenBright("success"),
-      t.whiteBright(l.console)
+      t.whiteBright(c.console)
     ), o.SKIP_BUILD || h.push(`${i.toLowerCase()}.ts`)) : console.error(
       "api-client-generator %s Failed to generate %s",
       t.red("error"),
-      t.whiteBright(l.console)
+      t.whiteBright(c.console)
     );
   }
   if (!o.SKIP_BUILD) {
-    const i = y.join(o.APP_API_CLIENT_DIRECTORY, "tsconfig.json"), l = v(i, h, r, a);
-    B(i, JSON.stringify(l, null, 2)), console.log("api-client-generator %s Compiling TypeScript files to JavaScript", t.green("info")), E("npx tsc", ["--project", i], {
+    const i = m.join(o.APP_API_CLIENT_DIRECTORY, "tsconfig.json"), c = F(i, h, r, a);
+    I(i, JSON.stringify(c, null, 2)), console.log("api-client-generator %s Compiling TypeScript files to JavaScript", t.green("info")), E("npx tsc", ["--project", i], {
       stdio: ["ignore", "inherit", "ignore"],
       shell: !0
     }).status === 0 ? console.log("api-client-generator %s Successfully compiled TypeScript files", t.greenBright("success")) : console.error("api-client-generator %s Failed to compile TypeScript files", t.red("error"));
-    const d = y.join(o.APP_API_CLIENT_DIRECTORY, "package.json"), m = N(d, h, o);
-    B(d, JSON.stringify(m, null, 2)), console.log("api-client-generator %s Generated package.json", t.greenBright("success"));
+    const g = m.join(o.APP_API_CLIENT_DIRECTORY, "package.json"), y = U(g, h, o);
+    I(g, JSON.stringify(y, null, 2)), console.log("api-client-generator %s Generated package.json", t.greenBright("success"));
   }
 }
 J();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vc-shell/api-client-generator",
   "description": "Tool for API clients generation",
-  "version": "1.1.28",
+  "version": "1.1.30",
   "type": "module",
   "bin": "./dist/api-client-generator.js",
   "files": [
@@ -13,7 +13,7 @@
   },
   "devDependencies": {
     "@types/cross-spawn": "^6.0.6",
-    "@vc-shell/ts-config": "^1.1.28",
+    "@vc-shell/ts-config": "^1.1.30",
     "typescript": "^5.8.3"
   },
   "dependencies": {