xshell 1.2.48 → 1.2.50

package/utils.browser.js

@@ -1,4 +1,4 @@
-import { is_key_type, build_mapper, not_empty, ident } from "./prototype.browser.js";
+import { is_key_type, select, not_empty, ident } from "./prototype.browser.js";
 import { t } from "./i18n/instance.js";
 export function assert(assertion, message) {
     if (!assertion) {
@@ -33,7 +33,7 @@ export function unique(iterable, mapper) {
     if (!mapper)
         return [...new Set(iterable)];
     if (is_key_type(mapper))
-        mapper = build_mapper(mapper);
+        mapper = select(mapper);
     let map = new Map();
     for (const x of iterable)
         map.set(mapper(x), x);
@@ -282,7 +282,7 @@ export function fuzzyfilter(query, list, mapper = ident, list_lower, single_char
     if (!query)
         return list;
     if (is_key_type(mapper))
-        mapper = build_mapper(mapper);
+        mapper = select(mapper);
     mapper ??= ident;
     list_lower ??= list.map(item => mapper(item).toLowerCase());
     const query_lower = query.toLowerCase();

package/utils.js

@@ -2,7 +2,7 @@ import { Stream, Writable, Transform } from 'stream';
 import util from 'util';
 import timers from 'timers/promises';
 import { t } from "./i18n/instance.js";
-import { build_mapper, not_empty, is_key_type, noop, ident } from "./prototype.js";
+import { select, not_empty, is_key_type, noop, ident } from "./prototype.js";
 /** `180` 输出字符宽度 */
 export const output_width = 180;
 export const url_width = 52;
@@ -55,7 +55,7 @@ export function unique(iterable, mapper) {
     if (!mapper)
         return [...new Set(iterable)];
     if (is_key_type(mapper))
-        mapper = build_mapper(mapper);
+        mapper = select(mapper);
     let map = new Map();
     for (const x of iterable)
         map.set(mapper(x), x);
@@ -152,7 +152,7 @@ export function fuzzyfilter(query, list, mapper = ident, list_lower, single_char
     if (!query)
         return list;
     if (is_key_type(mapper))
-        mapper = build_mapper(mapper);
+        mapper = select(mapper);
     mapper ??= ident;
     list_lower ??= list.map(item => mapper(item).toLowerCase());
     const query_lower = query.toLowerCase();

package/xlint.js

@@ -809,7 +809,7 @@ export const xlint_config = {
         // [a, b, c]
         '@stylistic/comma-spacing': 'error',
         // foo()
-        '@stylistic/func-call-spacing': 'error',
+        '@stylistic/function-call-spacing': 'error',
         // a => { } 中箭头左右两边空格
         '@stylistic/arrow-spacing': ['error'],
         // 注释双斜杠后面要有空格

package/Terminal.d.ts

@@ -1,19 +0,0 @@
-import '@xterm/xterm/css/xterm.css';
-import { Terminal as XTerminal } from '@xterm/xterm';
-import { FitAddon } from '@xterm/addon-fit';
-import { Model } from 'react-object-model';
-import type { Remote } from './net.browser.ts';
-export declare function Terminal({ font }: {
-    font: string;
-}): import("react/jsx-runtime").JSX.Element;
-declare class TerminalModel extends Model<TerminalModel> {
-    pterm: import("./utils.browser.ts").Deferred<XTerminal>;
-    term: XTerminal;
-    fit_addon: FitAddon;
-    stdio_id: number;
-    fit(): void;
-    subscribe_stdio(remote: Remote): Promise<void>;
-    unsubscribe_stdio(remote: Remote): Promise<void>;
-}
-export declare let terminal: TerminalModel;
-export {};

package/Terminal.js

@@ -1,98 +0,0 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-import '@xterm/xterm/css/xterm.css';
-import { useEffect, useRef } from 'react';
-import { Terminal as XTerminal } from '@xterm/xterm';
-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 { Model } from 'react-object-model';
-import { assert, defer, genid } from "./utils.browser.js";
-export function Terminal({ font }) {
-    let rterminal = useRef(undefined);
-    useEffect(() => {
-        (async () => {
-            await document.fonts.ready;
-            let term = new XTerminal({
-                fontFamily: font,
-                fontSize: 16,
-                cursorStyle: 'bar',
-                disableStdin: true,
-                convertEol: true,
-                allowProposedApi: true,
-                theme: {
-                    ...myscheme,
-                    magenta: myscheme.purple,
-                    brightMagenta: myscheme.brightPurple,
-                }
-            });
-            const fit_addon = new FitAddon();
-            const link_addon = new WebLinksAddon();
-            // const search_addon = new SearchAddon()
-            term.loadAddon(fit_addon);
-            term.loadAddon(link_addon);
-            // term.loadAddon(search_addon)
-            term.open(rterminal.current);
-            if (document.createElement('canvas').getContext('webgl2'))
-                term.loadAddon(new WebglAddon());
-            fit_addon.fit();
-            terminal.pterm.resolve(term);
-            terminal.set({ term, fit_addon });
-        })();
-    }, []);
-    return _jsx("div", { className: 'term', ref: rterminal });
-}
-class TerminalModel extends Model {
-    pterm = defer();
-    term;
-    fit_addon;
-    stdio_id = 0;
-    fit() {
-        this.fit_addon?.fit();
-    }
-    async subscribe_stdio(remote) {
-        assert(!this.stdio_id);
-        const id = this.stdio_id = genid();
-        remote.handlers.set(id, ({ data, error }) => {
-            if (error)
-                throw error;
-            else
-                this.term.write(data[0]);
-        });
-        await remote.send({ id, func: 'subscribe_stdio' });
-    }
-    async unsubscribe_stdio(remote) {
-        let { stdio_id } = this;
-        assert(stdio_id);
-        await remote.call('unsubscribe_stdio', [stdio_id]);
-        remote.handlers.delete(stdio_id);
-        this.stdio_id = 0;
-    }
-}
-export let terminal = new TerminalModel();
-/** winterm.json */
-const myscheme = {
-    background: '#FFFFFF',
-    black: '#000000',
-    blue: '#0070C0',
-    brightBlack: '#444444',
-    brightBlue: '#0000FF',
-    brightCyan: '#008080',
-    brightGreen: '#718C00',
-    brightPurple: '#8959A8',
-    brightRed: '#DF0000',
-    brightWhite: '#AAAAAA',
-    brightYellow: '#FF81FF',
-    cursorColor: '#000000',
-    cyan: '#821717',
-    foreground: '#000000',
-    green: '#008000',
-    name: 'myscheme',
-    purple: '#800080',
-    red: '#C82829',
-    selectionBackground: '#ADD6FF',
-    white: '#888888',
-    yellow: '#EC7600'
-};
-//# sourceMappingURL=Terminal.js.map