console-toolkit 1.2.0 → 1.2.2

package/README.md

@@ -89,7 +89,9 @@ BSD 3-Clause License
 
 ## Release history
 
-- 1.2.0: *Refactored `strings`.*
-- 1.1.1: *Minor bugfixes in `Table`, some improvements, updated deps.*
-- 1.1.0: *Minor improvements, enhanced `Writer` and `Updater`.*
-- 1.0.0: *Initial release.*
+* 1.2.2 *Updated deps.*
+* 1.2.1 *Added support for `Bun.stringWidth()`.*
+* 1.2.0 *Refactored `strings`.*
+* 1.1.1 *Minor bugfixes in `Table`, some improvements, updated deps.*
+* 1.1.0 *Minor improvements, enhanced `Writer` and `Updater`.*
+* 1.0.0 *Initial release.*

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "console-toolkit",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "Toolkit to produce a fancy console output (boxes, tables, charts, colors).",
   "type": "module",
   "main": "src/index.js",
@@ -18,7 +18,10 @@
     "./style": "./src/style.js"
   },
   "scripts": {
-    "test": "tape6 --flags FO"
+    "test": "tape6 --flags FO",
+    "test:bun": "tape6-bun --flags FO",
+    "test:deno-original": "tape6-deno --flags FO",
+    "test:deno": "deno run -A `tape6-runner main` --flags FO"
   },
   "github": "http://github.com/uhop/console-toolkit",
   "repository": {
@@ -58,8 +61,8 @@
     ]
   },
   "devDependencies": {
-    "emoji-regex": "^10.3.0",
+    "emoji-regex": "^10.4.0",
     "get-east-asian-width": "^1.2.0",
-    "tape-six": "^0.9.6"
+    "tape-six": "^0.12.2"
   }
 }

package/src/strings/split.js

@@ -1,18 +1,19 @@
-// Loosely adapted on https://www.npmjs.com/package/string-width by
+// Loosely adapted from https://www.npmjs.com/package/string-width by
 // [Sindre Sorhus](https://www.npmjs.com/~sindresorhus) under the MIT license.
 
-let emojiRegex = null;
-try {
-  emojiRegex = (await import('emoji-regex')).default();
-} catch (error) {
-  // squelch
-}
-
-let eastAsianWidth = null;
-try {
-  eastAsianWidth = (await import('get-east-asian-width')).eastAsianWidth;
-} catch (error) {
-  // squelch
+let emojiRegex = null,
+  eastAsianWidth = null;
+if (!globalThis.Bun) {
+  try {
+    emojiRegex = (await import('emoji-regex')).default();
+  } catch (error) {
+    // squelch
+  }
+  try {
+    eastAsianWidth = (await import('get-east-asian-width')).eastAsianWidth;
+  } catch (error) {
+    // squelch
+  }
 }
 
 const segmenter = new Intl.Segmenter();
@@ -22,7 +23,8 @@ export const split = (s, options = {}) => {
   if (!s) return {graphemes: [], width: 0};
 
   const {ignoreControlSymbols = false, ambiguousAsWide = false} = options,
-    eastAsianWidthOptions = {ambiguousAsWide};
+    eastAsianWidthOptions = {ambiguousAsWide},
+    bunStringWidthOptions = {ambiguousAsNarrow: !ambiguousAsWide};
 
   const graphemes = [];
   let width = 0;
@@ -41,6 +43,12 @@ export const split = (s, options = {}) => {
       if (graphemes.length) graphemes[graphemes.length - 1].symbol += segment;
       continue;
     }
+    if (globalThis.Bun) {
+      const w = Bun.stringWidth(segment, bunStringWidthOptions);
+      graphemes.push({symbol: segment, width: w});
+      width += w;
+      continue;
+    }
     if (emojiRegex && ((emojiRegex.lastIndex = 0), emojiRegex.test(segment))) {
       graphemes.push({symbol: segment, width: 2});
       width += 2;
@@ -63,7 +71,8 @@ export const size = (s, options = {}) => {
   if (!s) return 0;
 
   const {ignoreControlSymbols = false, ambiguousAsWide = false} = options,
-    eastAsianWidthOptions = {ambiguousAsWide};
+    eastAsianWidthOptions = {ambiguousAsWide},
+    bunStringWidthOptions = {ambiguousAsNarrow: !ambiguousAsWide};
 
   let width = 0;
   for (const {segment} of segmenter.segment(s)) {
@@ -80,6 +89,10 @@ export const size = (s, options = {}) => {
     ) {
       continue;
     }
+    if (globalThis.Bun) {
+      width += Bun.stringWidth(segment, bunStringWidthOptions);
+      continue;
+    }
     if (emojiRegex && ((emojiRegex.lastIndex = 0), emojiRegex.test(segment))) {
       width += 2;
       continue;