xshell 1.0.131 → 1.0.133

package/builder.d.ts

@@ -1,6 +1,46 @@
 import Webpack from 'webpack';
 import { Lock } from './utils.js';
+/** target web 时的 npm 包依赖管理
+    有 productions 但无 devs 时，大部分情况是相同配置，因此在 dev 模式下会用 productions
+    也可以手动设置 [ ] 禁用 fallback */
+export interface Dependency {
+    /** 项目隐含的子依赖 */
+    dependencies?: string[];
+    /** 开发环境依赖的 .js 文件 */
+    devs?: string[];
+    /** 生产环境依赖的 .js 文件 */
+    productions?: string[];
+    /** 需要直接复制到输出目录的资源 */
+    assets?: {
+        productions: string[];
+        devs?: string[];
+    };
+    /** .map 代码映射 */
+    maps?: {
+        productions?: string[];
+        devs?: string[];
+    };
+}
+type DependencyId = 'react' | 'react-dom' | 'lodash' | 'jquery' | 'xterm' | 'swiper' | 'dayjs' | 'antd' | 'antd-icons' | 'vscode-oniguruma' | 'antd-plots' | 'gridstack' | 'quill' | 'monaco';
+export interface HtmlBuildOptions {
+    title: string;
+    device_viewport?: boolean;
+    /** 也会在 copy_files 中一并被复制 */
+    fp_icon?: string;
+    dependencies?: DependencyId[];
+    fp_manifest?: string;
+    /** 额外需要加载的脚本 */
+    scripts?: {
+        /** 在 index.js 之前加载 */
+        before?: string[];
+        /** 在 index.js 之后加载 */
+        after?: string[];
+    };
+    heads?: string[];
+    notice?: boolean;
+}
 export interface BundlerOptions {
+    dependencies?: DependencyId[];
     source_map?: boolean;
     production?: boolean;
     external_dayjs?: boolean;
@@ -19,12 +59,26 @@ export interface BundlerOptions {
     license?: {
         ignores?: string[];
     };
+    assets?: {
+        productions?: string[];
+        devs?: string[];
+    };
+    htmls?: Record<string, HtmlBuildOptions>;
 }
 export declare class Bundler {
     name: string;
     fpd_root: string;
-    config: Webpack.Configuration;
+    production: boolean;
+    fpd_out: string;
+    source_map: boolean;
+    dependencies: DependencyId[];
     analyzer: boolean;
+    config: Webpack.Configuration;
+    htmls?: Record<string, HtmlBuildOptions>;
+    assets?: {
+        productions?: string[];
+        devs?: string[];
+    };
     license?: {
         ignores?: string[];
     };
@@ -41,6 +95,9 @@ export declare class Bundler {
             - globals?: 全局变量定义
             - external_dayjs?: `false` 配置 dayjs 为 external 来配合 antd 使用, 减小一点体积
             - externals?: 配置外部模块
+            - htmls?: 配置要生成的 html, 比如 { 'index.html', { title: '文件', ... } }
+            - assets?: 项目中需要直接复制到输出目录的资源，有 productions 但无 devs 时 (是同一套)，
+                在 dev 模式下会用 productions 中的资源，如果不需要 productions 资源， devs 可以设置为 [ ]
             - commonjs2?: `false` 打包为 commonjs2 (.cjs) 的文件
             - single_chunk?: `true` 输出为单个文件，将依赖也打包到其中，不要生成多个 chunk
             - dynamic_import?: `true` 对于 await import('...') 要不要打包外部模块到输出文件中
@@ -53,15 +110,40 @@ export declare class Bundler {
             - production?: `true` webpack mode 设置为 'production'
             - sass?: 传入 sass 实例避免 webpack 重复加载 .cjs 版本
             - license?: 使用 license-webpack-plugin 构建 ThirdPartyNotice.txt */
-    constructor(name: string, target: 'web' | 'nodejs', fpd_root: string, fpd_out: string, fpdt_cache: string, entry: Record<string, string>, { source_map, globals, external_dayjs, externals, commonjs2, single_chunk, dynamic_import, resolve_alias, assets_stats, analyzer, dts, exclude_modules, cache_version, production, sass, license, }?: BundlerOptions);
-    /** 获取构建时 git 仓库的最新提交、分支信息 */
-    get_git_info(version?: string): Promise<{
-        version: string;
-        branch: string;
-        time: string;
-        commit: string;
-    }>;
+    constructor(name: string, target: 'web' | 'nodejs', fpd_root: string, fpd_out: string, fpdt_cache: string, entry: Record<string, string>, { source_map, globals, external_dayjs, externals, htmls, assets, commonjs2, single_chunk, dynamic_import, resolve_alias, assets_stats, analyzer, dts, exclude_modules, cache_version, production, sass, dependencies, license, }?: BundlerOptions);
     build(print?: boolean): Promise<void>;
     close(): Promise<void>;
     build_and_close(print?: boolean): Promise<void>;
+    build_htmls(print?: {
+        info: boolean;
+        files: boolean;
+    }): Promise<void>;
+    resolve_dependencies(dependency_ids?: DependencyId[], resolveds?: Set<DependencyId>): Set<DependencyId>;
+    /** 解析依赖的文件
+        - dependencies: 依赖 id
+        - assets: false 时只包括在 script 标签加载的文件;  true 时包括 assets, maps 等 */
+    resolve_dependency_files(_dependencies: DependencyId[], assets: boolean, { production, source_map }?: {
+        production?: boolean;
+        source_map?: boolean;
+    }): string[];
+    copy_files({ dependencies, production, assets, fpd_root, fpd_out, print }?: {
+        dependencies?: DependencyId[];
+        production?: boolean;
+        assets?: {
+            productions?: string[];
+            devs?: string[];
+        };
+        fpd_root?: string;
+        fpd_out?: string;
+        print?: {
+            info: boolean;
+            files: boolean;
+        };
+    }): Promise<void>;
+    /** 为空时返回空数组 */
+    resolve_config(config: {
+        productions?: string[];
+        devs?: string[];
+    }, production: boolean): string[];
 }
+export {};

package/builder.js

@@ -1,12 +1,107 @@
 import { fileURLToPath } from 'url';
 import Webpack from 'webpack';
-import { Lock, Timer, filter_values } from './utils.js';
-import { Git } from './git.js';
+import { noprint } from './process.js';
+import { Lock, Timer, assert, filter_values, not_empty } from './utils.js';
+import { fcopy, fmkdir, fwrite } from './file.js';
+import { path } from './path.js';
+const monaco_files = [
+    'loader.js',
+    'editor/editor.main.js',
+    'editor/editor.main.css',
+    'editor/editor.main.nls.js',
+    'editor/editor.main.nls.zh-cn.js',
+    'base/common/worker/simpleWorker.nls.js',
+    'base/worker/workerMain.js',
+    'base/browser/ui/codicons/codicon/codicon.ttf',
+    ...['python', 'javascript', 'typescript', 'css', 'html', 'cpp', 'sql', 'scss', 'shell'].map(language => `basic-languages/${language}/${language}.js`),
+];
+const dependencies = {
+    react: {
+        productions: ['react/umd/react.production.min.js'],
+        devs: ['react/umd/react.development.js'],
+    },
+    'react-dom': {
+        dependencies: ['react'],
+        productions: ['react-dom/umd/react-dom.production.min.js'],
+        devs: ['react-dom/umd/react-dom.development.js'],
+    },
+    lodash: {
+        productions: ['lodash/lodash.min.js'],
+        devs: ['lodash/lodash.js'],
+    },
+    jquery: {
+        productions: ['jquery/dist/jquery.min.js']
+    },
+    xterm: {
+        productions: ['@xterm/xterm/lib/xterm.js'],
+        maps: {
+            productions: ['@xterm/xterm/lib/xterm.js.map'],
+        }
+    },
+    swiper: {
+        productions: ['swiper/swiper-bundle.min.js']
+    },
+    dayjs: {
+        productions: ['dayjs/dayjs.min.js'],
+    },
+    antd: {
+        dependencies: ['dayjs', 'react', 'react-dom'],
+        productions: ['antd/dist/antd.min.js'],
+        devs: ['antd/dist/antd.js'],
+        maps: {
+            productions: ['antd/dist/antd.min.js.map'],
+            devs: ['antd/dist/antd.js.map'],
+        }
+    },
+    'antd-icons': {
+        dependencies: ['antd'],
+        productions: ['@ant-design/icons/dist/index.umd.min.js'],
+        devs: ['@ant-design/icons/dist/index.umd.js']
+    },
+    'vscode-oniguruma': {
+        assets: {
+            productions: ['vscode-oniguruma/release/onig.wasm']
+        }
+    },
+    'antd-plots': {
+        productions: ['@ant-design/plots/dist/plots.min.js'],
+        maps: {
+            productions: ['@ant-design/plots/dist/plots.min.js.map']
+        }
+    },
+    gridstack: {
+        productions: ['gridstack/dist/gridstack-all.js'],
+        maps: {
+            productions: ['gridstack/dist/gridstack-all.js.map']
+        }
+    },
+    quill: {
+        productions: ['react-quill/dist/react-quill.js']
+    },
+    monaco: {
+        assets: {
+            productions: monaco_files.map(fp => `monaco-editor/min/vs/${fp}`),
+            devs: monaco_files.map(fp => `monaco-editor/dev/vs/${fp}`)
+        },
+        maps: {
+            productions: monaco_files.filter(fp => fp.endsWith('.js') && !fp.startsWith('basic-languages/') && !fp.startsWith('language/'))
+                .map(fp => `monaco-editor/min-maps/vs/${fp}.map`),
+            devs: monaco_files.filter(fp => fp.endsWith('.js') && !fp.startsWith('basic-languages/') && !fp.startsWith('language/'))
+                .map(fp => `monaco-editor/dev/vs/${fp}.map`),
+        }
+    }
+};
 export class Bundler {
     name;
     fpd_root;
-    config;
+    production;
+    fpd_out;
+    source_map;
+    dependencies = [];
     analyzer;
+    config;
+    htmls;
+    assets;
     license;
     lcompiler;
     /** 通过 webpack 从入口文件打包所有依赖生成单个 index.{mjs,cjs} 文件
@@ -21,6 +116,9 @@ export class Bundler {
             - globals?: 全局变量定义
             - external_dayjs?: `false` 配置 dayjs 为 external 来配合 antd 使用, 减小一点体积
             - externals?: 配置外部模块
+            - htmls?: 配置要生成的 html, 比如 { 'index.html', { title: '文件', ... } }
+            - assets?: 项目中需要直接复制到输出目录的资源，有 productions 但无 devs 时 (是同一套)，
+                在 dev 模式下会用 productions 中的资源，如果不需要 productions 资源， devs 可以设置为 [ ]
             - commonjs2?: `false` 打包为 commonjs2 (.cjs) 的文件
             - single_chunk?: `true` 输出为单个文件，将依赖也打包到其中，不要生成多个 chunk
             - dynamic_import?: `true` 对于 await import('...') 要不要打包外部模块到输出文件中
@@ -33,9 +131,19 @@ export class Bundler {
             - production?: `true` webpack mode 设置为 'production'
             - sass?: 传入 sass 实例避免 webpack 重复加载 .cjs 版本
             - license?: 使用 license-webpack-plugin 构建 ThirdPartyNotice.txt */
-    constructor(name, target, fpd_root, fpd_out, fpdt_cache, entry, { source_map = true, globals, external_dayjs = false, externals, commonjs2 = false, single_chunk = true, dynamic_import = true, resolve_alias, assets_stats = true, analyzer = false, dts = false, exclude_modules, cache_version, production = true, sass, license, } = {}) {
+    constructor(name, target, fpd_root, fpd_out, fpdt_cache, entry, { source_map = true, globals, external_dayjs = false, externals, htmls, assets, commonjs2 = false, single_chunk = true, dynamic_import = true, resolve_alias, assets_stats = true, analyzer = false, dts = false, exclude_modules, cache_version, production = true, sass, dependencies, license, } = {}) {
         this.name = name;
         this.analyzer = analyzer;
+        this.production = production;
+        this.fpd_root = fpd_root;
+        this.fpd_out = fpd_out;
+        this.source_map = source_map;
+        this.htmls = htmls;
+        this.assets = assets;
+        if (dependencies) {
+            assert(target === 'web');
+            this.dependencies = dependencies;
+        }
         this.license = license;
         // let smp = new SpeedMeasurePlugin()
         // const config: Webpack.Configuration = smp.wrap({
@@ -262,21 +370,6 @@ export class Bundler {
             }
         };
     }
-    /** 获取构建时 git 仓库的最新提交、分支信息 */
-    async get_git_info(version) {
-        let git = new Git(this.fpd_root);
-        const branch = await git.get_branch();
-        const { hash, time } = (await git.get_last_commits(1))[0];
-        version ||= branch;
-        const timestr = time.to_formal_str();
-        const commit = hash.slice(0, 6);
-        return {
-            version: version,
-            branch,
-            time: timestr,
-            commit
-        };
-    }
     async build(print = true) {
         let timer = new Timer();
         if (!this.lcompiler) {
@@ -346,5 +439,84 @@ export class Bundler {
         await this.build(print);
         await this.close();
     }
+    async build_htmls(print = { info: true, files: false }) {
+        await Promise.all(Object.entries(this.htmls).map(async ([fp_html, { device_viewport: device_width = false, fp_icon, fp_manifest, dependencies: _dependencies = this.dependencies, title, scripts, notice = false, heads, }]) => {
+            const html = '<!doctype html>\n' +
+                '<html>\n' +
+                '    <head>\n' +
+                `        <title>${title}</title>\n` +
+                "        <meta charset='utf-8' />\n" +
+                (heads ? heads.map(head => `        ${head}`).join_lines() : '') +
+                (device_width ? "        <meta name='viewport' content='width=device-width, initial-scale=1.0' />\n" : '') +
+                (fp_icon ? `        <link rel='icon' href='${fp_icon}' />\n` : '') +
+                (fp_manifest ? `        <link rel='manifest' href='${fp_manifest}' />\n` : '') +
+                this.resolve_dependency_files(_dependencies, false, { production: this.production }).map(fp => `        <script src='/vendors/${fp}' defer></script>`).join_lines() +
+                (scripts?.before ? scripts.before.map(fp => `        <script src='${fp}' defer></script>`).join_lines() : '') +
+                "        <script src='./index.js' type='module'></script>\n" +
+                (scripts?.after ? scripts.after.map(fp => `        <script src='${fp}' defer></script>`).join_lines() : '') +
+                '    </head>\n' +
+                '    <body>\n' +
+                "        <div class='root'>\n" +
+                (notice ?
+                    '            <h2>正在加载 ··· (最多需要十秒钟)</h2>\n' +
+                        '            <h2>如果一直停留在此页面请按 f12 或右键 > 检查，打开开发者工具查看底部控制台报错，并尝试更换浏览器或将浏览器更新到最新版本，同时检查网络连接情况</h2>\n'
+                    : '') +
+                '        </div>\n' +
+                '    </body>\n' +
+                '</html>\n';
+            await fwrite(`${this.fpd_out}${fp_html}`, html, noprint);
+            if (print.files)
+                console.log(`已构建 ${fp_html}`);
+        }));
+        if (print.info)
+            console.log('htmls 已构建完成');
+    }
+    resolve_dependencies(dependency_ids = this.dependencies, resolveds = new Set()) {
+        dependency_ids.forEach(id => {
+            if (!resolveds.has(id)) {
+                const dependency_ids_ = dependencies[id].dependencies;
+                if (dependency_ids_)
+                    this.resolve_dependencies(dependency_ids_, resolveds);
+                resolveds.add(id);
+            }
+        });
+        return resolveds;
+    }
+    /** 解析依赖的文件
+        - dependencies: 依赖 id
+        - assets: false 时只包括在 script 标签加载的文件;  true 时包括 assets, maps 等 */
+    resolve_dependency_files(_dependencies, assets, { production = this.production, source_map = this.source_map } = {}) {
+        return this.resolve_dependencies(_dependencies).map(id => {
+            const dependency = dependencies[id];
+            const { assets: _assets, maps } = dependency;
+            return [
+                ...assets ? this.resolve_config(_assets, production) : [],
+                ...assets && source_map ? this.resolve_config(maps, production) : [],
+                ...this.resolve_config(dependency, production)
+            ];
+        }).flat();
+    }
+    async copy_files({ dependencies = this.dependencies, production = this.production, assets = this.assets, fpd_root = this.fpd_root, fpd_out = this.fpd_out, print = { info: true, files: false } } = {}) {
+        if (print.info)
+            console.log(`复制项目文件及依赖到输出目录`);
+        if (dependencies)
+            await fmkdir(`${fpd_out}vendors/`, { print: false });
+        await Promise.all([
+            ...this.resolve_dependency_files(dependencies, true, { production })
+                .map(async (fp) => fcopy(`${fpd_root}node_modules/${fp}`, `${fpd_out}vendors/${fp}`, { print: print.files })),
+            ...this.resolve_config(assets, production)
+                .map(async (fp) => fcopy(`${fpd_root}${fp}`, `${fpd_out}${fp}`, { print: print.files })),
+            ...this.htmls ? Object.entries(this.htmls).map(async ([fp_html, { fp_icon, fp_manifest, scripts }]) => Promise.all([fp_icon, fp_manifest, ...(scripts?.before || []), ...(scripts?.after || [])]
+                .filter(not_empty)
+                .map(fp => fcopy(path.resolve(`${fpd_root}${fp_html}`.fdir, fp), path.resolve(`${fpd_out}${fp_html}`.fdir, fp), { print: print.files })))) : []
+        ]);
+    }
+    /** 为空时返回空数组 */
+    resolve_config(config, production) {
+        return config
+            ? (production ? config.productions : config.devs || config.productions) ||
+                []
+            : [];
+    }
 }
 //# sourceMappingURL=builder.js.map

package/file.d.ts

@@ -42,6 +42,7 @@ export declare function fread(fp: string, { dir, encoding, print }?: {
     encoding?: Encoding;
     print?: boolean;
 }): Promise<string>;
+/** 读取文件，划分为行，并去掉最后一个 \n 之后的 '' */
 export declare function fread_lines(fp: string, options?: {
     dir?: string;
     encoding?: Encoding;

package/file.js

@@ -49,6 +49,7 @@ export async function fread(fp, { dir, encoding = 'utf-8', print = true } = {})
                 .decode(await fsp.readFile(fp));
     }
 }
+/** 读取文件，划分为行，并去掉最后一个 \n 之后的 '' */
 export async function fread_lines(fp, options = {}) {
     return (await fread(fp, options))
         .split_lines();

package/git.d.ts

@@ -5,9 +5,10 @@ export declare class Git {
     constructor(cwd: string);
     static init(cwd: string, print?: boolean): Promise<Git>;
     static clone(repo: string, fpd: string): Promise<void>;
-    call(args?: any[], { color, print }?: {
+    call(args?: any[], { color, print, printers }?: {
         color?: boolean;
         print?: CallOptions['print'];
+        printers?: CallOptions['printers'];
     }): Promise<import("./process.js").CallResult<string>>;
     get_branch(): Promise<string>;
     /** - print: `true` */
@@ -33,4 +34,20 @@ export declare class Git {
     checkout(branch?: 'main'): Promise<void>;
     checkout(branch?: string): Promise<void>;
     _checkout(branch?: string): Promise<void>;
+    get_version_info(version?: string): Promise<{
+        version: string;
+        branch: string;
+        time: string;
+        hash: string;
+        commiter: string;
+        message: string;
+    }>;
+}
+export interface GitVersionInfo {
+    version: string;
+    branch: string;
+    time: string;
+    hash: string;
+    commiter: string;
+    message: string;
 }

package/git.js

@@ -1,4 +1,4 @@
-import { call } from './process.js';
+import { call, print_no_command } from './process.js';
 import { fread, fmkdir } from './file.js';
 export class Git {
     static exe = 'git';
@@ -15,7 +15,7 @@ export class Git {
         await fmkdir(fpd);
         await new this(fpd).call(['clone', repo, '.']);
     }
-    async call(args = [], { color = true, print } = {}) {
+    async call(args = [], { color = true, print, printers } = {}) {
         return call(Git.exe, [
             ...color ? [] : [
                 '-c', 'color.status=false',
@@ -26,6 +26,7 @@ export class Git {
         ], {
             cwd: this.cwd,
             print,
+            printers
         });
     }
     async get_branch() {
@@ -93,32 +94,26 @@ export class Git {
                 await this._checkout(branch);
             else {
                 console.log(`创建分支 ${branch}`);
-                await this.call(['checkout', '-b', branch], { print: { command: false, code: false, stdout: true, stderr: true } });
+                await this.call(['checkout', '-b', branch], print_no_command);
             }
         }
     }
     async _checkout(branch) {
-        try {
-            const { stdout, stderr } = await this.call(['checkout', branch], { print: false });
-            if (stdout)
-                console.log(stdout.trimEnd());
-            console.log(/Already on '.*'\n/.test(stderr) ?
-                `已经在 ${branch} 分支了`
-                : /Switched to branch '.*'/.test(stderr) ?
-                    `已切换到 ${branch} 分支`
-                    :
-                        stderr.trimEnd());
-        }
-        catch (error) {
-            if (error.result) {
-                const { stdout, stderr } = error.result;
-                if (stdout)
-                    console.log(stdout);
-                if (stderr)
-                    console.log(stderr);
-            }
-            throw error;
-        }
+        await this.call(['checkout', branch], print_no_command);
+    }
+    async get_version_info(version) {
+        const branch = await this.get_branch();
+        const { hash, time, commiter, message } = (await this.get_last_commits(1))[0];
+        version ||= branch;
+        const timestr = time.to_formal_str();
+        return {
+            version,
+            branch,
+            time: timestr,
+            hash: hash.slice(0, 6),
+            commiter,
+            message
+        };
     }
 }
 //# sourceMappingURL=git.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.0.131",
+    "version": "1.0.133",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -56,9 +56,9 @@
         "@svgr/webpack": "^8.1.0",
         "@types/sass-loader": "^8.0.8",
         "@types/ws": "^8.5.10",
-        "@typescript-eslint/eslint-plugin": "^7.13.0",
-        "@typescript-eslint/parser": "^7.13.0",
-        "@typescript-eslint/utils": "^7.13.0",
+        "@typescript-eslint/eslint-plugin": "^7.13.1",
+        "@typescript-eslint/parser": "^7.13.1",
+        "@typescript-eslint/utils": "^7.13.1",
         "@xterm/addon-fit": "^0.10.0",
         "@xterm/addon-web-links": "^0.11.0",
         "@xterm/addon-webgl": "^0.18.0",
@@ -74,14 +74,14 @@
         "commander": "^12.1.0",
         "css-loader": "^7.1.2",
         "emoji-regex": "^10.3.0",
-        "eslint": "^9.4.0",
+        "eslint": "^9.5.0",
         "eslint-plugin-import": "^2.29.1",
-        "eslint-plugin-react": "^7.34.2",
+        "eslint-plugin-react": "^7.34.3",
         "gulp-sort": "^2.0.0",
         "hash-string": "^1.0.0",
         "https-proxy-agent": "^7.0.4",
         "i18next": "^23.11.5",
-        "i18next-scanner": "^4.4.0",
+        "i18next-scanner": "^4.5.0",
         "koa": "^2.15.3",
         "koa-compress": "^5.1.1",
         "license-webpack-plugin": "^4.0.2",
@@ -93,7 +93,7 @@
         "react-i18next": "^14.1.2",
         "react-object-model": "^1.2.6",
         "resolve-path": "^1.4.0",
-        "sass": "^1.77.5",
+        "sass": "^1.77.6",
         "sass-loader": "^14.2.1",
         "source-map-loader": "^5.0.0",
         "strip-ansi": "^7.1.0",
@@ -104,12 +104,12 @@
         "tslib": "^2.6.3",
         "typescript": "^5.4.5",
         "ua-parser-js": "^2.0.0-beta.3",
-        "undici": "^6.18.2",
+        "undici": "^6.19.2",
         "vinyl": "^3.0.0",
         "vinyl-fs": "^4.0.0",
-        "webpack": "^5.92.0",
+        "webpack": "^5.92.1",
         "webpack-bundle-analyzer": "^4.10.2",
-        "ws": "^8.17.0"
+        "ws": "^8.17.1"
     },
     "devDependencies": {
         "@babel/types": "^7.24.7",
@@ -125,7 +125,7 @@
         "@types/koa-compress": "^4.0.6",
         "@types/lodash": "^4.17.5",
         "@types/mime-types": "^2.1.4",
-        "@types/node": "^20.14.2",
+        "@types/node": "^20.14.6",
         "@types/react": "^18.3.3",
         "@types/through2": "^2.0.41",
         "@types/tough-cookie": "^4.0.5",

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/polyfill.browser.d.ts

@@ -0,0 +1 @@
+export {};

package/polyfill.browser.js

@@ -0,0 +1,40 @@
+if (!Promise.withResolvers)
+    Promise.withResolvers = function PromiseWithResolvers() {
+        let resolve, reject;
+        let promise = new Promise((_resolve, _reject) => {
+            resolve = _resolve;
+            reject = _reject;
+        });
+        return { promise, resolve, reject };
+    };
+if (!Array.prototype.toReversed)
+    Object.defineProperty(Array.prototype, 'toReversed', {
+        configurable: true,
+        writable: true,
+        enumerable: false,
+        value: function toReversed() {
+            return [...this].reverse();
+        }
+    });
+if (!Array.prototype.toSpliced)
+    Object.defineProperty(Array.prototype, 'toSpliced', {
+        configurable: true,
+        writable: true,
+        enumerable: false,
+        value: function toSpliced(...args) {
+            const copy = [...this];
+            copy.splice(...args);
+            return copy;
+        }
+    });
+if (!Array.prototype.at)
+    Object.defineProperty(Array.prototype, 'at', {
+        configurable: true,
+        writable: true,
+        enumerable: false,
+        value: function at(index) {
+            return index >= 0 ? this[index] : this[index + this.length];
+        }
+    });
+export {};
+//# sourceMappingURL=polyfill.browser.js.map

package/process.d.ts

@@ -11,6 +11,14 @@ export declare const username: string;
 export declare const noprint: {
     readonly print: false;
 };
+export declare const print_no_command: {
+    readonly print: {
+        readonly command: false;
+        readonly code: false;
+        readonly stdout: true;
+        readonly stderr: true;
+    };
+};
 interface StartOptions {
     /** `继承当前工作目录 process.cwd()` 子进程的工作目录  `inherit the cwd` cwd of the child process. */
     cwd?: string;
@@ -57,6 +65,10 @@ export declare function start_nodejs(js: string, args?: string[], options?: Star
 export interface CallOptions extends StartOptions {
     throw_code?: boolean;
     input?: string;
+    printers?: {
+        stdout?: (chunk: string) => void;
+        stderr?: (chunk: string) => void;
+    };
 }
 export interface CallResult<TOutput extends string | Buffer = string> {
     pid: number;
@@ -109,7 +121,9 @@ export interface CallNodeJsOptions extends CallOptions {
         - print?: `true` print 选项，支持设置细项  print option (with details)
         - stdio?: `'pipe'` 设置为 'ignore' 时忽略 stdio 处理  when 'ignore' then ignore stdio processing
         - detached?: `false` 是否断开和 child 的关系 (ignore stdio, unref)  whether to break the connection with child (ignore stdio, unref)
-        - throw_code?: `true` code 不为 0 时是否抛出异常  whether to throw Error when code is not 0 */
+        - throw_code?: `true` code 不为 0 时是否抛出异常
+        - inspect?: nodejs debugger port
+        - break?: break at first line */
 export declare function call_nodejs(js: string, args?: string[], { inspect, break: _break, ...options }?: CallNodeJsOptions): Promise<CallResult<string>>;
 export interface TermOptions {
     /** `process.cwd()` */

package/process.js

@@ -7,6 +7,7 @@ export const exe_nodejs = process.execPath.fp;
 export const platform = os.platform();
 export const username = os.userInfo().username;
 export const noprint = { print: false };
+export const print_no_command = { print: { command: false, code: false, stdout: true, stderr: true } };
 /** start process
     - exe: .exe 路径或文件名 (建议使用完整路径，跳过 path 搜索，性能更高)  path or filename (full path is recommanded to skip path searching for better perf)
     - args: `[]` 参数列表  arguments list
@@ -86,7 +87,7 @@ export async function start_nodejs(js, args = [], options) {
     return start(exe_nodejs, [js, ...args], options);
 }
 export async function call(exe, args = [], options = {}) {
-    const { encoding = 'utf-8', throw_code = true, input, } = options;
+    const { encoding = 'utf-8', throw_code = true, input, printers } = options;
     let { stdio = 'pipe', print = true } = options;
     if (typeof print === 'boolean')
         print = {
@@ -126,7 +127,10 @@ export async function call(exe, args = [], options = {}) {
             if (stdio[1] === 'pipe')
                 for await (const chunk of child.stdout) {
                     if (encoding !== 'binary' && print.stdout)
-                        process.stdout.write(chunk);
+                        if (printers?.stdout)
+                            printers.stdout(chunk);
+                        else
+                            process.stdout.write(chunk);
                     stdouts.push(chunk);
                 }
         })(),
@@ -134,7 +138,10 @@ export async function call(exe, args = [], options = {}) {
             if (stdio[2] === 'pipe')
                 for await (const chunk of child.stderr) {
                     if (encoding !== 'binary' && print.stderr)
-                        process.stderr.write(chunk);
+                        if (printers?.stderr)
+                            printers.stderr(chunk);
+                        else
+                            process.stderr.write(chunk);
                     stderrs.push(chunk);
                 }
         })()
@@ -176,7 +183,9 @@ export async function call(exe, args = [], options = {}) {
         - print?: `true` print 选项，支持设置细项  print option (with details)
         - stdio?: `'pipe'` 设置为 'ignore' 时忽略 stdio 处理  when 'ignore' then ignore stdio processing
         - detached?: `false` 是否断开和 child 的关系 (ignore stdio, unref)  whether to break the connection with child (ignore stdio, unref)
-        - throw_code?: `true` code 不为 0 时是否抛出异常  whether to throw Error when code is not 0 */
+        - throw_code?: `true` code 不为 0 时是否抛出异常
+        - inspect?: nodejs debugger port
+        - break?: break at first line */
 export async function call_nodejs(js, args = [], { inspect, break: _break, ...options } = {}) {
     return call(exe_nodejs, [
         ...inspect ? [`--inspect${_break ? '-brk' : ''}=localhost:${inspect}`] : [],

package/prototype.browser.d.ts

@@ -53,6 +53,8 @@ declare global {
             }
             ```
             
+            为空时返回 { }
+            
             - preservations?: `''` 保留的正则表达式字符
             - flags?: `''` 正则匹配选项
             - pattern_placeholder?: `/\{.*?\}/g`
@@ -147,6 +149,9 @@ declare global {
     interface Error {
         toJSON(this: Error): string;
     }
+    interface Set<T> {
+        map<TResult>(mapfn: (value: T, index: number) => TResult): TResult[];
+    }
 }
 export declare const emoji_regex: RegExp;
 export declare function to_method_property_descriptors(methods: {

package/prototype.browser.js

@@ -454,6 +454,11 @@ Object.defineProperties(Error.prototype, to_method_property_descriptors({
             .map(name => [name, this[name]]));
     }
 }));
+Object.defineProperties(Set.prototype, to_method_property_descriptors({
+    map(mapfn) {
+        return Array.from(this, mapfn);
+    }
+}));
 export function to_json(obj, replacer) {
     return JSON.stringify(obj, replacer, 4) + '\n';
 }

package/prototype.d.ts

@@ -54,6 +54,8 @@ declare global {
             }
             ```
             
+            为空时返回 { }
+            
             - preservations?: `''` 保留的正则表达式字符
             - flags?: `''` 正则匹配选项
             - pattern_placeholder?: `/\{.*?\}/g` */
@@ -178,6 +180,9 @@ declare global {
     interface Error {
         toJSON(this: Error): string;
     }
+    interface Set<T> {
+        map<TResult>(mapfn: (value: T, index: number) => TResult): TResult[];
+    }
 }
 import chalk from 'chalk';
 export declare const emoji_regex: RegExp;

package/prototype.js

@@ -507,6 +507,11 @@ if (!globalThis.my_prototype_defined) {
                 .map(name => [name, this[name]]));
         }
     }));
+    Object.defineProperties(Set.prototype, to_method_property_descriptors({
+        map(mapfn) {
+            return Array.from(this, mapfn);
+        }
+    }));
 }
 export function to_json(obj, replacer) {
     return JSON.stringify(obj, replacer, 4) + '\n';

package/utils.browser.d.ts

@@ -3,6 +3,9 @@ export declare const noop: () => void;
 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;
+/** 数组或 iterable 去重（可按 selector 去重），重复值保留最后出现的那个
+    - selector?: 可以是 key (string) 或 (obj: any) => any */
+export declare function unique<TObj>(iterable: TObj[] | Iterable<TObj>, selector?: string | ((obj: TObj) => any)): 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[];

package/utils.browser.js

@@ -12,6 +12,17 @@ export function log(obj) {
     console.log(obj);
     return obj;
 }
+/** 数组或 iterable 去重（可按 selector 去重），重复值保留最后出现的那个
+    - selector?: 可以是 key (string) 或 (obj: any) => any */
+export function unique(iterable, selector) {
+    if (!selector)
+        return [...new Set(iterable)];
+    let map = new Map();
+    const is_str_selector = typeof selector === 'string';
+    for (const x of iterable)
+        map.set(is_str_selector ? x[selector] : selector(x), x);
+    return [...map.values()];
+}
 /** 生成 0, 1, ..., n - 1 (不包括 n) 的数组，支持传入 generator 函数，通过 index 生成各个元素
     @example seq(10, i => `item-${i}`) */
 export function seq(n, generator) {
@@ -216,12 +227,16 @@ export function concat(arrays) {
 export function delta2str(delta) {
     if (delta < 1)
         return '0 ms';
-    // [1, 1000) ms
-    if (delta < 1000)
+    // [1, 100) ms
+    if (delta < 100)
         return `${delta.toFixed(0)} ms`;
-    // 1.1 s
-    if (1000 <= delta && delta < 1000 * 60)
+    // [100, 1000) ms
+    // 0.8 s
+    if (delta <= 950)
         return `${(delta / 1000).toFixed(1)} s`;
+    // 3 s
+    if (delta < 1000 * 60)
+        return `${(delta / 1000).toFixed()} s`;
     // 1 min 12 s [1 min 0s, 60 min)
     const seconds = Math.trunc(delta / 1000);
     if (seconds < 60 * 60)

package/utils.js

@@ -150,12 +150,16 @@ export function typed_array_to_buffer(view) {
 export function delta2str(delta) {
     if (delta < 1)
         return '0 ms';
-    // [1, 1000) ms
-    if (delta < 1000)
+    // [1, 100) ms
+    if (delta < 100)
         return `${delta.toFixed(0)} ms`;
-    // 1.1 s
-    if (1000 <= delta && delta < 1000 * 60)
+    // [100, 1000) ms
+    // 0.8 s
+    if (delta <= 950)
         return `${(delta / 1000).toFixed(1)} s`;
+    // 3 s
+    if (delta < 1000 * 60)
+        return `${(delta / 1000).toFixed()} s`;
     // 1 min 12 s [1 min 0s, 60 min)
     const seconds = Math.trunc(delta / 1000);
     if (seconds < 60 * 60)