xshell 1.0.133 → 1.0.135

package/apps.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import type { Readable } from 'stream';
 import type OSS from 'ali-oss';
 import { type CallOptions } from './process.js';

package/builder.d.ts

@@ -21,7 +21,7 @@ export interface Dependency {
         devs?: string[];
     };
 }
-type DependencyId = 'react' | 'react-dom' | 'lodash' | 'jquery' | 'xterm' | 'swiper' | 'dayjs' | 'antd' | 'antd-icons' | 'vscode-oniguruma' | 'antd-plots' | 'gridstack' | 'quill' | 'monaco';
+type DependencyId = 'react' | 'react-dom' | 'lodash' | 'jquery' | 'xterm' | 'swiper' | 'dayjs' | 'antd' | 'antd-icons' | 'vscode-oniguruma' | 'antd-plots' | 'gridstack' | 'quill' | 'monaco' | 'echarts';
 export interface HtmlBuildOptions {
     title: string;
     device_viewport?: boolean;
@@ -36,9 +36,21 @@ export interface HtmlBuildOptions {
         /** 在 index.js 之后加载 */
         after?: string[];
     };
+    /** 额外需要加载的 module 脚本, 在 index.js 之前 */
+    mscripts?: string[];
     heads?: string[];
     notice?: boolean;
 }
