@jsenv/humanize 1.1.3 → 1.2.1

package/dist/browser/jsenv_humanize_browser.js

@@ -22,14 +22,34 @@ const createAnsi = ({
     MAGENTA: "\x1b[35m",
     CYAN: "\x1b[36m",
     GREY: "\x1b[90m",
-    color: (text, ANSI_COLOR) => {
-      return ANSI.supported && ANSI_COLOR ? "".concat(ANSI_COLOR).concat(text).concat(RESET) : text;
+    color: (text, color) => {
+      if (!ANSI.supported) {
+        return text;
+      }
+      if (!color) {
+        return text;
+      }
+      if (text.trim() === "") {
+        // cannot set color of blank chars
+        return text;
+      }
+      return "".concat(color).concat(text).concat(RESET);
     },
     BOLD: "\x1b[1m",
     UNDERLINE: "\x1b[4m",
     STRIKE: "\x1b[9m",
-    effect: (text, ANSI_EFFECT) => {
-      return ANSI.supported && ANSI_EFFECT ? "".concat(ANSI_EFFECT).concat(text).concat(RESET) : text;
+    effect: (text, effect) => {
+      if (!ANSI.supported) {
+        return text;
+      }
+      if (!effect) {
+        return text;
+      }
+      // cannot add effect to empty string
+      if (text === "") {
+        return text;
+      }
+      return "".concat(effect).concat(text).concat(RESET);
     }
   };
   return ANSI;
@@ -68,6 +88,9 @@ const createUnicode = ({
     get CIRCLE_CROSS_RAW() {
       return UNICODE.supported ? "\u24E7" : "(\xD7)";
     },
+    get CIRCLE_DOTTED_RAW() {
+      return UNICODE.supported ? "\u25CC" : "*";
+    },
     get COMMAND() {
       return ANSI.color(UNICODE.COMMAND_RAW, ANSI.GREY); // ANSI_MAGENTA)
     },

package/dist/node/jsenv_humanize_node.js

@@ -213,19 +213,35 @@ const createAnsi = ({ supported }) => {
     MAGENTA: "\x1b[35m",
     CYAN: "\x1b[36m",
     GREY: "\x1b[90m",
-    color: (text, ANSI_COLOR) => {
-      return ANSI.supported && ANSI_COLOR
-        ? `${ANSI_COLOR}${text}${RESET}`
-        : text;
+    color: (text, color) => {
+      if (!ANSI.supported) {
+        return text;
+      }
+      if (!color) {
+        return text;
+      }
+      if (text.trim() === "") {
+        // cannot set color of blank chars
+        return text;
+      }
+      return `${color}${text}${RESET}`;
     },
 
     BOLD: "\x1b[1m",
     UNDERLINE: "\x1b[4m",
     STRIKE: "\x1b[9m",
-    effect: (text, ANSI_EFFECT) => {
-      return ANSI.supported && ANSI_EFFECT
-        ? `${ANSI_EFFECT}${text}${RESET}`
-        : text;
+    effect: (text, effect) => {
+      if (!ANSI.supported) {
+        return text;
+      }
+      if (!effect) {
+        return text;
+      }
+      // cannot add effect to empty string
+      if (text === "") {
+        return text;
+      }
+      return `${effect}${text}${RESET}`;
     },
   };
 
@@ -236,6 +252,7 @@ const processSupportsBasicColor = createSupportsColor(process.stdout).hasBasic;
 
 const ANSI = createAnsi({
   supported:
+    process.env.FORCE_COLOR === "1" ||
     processSupportsBasicColor ||
     // GitHub workflow does support ANSI but "supports-color" returns false
     // because stream.isTTY returns false, see https://github.com/actions/runner/issues/241
@@ -283,6 +300,9 @@ const createUnicode = ({ supported, ANSI }) => {
     get CIRCLE_CROSS_RAW() {
       return UNICODE.supported ? `ⓧ` : `(×)`;
     },
+    get CIRCLE_DOTTED_RAW() {
+      return UNICODE.supported ? `◌` : `*`;
+    },
     get COMMAND() {
       return ANSI.color(UNICODE.COMMAND_RAW, ANSI.GREY); // ANSI_MAGENTA)
     },
@@ -312,7 +332,7 @@ const createUnicode = ({ supported, ANSI }) => {
 };
 
 const UNICODE = createUnicode({
-  supported: isUnicodeSupported() || process.env.FORCE_UNICODE === "1",
+  supported: process.env.FORCE_UNICODE === "1" || isUnicodeSupported(),
   ANSI,
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/humanize",
-  "version": "1.1.3",
+  "version": "1.2.1",
   "description": "Generate messages meant to read by humans",
   "license": "MIT",
   "repository": {

package/src/.jsenv/jsenv_tests_output.txt

@@ -1,32 +1,30 @@
--------------- execution start --------------
-21 files matching "testPlan" in /Users/damien.maillard/dev/perso/jsenv-core/packages/independent/humanize/src
+------------ 23 executions ready ------------
+directory: /Users/damien.maillard/dev/perso/jsenv-core/packages/independent/humanize/src
 ---------------------------------------------
-
-✔ 01/23 _tests/byte/file_size.test.js [node/0.06s] (1 completed)
-✔ 02/23 _tests/byte/memory.test.js [node/0.05s] (2 completed)
-✔ 03/23 _tests/content_frame/content_frame.test.js [node/0.1s] (3 completed)
-✔ 04/23 _tests/js_value/_inspect.test.html [chromium/0.4s] (4 completed)
+✔ 01/23 _tests/byte/file_size.test.js [node/0.04s] (1 completed)
+✔ 02/23 _tests/byte/memory.test.js [node/0.03s] (2 completed)
+✔ 03/23 _tests/content_frame/content_frame.test.js [node/0.09s] (3 completed)
+✔ 04/23 _tests/js_value/_inspect.test.html [chromium/0.2s] (4 completed)
 ✔ 05/23 _tests/js_value/_inspect.test.html [firefox/0.2s] (5 completed)
 ✔ 06/23 _tests/js_value/_inspect.test.html [webkit/0.4s] (6 completed)
-✔ 07/23 _tests/js_value/array.test.js [node/0.06s] (7 completed)
-✔ 08/23 _tests/js_value/biginit.test.js [node/0.07s] (8 completed)
+✔ 07/23 _tests/js_value/array.test.js [node/0.03s] (7 completed)
+✔ 08/23 _tests/js_value/biginit.test.js [node/0.04s] (8 completed)
 ✔ 09/23 _tests/js_value/boolean.test.js [node/0.05s] (9 completed)
-✔ 10/23 _tests/js_value/date.test.js [node/0.03s] (10 completed)
-✔ 11/23 _tests/js_value/error.test.js [node/0.04s] (11 completed)
+✔ 10/23 _tests/js_value/date.test.js [node/0.05s] (10 completed)
+✔ 11/23 _tests/js_value/error.test.js [node/0.05s] (11 completed)
 ✔ 12/23 _tests/js_value/function.test.js [node/0.04s] (12 completed)
-✔ 13/23 _tests/js_value/instance.test.js [node/0.05s] (13 completed)
-✔ 14/23 _tests/js_value/null.test.js [node/0.2s] (14 completed)
-✔ 15/23 _tests/js_value/number.test.js [node/0.2s] (15 completed)
-✔ 16/23 _tests/js_value/object.test.js [node/0.2s] (16 completed)
+✔ 13/23 _tests/js_value/instance.test.js [node/0.04s] (13 completed)
+✔ 14/23 _tests/js_value/null.test.js [node/0.05s] (14 completed)
+✔ 15/23 _tests/js_value/number.test.js [node/0.05s] (15 completed)
+✔ 16/23 _tests/js_value/object.test.js [node/0.05s] (16 completed)
 ✔ 17/23 _tests/js_value/regexp.test.js [node/0.05s] (17 completed)
-✔ 18/23 _tests/js_value/string.test.js [node/0.04s] (18 completed)
-✔ 19/23 _tests/js_value/symbol.test.js [node/0.04s] (19 completed)
-✔ 20/23 _tests/js_value/undefined.test.js [node/0.03s] (20 completed)
-✔ 21/23 _tests/time/decimals.test.js [node/0.03s] (21 completed)
-✔ 22/23 _tests/time/duration.test.js [node/0.03s] (22 completed)
-✔ 23/23 _tests/time/ellapsed.test.js [node/0.03s] (all completed)
-
---------------- execution end ---------------
-23 executions: all completed
-duration: 5.1s (setup: 0.4s, execution: 3.2s, teardown: 1.9s)
+✔ 18/23 _tests/js_value/string.test.js [node/0.05s] (18 completed)
+✔ 19/23 _tests/js_value/symbol.test.js [node/0.06s] (19 completed)
+✔ 20/23 _tests/js_value/undefined.test.js [node/0.04s] (20 completed)
+✔ 21/23 _tests/time/decimals.test.js [node/0.04s] (21 completed)
+✔ 22/23 _tests/time/duration.test.js [node/0.04s] (22 completed)
+✔ 23/23 _tests/time/ellapsed.test.js [node/0.04s] (all completed)
+------------ 23 executions done -------------
+status: all completed
+duration: 2.8s (setup: 0.4s, execution: 2.6s, teardown: 0.2s)
 ---------------------------------------------

package/src/_tests/js_value/regexp.test.js

@@ -8,6 +8,7 @@ import { humanize } from "@jsenv/humanize";
 }
 
 {
+  // eslint-disable-next-line prefer-regex-literals
   const actual = humanize(new RegExp("foo", "g"));
   const expect = "/foo/g";
   assert({ actual, expect });

package/src/ansi/ansi_node.js

@@ -5,6 +5,7 @@ const processSupportsBasicColor = createSupportsColor(process.stdout).hasBasic;
 
 export const ANSI = createAnsi({
   supported:
+    process.env.FORCE_COLOR === "1" ||
     processSupportsBasicColor ||
     // GitHub workflow does support ANSI but "supports-color" returns false
     // because stream.isTTY returns false, see https://github.com/actions/runner/issues/241

package/src/ansi/ansi_runtime_agnostic.js

@@ -13,19 +13,35 @@ export const createAnsi = ({ supported }) => {
     MAGENTA: "\x1b[35m",
     CYAN: "\x1b[36m",
     GREY: "\x1b[90m",
-    color: (text, ANSI_COLOR) => {
-      return ANSI.supported && ANSI_COLOR
-        ? `${ANSI_COLOR}${text}${RESET}`
-        : text;
+    color: (text, color) => {
+      if (!ANSI.supported) {
+        return text;
+      }
+      if (!color) {
+        return text;
+      }
+      if (text.trim() === "") {
+        // cannot set color of blank chars
+        return text;
+      }
+      return `${color}${text}${RESET}`;
     },
 
     BOLD: "\x1b[1m",
     UNDERLINE: "\x1b[4m",
     STRIKE: "\x1b[9m",
-    effect: (text, ANSI_EFFECT) => {
-      return ANSI.supported && ANSI_EFFECT
-        ? `${ANSI_EFFECT}${text}${RESET}`
-        : text;
+    effect: (text, effect) => {
+      if (!ANSI.supported) {
+        return text;
+      }
+      if (!effect) {
+        return text;
+      }
+      // cannot add effect to empty string
+      if (text === "") {
+        return text;
+      }
+      return `${effect}${text}${RESET}`;
     },
   };
 

package/src/unicode/unicode_node.js

@@ -3,6 +3,6 @@ import { createUnicode } from "./unicode_runtime_agnostic.js";
 import { ANSI } from "../ansi/ansi_node.js";
 
 export const UNICODE = createUnicode({
-  supported: isUnicodeSupported() || process.env.FORCE_UNICODE === "1",
+  supported: process.env.FORCE_UNICODE === "1" || isUnicodeSupported(),
   ANSI,
 });

package/src/unicode/unicode_runtime_agnostic.js

@@ -24,6 +24,9 @@ export const createUnicode = ({ supported, ANSI }) => {
     get CIRCLE_CROSS_RAW() {
       return UNICODE.supported ? `ⓧ` : `(×)`;
     },
+    get CIRCLE_DOTTED_RAW() {
+      return UNICODE.supported ? `◌` : `*`;
+    },
     get COMMAND() {
       return ANSI.color(UNICODE.COMMAND_RAW, ANSI.GREY); // ANSI_MAGENTA)
     },