xshell 1.3.60 → 1.3.63

package/repl.js

@@ -1,18 +1,11 @@
-var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
-    if (typeof path === "string" && /^\.\.?\//.test(path)) {
-        return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
-            return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
-        });
-    }
-    return path;
-};
+import { __rewriteRelativeImportExtension } from "tslib";
 import repl from 'node:repl';
 import process from 'node:process';
 import { fileURLToPath } from 'url';
-import { path } from "./path.js";
-import { t } from "./i18n/instance.js";
-import "./prototype.js";
-import { delay, set_inspect_options } from "./utils.js";
+import { path } from './path.js';
+import { t } from './i18n/instance.js';
+import './prototype.js';
+import { delay, set_inspect_options } from './utils.js';
 set_inspect_options();
 let server;
 /** 谨慎使用，webpack 打包后可能会变成 /d:/1/mod/node_modules/xshell/ 这样的编译期路径 */
@@ -36,7 +29,7 @@ export async function start_repl() {
         pollute_global(),
         (async () => {
             // --- http server
-            let { Server } = await import("./server.js");
+            let { Server } = await import('./server.js');
             server = new Server({
                 name: 'repl',
                 http: true,

package/server.d.ts

@@ -145,7 +145,7 @@ export declare class Server {
             )
             return
         } */
-    try_send(ctx: Context, fp: string, { fpd_root, assets_root, sea: _sea, log_404, }?: {
+    try_send(ctx: Context, fp: string, { fpd_root, assets_root, sea: _sea, log_404 }?: {
         fpd_root?: string;
         assets_root?: string;
         sea?: boolean;
@@ -188,5 +188,5 @@ export interface ServerRequestOptions {
     throw_error?: boolean;
     proxy?: RequestOptions['proxy'];
 }
-export declare const text_plain: "text/plain; charset=utf-8";
+export declare const text_plain: 'text/plain; charset=utf-8';
 export {};

package/server.js

@@ -11,11 +11,11 @@ import KoaCompress from 'koa-compress';
 import resolve_safely from 'resolve-path';
 import { contentType as get_content_type } from 'mime-types';
 // --- my libs
-import { t } from "./i18n/instance.js";
-import { request as _request, Remote, get_socket_ip } from "./net.js";
-import { inspect, check, range_to_numbers, encode, filter_keys, filter_values, consume_stream, colored, url_width, defer2 } from "./utils.js";
-import { flist, fread, fstat } from "./file.js";
-import { exe_nodejs, sea } from "./process.js";
+import { t } from './i18n/instance.js';
+import { request as _request, Remote, get_socket_ip } from './net.js';
+import { inspect, check, range_to_numbers, encode, filter_keys, filter_values, consume_stream, colored, url_width, defer2 } from './utils.js';
+import { flist, fread, fstat } from './file.js';
+import { exe_nodejs, sea } from './process.js';
 // ------------ my server
 export class Server {
     /** proxy 时需要丢弃的 resposne headers */

package/storage.d.ts

@@ -13,7 +13,7 @@ export declare let storage: {
     get_bool(key: string): boolean | undefined;
 };
 export declare let db: {
-    store_name: "kv-store";
+    store_name: 'kv-store';
     db: IDBDatabase;
     wait_request<TResult>(request: IDBOpenDBRequest | IDBRequest): Promise<TResult>;
     open(): Promise<void>;

package/toaster.browser.d.ts

@@ -1,8 +1,8 @@
 import './toaster.sass';
 export declare let toaster: {
     messages: string[];
-    state: "IDLE" | "SHOW";
+    state: 'IDLE' | 'SHOW';
     toast(message: string): Promise<void>;
     show(): Promise<void>;
 };
-export declare const toast: (typeof toaster)["toast"];
+export declare const toast: (typeof toaster)['toast'];

package/toaster.browser.js

@@ -1,6 +1,6 @@
 // @ts-ignore
 import './toaster.sass';
-import { delay } from "./utils.browser.js";
+import { delay } from './utils.browser.js';
 export let toaster = {
     messages: [],
     state: 'IDLE',

package/utils.browser.js

@@ -1,7 +1,7 @@
-import "./prototype.browser.js";
-import "./platform.browser.js";
-import { delay } from "./utils.common.js";
-export * from "./utils.common.js";
+import './prototype.browser.js';
+import './platform.browser.js';
+import { delay } from './utils.common.js';
+export * from './utils.common.js';
 export async function pause(milliseconds = 3000) {
     await delay(milliseconds);
     debugger;

package/utils.common.d.ts

@@ -21,7 +21,7 @@ export declare function seq<T = number>(n: number, generator?: (index: number) =
     - mapper?: 可以是 key (string, number, symbol) 或 (obj: any) => any */
 export declare function unique<TObj>(iterable: TObj[] | Iterable<TObj>, mapper?: keyof TObj | Mapper<TObj>): TObj[];
 /** 字符串字典序比较 */
-export declare function strcmp(l: string, r: string): 0 | 1 | -1;
+export declare function strcmp(l: string, r: string): -1 | 0 | 1;
 /** 排序对象中 keys 的顺序，返回新的对象 */
 export declare function sort_keys<TObj>(obj: TObj): TObj;
 /** 比较 1.10.02 这种版本号
@@ -50,14 +50,14 @@ export declare function filter_keys<TObj>(obj: TObj, filter: (key: string) => an
     - filter?: `not_empty` */
 export declare function filter_values<TObj extends Record<string, any>>(obj: TObj, filter?: (value: TObj[string]) => any): TObj;
 /** 简单选择对象中的部分 keys, 返回新对象 */
-export declare function pick<TObject = any>(obj: TObject, keys: (keyof TObject)[]): Partial<TObject>;
+export declare function pick<TObject = any>(obj: TObject, keys: (keyof TObject)[]): TObject;
 /** 忽略对象中的 keys, 返回新对象 */
 export declare function omit<TObj>(obj: TObj, omit_keys: string[] | Set<string>): TObj;
 /** 拼接 TypedArrays 生成一个完整的 Uint8Array */
-export declare function concat(arrays: ArrayBufferView[]): Uint8Array<ArrayBufferLike>;
+export declare function concat(arrays: ArrayBufferView[]): Uint8Array<ArrayBuffer>;
 export declare let encoder: TextEncoder;
 /** 将字符串简单的编码为 utf-8 的 buffer (Uint8Array)。高频使用或者在流式处理时，考虑使用 TextEncoder 的 encodeInto 方法 */
-export declare function encode(str: string): Uint8Array<ArrayBufferLike>;
+export declare function encode(str: string): Uint8Array<ArrayBuffer>;
 export declare function encode_into(str: string, buf: Uint8Array): TextEncoderEncodeIntoResult;
 /** 将 utf-8 buffer (Uint8Array) 简单的解码为 string。
     在流式处理 (buffer 可能不完整) 时，应使用独立的 TextDecoder 实例调用 decode(buffer, { stream: true }) */
@@ -101,11 +101,11 @@ export declare function invoke<TReturn = any>(obj: any, funcpath: string, args:
 /** 时间间隔 (milliseconds) 格式化 */
 export declare function delta2str(delta: number): string;
 /** 默认日期时间格式 */
-export declare const datetime_format: "YYYY.MM.DD HH:mm:ss";
+export declare const datetime_format: 'YYYY.MM.DD HH:mm:ss';
 /** 默认日期格式 */
-export declare const date_format: "YYYY.MM.DD";
+export declare const date_format: 'YYYY.MM.DD';
 /** 默认时间格式 */
-export declare const time_format: "HH:mm:ss";
+export declare const time_format: 'HH:mm:ss';
 export declare class Timer {
     started: number;
     ended: number;
@@ -124,7 +124,7 @@ export declare class Timer {
     getstr_and_reset(parenthesis?: boolean): string;
 }
 export declare class TimeoutError extends Error {
-    name: "TimeoutError";
+    name: 'TimeoutError';
 }
 /** https://stackoverflow.com/questions/63297164/how-to-only-accept-arraybuffer-as-parameter */
 export type StrictArrayBuffer = ArrayBuffer & {
@@ -192,6 +192,7 @@ export declare function to_csv_field(str: string): string;
 export declare function set_error_message(error: Error, message: string): Error;
 /** 比较两个数组中的元素完全相同，数组元素用引用比较 */
 export declare function array_equals(a: any[], b: any[]): boolean;
+/** - with_date?: `false` */
 export declare function nowstr(with_date?: boolean): string;
 export declare function has_chinese(str: string): boolean;
 export declare function fold_spaces(str: string): string;

package/utils.common.js

@@ -1,6 +1,6 @@
-import { t } from "./i18n/instance.js";
-import { is_key_type, noop, not_empty, select, to_snake_case } from "./prototype.common.js";
-import { platform } from "./platform.common.js";
+import { t } from './i18n/instance.js';
+import { is_key_type, noop, not_empty, select, to_snake_case } from './prototype.common.js';
+import { platform } from './platform.common.js';
 export async function delay(milliseconds, options) {
     return platform.delay(milliseconds, options);
 }
@@ -542,8 +542,18 @@ export function lowercase_first_letter(str) {
 }
 /** 大于 n 的最小的 2 的幂次 */
 export function ceil2(n) {
-    let power = 1;
+    // 位运算基于 32 位有符号整数，有效范围 [0, 2^31)
+    if (n < 2 ** 31) {
+        n |= n >> 1;
+        n |= n >> 2;
+        n |= n >> 4;
+        n |= n >> 8;
+        n |= n >> 16;
+        return n + 1;
+    }
+    // 超过 32 位范围，退化到翻倍法
     // 不能用 power <<= 1, 结果可能会超过 32 bit 整数导致位运算溢出为 0，死循环
+    let power = 1;
     for (; power <= n; power += power)
         ;
     return power;
@@ -638,6 +648,7 @@ export function array_equals(a, b) {
         return false;
     return a.every((x, i) => x === b[i]);
 }
+/** - with_date?: `false` */
 export function nowstr(with_date = false) {
     const date = new Date();
     return with_date ? date.to_str() : date.to_time_str();

package/utils.d.ts

@@ -21,14 +21,16 @@ export declare function inspect(obj: any, options?: util.InspectOptions & {
     limit?: number;
     omit?: string[];
 }): string;
-export declare namespace inspect {
-    var custom: typeof util.inspect.custom;
-    var defaultOptions: util.InspectOptions;
-}
 export interface inspect {
     custom: typeof util.inspect.custom;
     defaultOptions: typeof util.inspect.defaultOptions;
 }
+export declare namespace inspect {
+    var custom: symbol;
+}
+export declare namespace inspect {
+    var defaultOptions: util.InspectOptions;
+}
 /** 根据 enabled 选项返回有 / 无颜色的字符串 (str) */
 export declare function colored(str: string, color: string, enabled?: boolean): any;
 /** 消费一个可读流 */

package/utils.js

@@ -1,10 +1,10 @@
 import { Writable, Transform } from 'node:stream';
 import util from 'node:util';
 import ncrypto from 'node:crypto';
-import "./prototype.js";
-import "./platform.js";
-import { assert, check, decode, defer } from "./utils.common.js";
-export * from "./utils.common.js";
+import './prototype.js';
+import './platform.js';
+import { assert, check, decode, defer } from './utils.common.js';
+export * from './utils.common.js';
 /** `180` 输出字符宽度 */
 export const output_width = 180;
 export const url_width = 52;

package/xlint.js

@@ -5,8 +5,8 @@ import TSParser from '@typescript-eslint/parser';
 import ts_plugin from '@typescript-eslint/eslint-plugin';
 import react_plugin from 'eslint-plugin-react';
 import stylistic_plugin from '@stylistic/eslint-plugin';
-import { array_equals, check } from "./utils.js";
-import { path } from "./path.js";
+import { array_equals, check } from './utils.js';
+import { path } from './path.js';
 // 用 ast explorer 选 esprima 来看
 // 或者 https://explorer.eslint.org/
 // node.loc.start.line 下标从 1 开始

package/xshell.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
 globalThis.tstarted = new Date();
-import { start_repl } from "./repl.js";
+import { start_repl } from './repl.js';
 start_repl();
 //# sourceMappingURL=xshell.js.map