xshell 0.0.10 → 0.0.14

package/prototype.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.is_codepoint_fullwidth = exports.to_json_safely = exports.to_json = exports.BRACKETS = exports.QUOTES = exports.CJK = exports.to_getter_property_descriptors = exports.to_method_property_descriptors = exports.colors = exports.EMOJI_REGEX = void 0;
+exports.is_codepoint_fullwidth = exports.to_json_safely = exports.to_json = exports.brackets = exports.quotes = exports.cjk = exports.to_getter_property_descriptors = exports.to_method_property_descriptors = exports.chalk = exports.emoji_regex = void 0;
 const tslib_1 = require("tslib");
 const fs_1 = (0, tslib_1.__importDefault)(require("fs"));
 const upath_1 = (0, tslib_1.__importDefault)(require("upath"));
@@ -8,11 +8,12 @@ const upath_1 = (0, tslib_1.__importDefault)(require("upath"));
 const byte_size_1 = (0, tslib_1.__importDefault)(require("byte-size"));
 const emoji_regex_1 = (0, tslib_1.__importDefault)(require("emoji-regex"));
 const strip_ansi_1 = (0, tslib_1.__importDefault)(require("strip-ansi"));
-const safe_1 = (0, tslib_1.__importDefault)(require("colors/safe"));
-exports.colors = safe_1.default;
-exports.EMOJI_REGEX = (0, emoji_regex_1.default)();
+const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
+exports.chalk = chalk_1.default;
+exports.emoji_regex = (0, emoji_regex_1.default)();
 function to_method_property_descriptors(methods) {
-    return Object.fromEntries(Object.entries(methods).map(([name, value]) => ([name, {
+    return Object.fromEntries(Object.entries(methods)
+        .map(([name, value]) => ([name, {
             configurable: true,
             writable: true,
             enumerable: false,
@@ -21,42 +22,44 @@ function to_method_property_descriptors(methods) {
 }
 exports.to_method_property_descriptors = to_method_property_descriptors;
 function to_getter_property_descriptors(getters) {
-    return Object.fromEntries(Object.entries(getters).map(([name, get]) => ([name, {
+    return Object.fromEntries(Object.entries(getters)
+        .map(([name, get]) => ([name, {
             configurable: true,
             enumerable: false,
             get,
         }])));
 }
 exports.to_getter_property_descriptors = to_getter_property_descriptors;
-exports.CJK = '([\u2e80-\u9fff\uf900-\ufaff])';
-exports.QUOTES = {
-    SINGLE: "'",
-    DOUBLE: '"',
-    BACKTICK: '`',
+exports.cjk = '([\u2e80-\u9fff\uf900-\ufaff])';
+exports.quotes = {
+    single: "'",
+    double: '"',
+    backtick: '`',
 };
-exports.BRACKETS = {
-    ROUND: ['(', ')'],
-    SQUARE: ['[', ']'],
-    CURLY: ['{', '}'],
-    POINTY: ['<', '>'],
-    CORNER: ['「', '」'],
-    FAT: ['【', '】'],
-    TORTOISE_SHELL: ['〔', '〕'],
+exports.brackets = {
+    round: ['(', ')'],
+    square: ['[', ']'],
+    curly: ['{', '}'],
+    pointy: ['<', '>'],
+    corner: ['「', '」'],
+    fat: ['【', '】'],
+    tortoise_shell: ['〔', '〕'],
 };
+const color_map = Object.fromEntries(['red_', 'green_', 'yellow_', 'blue_', 'magenta_', 'cyan_'].map(color => [color, `${color.slice(0, -1)}Bright`]));
 // ------------------------------------ String.prototype
 Object.defineProperties(String.prototype, {
     ...to_getter_property_descriptors({
         width() {
-            const s = (0, strip_ansi_1.default)(this.replace(exports.EMOJI_REGEX, '  '));
+            const s = (0, strip_ansi_1.default)(this.replace(exports.emoji_regex, '  '));
             let width = 0;
             for (let i = 0; i < s.length; i++) {
                 const code = s.codePointAt(i);
-                if ((code <= 0x1F || (code >= 0x7F && code <= 0x9F)) || // Ignore control characters
-                    code >= 0x300 && code <= 0x36F // Ignore combining characters
+                if ((code <= 0x1f || (code >= 0x7f && code <= 0x9f)) || // ignore control characters
+                    code >= 0x300 && code <= 0x36f // ignore combining characters
                 )
                     continue;
-                // Surrogates
-                if (code > 0xFFFF)
+                // surrogates
+                if (code > 0xffff)
                     i++;
                 width += is_codepoint_fullwidth(code) ? 2 : 1;
             }
@@ -80,7 +83,7 @@ Object.defineProperties(String.prototype, {
                     code >= 0x300 && code <= 0x36F // Ignore combining characters
                 )
                     continue;
-                // Surrogates (codepoint need two UTF-16 encoding units, thus here skip the first in order to prevent repeated counting) 
+                // surrogates (codepoint need two utf-16 encoding units, thus here skip the first in order to prevent repeated counting) 
                 if (code > 0xFFFF)
                     i++;
                 const w = is_codepoint_fullwidth(code) ? 2 : 1;
@@ -111,8 +114,7 @@ Object.defineProperties(String.prototype, {
         to_regx(preservations, flags = '') {
             const preserved_chars = new Set(preservations);
             const replace_chars = Array.prototype.filter.call('|\\{}()[]^$+*?.-', (c) => !preserved_chars.has(c))
-                .map((c) => c === ']' ? '\\]' : c)
-                .join('');
+                .map((c) => c === ']' ? '\\]' : c).join('');
             return new RegExp(this.replace(new RegExp(`[${replace_chars}]`, 'g'), '\\$&'), flags);
         },
         to_bool() {
@@ -139,7 +141,10 @@ Object.defineProperties(String.prototype, {
                     placeholder_name = placeholder_name.slice(0, -1);
                     optional = true;
                 }
-                $placeholders[placeholder_name] = regx_parts.push(placeholder_pattern ? placeholder_pattern.bracket() + (optional ? '?' : '') : '(.*?)');
+                $placeholders[placeholder_name] = regx_parts.push(placeholder_pattern ?
+                    `${placeholder_pattern.bracket()}${optional ? '?' : ''}`
+                    :
+                        '(.*?)');
                 return '';
             });
             add_part(last_end);
@@ -152,11 +157,13 @@ Object.defineProperties(String.prototype, {
             const matches = pattern_regx.exec(this);
             if (!matches)
                 return this;
-            const placeholders = Object.fromEntries(Object.entries($placeholders).map(([name, $i]) => ([
+            const placeholders = Object.fromEntries(Object.entries($placeholders)
+                .map(([name, $i]) => [
                 [name, matches[$i]],
-                [name + '.before', matches[$i - 1] || ''],
-                [name + '.after', matches[$i + 1] || ''],
-            ])).flat());
+                [`${name}.before`, matches[$i - 1] || ''],
+                [`${name}.after`, matches[$i + 1] || ''],
+            ])
+                .flat());
             // --- convert pattern_ to replacement_str, if transformer exists then apply on placeholder
             last_end = 0;
             let replacement_parts = [];
@@ -191,28 +198,32 @@ Object.defineProperties(String.prototype, {
                     placeholder_name = placeholder_name.slice(0, -1);
                     optional = true;
                 }
-                $placeholders[placeholder_name] = regx_parts.push(placeholder_pattern ? placeholder_pattern.bracket() + (optional ? '?' : '') : '(.*?)');
+                $placeholders[placeholder_name] = regx_parts.push(placeholder_pattern ?
+                    `${placeholder_pattern.bracket()}${optional ? '?' : ''}`
+                    :
+                        '(.*?)');
                 return '';
             });
             add_part(last_end);
             // convert last (.*?) to greedy, to make .{suffix} work
             regx_parts = regx_parts.filter(part => part);
-            if (regx_parts.last === '(.*?)')
+            if (regx_parts[regx_parts.length - 1] === '(.*?)')
                 regx_parts[regx_parts.length - 1] = '(.*)';
             const pattern_regx = new RegExp(regx_parts.join(''), flags);
             // --- match original string based on pattern_regx, and get result to build placeholders dict
             const matches = pattern_regx.exec(this);
             if (!matches)
                 return {};
-            return Object.fromEntries(Object.entries($placeholders).map(([name, $i]) => ([name, matches[$i] || ''])));
+            return Object.fromEntries(Object.entries($placeholders)
+                .map(([name, $i]) => [name, matches[$i] || '']));
         },
-        quote(type = 'SINGLE') {
-            if (type === 'PSH')
-                return '& ' + this.quote();
-            return this.surround(exports.QUOTES[type]);
+        quote(type = 'single') {
+            if (type === 'psh')
+                return `& ${this.quote()}`;
+            return this.surround(exports.quotes[type]);
         },
-        bracket(shape = 'ROUND') {
-            return this.surround(...exports.BRACKETS[shape]);
+        bracket(shape = 'round') {
+            return this.surround(...exports.brackets[shape]);
         },
         surround(left, right) {
             return left + this + (right || left);
@@ -258,8 +269,11 @@ Object.defineProperties(String.prototype, {
         to_base64() {
             return Buffer.from(this).toString('base64');
         },
-        decode_base64() {
-            return Buffer.from(this, 'base64').toString();
+        decode_base64(buffer = false) {
+            const buf = Buffer.from(this, 'base64');
+            if (buffer)
+                return buf;
+            return buf.toString();
         },
         strip_ansi() {
             return (0, strip_ansi_1.default)(this);
@@ -269,30 +283,34 @@ Object.defineProperties(String.prototype, {
                 return this;
             let text_;
             text_ = this
-                .replace(new RegExp(exports.CJK + `(['"])`, 'g'), '$1 $2')
-                .replace(new RegExp(`(['"])` + exports.CJK, 'g'), '$1 $2')
+                .replace(new RegExp(exports.cjk + `(['"])`, 'g'), '$1 $2')
+                .replace(new RegExp(`(['"])` + exports.cjk, 'g'), '$1 $2')
                 .replace(/(["']+)\s*(.+?)\s*(["']+)/g, '$1$2$3')
-                .replace(new RegExp(exports.CJK + '([\\+\\-\\*\\/=&\\\\\\|<>])([A-Za-z0-9])', 'g'), '$1 $2 $3')
-                .replace(new RegExp('([A-Za-z0-9])([\\+\\-\\*\\/=&\\\\\\|<>])' + exports.CJK, 'g'), '$1 $2 $3');
+                .replace(new RegExp(exports.cjk + '([\\+\\-\\*\\/=&\\\\\\|<>])([A-Za-z0-9])', 'g'), '$1 $2 $3')
+                .replace(new RegExp('([A-Za-z0-9])([\\+\\-\\*\\/=&\\\\\\|<>])' + exports.cjk, 'g'), '$1 $2 $3');
             const textBak = text_;
-            text_ = text_.replace(new RegExp(exports.CJK + '([\\(\\[\\{<\u201c]+(.*?)[\\)\\]\\}>\u201d]+)' + exports.CJK, 'g'), '$1 $2 $4');
+            text_ = text_.replace(new RegExp(exports.cjk + '([\\(\\[\\{<\u201c]+(.*?)[\\)\\]\\}>\u201d]+)' + exports.cjk, 'g'), '$1 $2 $4');
             if (text_ === textBak)
                 text_ = text_
-                    .replace(new RegExp(exports.CJK + '([\\(\\[\\{<\u201c>])', 'g'), '$1 $2')
-                    .replace(new RegExp('([\\)\\]\\}>\u201d<])' + exports.CJK, 'g'), '$1 $2');
+                    .replace(new RegExp(exports.cjk + '([\\(\\[\\{<\u201c>])', 'g'), '$1 $2')
+                    .replace(new RegExp('([\\)\\]\\}>\u201d<])' + exports.cjk, 'g'), '$1 $2');
             return text_
                 // eslint-disable-next-line no-useless-escape
                 .replace(/([\(\[\{<\u201c]+)(\s*)(.+?)(\s*)([\)\]\}>\u201d]+)/g, '$1$3$5')
-                .replace(new RegExp(exports.CJK + '([~!;:,\\.\\?\u2026])([A-Za-z0-9])', 'g'), '$1$2 $3')
-                .replace(new RegExp(exports.CJK + '([A-Za-z0-9`\\$%\\^&\\*\\-=\\+\\\\\\|\\/@\u00a1-\u00ff\u2022\u2027\u2150-\u218f])', 'g'), '$1 $2')
-                .replace(new RegExp('([A-Za-z0-9`\\$%\\^&\\*\\-=\\+\\\\\\|\\/@\u00a1-\u00ff\u2022\u2027\u2150-\u218f])' + exports.CJK, 'g'), '$1 $2');
+                .replace(new RegExp(exports.cjk + '([~!;:,\\.\\?\u2026])([A-Za-z0-9])', 'g'), '$1$2 $3')
+                .replace(new RegExp(exports.cjk + '([A-Za-z0-9`\\$%\\^&\\*\\-=\\+\\\\\\|\\/@\u00a1-\u00ff\u2022\u2027\u2150-\u218f])', 'g'), '$1 $2')
+                .replace(new RegExp('([A-Za-z0-9`\\$%\\^&\\*\\-=\\+\\\\\\|\\/@\u00a1-\u00ff\u2022\u2027\u2150-\u218f])' + exports.cjk, 'g'), '$1 $2');
         }
     }),
-    // ------------ colors
-    ...Object.fromEntries(['red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'grey', 'underline'].map(color => ([color, {
+    // ------------ chalk colors
+    ...Object.fromEntries([
+        'red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'grey',
+        'red_', 'green_', 'yellow_', 'blue_', 'magenta_', 'cyan_',
+        'underline',
+    ].map(color => ([color, {
             configurable: true,
             get() {
-                return safe_1.default[color](this);
+                return chalk_1.default[color_map[color] || color](this);
             }
         }]))),
     // ------------ file path ops
@@ -371,13 +389,13 @@ Object.defineProperties(Date.prototype, to_method_property_descriptors({
 Object.defineProperties(Number.prototype, to_method_property_descriptors({
     to_fsize_str(units = 'iec') {
         const { value, unit } = (0, byte_size_1.default)(this, { units });
-        return `${value} ${unit.rm('i').toUpperCase()}`;
+        return `${value} ${unit.rm('i')}`;
     },
     to_bin_str() {
         return `0b${this.toString(2)}`;
     },
     to_hex_str(length) {
-        const s = this.toString(16).toUpperCase();
+        const s = this.toString(16);
         if (!length)
             length = Math.ceil(s.length / 4) * 4;
         return `0x${'0'.repeat(length - s.length)}${s}`;
@@ -407,7 +425,6 @@ Object.defineProperties(Array.prototype, {
         trim_lines({ trim_line = true, rm_empty_lines = true, rm_last_empty_lines = false } = {}) {
             if (!this.length)
                 return this;
-            // eslint-disable-next-line @typescript-eslint/no-this-alias
             let lines = this;
             if (trim_line)
                 lines = lines.map(line => line.trim());
@@ -438,7 +455,8 @@ Object.defineProperties(Array.prototype, {
             return this.map(line => character.repeat(width) + line);
         },
         indent2to4() {
-            return this.split_indents().map(line => ' '.repeat(Math.floor(line.indent / 2) * 4) + line.text);
+            return this.split_indents()
+                .map(line => ' '.repeat(Math.floor(line.indent / 2) * 4) + line.text);
         },
         join_lines(append = true) {
             return `${this.join('\n')}${append ? '\n' : ''}`;
@@ -446,7 +464,7 @@ Object.defineProperties(Array.prototype, {
     })
 });
 function to_json(obj, replacer) {
-    return JSON.stringify(obj, replacer, 4);
+    return JSON.stringify(obj, replacer, 4) + '\n';
 }
 exports.to_json = to_json;
 function to_json_safely(obj, replacer) {
@@ -457,48 +475,49 @@ function to_json_safely(obj, replacer) {
 }
 exports.to_json_safely = to_json_safely;
 function is_codepoint_fullwidth(codepoint) {
-    // Code points are derived from:
+    // code points are derived from:
     // http://www.unix.org/Public/UNIDATA/EastAsianWidth.txt
     return (!Number.isNaN(codepoint) &&
         codepoint >= 0x1100 &&
-        (codepoint <= 0x115F || // Hangul Jamo
+        (codepoint <= 0x115f || // hangul jamo
+            codepoint === 0x201c || codepoint === 0x201d || // 
             codepoint === 0x2026 || // …
-            codepoint === 0x203B || // ※
-            // Arrows
+            codepoint === 0x203b || // ※
+            // arrows
             (0x2190 <= codepoint && codepoint <= 0x21FF) ||
-            codepoint === 0x2329 || // LEFT-POINTING ANGLE BRACKET
-            codepoint === 0x232A || // RIGHT-POINTING ANGLE BRACKET
+            codepoint === 0x2329 || // left-pointing angle bracket
+            codepoint === 0x232a || // right-pointing angle bracket
             // ①
-            (0x2460 <= codepoint && codepoint <= 0x24FF) ||
-            // Box Drawing
-            (0x2500 <= codepoint && codepoint <= 0x257F) ||
-            // Shapes, Symbols, …
-            (0x2580 <= codepoint && codepoint <= 0x2BEF) ||
-            // CJK Radicals Supplement .. Enclosed CJK Letters and Months
-            (0x2E80 <= codepoint && codepoint <= 0x3247 && codepoint !== 0x303F) ||
-            // Enclosed CJK Letters and Months .. CJK Unified Ideographs Extension A
-            (0x3250 <= codepoint && codepoint <= 0x4DBF) ||
-            // CJK Unified Ideographs .. Yi Radicals
+            (0x2460 <= codepoint && codepoint <= 0x24ff) ||
+            // box drawing
+            (0x2500 <= codepoint && codepoint <= 0x257f) ||
+            // shapes, symbols, …
+            (0x2580 <= codepoint && codepoint <= 0x2bef) ||
+            // cjk radicals supplement .. enclosed cjk letters and months
+            (0x2e80 <= codepoint && codepoint <= 0x3247 && codepoint !== 0x303f) ||
+            // enclosed cjk letters and months .. cjk unified ideographs extension a
+            (0x3250 <= codepoint && codepoint <= 0x4dbf) ||
+            // cjk unified ideographs .. yi radicals
             (0x4E00 <= codepoint && codepoint <= 0xA4C6) ||
-            // Hangul Jamo Extended-A
-            (0xA960 <= codepoint && codepoint <= 0xA97C) ||
-            // Hangul Syllables
-            (0xAC00 <= codepoint && codepoint <= 0xD7A3) ||
-            // CJK Compatibility Ideographs
-            (0xF900 <= codepoint && codepoint <= 0xFAFF) ||
-            // Vertical Forms
-            (0xFE10 <= codepoint && codepoint <= 0xFE19) ||
-            // CJK Compatibility Forms .. Small Form Variants
-            (0xFE30 <= codepoint && codepoint <= 0xFE6B) ||
-            // Halfwidth and Fullwidth Forms
-            (0xFF01 <= codepoint && codepoint <= 0xFF60) ||
-            (0xFFE0 <= codepoint && codepoint <= 0xFFE6) ||
-            // Kana Supplement
-            (0x1B000 <= codepoint && codepoint <= 0x1B001) ||
-            // Enclosed Ideographic Supplement
-            (0x1F200 <= codepoint && codepoint <= 0x1F251) ||
-            // CJK Unified Ideographs Extension B .. Tertiary Ideographic Plane
-            (0x20000 <= codepoint && codepoint <= 0x3FFFD)));
+            // hangul jamo extended-a
+            (0xa960 <= codepoint && codepoint <= 0xa97c) ||
+            // hangul syllables
+            (0xac00 <= codepoint && codepoint <= 0xd7a3) ||
+            // cjk compatibility ideographs
+            (0xf900 <= codepoint && codepoint <= 0xfaff) ||
+            // vertical forms
+            (0xfe10 <= codepoint && codepoint <= 0xfe19) ||
+            // cjk compatibility forms .. small form variants
+            (0xfe30 <= codepoint && codepoint <= 0xfe6b) ||
+            // halfwidth and fullwidth forms
+            (0xff01 <= codepoint && codepoint <= 0xff60) ||
+            (0xffe0 <= codepoint && codepoint <= 0xffe6) ||
+            // kana supplement
+            (0x1b000 <= codepoint && codepoint <= 0x1b001) ||
+            // enclosed ideographic supplement
+            (0x1f200 <= codepoint && codepoint <= 0x1f251) ||
+            // cjk unified ideographs extension b .. tertiary ideographic plane
+            (0x20000 <= codepoint && codepoint <= 0x3fffd)));
 }
 exports.is_codepoint_fullwidth = is_codepoint_fullwidth;
 //# sourceMappingURL=prototype.js.map