@vc-shell/api-client-generator 1.0.251 → 1.0.252

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [1.0.252](https://github.com/VirtoCommerce/vc-shell/compare/v1.0.251...v1.0.252) (2024-07-08)
+
+
+
 ## [1.0.251](https://github.com/VirtoCommerce/vc-shell/compare/v1.0.250...v1.0.251) (2024-07-08)
 
 

package/dist/api-client-generator.js

@@ -2,10 +2,10 @@ import g from "chalk";
 import { spawnSync as C } from "node:child_process";
 import { resolveConfig as L } from "vite";
 import { existsSync as D, readFileSync as T, writeFileSync as x } from "node:fs";
-import A, { dirname as R, resolve as b, join as _, relative as w } from "node:path";
-import { fileURLToPath as S } from "node:url";
-import { cwd as k } from "node:process";
-const E = S(import.meta.url), j = R(E);
+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);
 class I {
   workingDirectory;
   generatorDirectory;
@@ -13,7 +13,7 @@ class I {
   apiClientDirectory;
   nswagPaths;
   constructor(e) {
-    this.workingDirectory = k(), this.generatorDirectory = b(j, ".."), this.assetsDirectory = _(this.generatorDirectory, "public", "assets"), this.apiClientDirectory = b(this.workingDirectory, e), this.nswagPaths = {
+    this.workingDirectory = S(), this.generatorDirectory = b(E, ".."), 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"
@@ -31,63 +31,63 @@ class I {
 function O(r) {
   return r == null ? [] : Array.isArray(r) ? r : [r];
 }
-function M(r, e, i, n) {
-  var c, t = r[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" || (r._.push((c = +i, c * 0 === 0 ? c : i)), !!i) : (c = +i, c * 0 === 0 ? c : i);
-  r[e] = t == null ? u : Array.isArray(t) ? t.concat(u) : [t, u];
+function $(r, e, i, n) {
+  var c, t = r[e], h = ~n.string.indexOf(e) ? i == null || i === !0 ? "" : String(i) : typeof i == "boolean" ? i : ~n.boolean.indexOf(e) ? i === "false" ? !1 : i === "true" || (r._.push((c = +i, c * 0 === 0 ? c : i)), !!i) : (c = +i, c * 0 === 0 ? c : i);
+  r[e] = t == null ? h : Array.isArray(t) ? t.concat(h) : [t, h];
 }
-function N(r, e) {
+function M(r, e) {
   r = r || [], e = e || {};
-  var i, n, c, t, u, s = { _: [] }, o = 0, l = 0, a = 0, f = r.length;
-  const P = e.alias !== void 0, p = e.unknown !== void 0, h = 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, 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)
     for (i in e.alias)
-      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 (h) {
+      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]);
+  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), o = 0; o < n.length; o++)
-          e[t].push(n[o]);
+        for (e[t].push(i), s = 0; s < n.length; s++)
+          e[t].push(n[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));
+  const d = P ? Object.keys(e.alias) : [];
+  for (s = 0; s < f; s++) {
+    if (c = r[s], c === "--") {
+      o._ = o._.concat(r.slice(++s));
       break;
     }
     for (l = 0; l < c.length && c.charCodeAt(l) === 45; l++)
       ;
     if (l === 0)
-      s._.push(c);
+      o._.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);
-      s[t] = !1;
+      o[t] = !1;
     } else {
       for (a = l + 1; a < c.length && c.charCodeAt(a) !== 61; a++)
         ;
-      for (t = c.substring(l, a), u = 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);
-        M(s, t, a + 1 < n.length || u, e);
+      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);
       }
     }
   }
-  if (h)
+  if (u)
     for (i in e.default)
-      s[i] === void 0 && (s[i] = e.default[i]);
-  if (P)
-    for (i in s)
+      o[i] === void 0 && (o[i] = e.default[i]);
+  if (p)
+    for (i in o)
       for (n = e.alias[i] || []; n.length > 0; )
-        s[n.shift()] = s[i];
-  return s;
+        o[n.shift()] = o[i];
+  return o;
 }
