xshell 1.0.96 → 1.0.97

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.0.96",
+    "version": "1.0.97",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -71,7 +71,7 @@
         "colors": "^1.4.0",
         "commander": "^12.0.0",
         "emoji-regex": "^10.3.0",
-        "eslint": "^9.1.1",
+        "eslint": "^9.2.0",
         "eslint-plugin-import": "^2.29.1",
         "eslint-plugin-react": "^7.34.1",
         "gulp-sort": "^2.0.0",
@@ -96,7 +96,7 @@
         "tslib": "^2.6.2",
         "typescript": "^5.4.5",
         "ua-parser-js": "2.0.0-alpha.2",
-        "undici": "^6.15.0",
+        "undici": "^6.16.0",
         "vinyl": "^3.0.0",
         "vinyl-fs": "^4.0.0",
         "ws": "^8.17.0",
@@ -118,15 +118,15 @@
         "@types/js-cookie": "^3.0.6",
         "@types/koa": "^2.15.0",
         "@types/koa-compress": "^4.0.6",
-        "@types/lodash": "^4.17.0",
+        "@types/lodash": "^4.17.1",
         "@types/mime-types": "^2.1.4",
-        "@types/node": "^20.12.7",
+        "@types/node": "^20.12.11",
         "@types/react": "^18.3.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.88.0"
+        "@types/vscode": "^1.89.0"
     },
     "pnpm": {
         "patchedDependencies": {

package/utils.browser.d.ts

@@ -6,6 +6,8 @@ export declare function log<T>(obj: T): T;
 /** 生成 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[];
+/** 将 keys, values 数组按对应的顺序组合成一个对象 */
+export declare function zip_object<TValue>(keys: (string | number)[], values: TValue[]): Record<string, TValue>;
 export declare function delay(milliseconds: number): Promise<void>;
 export declare function timeout(milliseconds: number): Promise<void>;
 /** https://stackoverflow.com/questions/63297164/how-to-only-accept-arraybuffer-as-parameter */
@@ -58,7 +60,7 @@ export declare function encode(str: string): Uint8Array;
     在流式处理 (buffer 可能不完整) 时，应使用独立的 TextDecoder 实例调用 decode(buffer, { stream: true }) */
 export declare function decode(buffer: Uint8Array): string;
 /** 字符串字典序比较 */
-export declare function strcmp(l: string, r: string): 1 | 0 | -1;
+export declare function strcmp(l: string, r: string): 0 | 1 | -1;
 /** 比较 1.10.02 这种版本号 */
 export declare function vercmp(l: string, r: string): number;
 export declare function get<TReturn = any>(obj: any, keypath: string): TReturn;

package/utils.browser.js

@@ -20,6 +20,13 @@ export function seq(n, generator) {
         a[i] = generator ? generator(i) : i;
     return a;
 }
+/** 将 keys, values 数组按对应的顺序组合成一个对象 */
+export function zip_object(keys, values) {
+    return keys.reduce((obj, key, i) => {
+        obj[key] = values[i];
+        return obj;
+    }, {});
+}
 export async function delay(milliseconds) {
     return new Promise(resolve => {
         setTimeout(resolve, milliseconds);

package/utils.d.ts

@@ -16,13 +16,14 @@ export declare function log<T>(obj: T): T;
 /** 生成 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[];
-export declare function dedent(templ: TemplateStringsArray | string, ...values: any[]): string;
 /** 数组或 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 数组按对应的顺序组合成一个对象 */
+export declare function zip_object<TValue>(keys: (string | number)[], values: TValue[]): Record<string, TValue>;
 /** 映射对象中的 keys, 返回新对象 */
 export declare function map_keys<TObj>(obj: TObj, mapper: (key: string) => string): TObj;
 /** 映射对象中的 values, 返回新对象 */
@@ -38,7 +39,7 @@ export declare function filter_values<TObj extends Record<string, any>>(obj: TOb
 /** 忽略对象中的 keys, 返回新对象 */
 export declare function omit<TObj>(obj: TObj, omit_keys: string[]): TObj;
 /** 字符串字典序比较 */
-export declare function strcmp(l: string, r: string): 1 | 0 | -1;
+export declare function strcmp(l: string, r: string): 0 | 1 | -1;
 /** 比较 1.10.02 这种版本号 */
 export declare function vercmp(l: string, r: string): number;
 export declare function get<TReturn = any>(obj: any, keypath: string): TReturn;

package/utils.js

@@ -41,32 +41,6 @@ export function seq(n, generator) {
         a[i] = generator ? generator(i) : i;
     return a;
 }
-export function dedent(templ, ...values) {
-    let strings = Array.from(typeof templ === 'string' ? [templ] : templ.raw);
-    // 1. remove trailing whitespace
-    strings[strings.length - 1] = strings[strings.length - 1].replace(/\r?\n([\t ]*)$/, '');
-    // 2. find all line breaks to determine the highest common indentation level
-    const indent_lengths = strings.reduce((arr, str) => {
-        const matches = str.match(/\n[\t ]+/g);
-        if (matches)
-            return arr.concat(matches.map(match => match.length - 1));
-        return arr;
-    }, []);
-    // 3. remove the common indentation from all strings
-    if (indent_lengths.length) {
-        const pattern = new RegExp(`\n[\t ]{${Math.min(...indent_lengths)}}`, 'g');
-        strings = strings.map(str => str.replace(pattern, '\n'));
-    }
-    // 4. remove leading whitespace
-    strings[0] = strings[0].replace(/^\r?\n/, '');
-    // 5. perform interpolation
-    let string = strings[0];
-    values.forEach((value, i) => {
-        string += value + strings[i + 1];
-    });
-    string += '\n';
-    return string;
-}
 /** 数组或 iterable 去重（可按 selector 去重）
     - selector?: 可以是 key (string) 或 (obj: any) => any
 */
@@ -84,6 +58,13 @@ export function sort_keys(obj) {
     return Object.fromEntries(Object.entries(obj)
         .sort(([key_l], [key_r]) => strcmp(key_l, key_r)));
 }
+/** 将 keys, values 数组按对应的顺序组合成一个对象 */
+export function zip_object(keys, values) {
+    return keys.reduce((obj, key, i) => {
+        obj[key] = values[i];
+        return obj;
+    }, {});
+}
 /** 映射对象中的 keys, 返回新对象 */
 export function map_keys(obj, mapper) {
     return Object.fromEntries(Object.entries(obj)