xshell 1.0.164 → 1.0.166

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.0.164",
+    "version": "1.0.166",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -50,10 +50,10 @@
     },
     "dependencies": {
         "@babel/core": "^7.25.2",
-        "@babel/parser": "^7.25.4",
-        "@babel/traverse": "^7.25.4",
+        "@babel/parser": "^7.25.6",
+        "@babel/traverse": "^7.25.6",
         "@koa/cors": "^5.0.0",
-        "@stylistic/eslint-plugin": "^2.6.4",
+        "@stylistic/eslint-plugin": "^2.7.2",
         "@svgr/webpack": "^8.1.0",
         "@types/sass-loader": "^8.0.9",
         "@types/ws": "^8.5.12",
@@ -113,7 +113,7 @@
         "ws": "^8.18.0"
     },
     "devDependencies": {
-        "@babel/types": "^7.25.4",
+        "@babel/types": "^7.25.6",
         "@types/ali-oss": "^6.16.11",
         "@types/archiver": "^6.0.2",
         "@types/babel__traverse": "^7.20.6",
@@ -126,8 +126,8 @@
         "@types/koa-compress": "^4.0.6",
         "@types/lodash": "^4.17.7",
         "@types/mime-types": "^2.1.4",
-        "@types/node": "^22.5.0",
-        "@types/react": "^18.3.4",
+        "@types/node": "^22.5.2",
+        "@types/react": "^18.3.5",
         "@types/through2": "^2.0.41",
         "@types/tough-cookie": "^4.0.5",
         "@types/ua-parser-js": "^0.7.39",

package/path.d.ts

@@ -55,7 +55,7 @@ export declare function extname(path: string): string;
 /** `/` */
 export declare const sep = "/";
 /** The platform-specific file delimiter. ';' or ':'. */
-export declare const delimiter: ";" | ":";
+export declare const delimiter: ":" | ";";
 /** Returns an object from a path string - the opposite of format().
     @param path path to evaluate.
     @throws {TypeError} if `path` is not a string. */
@@ -83,7 +83,7 @@ export declare let path: {
     basename: typeof basename;
     extname: typeof extname;
     sep: string;
-    delimiter: ";" | ":";
+    delimiter: ":" | ";";
     parse: typeof parse;
     format: typeof format;
     toNamespacedPath: typeof toNamespacedPath;

package/utils.browser.d.ts

@@ -11,6 +11,8 @@ export declare function unique<TObj>(iterable: TObj[] | Iterable<TObj>, selector
 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>;
+/** 过滤对象中的 values, 返回新对象 */
+export declare function filter_values<TObj extends Record<string, any>>(obj: TObj, filter?: (value: TObj[string]) => any): TObj;
 export declare function delay(milliseconds: number, { signal }?: {
     signal?: AbortSignal;
 }): Promise<void>;
@@ -68,7 +70,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 这种版本号
     - l, r: 两个版本号字符串
     - loose?: 宽松模式，允许两个版本号格式（位数）不一致 */
@@ -90,7 +92,13 @@ export declare class Timer {
     /** 如果秒表未停止，获取当前秒表读数；
         如果秒表已停止，获取停止时的秒表读数; */
     get(): number;
-    getstr(): string;
+    /** 获取时间表示字符串，如 1.2 s
+        - parenthesis?: `true` 字符串前后加上括号，如 (1.2 s) */
+    getstr(parenthesis?: boolean): string;
     print(): void;
+    /** 重置 started */
+    reset(): void;
+    get_and_reset(): number;
+    getstr_and_reset(parenthesis?: boolean): string;
 }
 export declare function lowercase_first_letter(str: string): string;

package/utils.browser.js

@@ -38,6 +38,11 @@ export function zip_object(keys, values) {
         return obj;
     }, {});
 }
+/** 过滤对象中的 values, 返回新对象 */
+export function filter_values(obj, filter = not_empty) {
+    return Object.fromEntries(Object.entries(obj)
+        .filter(([, value]) => filter(value)));
+}
 export async function delay(milliseconds, { signal } = {}) {
     signal?.throwIfAborted();
     return new Promise((resolve, reject) => {
@@ -265,11 +270,32 @@ export class Timer {
     get() {
         return (this.ended || new Date().getTime()) - this.started;
     }
-    getstr() {
-        return `(${delta2str(this.get())})`;
+    /** 获取时间表示字符串，如 1.2 s
+        - parenthesis?: `true` 字符串前后加上括号，如 (1.2 s) */
+    getstr(parenthesis = false) {
+        let s = delta2str(this.get());
+        if (parenthesis)
+            return s.bracket();
+        else
+            return s;
     }
     print() {
-        console.log(this.getstr());
+        console.log(this.getstr(true));
+    }
+    /** 重置 started */
+    reset() {
+        this.started = new Date().getTime();
+        this.ended = null;
+    }
+    get_and_reset() {
+        const result = this.get();
+        this.reset();
+        return result;
+    }
+    getstr_and_reset(parenthesis) {
+        const result = this.getstr(parenthesis);
+        this.reset();
+        return result;
     }
 }
 export function lowercase_first_letter(str) {

package/utils.d.ts

@@ -37,7 +37,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 这种版本号
     - l, r: 两个版本号字符串
     - loose?: 宽松模式，允许两个版本号格式（位数）不一致 */
@@ -61,9 +61,13 @@ export declare class Timer {
         如果秒表已停止，获取停止时的秒表读数; */
     get(): number;
     /** 获取时间表示字符串，如 1.2 s
-        - bracket?: `true` 字符串前后加上括号，如 (1.2 s) */
-    getstr(bracket?: boolean): string;
+        - parenthesis?: `true` 字符串前后加上括号，如 (1.2 s) */
+    getstr(parenthesis?: boolean): string;
     print(): void;
+    /** 重置 started */
+    reset(): void;
+    get_and_reset(): number;
+    getstr_and_reset(parenthesis?: boolean): string;
 }
 export declare function log_line(): void;
 export declare function delay(milliseconds: number, options?: TimerOptions): Promise<void>;

package/utils.js

@@ -189,10 +189,10 @@ export class Timer {
         return (this.ended || new Date().getTime()) - this.started;
     }
     /** 获取时间表示字符串，如 1.2 s
-        - bracket?: `true` 字符串前后加上括号，如 (1.2 s) */
-    getstr(bracket = false) {
+        - parenthesis?: `true` 字符串前后加上括号，如 (1.2 s) */
+    getstr(parenthesis = false) {
         let s = delta2str(this.get());
-        if (bracket)
+        if (parenthesis)
             return s.bracket();
         else
             return s;
@@ -200,6 +200,21 @@ export class Timer {
     print() {
         console.log(this.getstr(true));
     }
+    /** 重置 started */
+    reset() {
+        this.started = new Date().getTime();
+        this.ended = null;
+    }
+    get_and_reset() {
+        const result = this.get();
+        this.reset();
+        return result;
+    }
+    getstr_and_reset(parenthesis) {
+        const result = this.getstr(parenthesis);
+        this.reset();
+        return result;
+    }
 }
 export function log_line() {
     console.log('---');