xshell 1.3.40 → 1.3.41

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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.3.40",
+    "version": "1.3.41",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -53,19 +53,18 @@
         "@babel/parser": "^7.29.0",
         "@babel/traverse": "^7.29.0",
         "@koa/cors": "^5.0.0",
-        "@stylistic/eslint-plugin": "^5.9.0",
+        "@stylistic/eslint-plugin": "^5.10.0",
         "@svgr/webpack": "^8.1.0",
         "@types/sass-loader": "^8.0.10",
-        "@typescript-eslint/eslint-plugin": "^8.56.1",
-        "@typescript-eslint/parser": "^8.56.1",
-        "@typescript-eslint/utils": "^8.56.1",
+        "@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.4",
         "emoji-regex": "^10.6.0",
-        "eslint": "^10.0.2",
-        "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",
@@ -76,9 +75,9 @@
         "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.2.0",
@@ -88,7 +87,7 @@
         "tslib": "^2.8.1",
         "typescript": "^5.9.3",
         "undici": "^7.22.0",
-        "webpack": "^5.105.3",
+        "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.3.2",
+        "@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/utils.d.ts

@@ -6,6 +6,7 @@ export * from './utils.common.ts';
 /** `180` 输出字符宽度 */
 export declare const output_width = 180;
 export declare const url_width = 52;
+/** - colors?: `true` */
 export declare function set_inspect_options(colors?: boolean): void;
 export declare function typed_array_to_buffer(view: ArrayBufferView): Buffer<ArrayBufferLike>;
 export declare function log_line(): void;

package/utils.js

@@ -8,6 +8,7 @@ export * from "./utils.common.js";
 /** `180` 输出字符宽度 */
 export const output_width = 180;
 export const url_width = 52;
+/** - colors?: `true` */
 export function set_inspect_options(colors = true) {
     util.inspect.defaultOptions.maxArrayLength = 40;
     util.inspect.defaultOptions.maxStringLength = 10000;