dxfl 0.4.0 → 0.4.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/CHANGELOG.md +5 -0
  2. package/dist/error.js +4 -4
  3. package/dist/guichet.js +2 -2
  4. package/dist/index.js +1 -1
  5. package/dist/inspect.js +12 -11
  6. package/dist/utils.js +2 -6
  7. package/dist/vhosts.js +5 -5
  8. package/package.json +4 -3
package/CHANGELOG.md CHANGED
@@ -1,3 +1,8 @@
1
+ # v0.4.1
2
+
3
+ - Define required node version
4
+ - Replace cli-color by native styleText
5
+
1
6
  # v0.4.0
2
7
 
3
8
  - `deploy`: allow to specify a custom config file with `--config-file` or `-c`
package/dist/error.js CHANGED
@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
8
8
  });
9
9
  };
10
10
  import { S3ServiceException } from "@aws-sdk/client-s3";
11
- import clc from "cli-color";
11
+ import { styleText } from "node:util";
12
12
  export class ErrorCtx {
13
13
  constructor(ctx, error) {
14
14
  this.ctx = ctx;
@@ -83,10 +83,10 @@ export function wrapS3Call(context, expectedCodes, f) {
83
83
  // otherwise it is thrown as an exception.
84
84
  export function handleError(e) {
85
85
  if (e instanceof ErrorMsg) {
86
- console.error(`${clc.red("Error:")} ${e.msg}`);
86
+ console.error(`${styleText("red", "Error:")} ${e.msg}`);
87
87
  }
88
88
  else if (e instanceof ErrorGuichet) {
89
- let msg = clc.red("Error: ");
89
+ let msg = styleText("red", "Error: ");
90
90
  if (e.cause.kind == "Unauthorized") {
91
91
  msg +=
92
92
  "failed to authenticate with Guichet. Is your password and login correct?";
@@ -97,7 +97,7 @@ export function handleError(e) {
97
97
  console.error(msg);
98
98
  }
99
99
  else {
100
- console.error(clc.red("Unexpected error:") + "\n", e);
100
+ console.error(styleText("red", "Unexpected error:") + "\n", e);
101
101
  }
102
102
  process.exit(1);
103
103
  }
package/dist/guichet.js CHANGED
@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
8
8
  });
9
9
  };
10
10
  import { WebsiteApi, } from "guichet-sdk-ts";
11
- import { textWarn } from "./utils.js";
11
+ import { styleText } from "node:util";
12
12
  import { ErrorGuichet } from "./error.js";
13
13
  // The GuichetApi class wraps WebsiteApi (from the guichet sdk). It catches
14
14
  // errors that can happen in normal use, and it turn them into a dedicated error type
@@ -45,7 +45,7 @@ export class GuichetApi {
45
45
  // the migration of websites *.web.deuxfleurs.fr to bucket
46
46
  // names with the full domain name.
47
47
  // We just warn that this is a working but deprecated name.
48
- console.log(`${textWarn("Warning")}: the name "${vhost}" is now deprecated for this website,` +
48
+ console.log(`${styleText("yellow", "Warning")}: the name "${vhost}" is now deprecated for this website,` +
49
49
  ` you should use "${vhost}.web.deuxfleurs.fr" instead.`);
50
50
  }
51
51
  return websiteInfo;
package/dist/index.js CHANGED
@@ -6,7 +6,7 @@ import { deploy } from "./deploy.js";
6
6
  import { empty } from "./empty.js";
7
7
  import { vhostsList } from "./vhosts.js";
8
8
  import { inspect } from "./inspect.js";
9
- program.name("dxfl").description("Deuxfleurs CLI tool").version("0.4.0");
9
+ program.name("dxfl").description("Deuxfleurs CLI tool").version("0.4.1");
10
10
  program
11
11
  .command("login")
12
12
  .description("Link your Deuxfleurs account with this tool.")
package/dist/inspect.js CHANGED
@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
9
9
  };
10
10
  import { WebsiteApi } from "guichet-sdk-ts";
11
11
  import { openApiConf } from "./auth.js";
12
- import { formatBytesHuman, separator, textGreen, textGrey, } from "./utils.js";
13
- import clc from "cli-color";
12
+ import { formatBytesHuman, separator } from "./utils.js";
13
+ import { styleText } from "node:util";
14
14
  export function inspect(website, options) {
15
15
  return __awaiter(this, void 0, void 0, function* () {
16
16
  var _a, _b, _c;
@@ -24,17 +24,18 @@ export function inspect(website, options) {
24
24
  if (!options.secret) {
25
25
  kSecret =
26
26
  `**** ` +
27
- textGrey.italic(`(use \`dxfl inspect ${v === null || v === void 0 ? void 0 : v.name} --secret\` to reveal it)`);
27
+ styleText(["gray", "italic"], `(use \`dxfl inspect ${v === null || v === void 0 ? void 0 : v.name} --secret\` to reveal it)`);
28
28
  }
29
- console.log(textGreen.bold(`${v === null || v === void 0 ? void 0 : v.name} details`));
29
+ console.log(styleText(["green", "bold"], `${v === null || v === void 0 ? void 0 : v.name} details`));
30
30
  console.log(separator());
31
- console.log(` ${clc.bold("id")}: ${v === null || v === void 0 ? void 0 : v.name}`);
32
- console.log(` ${clc.bold("url")}: ${clc.underline("https://" + (v === null || v === void 0 ? void 0 : v.domain))}`);
33
- console.log(` ${clc.bold("usage")}:`, `${formatBytesHuman((_a = q === null || q === void 0 ? void 0 : q.current) !== null && _a !== void 0 ? _a : 0)} / ${formatBytesHuman((_b = q === null || q === void 0 ? void 0 : q.max) !== null && _b !== void 0 ? _b : 0)}`, `(${Math.round(((_c = q === null || q === void 0 ? void 0 : q.ratio) !== null && _c !== void 0 ? _c : 0) * 100)}%)`);
34
- console.log(` ${clc.bold("S3 keys")}:`);
35
- console.log(` ${clc.bold("access_key_id")}: ${kId}`);
36
- console.log(` ${clc.bold("secret_access_key")}: ${kSecret}`);
31
+ console.log(` ${styleText("bold", "id")}: ${v === null || v === void 0 ? void 0 : v.name}`);
32
+ console.log(` ${styleText("bold", "url")}: ${styleText("underline", "https://" + (v === null || v === void 0 ? void 0 : v.domain))}`);
33
+ console.log(` ${styleText("bold", "usage")}:`, `${formatBytesHuman((_a = q === null || q === void 0 ? void 0 : q.current) !== null && _a !== void 0 ? _a : 0)} / ${formatBytesHuman((_b = q === null || q === void 0 ? void 0 : q.max) !== null && _b !== void 0 ? _b : 0)}`, `(${Math.round(((_c = q === null || q === void 0 ? void 0 : q.ratio) !== null && _c !== void 0 ? _c : 0) * 100)}%)`);
34
+ console.log(` ${styleText("bold", "S3 keys")}:`);
35
+ console.log(` ${styleText("bold", "access_key_id")}: ${kId}`);
36
+ console.log(` ${styleText("bold", "secret_access_key")}: ${kSecret}`);
37
37
  console.log(separator());
38
- console.log(textGrey.italic(`→ For more information and features, you can visit the web UI:`, `${clc.underline("https://guichet.deuxfleurs.fr/website/inspect/" + (v === null || v === void 0 ? void 0 : v.name))}`));
38
+ console.log(styleText(["gray", "italic"], `→ For more information and features, you can visit the web UI: ` +
39
+ `${styleText("underline", "https://guichet.deuxfleurs.fr/website/inspect/" + (v === null || v === void 0 ? void 0 : v.name))}`));
39
40
  });
40
41
  }
package/dist/utils.js CHANGED
@@ -19,11 +19,7 @@ import crypto from "crypto";
19
19
  import { stdin, stdout } from "process";
20
20
  import readline from "readline/promises";
21
21
  import { ErrorMsg } from "./error.js";
22
- import clc from "cli-color";
23
- export const textGreen = clc.green;
24
- export const textWarn = clc.yellow;
25
- export const textError = clc.red;
26
- export const textGrey = clc.xterm(242);
22
+ import { styleText } from "node:util";
27
23
  export function getFileMd5(file) {
28
24
  return __awaiter(this, void 0, void 0, function* () {
29
25
  var _a, e_1, _b, _c;
@@ -132,5 +128,5 @@ export function separator(size = 42) {
132
128
  for (let i = 0; i < size; i++) {
133
129
  dashes += "-";
134
130
  }
135
- return textGrey(dashes);
131
+ return styleText("gray", dashes);
136
132
  }
package/dist/vhosts.js CHANGED
@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
9
9
  };
10
10
  import { WebsiteApi } from "guichet-sdk-ts";
11
11
  import { openApiConf } from "./auth.js";
12
- import { separator, textGreen } from "./utils.js";
13
- import clc from "cli-color";
12
+ import { separator } from "./utils.js";
13
+ import { styleText } from "node:util";
14
14
  export function vhostsList() {
15
15
  return __awaiter(this, void 0, void 0, function* () {
16
16
  var _a, _b, _c;
@@ -24,9 +24,9 @@ export function vhostsList() {
24
24
  if (i === 0) {
25
25
  console.log(separator());
26
26
  }
27
- console.log(textGreen(v.name));
28
- console.log(` ${clc.bold("id")}: ${v.name}`);
29
- console.log(` ${clc.bold("url")}: ${clc.underline("https://" + v.domain)}`);
27
+ console.log(styleText("green", v.name || ""));
28
+ console.log(` ${styleText("green", "id")}: ${v.name}`);
29
+ console.log(` ${styleText("bold", "url")}: ${styleText("underline", "https://" + v.domain)}`);
30
30
  console.log(separator());
31
31
  });
32
32
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dxfl",
3
- "version": "0.4.0",
3
+ "version": "0.4.1",
4
4
  "description": "",
5
5
  "license": "EUPL-1.2",
6
6
  "author": "Deuxfleurs Team <coucou@deuxfleurs.fr>",
@@ -13,6 +13,9 @@
13
13
  "bin": {
14
14
  "dxfl": "dist/index.js"
15
15
  },
16
+ "engines": {
17
+ "node": ">=20.0.0"
18
+ },
16
19
  "scripts": {
17
20
  "prepare": "npx tsc",
18
21
  "prettier": "npx prettier . --write",
@@ -24,7 +27,6 @@
24
27
  "@commander-js/extra-typings": "^14.0.0",
25
28
  "@supercharge/promise-pool": "^3.2.0",
26
29
  "@types/node": "^25.2.1",
27
- "cli-color": "^2.0.4",
28
30
  "commander": "^14.0.3",
29
31
  "fast-uri": "^3.1.0",
30
32
  "guichet-sdk-ts": "^0.1.0",
@@ -36,7 +38,6 @@
36
38
  "zod-validation-error": "^3.4.1"
37
39
  },
38
40
  "devDependencies": {
39
- "@types/cli-color": "^2.0.6",
40
41
  "onchange": "^7.1.0",
41
42
  "prettier": "3.5.3"
42
43
  }