xshell 1.1.6 → 1.1.7

package/builder.js

@@ -1,6 +1,7 @@
 import { fileURLToPath } from 'url';
+import { not_empty } from "./prototype.js";
 import { noprint } from "./process.js";
-import { Lock, check, filter_values, not_empty } from "./utils.js";
+import { Lock, check, filter_values } from "./utils.js";
 import { fcopy, fmkdir, fwrite } from "./file.js";
 import { path } from "./path.js";
 const monaco_files = [

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.1.6",
+    "version": "1.1.7",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -75,7 +75,7 @@
         "commander": "^12.1.0",
         "css-loader": "^7.1.2",
         "emoji-regex": "^10.4.0",
-        "eslint": "^9.16.0",
+        "eslint": "^9.17.0",
         "eslint-plugin-import": "^2.31.0",
         "eslint-plugin-react": "^7.37.2",
         "gulp-sort": "^2.0.0",
@@ -91,10 +91,10 @@
         "mime-types": "^2.1.35",
         "ora": "^8.1.1",
         "react": "^19.0.0",
-        "react-i18next": "^15.1.4",
+        "react-i18next": "^15.2.0",
         "react-object-model": "^1.2.20",
         "resolve-path": "^1.4.0",
-        "sass": "^1.82.0",
+        "sass": "^1.83.0",
         "sass-loader": "^16.0.4",
         "source-map-loader": "^5.0.0",
         "strip-ansi": "^7.1.0",
@@ -126,13 +126,13 @@
         "@types/koa-compress": "^4.0.6",
         "@types/lodash": "^4.17.13",
         "@types/mime-types": "^2.1.4",
-        "@types/node": "^22.10.1",
+        "@types/node": "^22.10.2",
         "@types/react": "^19.0.1",
         "@types/through2": "^2.0.41",
         "@types/tough-cookie": "^4.0.5",
         "@types/ua-parser-js": "^0.7.39",
         "@types/vinyl-fs": "^3.0.5",
-        "@types/vscode": "^1.95.0",
+        "@types/vscode": "^1.96.0",
         "@types/webpack-bundle-analyzer": "^4.7.0"
     },
     "pnpm": {

package/path.js

@@ -4,10 +4,9 @@ export function to_fp(str) {
         return str;
     const fp = str.replaceAll('\\', '/');
     // 转换小写盘符开头的路径
-    return fp[1] === ':' && 'a' <= fp[0] && fp[0] <= 'z' ?
-        fp[0].toUpperCase() + fp.slice(1)
-        :
-            fp;
+    return fp[1] === ':' && 'a' <= fp[0] && fp[0] <= 'z'
+        ? fp[0].toUpperCase() + fp.slice(1)
+        : fp;
 }
 /** Normalize a string path, reducing '..' and '.' parts.
     When multiple slashes are found, they're replaced by a single one; when the path contains a trailing slash, it is preserved.

package/process.d.ts

@@ -67,7 +67,6 @@ export interface StartOptions extends BaseOptions {
         - envs?: `process.env` 覆盖／添加到 process.env 的环境变量，传 null 时可以取消设置该变量
         - encoding?: `'utf-8'` 子进程输出编码
         - print?: `true` 是否打印启动命令行
-        - stdio?: `'pipe'` 设置为 'ignore' 时忽略 stdio 处理
         - input?: string, 启动子进程之后写入到子进程 stdin 中的内容，写完后关闭子进程 stdin (pty 不关闭)
         - fp_stdin?: 使用文件作为标准输入，设置 stdio 中对应的值
         - fp_stdout?: 使用文件作为标准输出，设置 stdio 中对应的值
@@ -151,10 +150,7 @@ export interface StartNodeJsOptions extends StartOptions {
     - options
         - cwd?: `'T:/'`
         - envs?: `process.env` 覆盖／添加到 process.env 的环境变量
-        - encoding?: `'utf-8'` 子进程输出编码
         - print?: `true` print 选项，支持设置细项
-        - stdio?: `'pipe'` 设置为 'ignore' 时忽略 stdio 处理
-        - detached?: `false` 是否断开和 child 的关系 (ignore stdio, unref)
         - inspect?: nodejs debugger port, 填 9229 端口 (或者传 true) 可以用临时配置来调试
         - break?: break at first line */
 export declare function start_nodejs(js: string, args?: string[], { inspect, break: _break, ...options }?: StartNodeJsOptions): Promise<ChildProcess>;

package/process.js

@@ -110,7 +110,6 @@ stdio }) {
         - envs?: `process.env` 覆盖／添加到 process.env 的环境变量，传 null 时可以取消设置该变量
         - encoding?: `'utf-8'` 子进程输出编码
         - print?: `true` 是否打印启动命令行
-        - stdio?: `'pipe'` 设置为 'ignore' 时忽略 stdio 处理
         - input?: string, 启动子进程之后写入到子进程 stdin 中的内容，写完后关闭子进程 stdin (pty 不关闭)
         - fp_stdin?: 使用文件作为标准输入，设置 stdio 中对应的值
         - fp_stdout?: 使用文件作为标准输出，设置 stdio 中对应的值
@@ -248,10 +247,7 @@ export async function call_nodejs(js, args = [], { inspect, break: _break, ...op
     - options
         - cwd?: `'T:/'`
         - envs?: `process.env` 覆盖／添加到 process.env 的环境变量
-        - encoding?: `'utf-8'` 子进程输出编码
         - print?: `true` print 选项，支持设置细项
-        - stdio?: `'pipe'` 设置为 'ignore' 时忽略 stdio 处理
-        - detached?: `false` 是否断开和 child 的关系 (ignore stdio, unref)
         - inspect?: nodejs debugger port, 填 9229 端口 (或者传 true) 可以用临时配置来调试
         - break?: break at first line */
 export async function start_nodejs(js, args = [], { inspect, break: _break, ...options } = {}) {

package/prototype.browser.d.ts

@@ -146,6 +146,15 @@ declare global {
         /** 等价于 .at(-1) */
         last: T;
         indent(this: string[], width?: number, c?: string): string[];
+        /** 对数组中所有元素求和 (+), 返回结果 */
+        sum(this: T[]): T;
+        /** 查找数组中最大的元素，可传入 selector 选择某个属性，或者计算出某个值，用作大小比较 */
+        max(this: T[], selector?: keyof T | KeySelector<T>): T;
+        /** 查找数组中最小的元素，可传入 selector 选择某个属性，或者计算出某个值，用作大小比较 */
+        min(this: T[], selector?: keyof T | KeySelector<T>): T;
+        /** 去除重复元素（可按 selector 去重），重复值保留最后出现的那个
+            - selector?: 可以是 key (string, number, symbol) 或 (obj: any) => any */
+        unique(this: T[], selector?: keyof T | KeySelector<T>): T[];
         /**
             - trim_line?: `true`
             - rm_empty_lines?: `true`
@@ -174,6 +183,15 @@ interface SliceOptions {
     last?: boolean;
 }
 export declare const emoji_regex: RegExp;
+export declare const noop: () => void;
+export declare const ident: <T>(x: T) => T;
+export declare const build_selector: <TObj>(key: keyof TObj) => (obj: TObj) => TObj[keyof TObj];
+export type KeySelector<TObj = any, TKey extends keyof TObj = keyof TObj> = (key: TObj) => TObj[TKey];
+/** value 不为 null 或 undefined */
+export declare const not_empty: (value: any) => boolean;
+export declare const empty: (value: any) => boolean;
+export declare const is_key_type: IsKeyType;
+type IsKeyType = (key: any) => key is string | number | symbol;
 export declare function to_method_property_descriptors(methods: {
     [name: string]: Function;
 }): PropertyDescriptorMap;

package/prototype.browser.js

@@ -3,6 +3,14 @@ import byte_size from 'byte-size';
 import EmojiRegex from 'emoji-regex';
 import { t } from "./i18n/instance.js";
 export const emoji_regex = EmojiRegex();
+export const noop = () => { };
+export const ident = (x) => x;
+export const build_selector = (key) => (obj) => obj[key];
+/** value 不为 null 或 undefined */
+export const not_empty = (value) => value !== null && value !== undefined;
+export const empty = (value) => value === undefined || value === null;
+const key_types = ['string', 'number', 'symbol'];
+export const is_key_type = ((key) => key_types.includes(typeof key));
 export function to_method_property_descriptors(methods) {
     return Object.fromEntries(Object.entries(methods)
         .map(([name, value]) => ([name, {
@@ -444,10 +452,10 @@ Object.defineProperties(Array.prototype, {
             if (trim_line)
                 lines = lines.map(line => line.trim());
             if (rm_empty_lines)
-                return lines.filter(line => line);
+                return lines.filter(Boolean);
             if (rm_last_empty_lines) {
                 lines.reverse();
-                const i_not_empty = lines.findIndex(line => line);
+                const i_not_empty = lines.findIndex(Boolean);
                 if (i_not_empty !== -1)
                     lines = lines.slice(i_not_empty);
                 lines.reverse();
@@ -459,6 +467,53 @@ Object.defineProperties(Array.prototype, {
             const indent = character.repeat(width);
             return this.map(line => indent + line);
         },
+        sum() {
+            return this.length
+                ? this.reduce((acc, x) => acc + x)
+                : undefined;
+        },
+        max(selector = ident) {
+            if (!this.length)
+                return undefined;
+            if (typeof selector === 'string')
+                selector = build_selector(selector);
+            let max = selector(this[0]);
+            let imax = 0;
+            for (let i = 0; i < this.length; i++) {
+                const value = selector(this[i]);
+                if (value > max) {
+                    max = value;
+                    imax = i;
+                }
+            }
+            return this[imax];
+        },
+        min(selector = ident) {
+            if (!this.length)
+                return undefined;
+            if (typeof selector === 'string')
+                selector = build_selector(selector);
+            let min = selector(this[0]);
+            let imin = 0;
+            for (let i = 0; i < this.length; i++) {
+                const value = selector(this[i]);
+                if (value < min) {
+                    min = value;
+                    imin = i;
+                }
+            }
+            return this[imin];
+        },
+        unique(selector) {
+            if (!selector)
+                return [...new Set(this)];
+            if (is_key_type(selector))
+                selector = build_selector(selector);
+            let map = new Map();
+            for (const x of this)
+                map.set(selector(x), x);
+            return [...map.values()];
+        },
         join_lines(append = true) {
             return `${this.join('\n')}${append ? '\n' : ''}`;
         }

package/prototype.d.ts

@@ -171,6 +171,15 @@ declare global {
         log(this: string[], limit?: number): void;
         indent(this: string[], width?: number, c?: string): string[];
         indent2to4(this: string[]): string[];
+        /** 对数组中所有元素求和 (+), 返回结果 */
+        sum(this: T[]): T;
+        /** 查找数组中最大的元素，可传入 selector 选择某个属性，或者计算出某个值，用作大小比较 */
+        max(this: T[], selector?: keyof T | KeySelector<T>): T;
+        /** 查找数组中最小的元素，可传入 selector 选择某个属性，或者计算出某个值，用作大小比较 */
+        min(this: T[], selector?: keyof T | KeySelector<T>): T;
+        /** 去除重复元素（可按 selector 去重），重复值保留最后出现的那个
+            - selector?: 可以是 key (string, number, symbol) 或 (obj: any) => any */
+        unique(this: T[], selector?: keyof T | KeySelector<T>): T[];
         /**
             - trim_line?: `true`
             - rm_empty_lines?: `true`
@@ -206,6 +215,15 @@ interface SliceOptions {
 import chalk from 'chalk';
 export declare const emoji_regex: RegExp;
 export { chalk };
+export declare const noop: () => void;
+export declare const ident: <T>(x: T) => T;
+export declare const build_selector: <TObj>(key: keyof TObj) => (obj: TObj) => TObj[keyof TObj];
+export type KeySelector<TObj = any, TKey extends keyof TObj = keyof TObj> = (key: TObj) => TObj[TKey];
+/** value 不为 null 或 undefined */
+export declare const not_empty: (value: any) => boolean;
+export declare const empty: (value: any) => boolean;
+export declare const is_key_type: IsKeyType;
+type IsKeyType = (key: any) => key is string | number | symbol;
 export declare function to_method_property_descriptors(methods: {
     [name: string]: Function;
 }): PropertyDescriptorMap;

package/prototype.js

@@ -7,6 +7,14 @@ import { t } from "./i18n/instance.js";
 chalk.level = 2;
 export const emoji_regex = EmojiRegex();
 export { chalk };
+export const noop = () => { };
+export const ident = (x) => x;
+export const build_selector = (key) => (obj) => obj[key];
+/** value 不为 null 或 undefined */
+export const not_empty = (value) => value !== null && value !== undefined;
+export const empty = (value) => value === undefined || value === null;
+const key_types = ['string', 'number', 'symbol'];
+export const is_key_type = ((key) => key_types.includes(typeof key));
 export function to_method_property_descriptors(methods) {
     return Object.fromEntries(Object.entries(methods)
         .map(([name, value]) => ([name, {
@@ -482,10 +490,10 @@ if (!globalThis.my_prototype_defined) {
                 if (trim_line)
                     lines = lines.map(line => line.trim());
                 if (rm_empty_lines)
-                    return lines.filter(line => line);
+                    return lines.filter(Boolean);
                 if (rm_last_empty_lines) {
                     lines.reverse();
-                    const i_not_empty = lines.findIndex(line => line);
+                    const i_not_empty = lines.findIndex(Boolean);
                     if (i_not_empty !== -1)
                         lines = lines.slice(i_not_empty);
                     lines.reverse();
@@ -512,6 +520,53 @@ if (!globalThis.my_prototype_defined) {
                 return this.split_indents()
                     .map(line => ' '.repeat(line.indent * 2) + line.text);
             },
+            sum() {
+                return this.length
+                    ? this.reduce((acc, x) => acc + x)
+                    : undefined;
+            },
+            max(selector = ident) {
+                if (!this.length)
+                    return undefined;
+                if (is_key_type(selector))
+                    selector = build_selector(selector);
+                let max = selector(this[0]);
+                let imax = 0;
+                for (let i = 0; i < this.length; i++) {
+                    const value = selector(this[i]);
+                    if (value > max) {
+                        max = value;
+                        imax = i;
+                    }
+                }
+                return this[imax];
+            },
+            min(selector = ident) {
+                if (!this.length)
+                    return undefined;
+                if (is_key_type(selector))
+                    selector = build_selector(selector);
+                let min = selector(this[0]);
+                let imin = 0;
+                for (let i = 0; i < this.length; i++) {
+                    const value = selector(this[i]);
+                    if (value < min) {
+                        min = value;
+                        imin = i;
+                    }
+                }
+                return this[imin];
+            },
+            unique(selector) {
+                if (!selector)
+                    return [...new Set(this)];
+                if (is_key_type(selector))
+                    selector = build_selector(selector);
+                let map = new Map();
+                for (const x of this)
+                    map.set(selector(x), x);
+                return [...map.values()];
+            },
             join_lines(append = true) {
                 return `${this.join('\n')}${append ? '\n' : ''}`;
             }

package/utils.browser.d.ts

@@ -1,6 +1,4 @@
-export declare const noop: () => void;
-/** value 不为 null 或 undefined */
-export declare const not_empty: (value: any) => boolean;
+import { type KeySelector } from './prototype.browser.ts';
 export declare function assert(assertion: any, message?: string): never | void;
 /** 做参数校验，逻辑检查 */
 export declare function check(condition: any, message?: string): never | void;
@@ -11,8 +9,8 @@ export declare function check(condition: any, message?: string): never | void;
 export declare function log<TObj>(obj: TObj): TObj;
 export declare function log<TObj>(label: string, obj: TObj): TObj;
 /** 数组或 iterable 去重（可按 selector 去重），重复值保留最后出现的那个
-    - selector?: 可以是 key (string) 或 (obj: any) => any */
-export declare function unique<TObj>(iterable: TObj[] | Iterable<TObj>, selector?: string | ((obj: TObj) => any)): TObj[];
+    - selector?: 可以是 key (string, number, symbol) 或 (obj: any) => any */
+export declare function unique<TObj>(iterable: TObj[] | Iterable<TObj>, selector?: keyof TObj | KeySelector<TObj>): TObj[];
 /** 生成 0, 1, ..., n - 1 (不包括 n) 的数组，支持传入 generator 函数，通过 index 生成各个元素
     @example seq(10, i => `item-${i}`) */
 export declare function seq<T = number>(n: number, generator?: (index: number) => T): T[];

package/utils.browser.js

@@ -1,7 +1,5 @@
+import { is_key_type, build_selector, not_empty } from "./prototype.browser.js";
 import { t } from "./i18n/instance.js";
-export const noop = () => { };
-/** value 不为 null 或 undefined */
-export const not_empty = (value) => value !== null && value !== undefined;
 export function assert(assertion, message) {
     if (!assertion) {
         debugger;
@@ -28,14 +26,15 @@ export function log(...args) {
     }
 }
 /** 数组或 iterable 去重（可按 selector 去重），重复值保留最后出现的那个
-    - selector?: 可以是 key (string) 或 (obj: any) => any */
+    - selector?: 可以是 key (string, number, symbol) 或 (obj: any) => any */
 export function unique(iterable, selector) {
     if (!selector)
         return [...new Set(iterable)];
+    if (is_key_type(selector))
+        selector = build_selector(selector);
     let map = new Map();
-    const is_str_selector = typeof selector === 'string';
     for (const x of iterable)
-        map.set(is_str_selector ? x[selector] : selector(x), x);
+        map.set(selector(x), x);
     return [...map.values()];
 }
 /** 生成 0, 1, ..., n - 1 (不包括 n) 的数组，支持传入 generator 函数，通过 index 生成各个元素

package/utils.d.ts

@@ -2,10 +2,7 @@ import { Writable, Transform, type Readable, type Duplex, type TransformCallback
 import util from 'util';
 import type { TimerOptions } from 'timers';
 import type Vinyl from 'vinyl';
-import './prototype.ts';
-export declare const noop: () => void;
-/** value 不为 null 或 undefined */
-export declare const not_empty: (value: any) => boolean;
+import { type KeySelector } from './prototype.ts';
 /** `230` term 字符宽度 （实际上有 240） */
 export declare const output_width = 230;
 export declare function set_inspect_options(colors?: boolean): void;
@@ -18,13 +15,12 @@ export declare function check(condition: any, message?: string): never | void;
     log(obj) */
 export declare function log<TObj>(obj: TObj): TObj;
 export declare function log<TObj>(label: string, obj: TObj): TObj;
+/** 数组或 iterable 去重（可按 selector 去重），重复值保留最后出现的那个
+    - selector?: 可以是 key (string, number, symbol) 或 (obj: any) => any */
+export declare function unique<TObj>(iterable: TObj[] | Iterable<TObj>, selector?: keyof TObj | KeySelector<TObj>): TObj[];
 /** 生成 0, 1, ..., n - 1 (不包括 n) 的数组，支持传入 generator 函数，通过 index 生成各个元素
     @example seq(10, i => `item-${i}`) */
 export declare function seq<T = number>(n: number, generator?: (index: number) => T): T[];
-/** 数组或 iterable 去重（可按 selector 去重）
-    - selector?: 可以是 key (string) 或 (obj: any) => any
-*/
-export declare function unique<T>(iterable: T[] | Iterable<T>, selector?: string | ((obj: T) => any)): any[];
 /** 排序对象中 keys 的顺序，返回新的对象 */
 export declare function sort_keys<TObj>(obj: TObj): TObj;
 /** 将 keys, values 数组按对应的顺序组合成一个对象 */

package/utils.js

@@ -2,10 +2,7 @@ import { Stream, Writable, Transform } from 'stream';
 import util from 'util';
 import timers from 'timers/promises';
 import { t } from "./i18n/instance.js";
-import "./prototype.js";
-export const noop = () => { };
-/** value 不为 null 或 undefined */
-export const not_empty = (value) => value !== null && value !== undefined;
+import { build_selector, not_empty, is_key_type, noop } from "./prototype.js";
 /** `230` term 字符宽度 （实际上有 240） */
 export const output_width = 230;
 export function set_inspect_options(colors = true) {
@@ -49,6 +46,18 @@ export function log(...args) {
         return obj;
     }
 }
+/** 数组或 iterable 去重（可按 selector 去重），重复值保留最后出现的那个
+    - selector?: 可以是 key (string, number, symbol) 或 (obj: any) => any */
+export function unique(iterable, selector) {
+    if (!selector)
+        return [...new Set(iterable)];
+    if (is_key_type(selector))
+        selector = build_selector(selector);
+    let map = new Map();
+    for (const x of iterable)
+        map.set(selector(x), x);
+    return [...map.values()];
+}
 /** 生成 0, 1, ..., n - 1 (不包括 n) 的数组，支持传入 generator 函数，通过 index 生成各个元素
     @example seq(10, i => `item-${i}`) */
 export function seq(n, generator) {
@@ -57,18 +66,6 @@ export function seq(n, generator) {
         a[i] = generator ? generator(i) : i;
     return a;
 }
-/** 数组或 iterable 去重（可按 selector 去重）
-    - selector?: 可以是 key (string) 或 (obj: any) => any
-*/
-export function unique(iterable, selector) {
-    if (!selector)
-        return [...new Set(iterable)];
-    let map = new Map();
-    const is_str_selector = typeof selector === 'string';
-    for (const x of iterable)
-        map.set(is_str_selector ? x[selector] : selector(x), x);
-    return [...map.values()];
-}
 /** 排序对象中 keys 的顺序，返回新的对象 */
 export function sort_keys(obj) {
     return Object.fromEntries(Object.entries(obj)