+interface AssetOption {
+    /** 相对 fpd_root 的路径 */
+    src: string;
+    /** 默认为 {fpd_out}/ 加上 srcs 中的路径 */
+    out?: string;
+}
+type Assets = {
+    productions?: (string | AssetOption)[];
+    devs?: (string | AssetOption)[];
+};
 export interface BundlerOptions {
     dependencies?: DependencyId[];
     source_map?: boolean;
@@ -56,18 +68,16 @@ export interface BundlerOptions {
     cache_version?: string;
     single_chunk?: boolean;
     exclude_modules?: RegExp;
+    assets?: Assets;
     license?: {
         ignores?: string[];
     };
-    assets?: {
-        productions?: string[];
-        devs?: string[];
-    };
     htmls?: Record<string, HtmlBuildOptions>;
 }
 export declare class Bundler {
     name: string;
     fpd_root: string;
+    target: 'nodejs' | 'web';
     production: boolean;
     fpd_out: string;
     source_map: boolean;
@@ -75,10 +85,7 @@ export declare class Bundler {
     analyzer: boolean;
     config: Webpack.Configuration;
     htmls?: Record<string, HtmlBuildOptions>;
-    assets?: {
-        productions?: string[];
-        devs?: string[];
-    };
+    assets?: Assets;
     license?: {
         ignores?: string[];
     };
@@ -97,7 +104,9 @@ export declare class Bundler {
             - externals?: 配置外部模块
             - htmls?: 配置要生成的 html, 比如 { 'index.html', { title: '文件', ... } }
             - assets?: 项目中需要直接复制到输出目录的资源，有 productions 但无 devs 时 (是同一套)，
-                在 dev 模式下会用 productions 中的资源，如果不需要 productions 资源， devs 可以设置为 [ ]
+                在 dev 模式下会用 productions 中的资源，如果不需要 productions 资源， devs 可以设置为 [ ],
+                每一项是  string 或者 { src: '...', out: '...' }，路径相对于 fpd_root 和 fpd_out
+            - local_loaders?: `true` true 时使用项目 node_modules/ 中的 loader;  false 时使用 D:/0/ 下面的
             - commonjs2?: `false` 打包为 commonjs2 (.cjs) 的文件
             - single_chunk?: `true` 输出为单个文件，将依赖也打包到其中，不要生成多个 chunk
             - dynamic_import?: `true` 对于 await import('...') 要不要打包外部模块到输出文件中
@@ -113,7 +122,8 @@ export declare class Bundler {
     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_all(print?: boolean): Promise<void>;
+    build_all_and_close(print?: boolean): Promise<void>;
     build_htmls(print?: {
         info: boolean;
         files: boolean;
@@ -129,10 +139,7 @@ export declare class Bundler {
     copy_files({ dependencies, production, assets, fpd_root, fpd_out, print }?: {
         dependencies?: DependencyId[];
         production?: boolean;
-        assets?: {
-            productions?: string[];
-            devs?: string[];
-        };
+        assets?: Assets;
         fpd_root?: string;
         fpd_out?: string;
         print?: {
@@ -144,6 +151,6 @@ export declare class Bundler {
     resolve_config(config: {
         productions?: string[];
         devs?: string[];
-    }, production: boolean): string[];
+    } | Assets | undefined, production: boolean): (string | AssetOption)[];
 }
 export {};

package/builder.js

@@ -89,11 +89,15 @@ const dependencies = {
             devs: monaco_files.filter(fp => fp.endsWith('.js') && !fp.startsWith('basic-languages/') && !fp.startsWith('language/'))
                 .map(fp => `monaco-editor/dev/vs/${fp}.map`),
         }
+    },
+    echarts: {
+        productions: ['echarts/dist/echarts.js']
     }
 };
 export class Bundler {
     name;
     fpd_root;
+    target;
     production;
     fpd_out;
     source_map;
@@ -118,7 +122,9 @@ export class Bundler {
             - externals?: 配置外部模块
             - htmls?: 配置要生成的 html, 比如 { 'index.html', { title: '文件', ... } }
             - assets?: 项目中需要直接复制到输出目录的资源，有 productions 但无 devs 时 (是同一套)，
-                在 dev 模式下会用 productions 中的资源，如果不需要 productions 资源， devs 可以设置为 [ ]
+                在 dev 模式下会用 productions 中的资源，如果不需要 productions 资源， devs 可以设置为 [ ],
+                每一项是  string 或者 { src: '...', out: '...' }，路径相对于 fpd_root 和 fpd_out
+            - local_loaders?: `true` true 时使用项目 node_modules/ 中的 loader;  false 时使用 D:/0/ 下面的
             - commonjs2?: `false` 打包为 commonjs2 (.cjs) 的文件
             - single_chunk?: `true` 输出为单个文件，将依赖也打包到其中，不要生成多个 chunk
             - dynamic_import?: `true` 对于 await import('...') 要不要打包外部模块到输出文件中
@@ -135,6 +141,7 @@ export class Bundler {
         this.name = name;
         this.analyzer = analyzer;
         this.production = production;
+        this.target = target;
         this.fpd_root = fpd_root;
         this.fpd_out = fpd_out;
         this.source_map = source_map;
@@ -435,12 +442,25 @@ export class Bundler {
             });
         }));
     }
-    async build_and_close(print = true) {
-        await this.build(print);
-        await this.close();
+    async build_all(print = true) {
+        await Promise.all([
+            this.build(print),
+            this.copy_files({ print: { info: print, files: false } }),
+            this.target === 'web' && this.build_htmls({ info: print, files: false })
+        ]);
+    }
+    async build_all_and_close(print = true) {
+        await Promise.all([
+            (async () => {
+                await this.build(print);
+                await this.close();
+            })(),
+            this.copy_files({ print: { info: print, files: false } }),
+            this.target === 'web' && this.build_htmls({ info: print, files: false })
+        ]);
     }
     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, }]) => {
+        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, mscripts, notice = false, heads, }]) => {
             const html = '<!doctype html>\n' +
                 '<html>\n' +
                 '    <head>\n' +
@@ -450,8 +470,9 @@ export class Bundler {
                 (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() +
+                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() : '') +
+                (mscripts ? mscripts.map(fp => `        <script src='${fp}' type='module'></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' +
@@ -505,9 +526,21 @@ export class Bundler {
             ...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(async (asset) => {
+                let src, out;
+                if (typeof asset === 'string')
+                    src = out = asset;
+                else
+                    ({ src, out } = asset);
+                fcopy(`${fpd_root}${src}`, `${fpd_out}${out}`, { print: print.files });
+            }),
+            ...this.htmls ? Object.entries(this.htmls).map(async ([fp_html, { fp_icon, fp_manifest, scripts, mscripts }]) => Promise.all([
+                fp_icon,
+                fp_manifest,
+                ...(scripts?.before || []),
+                ...(scripts?.after || []),
+                ...(mscripts || [])
+            ].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 })))) : []
         ]);
     }

package/file.d.ts

@@ -1,6 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { promises as fsp, default as fs } from 'fs';
 type FileHandle = fsp.FileHandle & {
     fp: string;

package/i18n/instance.d.ts

@@ -1,9 +1,9 @@
 import { I18N } from './index.js';
 export declare let i18n: I18N;
 declare const t: (text: string, options?: {
-    [key: string]: any;
     language?: import("./index.js").Language;
     context?: string;
     count?: number;
+    [key: string]: any;
 }) => string, language: import("./index.js").Language;
 export { t, language };

package/i18n/scanner/checker.d.ts

@@ -1,3 +1,4 @@
+import { PluginItem } from '@babel/core';
 export declare let unmarkeds: any[];
 export declare function Checker({ filepath }: {
     filepath: any;

package/i18n/scanner/index.d.ts

@@ -27,7 +27,7 @@ declare const DEFAULT_CONFIG: {
     context: boolean;
     contextFallback: boolean;
     contextSeparator: string;
-    plural(language: string, ns: string, key: string, options: any /** Config */): boolean;
+    plural(language: string, ns: string, key: string, options: any /** Config */): language is "en";
     pluralFallback: boolean;
     pluralSeparator: string;
     interpolation: {

package/net.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { type Readable } from 'stream';
 import type { FormData } from 'undici';
 import type { WebSocket, CloseEvent, ErrorEvent } from 'ws';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.0.133",
+    "version": "1.0.135",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -102,7 +102,7 @@
         "tough-cookie": "^4.1.4",
         "ts-loader": "^9.5.1",
         "tslib": "^2.6.3",
-        "typescript": "^5.4.5",
+        "typescript": "^5.5.2",
         "ua-parser-js": "^2.0.0-beta.3",
         "undici": "^6.19.2",
         "vinyl": "^3.0.0",
@@ -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.6",
+        "@types/node": "^20.14.7",
         "@types/react": "^18.3.3",
         "@types/through2": "^2.0.41",
         "@types/tough-cookie": "^4.0.5",

package/path.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import { default as npath, type FormatInputPathObject } from 'path';
 export declare function to_fp(str: string): string;
 /** Normalize a string path, reducing '..' and '.' parts.

package/process.d.ts

@@ -1,6 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { type ChildProcess } from 'child_process';
 import './prototype.js';
 import { Encoding } from './file.js';

package/prototype.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 declare global {
     var my_prototype_defined: boolean;
     interface String {

package/server.d.ts

@@ -1,7 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { type Server as HttpServer, type IncomingHttpHeaders, type IncomingMessage } from 'http';
 import { type Http2SecureServer, type IncomingHttpHeaders as IncomingHttp2Headers } from 'http2';
 import type { Duplex } from 'stream';

package/toaster.browser.d.ts

@@ -5,4 +5,4 @@ export declare let toaster: {
     toast(message: string): Promise<void>;
     show(): Promise<void>;
 };
-export declare const toast: (message: string) => Promise<void>;
+export declare const toast: (typeof toaster)["toast"];

package/utils.browser.d.ts

@@ -68,7 +68,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 这种版本号 */
 export declare function vercmp(l: string, r: string): number;
 export declare function get<TReturn = any>(obj: any, keypath: string): TReturn;

package/utils.d.ts

@@ -1,7 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { Writable, Transform, type Readable, type Duplex, type TransformCallback } from 'stream';
 import util from 'util';
 import type { TimerOptions } from 'timers';
@@ -41,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 这种版本号 */
 export declare function vercmp(l: string, r: string): number;
 export declare function get<TReturn = any>(obj: any, keypath: string): TReturn;