@oclif/core 2.8.10 → 2.8.12

package/lib/cli-ux/styled/table.js

@@ -10,6 +10,7 @@ const util_2 = require("util");
 const stream_1 = require("../stream");
 const sw = require('string-width');
 const { orderBy } = require('natural-orderby');
+const sliceAnsi = require('slice-ansi');
 class Table {
     constructor(data, columns, options = {}) {
         this.data = data;
@@ -258,7 +259,12 @@ class Table {
                     const colorWidth = (d.length - visualWidth);
                     let cell = d.padEnd(width + colorWidth);
                     if ((cell.length - colorWidth) > width || visualWidth === width) {
-                        cell = cell.slice(0, width - 2) + '… ';
+                        // truncate the cell, preserving ANSI escape sequences, and keeping
+                        // into account the width of fullwidth unicode characters
+                        cell = sliceAnsi(cell, 0, width - 2) + '… ';
+                        // pad with spaces; this is necessary in case the original string
+                        // contained fullwidth characters which cannot be split
+                        cell += ' '.repeat(width - sw(cell));
                     }
                     l += cell;
                 }

package/lib/parser/parse.js

@@ -85,11 +85,16 @@ class Parser {
             if (this.flagAliases[char]) {
                 return this.flagAliases[char].name;
             }
-            return Object.keys(this.input.flags).find(k => this.input.flags[k].char === char);
+            return Object.keys(this.input.flags).find(k => (this.input.flags[k].char === char && char !== undefined && this.input.flags[k].char !== undefined));
+        };
+        const findFlag = (arg) => {
+            const isLong = arg.startsWith('--');
+            const short = isLong ? false : arg.startsWith('-');
+            const name = isLong ? findLongFlag(arg) : (short ? findShortFlag(arg) : undefined);
+            return { name, isLong };
         };
         const parseFlag = (arg) => {
-            const long = arg.startsWith('--');
-            const name = long ? findLongFlag(arg) : findShortFlag(arg);
+            const { name, isLong } = findFlag(arg);
             if (!name) {
                 const i = arg.indexOf('=');
                 if (i !== -1) {
@@ -106,16 +111,17 @@ class Parser {
             const flag = this.input.flags[name];
             if (flag.type === 'option') {
                 this.currentFlag = flag;
-                const input = long || arg.length < 3 ? this.argv.shift() : arg.slice(arg[2] === '=' ? 3 : 2);
-                if (typeof input !== 'string') {
+                const input = isLong || arg.length < 3 ? this.argv.shift() : arg.slice(arg[2] === '=' ? 3 : 2);
+                // if the value ends up being one of the command's flags, the user didn't provide an input
+                if ((typeof input !== 'string') || findFlag(input).name) {
                     throw new errors_1.CLIError(`Flag --${name} expects a value`);
                 }
-                this.raw.push({ type: 'flag', flag: flag.name, input });
+                this.raw.push({ type: 'flag', flag: flag.name, input: input });
             }
             else {
                 this.raw.push({ type: 'flag', flag: flag.name, input: arg });
                 // push the rest of the short characters back on the stack
-                if (!long && arg.length > 2) {
+                if (!isLong && arg.length > 2) {
                     this.argv.unshift(`-${arg.slice(2)}`);
                 }
             }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oclif/core",
   "description": "base library for oclif CLIs",
-  "version": "2.8.10",
+  "version": "2.8.12",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/core/issues",
   "dependencies": {
@@ -24,7 +24,8 @@
     "natural-orderby": "^2.0.3",
     "object-treeify": "^1.1.33",
     "password-prompt": "^1.1.2",
-    "semver": "^7.3.7",
+    "semver": "^7.5.3",
+    "slice-ansi": "^4.0.0",
     "string-width": "^4.2.3",
     "strip-ansi": "^6.0.1",
     "supports-color": "^8.1.1",
@@ -53,8 +54,9 @@
     "@types/node": "^16",
     "@types/node-notifier": "^8.0.2",
     "@types/proxyquire": "^1.3.28",
-    "@types/semver": "^7.3.13",
+    "@types/semver": "^7.5.0",
     "@types/shelljs": "^0.8.11",
+    "@types/slice-ansi": "^4.0.0",
     "@types/strip-ansi": "^5.2.1",
     "@types/supports-color": "^8.1.1",
     "@types/wordwrap": "^1.0.1",
@@ -108,6 +110,7 @@
     "commitlint": "commitlint",
     "lint": "eslint . --ext .ts --config .eslintrc",
     "posttest": "yarn lint",
+    "compile": "tsc",
     "prepack": "yarn run build",
     "test": "mocha --forbid-only \"test/**/*.test.ts\"",
     "test:e2e": "mocha --forbid-only \"test/**/*.e2e.ts\" --timeout 1200000",