-async function v() {
+async function N() {
   await L({}, "build");
-  const r = N(process.argv.slice(2)), e = process.env.APP_PLATFORM_URL ?? r.APP_PLATFORM_URL;
+  const r = M(process.argv.slice(2)), e = process.env.APP_PLATFORM_URL ?? r.APP_PLATFORM_URL;
   if (!e)
     return console.log(
       g.red("error"),
@@ -97,25 +97,25 @@ async function v() {
     return console.log(g.red("error"), "api-client-generator modules command is required");
   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 ?? "dist", n = new I(r.APP_API_CLIENT_DIRECTORY), c = r.APP_PLATFORM_MODULES.replace(/[[\]]/g, "").split(","), t = {}, u = A.join(r.APP_API_CLIENT_DIRECTORY, "tsconfig.json");
-  let s = {
+  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 = {
     extends: "@vc-shell/ts-config/tsconfig.json",
     compilerOptions: {
       baseUrl: ".",
-      declarationDir: A.join(i, "types"),
+      declarationDir: m.join(i, "types"),
       outDir: i,
       rootDir: "./"
     },
     files: [],
     include: ["*.ts"]
   };
-  if (D(u)) {
-    const f = JSON.parse(T(u, "utf-8"));
-    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 || [])));
+  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 || [])));
   }
   console.log("api-client-generator %s Generated tsconfig.json", g.greenBright("success"));
   for (const f of c) {
-    const P = n.resolveApiClientPaths(f);
+    const p = n.resolveApiClientPaths(f);
     if (console.log(
       "api-client-generator %s Generating API client for %s module on %s environment",
       g.green("info"),
@@ -126,7 +126,7 @@ async function v() {
       [
         "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"
       ],
       {
@@ -137,45 +137,45 @@ async function v() {
       console.log(
         "api-client-generator %s Successfully generated %s",
         g.greenBright("success"),
-        g.whiteBright(P.console)
+        g.whiteBright(p.console)
       );
-      const h = f.toLowerCase();
-      s.files.includes(`${h}.ts`) || s.files.push(`${h}.ts`);
+      const u = f.toLowerCase();
+      o.files.includes(`${u}.ts`) || o.files.push(`${u}.ts`);
       const d = {
-        import: A.join(i, `${h}.js`),
-        types: A.join(i, "types", `${h}.d.ts`)
-      }, m = Object.keys(t).find(
-        (y) => t[y].import.includes(`${h}.js`)
+        import: i !== "./" ? `./${i}/${u}.js` : `./${u}.js`,
+        types: i !== "./" ? `./${i}/types/${u}.d.ts` : `./types/${u}.js`
+      }, A = Object.keys(t).find(
+        (y) => t[y].import.includes(`${u}.js`)
       );
-      m ? t[m] = d : t[`./${h}`] = d;
+      A ? t[A] = d : t[`./${u}`] = d;
     } else
       console.error(
         "api-client-generator %s Failed to generate %s",
         g.red("error"),
-        g.whiteBright(P.console)
+        g.whiteBright(p.console)
       );
   }
-  x(u, JSON.stringify(s, null, 2)), console.log("api-client-generator %s Compiling TypeScript files to JavaScript", g.green("info")), C("npx tsc", ["--project", u], {
+  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], {
     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 l = A.join(r.APP_API_CLIENT_DIRECTORY, "package.json");
+  const l = m.join(r.APP_API_CLIENT_DIRECTORY, "package.json");
   let a = {
     name: r.APP_PACKAGE_NAME || "api-client",
     version: r.APP_PACKAGE_VERSION || "1.0.0",
-    files: [i, "package.json"],
+    files: i !== "./" ? [i, "package.json"] : ["package.json"],
     exports: t
   };
   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 h = p.import, d = A.basename(h), m = 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)
       );
-      m ? a.exports[m] = 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"));
 }
-v();
+N();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vc-shell/api-client-generator",
   "description": "Tool for API clients generation",
-  "version": "1.0.251",
+  "version": "1.0.252",
   "type": "module",
   "bin": "./dist/api-client-generator.js",
   "files": [
@@ -12,7 +12,7 @@
     "build": "vite build"
   },
   "devDependencies": {
-    "@vc-shell/ts-config": "^1.0.251",
+    "@vc-shell/ts-config": "^1.0.252",
     "typescript": "~5.3.3"
   },
   "dependencies": {