@vc-shell/api-client-generator 1.0.282 → 1.0.284

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [1.0.284](https://github.com/VirtoCommerce/vc-shell/compare/v1.0.283...v1.0.284) (2024-09-06)
+
+
+
+## [1.0.283](https://github.com/VirtoCommerce/vc-shell/compare/v1.0.282...v1.0.283) (2024-09-03)
+
+
+
 ## [1.0.282](https://github.com/VirtoCommerce/vc-shell/compare/v1.0.281...v1.0.282) (2024-08-30)
 
 

package/dist/api-client-generator.js

@@ -1,11 +1,11 @@
 import g from "chalk";
-import { spawnSync as C } from "node:child_process";
+import { sync as C } from "cross-spawn";
 import { resolveConfig as L } from "vite";
 import { existsSync as D, readFileSync as T, writeFileSync as x } from "node:fs";
 import m, { dirname as R, resolve as b, join as _, relative as w } from "node:path";
 import { fileURLToPath as k } from "node:url";
-import { cwd as S } from "node:process";
-const j = k(import.meta.url), E = R(j);
+import { cwd as j } from "node:process";
+const E = k(import.meta.url), S = R(E);
 class I {
   workingDirectory;
   generatorDirectory;
@@ -13,7 +13,7 @@ class I {
   apiClientDirectory;
   nswagPaths;
   constructor(e) {
-    this.workingDirectory = S(), this.generatorDirectory = b(E, ".."), this.assetsDirectory = _(this.generatorDirectory, "public", "assets"), this.apiClientDirectory = b(this.workingDirectory, e), this.nswagPaths = {
+    this.workingDirectory = j(), this.generatorDirectory = b(S, ".."), this.assetsDirectory = _(this.generatorDirectory, "public", "assets"), this.apiClientDirectory = b(this.workingDirectory, e), this.nswagPaths = {
       configuration: _(w(this.workingDirectory, this.assetsDirectory), "config.nswag"),
       authApiBase: "authApiBase.ts",
       templates: "templates"
@@ -37,53 +37,53 @@ function $(r, e, i, n) {
 }
 function M(r, e) {
   r = r || [], e = e || {};
-  var i, n, c, t, h, o = { _: [] }, s = 0, l = 0, a = 0, f = r.length;
-  const p = e.alias !== void 0, P = e.unknown !== void 0, u = e.default !== void 0;
-  if (e.alias = e.alias || {}, e.string = O(e.string), e.boolean = O(e.boolean), p)
+  var i, n, c, t, h, s = { _: [] }, o = 0, l = 0, a = 0, f = r.length;
+  const P = e.alias !== void 0, p = e.unknown !== void 0, u = e.default !== void 0;
+  if (e.alias = e.alias || {}, e.string = O(e.string), e.boolean = O(e.boolean), P)
     for (i in e.alias)
-      for (n = e.alias[i] = O(e.alias[i]), s = 0; s < n.length; s++)
-        (e.alias[n[s]] = n.concat(i)).splice(s, 1);
-  for (s = e.boolean.length; s-- > 0; )
-    for (n = e.alias[e.boolean[s]] || [], l = n.length; l-- > 0; ) e.boolean.push(n[l]);
-  for (s = e.string.length; s-- > 0; )
-    for (n = e.alias[e.string[s]] || [], l = n.length; l-- > 0; ) e.string.push(n[l]);
+      for (n = e.alias[i] = O(e.alias[i]), o = 0; o < n.length; o++)
+        (e.alias[n[o]] = n.concat(i)).splice(o, 1);
+  for (o = e.boolean.length; o-- > 0; )
+    for (n = e.alias[e.boolean[o]] || [], l = n.length; l-- > 0; ) e.boolean.push(n[l]);
+  for (o = e.string.length; o-- > 0; )
+    for (n = e.alias[e.string[o]] || [], l = n.length; l-- > 0; ) e.string.push(n[l]);
   if (u) {
     for (i in e.default)
       if (t = typeof e.default[i], n = e.alias[i] = e.alias[i] || [], e[t] !== void 0)
-        for (e[t].push(i), s = 0; s < n.length; s++)
-          e[t].push(n[s]);
+        for (e[t].push(i), o = 0; o < n.length; o++)
+          e[t].push(n[o]);
   }
-  const d = P ? Object.keys(e.alias) : [];
-  for (s = 0; s < f; s++) {
-    if (c = r[s], c === "--") {
-      o._ = o._.concat(r.slice(++s));
+  const d = p ? Object.keys(e.alias) : [];
+  for (o = 0; o < f; o++) {
+    if (c = r[o], c === "--") {
+      s._ = s._.concat(r.slice(++o));
       break;
     }
     for (l = 0; l < c.length && c.charCodeAt(l) === 45; l++)
       ;
     if (l === 0)
-      o._.push(c);
+      s._.push(c);
     else if (c.substring(l, l + 3) === "no-") {
-      if (t = c.substring(l + 3), P && !~d.indexOf(t))
+      if (t = c.substring(l + 3), p && !~d.indexOf(t))
         return e.unknown(c);
-      o[t] = !1;
+      s[t] = !1;
     } else {
       for (a = l + 1; a < c.length && c.charCodeAt(a) !== 61; a++)
         ;
-      for (t = c.substring(l, a), h = c.substring(++a) || s + 1 === f || ("" + r[s + 1]).charCodeAt(0) === 45 || r[++s], n = l === 2 ? [t] : t, a = 0; a < n.length; a++) {
-        if (t = n[a], P && !~d.indexOf(t)) return e.unknown("-".repeat(l) + t);
-        $(o, t, a + 1 < n.length || h, e);
+      for (t = c.substring(l, a), h = c.substring(++a) || o + 1 === f || ("" + r[o + 1]).charCodeAt(0) === 45 || r[++o], n = l === 2 ? [t] : t, a = 0; a < n.length; a++) {
+        if (t = n[a], p && !~d.indexOf(t)) return e.unknown("-".repeat(l) + t);
+        $(s, t, a + 1 < n.length || h, e);
       }
     }
   }
   if (u)
     for (i in e.default)
-      o[i] === void 0 && (o[i] = e.default[i]);
-  if (p)
-    for (i in o)
+      s[i] === void 0 && (s[i] = e.default[i]);
+  if (P)
+    for (i in s)
       for (n = e.alias[i] || []; n.length > 0; )
-        o[n.shift()] = o[i];
-  return o;
+        s[n.shift()] = s[i];
+  return s;
 }
 async function N() {
   await L({}, "build");
@@ -98,7 +98,7 @@ async function N() {
   if (!r.APP_API_CLIENT_DIRECTORY)
     return console.log(g.red("error"), "api-client-generator outDir command is required");
   const i = r.APP_OUT_DIR ?? "./", n = new I(r.APP_API_CLIENT_DIRECTORY), c = r.APP_PLATFORM_MODULES.replace(/[[\]]/g, "").split(","), t = {}, h = m.join(r.APP_API_CLIENT_DIRECTORY, "tsconfig.json");
-  let o = {
+  let s = {
     extends: "@vc-shell/ts-config/tsconfig.json",
     compilerOptions: {
       baseUrl: ".",
@@ -111,36 +111,38 @@ async function N() {
   };
   if (D(h)) {
     const f = JSON.parse(T(h, "utf-8"));
-    o = { ...o, ...f }, o.compilerOptions = { ...o.compilerOptions, ...f.compilerOptions }, o.files = Array.from(new Set(o.files.concat(f.files || []))), o.include = Array.from(new Set(o.include.concat(f.include || [])));
+    s = { ...s, ...f }, s.compilerOptions = { ...s.compilerOptions, ...f.compilerOptions }, s.files = Array.from(new Set(s.files.concat(f.files || []))), s.include = Array.from(new Set(s.include.concat(f.include || [])));
   }
   console.log("api-client-generator %s Generated tsconfig.json", g.greenBright("success"));
   for (const f of c) {
-    const p = n.resolveApiClientPaths(f);
-    if (console.log(
+    const P = n.resolveApiClientPaths(f);
+    console.log(
       "api-client-generator %s Generating API client for %s module on %s environment",
       g.green("info"),
       g.whiteBright(f),
       g.whiteBright(e)
-    ), C(
+    );
+    const p = C(
       "npx nswag",
       [
         "run",
         n.nswagPaths.configuration,
-        `/variables:APP_PLATFORM_URL=${e},APP_PLATFORM_MODULE=${f},APP_AUTH_API_BASE_PATH=${n.nswagPaths.authApiBase},APP_TEMPLATE_DIRECTORY=${n.nswagPaths.templates},APP_API_CLIENT_PATH=${p.nswag}`,
+        `/variables:APP_PLATFORM_URL=${e},APP_PLATFORM_MODULE=${f},APP_AUTH_API_BASE_PATH=${n.nswagPaths.authApiBase},APP_TEMPLATE_DIRECTORY=${n.nswagPaths.templates},APP_API_CLIENT_PATH=${P.nswag}`,
         "/runtime:Net60"
       ],
       {
         stdio: ["ignore", "inherit", "ignore"],
         shell: !0
       }
-    ).status === 0) {
+    );
+    if (p.status === 0) {
       console.log(
         "api-client-generator %s Successfully generated %s",
         g.greenBright("success"),
-        g.whiteBright(p.console)
+        g.whiteBright(P.console)
       );
       const u = f.toLowerCase();
-      o.files.includes(`${u}.ts`) || o.files.push(`${u}.ts`);
+      s.files.includes(`${u}.ts`) || s.files.push(`${u}.ts`);
       const d = {
         import: i !== "./" ? `./${i}/${u}.js` : `./${u}.js`,
         types: i !== "./" ? `./${i}/types/${u}.d.ts` : `./types/${u}.js`
@@ -152,10 +154,11 @@ async function N() {
       console.error(
         "api-client-generator %s Failed to generate %s",
         g.red("error"),
-        g.whiteBright(p.console)
+        g.whiteBright(P.console),
+        p
       );
   }
-  x(h, JSON.stringify(o, null, 2)), console.log("api-client-generator %s Compiling TypeScript files to JavaScript", g.green("info")), C("npx tsc", ["--project", h], {
+  x(h, JSON.stringify(s, null, 2)), console.log("api-client-generator %s Compiling TypeScript files to JavaScript", g.green("info")), C("npx tsc", ["--project", h], {
     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"));
@@ -169,11 +172,11 @@ async function N() {
   if (D(l)) {
     const f = JSON.parse(T(l, "utf-8"));
     a = { ...a, ...f }, a.files = Array.from(new Set(a.files.concat(f.files || []))), a.exports = { ...f.exports, ...a.exports };
-    for (const [p, P] of Object.entries(t)) {
-      const u = P.import, d = m.basename(u), A = Object.keys(a.exports).find(
+    for (const [P, p] of Object.entries(t)) {
+      const u = p.import, d = m.basename(u), A = Object.keys(a.exports).find(
         (y) => a.exports[y].import.includes(d)
       );
-      A ? a.exports[A] = P : a.exports[p] = P;
+      A ? a.exports[A] = p : a.exports[P] = p;
     }
   }
   x(l, JSON.stringify(a, null, 2)), console.log("api-client-generator %s Generated package.json", g.greenBright("success"));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vc-shell/api-client-generator",
   "description": "Tool for API clients generation",
-  "version": "1.0.282",
+  "version": "1.0.284",
   "type": "module",
   "bin": "./dist/api-client-generator.js",
   "files": [
@@ -12,11 +12,12 @@
     "build": "vite build"
   },
   "devDependencies": {
-    "@vc-shell/ts-config": "^1.0.282",
+    "@vc-shell/ts-config": "^1.0.284",
     "typescript": "~5.3.3"
   },
   "dependencies": {
     "chalk": "^2.4.2",
+    "cross-spawn": "^7.0.3",
     "nswag": "^13.20.0",
     "vite": "^5.0.11",
     "vite-plugin-dts": "^3.6.4"