dxfl 0.2.0 → 0.2.2

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+# v0.2.2
+
+- add color on prefixes from error/warning messages
+
+# v0.2.1
+
+- fix: actually display the warning added in v0.2.0 for deprecated website names
+
 # v0.2.0
 
 - hint towards new website names (XXX.web.deuxfleurs.fr), following an overhaul in website name handling in deuxfleurs

package/dist/error.js

@@ -8,6 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { S3ServiceException } from "@aws-sdk/client-s3";
+import clc from "cli-color";
 export class ErrorCtx {
     constructor(ctx, error) {
         this.ctx = ctx;
@@ -82,10 +83,10 @@ export function wrapS3Call(context, expectedCodes, f) {
 // otherwise it is thrown as an exception.
 export function handleError(e) {
     if (e instanceof ErrorMsg) {
-        console.error(`Error: ${e.msg}`);
+        console.error(`${clc.red("Error:")} ${e.msg}`);
     }
     else if (e instanceof ErrorGuichet) {
-        let msg = "Error: ";
+        let msg = clc.red("Error: ");
         if (e.cause.kind == "Unauthorized") {
             msg +=
                 "failed to authenticate with Guichet. Is your password and login correct?";
@@ -96,7 +97,7 @@ export function handleError(e) {
         console.error(msg);
     }
     else {
-        console.error("Unexpected error:\n", e);
+        console.error(clc.red("Unexpected error:") + "\n", e);
     }
     process.exit(1);
 }

package/dist/guichet.js

@@ -8,6 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { WebsiteApi, } from "guichet-sdk-ts";
+import clc from "cli-color";
 import { ErrorGuichet } from "./error.js";
 // The GuichetApi class wraps WebsiteApi (from the guichet sdk). It catches
 // errors that can happen in normal use, and it turn them into a dedicated error type
@@ -36,14 +37,15 @@ export class GuichetApi {
     }
     getWebsite(vhost) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             try {
                 const websiteInfo = yield this.api.getWebsite({ vhost });
-                if (websiteInfo.vhost == `${vhost}.web.deuxfleurs.fr`) {
+                if (((_a = websiteInfo.vhost) === null || _a === void 0 ? void 0 : _a.name) == `${vhost}.web.deuxfleurs.fr`) {
                     // This means that `vhost` is a website name from before
                     // the migration of websites *.web.deuxfleurs.fr to bucket
                     // names with the full domain name.
                     // We just warn that this is a working but deprecated name.
-                    console.log(`Warning: the name "${vhost}" is now deprecated for this website,` +
+                    console.log(`${clc.yellow("Warning")}: the name "${vhost}" is now deprecated for this website,` +
                         ` you should use "${vhost}.web.deuxfleurs.fr" instead.`);
                 }
                 return websiteInfo;

package/dist/index.js

@@ -5,7 +5,7 @@ import { login, logout } from "./auth.js";
 import { deploy } from "./deploy.js";
 import { empty } from "./empty.js";
 import { vhostsList } from "./vhosts.js";
-program.name("dxfl").description("Deuxfleurs CLI tool").version("0.2.0");
+program.name("dxfl").description("Deuxfleurs CLI tool").version("0.2.2");
 program
     .command("login")
     .description("Link your Deuxfleurs account with this tool.")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dxfl",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "",
   "license": "EUPL-1.2",
   "author": "Deuxfleurs Team <coucou@deuxfleurs.fr>",
@@ -24,6 +24,7 @@
     "@commander-js/extra-typings": "^13.1.0",
     "@supercharge/promise-pool": "^3.2.0",
     "@types/node": "^22.13.5",
+    "cli-color": "^2.0.4",
     "commander": "^13.1.0",
     "fast-uri": "^3.0.6",
     "guichet-sdk-ts": "^0.1.0",
@@ -35,6 +36,7 @@
     "zod-validation-error": "^3.4.1"
   },
   "devDependencies": {
+    "@types/cli-color": "^2.0.6",
     "onchange": "^7.1.0",
     "prettier": "3.5.3"
   }