xshell 1.0.154 → 1.0.155

package/Terminal.js

@@ -6,7 +6,7 @@ import { FitAddon } from '@xterm/addon-fit';
 import { WebglAddon } from '@xterm/addon-webgl';
 import { WebLinksAddon } from '@xterm/addon-web-links';
 // 没有 ui
-// import { SearchAddon } from 'xterm-addon-search'
+// import { SearchAddon } from '@xterm/addon-search'
 import { Model } from 'react-object-model';
 import { assert, genid } from './utils.browser.js';
 export function Terminal({ font }) {

package/builder.js

@@ -410,6 +410,10 @@ export class Bundler {
                     'ahooks',
                     'size-sensor',
                     'client-only',
+                    'only',
+                    'koa-compose',
+                    'cache-content-type',
+                    'isarray',
                     ...this.license.ignores || []
                 ]);
                 this.config.plugins.push(new LicenseWebpackPlugin({

package/file.d.ts

@@ -114,6 +114,11 @@ export declare function fdelete(fp: string, { print }?: {
 export declare function fdclear(fpd: string, { print }?: {
     print?: boolean;
 }): Promise<void>;
+export interface FCopyOptions {
+    print?: boolean;
+    overwrite?: boolean;
+    filter?: (fp: string) => true | false | 'filter';
+}
 /** 复制文件或文件夹
     会在因不存在父文件夹导致复制失败时，自动创建父文件夹，并再次尝试复制
     最好预先创建父文件夹，减少文件系统操作，提升性能
@@ -122,15 +127,15 @@ export declare function fdclear(fpd: string, { print }?: {
     - options?:
         - print?: `true`
         - overwrite?: `true`
-        - filter?: 当 fp_src 为文件夹时选择性复制里面的部分内容，和 flist 的 filter 选项一样，但只支持文件夹中第一层的文件
+        - filter?: 当 fp_src 为文件夹时选择性复制里面的部分内容，
+            和 flist 的 filter 选项不同，只支持函数，且函数返回值决定是否要继续进行过滤
+            - true: 复制文件夹的所有文件，交给 fsp.cp
+            - false 或不返回任何值: 不复制
+            - 'partial': 进一步进行过滤复制（先 flist with filter 再 fcopy），只有文件夹能返回这个值
         
     @example
     fcopy('D:/temp/camera/', 'D:/camera/') */
-export declare function fcopy(fp_src: string, fp_dst: string, { print, overwrite, filter, }?: {
-    print?: boolean;
-    overwrite?: boolean;
-    filter?: FListOptions['filter'];
-}): Promise<void>;
+export declare function fcopy(fp_src: string, fp_dst: string, { print, overwrite, filter, }?: FCopyOptions): Promise<void>;
 /** 移动文件或文件夹
     相同分区 / 文件系统下使用 rename, 否则 fallback 到复制后删除源文件
     - src: 源 文件/文件夹 完整路径

package/file.js

@@ -238,7 +238,11 @@ export async function fdclear(fpd, { print = true } = {}) {
     - options?:
         - print?: `true`
         - overwrite?: `true`
-        - filter?: 当 fp_src 为文件夹时选择性复制里面的部分内容，和 flist 的 filter 选项一样，但只支持文件夹中第一层的文件
+        - filter?: 当 fp_src 为文件夹时选择性复制里面的部分内容，
+            和 flist 的 filter 选项不同，只支持函数，且函数返回值决定是否要继续进行过滤
+            - true: 复制文件夹的所有文件，交给 fsp.cp
+            - false 或不返回任何值: 不复制
+            - 'partial': 进一步进行过滤复制（先 flist with filter 再 fcopy），只有文件夹能返回这个值
         
     @example
     fcopy('D:/temp/camera/', 'D:/camera/') */
@@ -254,7 +258,13 @@ export async function fcopy(fp_src, fp_dst, { print = true, overwrite = true, fi
         if (filter) {
             await fmkdir(fp_dst, { print });
             await Promise.all((await flist(fp_src, { filter, print: false }))
-                .map(async (fname) => fcopy(fp_src + fname, fp_dst + fname, { print, overwrite })));
+                .map(async (fname) => fcopy(`${fp_src}${fname}`, `${fp_dst}${fname}`, {
+                print,
+                overwrite,
+                ...fname.isdir && filter(fname) === 'filter' ? {
+                    filter: fp => filter(`${fname}${fp}`),
+                } : {}
+            })));
         }
         else
             await fsp.cp(fp_src, fp_dst, {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.0.154",
+    "version": "1.0.155",
     "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.1",
-        "@typescript-eslint/parser": "^7.13.1",
-        "@typescript-eslint/utils": "^7.13.1",
+        "@typescript-eslint/eslint-plugin": "^7.14.1",
+        "@typescript-eslint/parser": "^7.14.1",
+        "@typescript-eslint/utils": "^7.14.1",
         "@xterm/addon-fit": "^0.10.0",
         "@xterm/addon-web-links": "^0.11.0",
         "@xterm/addon-webgl": "^0.18.0",
@@ -123,9 +123,9 @@
         "@types/gulp-sort": "^2.0.4",
         "@types/koa": "^2.15.0",
         "@types/koa-compress": "^4.0.6",
-        "@types/lodash": "^4.17.5",
+        "@types/lodash": "^4.17.6",
         "@types/mime-types": "^2.1.4",
-        "@types/node": "^20.14.8",
+        "@types/node": "^20.14.9",
         "@types/react": "^18.3.3",
         "@types/through2": "^2.0.41",
         "@types/tough-cookie": "^4.0.5",

package/process.js

@@ -188,6 +188,7 @@ export async function call(exe, args = [], options = {}) {
         - break?: break at first line */
 export async function call_nodejs(js, args = [], { inspect, break: _break, ...options } = {}) {
     return call(exe_nodejs, [
+        '--enable-source-maps',
         ...inspect ? [`--inspect${_break ? '-brk' : ''}=localhost:${inspect}`] : [],
         js,
         ...args
@@ -215,6 +216,7 @@ 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 } = {}) {
     return term(exe_nodejs, [
+        '--enable-source-maps',
         ...trace_warnings ? ['--trace-warnings'] : [],
         ...resolve ? ['--experimental-specifier-resolution=node'] : [],
         ...title ? [`--title=${title}`] : [],

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

@@ -37,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;