xshell 1.0.167 → 1.0.169

package/file.d.ts

@@ -60,6 +60,7 @@ interface FWriteOptions {
 /** 写入 data 到 fp 路径所指的文件
     会在因不存在父文件夹导致写入失败时，自动创建父文件夹，并再次尝试写入
     最好预先创建父文件夹，减少文件系统操作，提升性能
+    返回写入的文件路径
     - fp: 目标文件完整路径
     - data: 支持下面几种类型
         - string: 写入文本

package/git.d.ts

@@ -4,7 +4,7 @@ export declare class Git {
     cwd: string;
     constructor(cwd: string);
     static init(cwd: string, print?: boolean): Promise<Git>;
-    static clone(repo: string, fpd: string, shallow?: boolean): Promise<void>;
+    static clone(repo: string, fpd: string, shallow?: boolean | string): Promise<void>;
     call(args?: any[], { color, print, printers }?: {
         color?: boolean;
         print?: CallOptions['print'];

package/git.js

@@ -16,6 +16,7 @@ export class Git {
         await new this(fpd)
             .call([
             'clone',
+            ...typeof shallow === 'string' ? ['--branch', shallow, '--single-branch'] : [],
             ...shallow ? ['--depth', '1'] : [],
             repo,
             '.'
@@ -27,6 +28,7 @@ export class Git {
                 '-c', 'color.status=false',
                 '-c', 'color.ui=false',
                 '-c', 'color.branch=false',
+                '-c', 'color.diff=false',
             ],
             ...args,
         ], {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.0.167",
+    "version": "1.0.169",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -57,9 +57,9 @@
         "@svgr/webpack": "^8.1.0",
         "@types/sass-loader": "^8.0.9",
         "@types/ws": "^8.5.12",
-        "@typescript-eslint/eslint-plugin": "^8.5.0",
-        "@typescript-eslint/parser": "^8.5.0",
-        "@typescript-eslint/utils": "^8.5.0",
+        "@typescript-eslint/eslint-plugin": "^8.6.0",
+        "@typescript-eslint/parser": "^8.6.0",
+        "@typescript-eslint/utils": "^8.6.0",
         "@xterm/addon-fit": "^0.10.0",
         "@xterm/addon-web-links": "^0.11.0",
         "@xterm/addon-webgl": "^0.18.0",
@@ -77,7 +77,7 @@
         "emoji-regex": "^10.4.0",
         "eslint": "^9.10.0",
         "eslint-plugin-import": "^2.30.0",
-        "eslint-plugin-react": "^7.35.2",
+        "eslint-plugin-react": "^7.36.1",
         "gulp-sort": "^2.0.0",
         "hash-string": "^1.0.0",
         "https-proxy-agent": "^7.0.5",
@@ -91,10 +91,10 @@
         "mime-types": "^2.1.35",
         "ora": "^8.1.0",
         "react": "^18.3.1",
-        "react-i18next": "^15.0.1",
+        "react-i18next": "^15.0.2",
         "react-object-model": "^1.2.13",
         "resolve-path": "^1.4.0",
-        "sass": "^1.78.0",
+        "sass": "^1.79.1",
         "sass-loader": "^16.0.1",
         "source-map-loader": "^5.0.0",
         "strip-ansi": "^7.1.0",
@@ -120,14 +120,14 @@
         "@types/byte-size": "^8.1.2",
         "@types/chardet": "^0.8.3",
         "@types/eslint": "^9.6.1",
-        "@types/estree": "^1.0.5",
+        "@types/estree": "^1.0.6",
         "@types/gulp-sort": "^2.0.4",
         "@types/koa": "^2.15.0",
         "@types/koa-compress": "^4.0.6",
         "@types/lodash": "^4.17.7",
         "@types/mime-types": "^2.1.4",
-        "@types/node": "^22.5.4",
-        "@types/react": "^18.3.5",
+        "@types/node": "^22.5.5",
+        "@types/react": "^18.3.7",
         "@types/through2": "^2.0.41",
         "@types/tough-cookie": "^4.0.5",
         "@types/ua-parser-js": "^0.7.39",

package/process.js

@@ -226,10 +226,10 @@ export async function term(exe, args = [], { cwd = process.cwd().fpd, print = tr
     });
 }
 /** 在 term tab 中创建 node.exe 进程 */
-export async function term_nodejs(fp_js, args = [], { title, inspect, tsnode = false, break: _break, resolve = false, trace_warnings = false, ...options } = {}) {
+export async function term_nodejs(fp_js, args = [], { title, inspect, tsnode = false, break: _break, resolve = false, trace_warnings, ...options } = {}) {
     return term(exe_nodejs, [
         '--enable-source-maps',
-        ...trace_warnings ? ['--trace-warnings'] : [],
+        ...trace_warnings ?? inspect ? ['--trace-warnings'] : [],
         ...resolve ? ['--experimental-specifier-resolution=node'] : [],
         ...title ? [`--title=${title}`] : [],
         ...inspect ? [`--inspect${_break ? '-brk' : ''}=localhost:${inspect}`] : [],

package/prototype.browser.d.ts

@@ -137,7 +137,7 @@ declare global {
     interface Array<T> {
         /** 等价于 .at(-1) */
         last: T;
-        indent(this: string[], width: number, c?: string): string[];
+        indent(this: string[], width?: number, c?: string): string[];
         /**
             - trim_line?: `true`
             - rm_empty_lines?: `true`

package/prototype.d.ts

@@ -161,7 +161,7 @@ declare global {
         /** 等价于 .at(-1) */
         last: T;
         log(this: string[], limit?: number): void;
-        indent(this: string[], width: number, c?: string): string[];
+        indent(this: string[], width?: number, c?: string): string[];
         indent2to4(this: string[]): string[];
         /**
             - trim_line?: `true`

package/utils.browser.d.ts

@@ -2,7 +2,12 @@ export declare const noop: () => void;
 /** value 不为 null 或 undefined */
 export declare const not_empty: (value: any) => boolean;
 export declare function assert(assertion: any, message?: string): never | void;
-export declare function log<T>(obj: T): T;
+/** 通过 console.log 打印对象并返回
+    @example
+    log('label', obj)
+    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) 或 (obj: any) => any */
 export declare function unique<TObj>(iterable: TObj[] | Iterable<TObj>, selector?: string | ((obj: TObj) => any)): TObj[];
@@ -84,6 +89,12 @@ export declare function concat(arrays: ArrayBufferView[]): Uint8Array;
 export declare function delta2str(delta: number): string;
 /** generate random id */
 export declare function genid(): number;
+/** 默认日期时间格式 */
+export declare const datetime_format: "YYYY.MM.DD HH:mm:ss";
+/** 默认日期格式 */
+export declare const date_format: "YYYY.MM.DD";
+/** 默认时间格式 */
+export declare const time_format: "HH:mm:ss";
 export declare class Timer {
     started: number;
     ended: number;

package/utils.browser.js

@@ -8,9 +8,17 @@ export function assert(assertion, message) {
         throw Object.assign(new Error(`断言失败: ${message ? `${message}: ` : ''}${assertion}`), { assertion });
     }
 }
-export function log(obj) {
-    console.log(obj);
-    return obj;
+export function log(...args) {
+    if (args.length === 2) {
+        const [label, obj] = args;
+        console.log(`${label}:`, obj);
+        return obj;
+    }
+    else {
+        const obj = args[0];
+        console.log(obj);
+        return obj;
+    }
 }
 /** 数组或 iterable 去重（可按 selector 去重），重复值保留最后出现的那个
     - selector?: 可以是 key (string) 或 (obj: any) => any */
@@ -258,6 +266,12 @@ export function delta2str(delta) {
 export function genid() {
     return Math.random() * 2 ** 53;
 }
+/** 默认日期时间格式 */
+export const datetime_format = 'YYYY.MM.DD HH:mm:ss';
+/** 默认日期格式 */
+export const date_format = 'YYYY.MM.DD';
+/** 默认时间格式 */
+export const time_format = 'HH:mm:ss';
 export class Timer {
     started = new Date().getTime();
     ended;

package/utils.d.ts

@@ -10,7 +10,12 @@ export declare const not_empty: (value: any) => boolean;
 export declare const output_width = 230;
 export declare function set_inspect_options(colors?: boolean): void;
 export declare function assert(assertion: any, message?: string): never | void;
-export declare function log<T>(obj: T): T;
+/** 通过 console.log 打印对象并返回
+    @example
+    log('label', obj)
+    log(obj) */
+export declare function log<TObj>(obj: TObj): TObj;
+export declare function log<TObj>(label: string, obj: 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[];
@@ -52,6 +57,12 @@ export declare function typed_array_to_buffer(view: ArrayBufferView): Buffer;
 export declare function delta2str(delta: number): string;
 /** generate random id */
 export declare function genid(): number;
+/** 默认日期时间格式 */
+export declare const datetime_format: "YYYY.MM.DD HH:mm:ss";
+/** 默认日期格式 */
+export declare const date_format: "YYYY.MM.DD";
+/** 默认时间格式 */
+export declare const time_format: "HH:mm:ss";
 export declare class Timer {
     started: number;
     ended: number;

package/utils.js

@@ -30,9 +30,17 @@ export function assert(assertion, message) {
         throw Object.assign(new Error(`${t('断言失败')}: ${message ? `${message}: ` : ''}${inspect(assertion, { colors: false, compact: true })}`), { assertion });
     }
 }
-export function log(obj) {
-    console.log(obj);
-    return obj;
+export function log(...args) {
+    if (args.length === 2) {
+        const [label, obj] = args;
+        console.log(`${label}:`, obj);
+        return obj;
+    }
+    else {
+        const obj = args[0];
+        console.log(obj);
+        return obj;
+    }
 }
 /** 生成 0, 1, ..., n - 1 (不包括 n) 的数组，支持传入 generator 函数，通过 index 生成各个元素
     @example seq(10, i => `item-${i}`) */
@@ -176,6 +184,12 @@ export function delta2str(delta) {
 export function genid() {
     return Math.random() * 2 ** 53;
 }
+/** 默认日期时间格式 */
+export const datetime_format = 'YYYY.MM.DD HH:mm:ss';
+/** 默认日期格式 */
+export const date_format = 'YYYY.MM.DD';
+/** 默认时间格式 */
+export const time_format = 'HH:mm:ss';
 export class Timer {
     started = new Date().getTime();
     ended;