fix: handle strings the same in cjs, esm, and deno

deno.ts

@@ -1,13 +1,14 @@
-// Bootstrap cliui with CommonJS dependencies:
+// Bootstrap cliui with ESM dependencies in Deno's style:
 import { cliui, UI } from './build/lib/index.js'
 import type { UIOptions } from './build/lib/index.d.ts'
-import { wrap, stripAnsi } from './build/lib/string-utils.js'
+
+import stringWidth from 'npm:string-width'
+import stripAnsi from 'npm:strip-ansi'
+import wrap from 'npm:wrap-ansi'
 
 export default function ui (opts: UIOptions): UI {
   return cliui(opts, {
-    stringWidth: (str: string) => {
-      return [...str].length
-    },
+    stringWidth,
     stripAnsi,
     wrap
   })

index.mjs

@@ -1,12 +1,13 @@
-// Bootstrap cliui with CommonJS dependencies:
+// Bootstrap cliui with ESM dependencies:
 import { cliui } from './build/lib/index.js'
-import { wrap, stripAnsi } from './build/lib/string-utils.js'
+
+import stringWidth from 'string-width'
+import stripAnsi from 'strip-ansi'
+import wrap from 'wrap-ansi'
 
 export default function ui (opts) {
   return cliui(opts, {
-    stringWidth: (str) => {
-      return [...str].length
-    },
+    stringWidth,
     stripAnsi,
     wrap
   })

lib/cjs.ts

@@ -1,8 +1,8 @@
 // Bootstrap cliui with CommonJS dependencies:
 import { cliui, UIOptions } from './index.js'
-const stringWidth = require('string-width')
-const stripAnsi = require('strip-ansi')
-const wrap = require('wrap-ansi')
+const stringWidth = require('string-width-cjs')
+const stripAnsi = require('strip-ansi-cjs')
+const wrap = require('wrap-ansi-cjs')
 export default function ui (opts: UIOptions) {
   return cliui(opts, {
     stringWidth,

lib/index.ts

@@ -47,7 +47,9 @@ export class UI {
 
   constructor (opts: UIOptions) {
     this.width = opts.width
+    /* c8 ignore start */
     this.wrap = opts.wrap ?? true
+    /* c8 ignore stop */
     this.rows = []
   }
 
@@ -164,7 +166,10 @@ export class UI {
           const fn = align[(row[c].align as 'right'|'center')]
           ts = fn(ts, wrapWidth)
           if (mixin.stringWidth(ts) < wrapWidth) {
-            ts += ' '.repeat((width || 0) - mixin.stringWidth(ts) - 1)
+            /* c8 ignore start */
+            const w = width || 0
+            /* c8 ignore stop */
+            ts += ' '.repeat(w - mixin.stringWidth(ts) - 1)
           }
         }
 
@@ -202,9 +207,11 @@ export class UI {
   // the target line, do so.
   private renderInline (source: string, previousLine: Line) {
     const match = source.match(/^ */)
+    /* c8 ignore start */
     const leadingWhitespace = match ? match[0].length : 0
+    /* c8 ignore stop */
     const target = previousLine.text
-    const targetTextWidth = mixin.stringWidth(target.trimRight())
+    const targetTextWidth = mixin.stringWidth(target.trimEnd())
 
     if (!previousLine.span) {
       return source
@@ -223,13 +230,13 @@ export class UI {
 
     previousLine.hidden = true
 
-    return target.trimRight() + ' '.repeat(leadingWhitespace - targetTextWidth) + source.trimLeft()
+    return target.trimEnd() + ' '.repeat(leadingWhitespace - targetTextWidth) + source.trimStart()
   }
 
   private rasterize (row: ColumnArray) {
     const rrows: string[][] = []
     const widths = this.columnWidths(row)
-    let wrapped
+    let wrapped: string[]
 
     // word wrap all columns, and create
     // a data-structure that is easy to rasterize.
@@ -274,7 +281,9 @@ export class UI {
   }
 
   private negatePadding (col: Column) {
+    /* c8 ignore start */
     let wrapWidth = col.width || 0
+    /* c8 ignore stop */
     if (col.padding) {
       wrapWidth -= (col.padding[left] || 0) + (col.padding[right] || 0)
     }
@@ -308,7 +317,9 @@ export class UI {
     })
 
     // any unset widths should be calculated.
+    /* c8 ignore start */
     const unsetWidth = unset ? Math.floor(remainingWidth / unset) : 0
+    /* c8 ignore stop */
 
     return widths.map((w, i) => {
       if (w === undefined) {
@@ -349,12 +360,13 @@ function _minWidth (col: Column) {
 }
 
 function getWindowWidth (): number {
-  /* istanbul ignore next: depends on terminal */
+  /* c8 ignore start */
   if (typeof process === 'object' && process.stdout && process.stdout.columns) {
     return process.stdout.columns
   }
   return 80
 }
+/* c8 ignore stop */
 
 function alignRight (str: string, width: number): string {
   str = str.trim()
@@ -371,10 +383,11 @@ function alignCenter (str: string, width: number): string {
   str = str.trim()
   const strWidth = mixin.stringWidth(str)
 
-  /* istanbul ignore next */
+  /* c8 ignore start */
   if (strWidth >= width) {
     return str
   }
+  /* c8 ignore stop */
 
   return ' '.repeat((width - strWidth) >> 1) + str
 }
@@ -383,7 +396,9 @@ let mixin: Mixin
 export function cliui (opts: Partial<UIOptions>, _mixin: Mixin) {
   mixin = _mixin
   return new UI({
+    /* c8 ignore start */
     width: opts?.width || getWindowWidth(),
     wrap: opts?.wrap
+    /* c8 ignore stop */
   })
 }

package.json

@@ -19,7 +19,7 @@
     "fix": "standardx --fix '**/*.ts' && standardx --fix '**/*.js' && standardx --fix '**/*.cjs'",
     "pretest": "rimraf build && tsc -p tsconfig.test.json && cross-env NODE_ENV=test npm run build:cjs",
     "test": "c8 mocha ./test/*.cjs",
-    "test:esm": "c8 mocha ./test/esm/cliui-test.mjs",
+    "test:esm": "c8 mocha ./test/**/*.mjs",
     "postest": "check",
     "coverage": "c8 report --check-coverage",
     "precompile": "rimraf build",
@@ -49,9 +49,12 @@
   "author": "Ben Coe <[email protected]>",
   "license": "ISC",
   "dependencies": {
-    "string-width": "^4.2.0",
-    "strip-ansi": "^6.0.1",
-    "wrap-ansi": "^7.0.0"
+    "string-width": "^5.1.2",
+    "string-width-cjs": "npm:string-width@^4.2.0",
+    "strip-ansi": "^7.0.1",
+    "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+    "wrap-ansi": "^8.1.0",
+    "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
   },
   "devDependencies": {
     "@types/node": "^14.0.27",

test/cjs-esm-compare.mjs

@@ -0,0 +1,35 @@
+'use strict'
+
+/* global describe, it */
+
+import { createRequire } from 'module'
+const require = createRequire(import.meta.url)
+require('chai').should()
+
+const text = `usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
+               <tagname> [<commit> | <object>]
+   or: git tag -d <tagname>...
+   or: git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
+               [--points-at <object>] [--column[=<options>] | --no-column]
+               [--create-reflog] [--sort=<key>] [--format=<format>]
+               [--merged <commit>] [--no-merged <commit>] [<pattern>...]
+   or: git tag -v [--format=<format>] <tagname>...`
+
+
+const cliuiCJS = require('../build/index.cjs')
+import cliuiESM from '../index.mjs'
+describe('consistent wrapping', () => {
+  it('should produce matching output in cjs and esm', () => {
+    const uiCJS = cliuiCJS({})
+    const uiESM = cliuiESM({})
+    uiCJS.div({
+      padding: [0, 0, 0, 0],
+      text,
+    })
+    uiESM.div({
+      padding: [0, 0, 0, 0],
+      text,
+    })
+    uiCJS.toString().should.equal(uiESM.toString())
+  })
+})

test/cliui.cjs

@@ -9,7 +9,7 @@ process.env.FORCE_COLOR = 1
 
 const chalk = require('chalk')
 const cliui = require('../build/index.cjs')
-const stripAnsi = require('strip-ansi')
+const stripAnsi = require('strip-ansi-cjs')
 
 describe('cliui', () => {
   describe('resetOutput', () => {

test/deno/cliui-test.ts

@@ -36,13 +36,12 @@ Deno.test('evenly divides text across columns if multiple columns are given', ()
   })
 
   // it should wrap each column appropriately.
-  // TODO: we should flesh out the Deno and ESM implementation
-  // such that it spreads words out over multiple columns appropriately:
   const expected = [
-    'i am a string ti am a seconi am a third',
-    'hat should be wd string tha string that',
-    'rapped         t should be  should be w',
-    '               wrapped     rapped'
+    'i am a string  i am a      i am a third',
+    'that should be second      string that',
+    'wrapped        string that should be',
+    '               should be   wrapped',
+    '               wrapped'
   ]
 
   ui.toString().split('\n').forEach((line: string, i: number) => {

test/esm/cliui-test.mjs

@@ -35,13 +35,14 @@ describe('ESM', () => {
     // TODO: we should flesh out the Deno and ESM implementation
     // such that it spreads words out over multiple columns appropriately:
     const expected = [
-      'i am a string ti am a seconi am a third',
-      'hat should be wd string tha string that',
-      'rapped         t should be  should be w',
-      '               wrapped     rapped'
+      'i am a string  i am a      i am a third',
+      'that should be second      string that',
+      'wrapped        string that should be',
+      '               should be   wrapped',
+      '               wrapped'
     ]
     ui.toString().split('\n').forEach((line, i) => {
       strictEqual(line, expected[i])
     })
   })
-})
+})

tsconfig.json

@@ -7,11 +7,11 @@
     "target": "es2017",
     "moduleResolution": "node",
     "module": "es2015"
-  },  
+  },
   "include": [
     "lib/**/*.ts"
   ],
   "exclude": [
     "lib/cjs.ts"
   ]
-}
+}