@vc-shell/api-client-generator 1.0.243 → 1.0.245

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## [1.0.245](https://github.com/VirtoCommerce/vc-shell/compare/v1.0.244...v1.0.245) (2024-06-28)
+
+
+### Features
+
+* **api-client-generator:** build api after generation, tsconfig/package.json creation, new args ([de115fe](https://github.com/VirtoCommerce/vc-shell/commit/de115fe05c9849dcdbbd9bd072a51472103e33a1))
+
+
+
+## [1.0.244](https://github.com/VirtoCommerce/vc-shell/compare/v1.0.243...v1.0.244) (2024-06-24)
+
+
+### Features
+
+* application insights logger ([536db4d](https://github.com/VirtoCommerce/vc-shell/commit/536db4db35c91f4fb566717d2d6c536e48aacc95))
+
+
+
 ## [1.0.243](https://github.com/VirtoCommerce/vc-shell/compare/v1.0.242...v1.0.243) (2024-06-21)
 
 

package/dist/api-client-generator.js

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

package/package.json

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