xshell 1.3.39 → 1.3.41

package/chalk.browser.d.ts

@@ -1,2 +1,2 @@
-declare const red: import("chalk").ChalkInstance, green: import("chalk").ChalkInstance, yellow: import("chalk").ChalkInstance, blue: import("chalk").ChalkInstance, magenta: import("chalk").ChalkInstance, cyan: import("chalk").ChalkInstance, grey: import("chalk").ChalkInstance, red_: import("chalk").ChalkInstance, green_: import("chalk").ChalkInstance, yellow_: import("chalk").ChalkInstance, blue_: import("chalk").ChalkInstance, magenta_: import("chalk").ChalkInstance, cyan_: import("chalk").ChalkInstance, underline: import("chalk").ChalkInstance;
-export { red, green, yellow, blue, magenta, cyan, grey, red_, green_, yellow_, blue_, magenta_, cyan_, underline };
+declare const red: import("chalk").ChalkInstance, green: import("chalk").ChalkInstance, yellow: import("chalk").ChalkInstance, blue: import("chalk").ChalkInstance, magenta: import("chalk").ChalkInstance, cyan: import("chalk").ChalkInstance, gray: import("chalk").ChalkInstance, red_: import("chalk").ChalkInstance, green_: import("chalk").ChalkInstance, yellow_: import("chalk").ChalkInstance, blue_: import("chalk").ChalkInstance, magenta_: import("chalk").ChalkInstance, cyan_: import("chalk").ChalkInstance, underline: import("chalk").ChalkInstance;
+export { red, green, yellow, blue, magenta, cyan, gray, red_, green_, yellow_, blue_, magenta_, cyan_, underline };

package/chalk.browser.js

@@ -1,5 +1,5 @@
 import { Chalk } from 'chalk';
 const chalk = new Chalk({ level: 2 });
-const { red, green, yellow, blue, magenta, cyan, grey, redBright: red_, greenBright: green_, yellowBright: yellow_, blueBright: blue_, magentaBright: magenta_, cyanBright: cyan_, underline, } = chalk;
-export { red, green, yellow, blue, magenta, cyan, grey, red_, green_, yellow_, blue_, magenta_, cyan_, underline };
+const { red, green, yellow, blue, magenta, cyan, gray, redBright: red_, greenBright: green_, yellowBright: yellow_, blueBright: blue_, magentaBright: magenta_, cyanBright: cyan_, underline, } = chalk;
+export { red, green, yellow, blue, magenta, cyan, gray, red_, green_, yellow_, blue_, magenta_, cyan_, underline };
 //# sourceMappingURL=chalk.browser.js.map

package/git.d.ts

@@ -28,10 +28,12 @@ export declare class Git {
         message: string;
     }[]>;
     get_last_commit_hash(short?: boolean): Promise<string>;
-    fetch({ print, remote }?: {
+    /** @example form.fetch({ remote: 'origin', args: ['pull/770/head:form-list-fields-value'] }) */
+    fetch({ print, remote, args }?: {
         print?: boolean;
         remote?: string;
-    }): Promise<void>;
+        args?: string[];
+    }): Promise<string>;
     /** 创建或者切换到分支
        - branch?: `'main'` */
     checkout(branch?: 'main'): Promise<void>;

package/git.js

@@ -1,5 +1,6 @@
 import { call, noprint, print_no_command } from "./process.js";
 import { fread, fmkdir } from "./file.js";
+import { colored } from "./utils.js";
 export class Git {
     static exe = 'git';
     cwd;
@@ -91,14 +92,35 @@ export class Git {
             .trim();
         return short ? hash.slice(0, 6) : hash;
     }
-    async fetch({ print = true, remote } = {}) {
+    /** @example form.fetch({ remote: 'origin', args: ['pull/770/head:form-list-fields-value'] }) */
+    async fetch({ print = true, remote, args = [] } = {}) {
+        let stderrs = [];
         await this.call([
             'fetch',
             remote || '--all',
-            '--prune'
-        ], print_stdout);
+            '--prune',
+            ...args
+        ], {
+            ...print_stdout,
+            on_stderr(chunk) {
+                stderrs.push(chunk);
+                if (chunk.includes('main'))
+                    chunk = chunk.replaceAll('main', 'main'.yellow);
+                if (stderrs.length === 1 && chunk.startsWith('来自')) {
+                    const lf = chunk.indexOf('\n');
+                    chunk = chunk.slice(0, lf).replace('来自', '更新源').blue + chunk.slice(lf);
+                }
+                process.stdout.write(chunk);
+            }
+        });
+        const stderr = stderrs.join('');
         if (print)
-            console.log(`${this.cwd.fname.slice(0, -1)} 更新远程分支成功`);
+            console.log(colored((stderr ? '更新 ' : '') +
+                `${this.cwd.fname.slice(0, -1)} 仓库` +
+                (remote ? ` ${remote} 源` : '') +
+                (args.length > 0 ? ` ${args.join(' ')} ` : '') +
+                (stderr ? '成功' : '无更新'), 'green', Boolean(stderr)));
+        return stderr;
     }
     async checkout(branch = 'main') {
         let create = false;

package/net.d.ts

@@ -1,17 +1,18 @@
 import net from 'node:net';
 import { type Readable } from 'node:stream';
 import type { Cookie, CookieJar, MemoryCookieStore } from 'tough-cookie';
+import { type ValueOf } from './prototype.ts';
 import type { Encoding } from './file.ts';
 import { inspect, type Deferred2, type OnTimeout } from './utils.ts';
 import { type BasicAuth, type BearerAuth } from './net.common.ts';
 export * from './net.common.ts';
-export declare enum MyProxy {
-    socks5 = "http://127.0.0.1:10080",
-    whistle = "http://localhost:8899",
-    work = "http://localhost:10090",
+export declare const MyProxy: {
+    readonly socks5: "http://127.0.0.1:10080";
+    readonly whistle: "http://localhost:8899";
+    readonly work: "http://localhost:10090";
     /** 需要先启动 server.start_tunnel_server('ddb.test.proxy') */
-    test = "http://localhost:10091"
-}
+    readonly test: "http://localhost:10091";
+};
 export declare const byproxy: {
     readonly proxy: true;
 };
@@ -37,7 +38,7 @@ export interface RequestOptions {
     headers?: Record<string, string>;
     body?: string | Record<string, any> | Uint8Array | URLSearchParams | Readable;
     type?: 'application/json' | 'application/x-www-form-urlencoded' | 'multipart/form-data';
-    proxy?: boolean | MyProxy | string;
+    proxy?: boolean | ValueOf<typeof MyProxy> | string;
     encoding?: Encoding | 'binary';
     retries?: true | number;
     timeout?: number;

package/net.js

@@ -6,14 +6,13 @@ import { noop } from "./prototype.js";
 import { inspect, assert, delay, map_values, unique, timeout, check, colored, encode, TimeoutError, set_error_message, defer2, nowstr } from "./utils.js";
 import { drop_request_headers } from "./net.common.js";
 export * from "./net.common.js";
-export var MyProxy;
-(function (MyProxy) {
-    MyProxy["socks5"] = "http://127.0.0.1:10080";
-    MyProxy["whistle"] = "http://localhost:8899";
-    MyProxy["work"] = "http://localhost:10090";
+export const MyProxy = {
+    socks5: 'http://127.0.0.1:10080',
+    whistle: 'http://localhost:8899',
+    work: 'http://localhost:10090',
     /** 需要先启动 server.start_tunnel_server('ddb.test.proxy') */
-    MyProxy["test"] = "http://localhost:10091";
-})(MyProxy || (MyProxy = {}));
+    test: 'http://localhost:10091'
+};
 export const byproxy = { proxy: true };
 // ------------------------------------ fetch, request
 export const cookies = {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.3.39",
+    "version": "1.3.41",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -53,42 +53,41 @@
         "@babel/parser": "^7.29.0",
         "@babel/traverse": "^7.29.0",
         "@koa/cors": "^5.0.0",
-        "@stylistic/eslint-plugin": "^5.8.0",
+        "@stylistic/eslint-plugin": "^5.10.0",
         "@svgr/webpack": "^8.1.0",
         "@types/sass-loader": "^8.0.10",
-        "@typescript-eslint/eslint-plugin": "^8.55.0",
-        "@typescript-eslint/parser": "^8.55.0",
-        "@typescript-eslint/utils": "^8.55.0",
+        "@typescript-eslint/eslint-plugin": "^8.57.0",
+        "@typescript-eslint/parser": "^8.57.0",
+        "@typescript-eslint/utils": "^8.57.0",
         "archiver": "^7.0.1",
         "chalk": "^5.6.2",
         "commander": "^14.0.3",
-        "css-loader": "^7.1.3",
+        "css-loader": "^7.1.4",
         "emoji-regex": "^10.6.0",
-        "eslint": "^10.0.0",
-        "eslint-plugin-import": "^2.32.0",
+        "eslint": "^10.0.3",
         "eslint-plugin-react": "^7.37.5",
         "https-proxy-agent": "^7.0.6",
         "i18next": "25.8.1",
         "i18next-scanner": "^4.6.0",
-        "koa": "^3.1.1",
+        "koa": "^3.1.2",
         "koa-compress": "^5.2.0",
         "license-webpack-plugin": "^4.0.2",
         "mime-types": "^3.0.2",
         "p-map": "^7.0.4",
         "react": "^19.2.4",
-        "react-i18next": "^16.5.4",
+        "react-i18next": "^16.5.6",
         "resolve-path": "^1.4.0",
-        "sass": "^1.97.3",
+        "sass": "^1.98.0",
         "sass-loader": "^16.0.7",
         "source-map-loader": "^5.0.0",
-        "strip-ansi": "^7.1.2",
+        "strip-ansi": "^7.2.0",
         "style-loader": "^4.0.0",
         "tough-cookie": "^6.0.0",
         "ts-loader": "^9.5.4",
         "tslib": "^2.8.1",
         "typescript": "^5.9.3",
-        "undici": "^7.21.0",
-        "webpack": "^5.105.2",
+        "undici": "^7.22.0",
+        "webpack": "^5.105.4",
         "webpack-bundle-analyzer": "^5.2.0",
         "ws": "^8.19.0"
     },
@@ -101,10 +100,10 @@
         "@types/koa": "^3.0.1",
         "@types/koa-compress": "^4.0.7",
         "@types/mime-types": "^3.0.1",
-        "@types/node": "^25.2.3",
+        "@types/node": "^25.4.0",
         "@types/react": "^19.2.14",
         "@types/tough-cookie": "^4.0.5",
-        "@types/vscode": "^1.109.0",
+        "@types/vscode": "^1.110.0",
         "@types/webpack-bundle-analyzer": "^4.7.0",
         "@types/ws": "^8.18.1"
     }

package/path.d.ts

@@ -54,7 +54,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. */
@@ -81,7 +81,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/process.d.ts

@@ -1,6 +1,7 @@
 import type { InspectOptions } from 'node:util';
 import { type ChildProcess } from 'node:child_process';
 import './prototype.ts';
+import type { ValueOf } from './prototype.ts';
 import { type Encoding } from './file.ts';
 import type { MyProxy } from './net.ts';
 export declare const sea: boolean;
@@ -30,7 +31,7 @@ interface BaseOptions {
     /** `process.env` 覆盖/添加到 process.env 的环境变量 */
     envs?: Record<string, string>;
     /** 创建子进程时添加 http_proxy, https_proxy, no_proxy 环境变量以启用代理 */
-    proxy?: MyProxy | true;
+    proxy?: ValueOf<typeof MyProxy> | true;
     /** 控制子进程 stdin，默认为 `Boolean(input)` (false 时读空设备)，除非传入了 {@link CallOptions.input} 属性
         - 默认值:
             - start(): false ('ignore', 空设备)

package/prototype.common.d.ts

@@ -236,8 +236,16 @@ export type Greater<T = any> = (a: T, b: T) => boolean;
 export declare const greater: Greater;
 export type Less = Greater;
 export declare const less: Less;
+export type ValueOf<T> = T[keyof T];
 export declare function to_snake_case(str: string): string;
 export declare function to_space_case(str: string): string;
+/** 在常量对象上添加反向映射（value -> key）
+    ```ts
+    const Modifier = { lshift: 0xa0, rshift: 0xa1 } as const
+    set_reverse(Modifier)
+    // Modifier[0xa0] === 'lshift'
+    ``` */
+export declare function set_reverse<T extends Record<string, number | string>>(obj: T): T;
 export declare function to_method_property_descriptors(methods: {
     [name: string]: Function;
 }): PropertyDescriptorMap;

package/prototype.common.js

@@ -28,6 +28,17 @@ export function to_space_case(str) {
         .replaceAll('_', ' ')
         .strip_if_start(' ');
 }
+/** 在常量对象上添加反向映射（value -> key）
+    ```ts
+    const Modifier = { lshift: 0xa0, rshift: 0xa1 } as const
+    set_reverse(Modifier)
+    // Modifier[0xa0] === 'lshift'
+    ``` */
+export function set_reverse(obj) {
+    for (const key in obj)
+        obj[obj[key]] = key;
+    return obj;
+}
 export function to_method_property_descriptors(methods) {
     return Object.fromEntries(Object.entries(methods)
         .map(([name, value]) => ([name, {

package/prototype.d.ts

@@ -21,7 +21,7 @@ declare global {
         readonly magenta_: string;
         readonly cyan: string;
         readonly cyan_: string;
-        readonly grey: string;
+        readonly gray: string;
         readonly underline: string;
         strip_ansi(this: string): string;
     }

package/prototype.js

@@ -29,7 +29,7 @@ if (!globalThis.my_prototype_defined) {
         }),
         // ------------ colors
         ...Object.fromEntries([
-            'red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'grey',
+            'red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'gray',
             'red_', 'green_', 'yellow_', 'blue_', 'magenta_', 'cyan_',
             'underline',
         ].map(color => {

package/react.development.js

@@ -30733,12 +30733,6 @@ if (false) // removed by dead control flow
 /******/ 		if (cachedModule !== undefined) {
 /******/ 			return cachedModule.exports;
 /******/ 		}
-/******/ 		// Check if module exists (development only)
-/******/ 		if (__webpack_modules__[moduleId] === undefined) {
-/******/ 			var e = new Error("Cannot find module '" + moduleId + "'");
-/******/ 			e.code = 'MODULE_NOT_FOUND';
-/******/ 			throw e;
-/******/ 		}
 /******/ 		// Create a new module (and put it into the cache)
 /******/ 		var module = __webpack_module_cache__[moduleId] = {
 /******/ 			id: moduleId,
@@ -30747,6 +30741,12 @@ if (false) // removed by dead control flow
 /******/ 		};
 /******/ 	
 /******/ 		// Execute the module function
+/******/ 		if (!(moduleId in __webpack_modules__)) {
+/******/ 			delete __webpack_module_cache__[moduleId];
+/******/ 			var e = new Error("Cannot find module '" + moduleId + "'");
+/******/ 			e.code = 'MODULE_NOT_FOUND';
+/******/ 			throw e;
+/******/ 		}
 /******/ 		__webpack_modules__[moduleId](module, module.exports, __webpack_require__);
 /******/ 	
 /******/ 		// Flag the module as loaded