@idlebox/common 1.4.2 → 1.4.3

package/src/error/getFrame.ts

@@ -3,10 +3,10 @@
  * @returns {string} if frame greater than max, return ''
  */
 export function getErrorFrame(e: Error, frame: number): string {
-	if (e && e.stack) {
+	if (e?.stack) {
 		const stackArr = e.stack.split('\n');
 		if (stackArr.length > frame + 1) {
-			return stackArr[frame + 1]!.trim();
+			return stackArr[frame + 1]?.trim();
 		}
 	}
 	return '';

package/src/error/known.ts

@@ -5,8 +5,8 @@ interface ErrorOptions {
 }
 
 abstract class KnownErrorAbstract extends Error {
-	protected static debugMode: boolean = false;
-	static debug(enabled: boolean = true) {
+	protected static debugMode = false;
+	static debug(enabled = true) {
 		KnownErrorAbstract.debugMode = enabled;
 	}
 	static is(e: any): e is KnownErrorAbstract {

package/src/error/pretty.ts

@@ -74,8 +74,8 @@ function addLoc(ret: IStructreStackLine, m: Record<TypeMatchFileOnly, string>) {
 	ret.location = {
 		schema: m.schema?.replace(/\/+$/, '') ?? '',
 		path: path,
-		line: parseInt(m.line),
-		column: parseInt(m.column),
+		line: Number.parseInt(m.line),
+		column: Number.parseInt(m.column),
 		isAbsolute: isAbsolute(path),
 	};
 }
@@ -126,12 +126,13 @@ export function parseStackLine(line: string): IStructreStackLine {
 		addLoc(ret, mEval);
 
 		ret.eval = {
-			eval_column: parseInt(mEval.eval_column),
+			eval_column: Number.parseInt(mEval.eval_column),
 			eval_func: mEval.eval_func,
-			eval_line: parseInt(mEval.eval_line),
+			eval_line: Number.parseInt(mEval.eval_line),
 			funcs: [],
 		};
 		for (const item of line.matchAll(regEvalItem)) {
+			// biome-ignore lint/style/noNonNullAssertion: 有匹配必然有 groups
 			ret.eval.funcs.push(item.groups!.func_name);
 		}
 		ret.eval.funcs.push(mEval.eval_func);
@@ -161,7 +162,7 @@ export function prettyPrintError(type: string, e: Error) {
 		// console.log(JSON.stringify(e.stack), JSON.stringify(e.message));
 		notify_printed = true;
 		console.error(
-			'\x1B[2muse env.DISABLE_PRETTY_ERROR=yes / window.DISABLE_PRETTY_ERROR=true to see original error stack\x1B[0m',
+			'\x1B[2muse env.DISABLE_PRETTY_ERROR=yes / window.DISABLE_PRETTY_ERROR=true to see original error stack\x1B[0m'
 		);
 	}
 }
@@ -197,12 +198,7 @@ export function prettyFormatStack(stackLines: readonly string[]) {
 					if (fn_name) {
 						ret += ' (';
 					}
-					ret += formatFileLine(
-						line.location.schema,
-						line.location.path,
-						line.location.line,
-						line.location.column,
-					);
+					ret += formatFileLine(line.location.schema, line.location.path, line.location.line, line.location.column);
 					if (fn_name) {
 						ret += ')';
 					}
@@ -216,7 +212,7 @@ export function prettyFormatStack(stackLines: readonly string[]) {
 				const color = fn_name ? (isNodeModule ? '14;2' : '14') : '8';
 				ret = `\x1b[0m  at \x1b[38;5;${color}m`;
 				if (fn_alias && fn_name && fn_name.startsWith('Object.')) {
-					ret += fn_alias + ' [export]';
+					ret += `${fn_alias} [export]`;
 				} else {
 					ret += formatFunctionName(fn_name, fn_alias);
 				}
@@ -232,7 +228,7 @@ export function prettyFormatStack(stackLines: readonly string[]) {
 					} else {
 						color = '\x1b[38;5;2m';
 					}
-					ret += ' (' + color;
+					ret += ` (${color}`;
 					const file = formatFileLine(line.location.schema, path, line.location.line, line.location.column);
 					const lastNmPos = file.lastIndexOf('/node_modules/');
 					if (lastNmPos >= 0) {
@@ -266,15 +262,14 @@ interface IError {
 export function prettyFormatError(e: IError, withMessage = true) {
 	if (!e || !e.stack) {
 		if (withMessage) {
-			let msg = e?.message || 'Unknown Error';
+			const msg = e?.message || 'Unknown Error';
 
-			return red(msg + '\n  No stack trace');
-		} else {
-			return red('  No stack trace');
+			return red(`${msg}\n  No stack trace`);
 		}
+		return red('  No stack trace');
 	}
 
-	let stackLines = e.stack.split(/\n/g);
+	const stackLines = e.stack.split(/\n/g);
 
 	let first = 'Unknown Error';
 	if (/^\S/.test(stackLines[0])) {
@@ -286,10 +281,9 @@ export function prettyFormatError(e: IError, withMessage = true) {
 			first = first.replace(/^(\S+):/, `$1(code ${e.code}):`);
 		}
 
-		return first + '\n' + prettyFormatStack(stackLines).join('\n');
-	} else {
-		return prettyFormatStack(stackLines).join('\n');
+		return `${first}\n${prettyFormatStack(stackLines).join('\n')}`;
 	}
+	return prettyFormatStack(stackLines).join('\n');
 }
 
 let alert = false;
@@ -300,7 +294,7 @@ function formatFileLine(schema: string | undefined, file: string, row?: number,
 		try {
 			rel = relativePath(root, file);
 			if (rel[0] !== '.') {
-				rel = './' + rel;
+				rel = `./${rel}`;
 			} else if (rel[1] === '.') {
 				if (file.length < rel.length) {
 					rel = file;
@@ -311,13 +305,12 @@ function formatFileLine(schema: string | undefined, file: string, row?: number,
 			}
 		} catch (e: any) {
 			if (!alert) {
-				debugger;
 				alert = true;
 				console.error(
 					'pretty print error: failed calc relative path ("%s" to "%s"):\n\x1B[2mFormat%s\x1B[0m',
 					root,
 					file,
-					e.stack,
+					e.stack
 				);
 			}
 			rel = file;
@@ -331,12 +324,10 @@ function formatFunctionName(fn?: string, as?: string) {
 	if (fn) {
 		if (as) {
 			return `${fn} [as ${as}]`;
-		} else {
-			return fn;
 		}
-	} else {
-		return '<anonymous>';
+		return fn;
 	}
+	return '<anonymous>';
 }
 
 function translateFunction(data: IStructreStackLine): IStructreStackLine {
@@ -353,8 +344,8 @@ function translateFunction(data: IStructreStackLine): IStructreStackLine {
 		data.func.name = 'process.nextTick';
 	}
 	if (data.func.name.startsWith('Timeout.') && data.func.alias === '_onTimeout') {
-		data.func.name = 'setTimeout->' + data.func.name.slice(8);
-		delete data.func.alias;
+		data.func.name = `setTimeout->${data.func.name.slice(8)}`;
+		data.func.alias = undefined;
 	}
 	return data;
 }
@@ -370,13 +361,17 @@ function skipSomeFrame({ location }: IStructreStackLine): boolean {
 	if (location.schema === 'node:') {
 		if (location.path.startsWith('internal/timers')) {
 			return false;
-		} else if (location.path === 'internal/modules/cjs/loader') {
+		}
+		if (location.path === 'internal/modules/cjs/loader') {
 			return false;
-		} else if (location.path === 'internal/modules/esm/loader') {
+		}
+		if (location.path === 'internal/modules/esm/loader') {
 			return false;
-		} else if (location.path === 'internal/modules/run_main') {
+		}
+		if (location.path === 'internal/modules/run_main') {
 			return false;
-		} else if (location.path === 'internal/modules/esm/module_job') {
+		}
+		if (location.path === 'internal/modules/esm/module_job') {
 			return false;
 		}
 	}

package/src/function/asyncCallbackList.ts

@@ -3,7 +3,7 @@ import { nameFunction } from './functionName.js';
 export interface MyAsyncCallback<Argument extends unknown[]> {
 	displayName?: string;
 
-	(...param: Argument): Promise<void | undefined | boolean> | void | undefined | boolean;
+	(...param: Argument): Promise<undefined | undefined | boolean> | undefined | undefined | boolean;
 }
 
 /**
@@ -11,7 +11,7 @@ export interface MyAsyncCallback<Argument extends unknown[]> {
  */
 export class AsyncCallbackList<Argument extends unknown[]> {
 	protected list: MyAsyncCallback<Argument>[] = [];
-	protected running: boolean = false;
+	protected running = false;
 
 	constructor() {
 		this.run = (this.run as any).bind(this);
@@ -62,7 +62,7 @@ export class AsyncCallbackList<Argument extends unknown[]> {
 	 */
 	async run(...argument: Argument): Promise<boolean> {
 		this.running = true;
-		let ret: boolean | undefined | void;
+		let ret: boolean | undefined | undefined;
 		for (const cb of this.list) {
 			ret = await cb(...argument);
 			if (ret === true) {

package/src/function/callbackList.ts

@@ -11,8 +11,8 @@ export interface MyCallback<Argument extends unknown[]> {
  */
 export class CallbackList<Argument extends unknown[]> {
 	protected list: MyCallback<Argument>[] = [];
-	protected running: boolean = false;
-	protected stop: boolean = false;
+	protected running = false;
+	protected stop = false;
 
 	constructor() {
 		this.run = (this.run as any).bind(this);

package/src/function/delayCallbackList.ts

@@ -12,7 +12,7 @@ export interface MyDelayCallback<Argument extends unknown[]> {
  */
 export class DelayCallbackList<Argument extends unknown[]> {
 	private delayArgument?: Argument;
-	private delayComplete: boolean = false;
+	private delayComplete = false;
 
 	protected list?: MyDelayCallback<Argument>[] = [];
 
@@ -27,7 +27,7 @@ export class DelayCallbackList<Argument extends unknown[]> {
 		if (this.delayComplete) {
 			item(...this.delayArgument!);
 		} else {
-			this.list!.push(item);
+			this.list?.push(item);
 		}
 	}
 
@@ -37,9 +37,9 @@ export class DelayCallbackList<Argument extends unknown[]> {
 		}
 		this.delayComplete = true;
 		this.delayArgument = argument;
-		this.list!.forEach((cb) => {
+		this.list?.forEach((cb) => {
 			cb(...argument);
 		});
-		delete this.list;
+		this.list = undefined;
 	}
 }

package/src/lifecycle/dispose/disposableEvent.ts

@@ -1,4 +1,4 @@
-import { IDisposable } from './lifecycle.js';
+import type { IDisposable } from './lifecycle.js';
 
 declare const AbortController: new () => any;
 
@@ -86,9 +86,8 @@ function check(options: IEventListenerOptions = {}): [{ abort(): void } | undefi
 		const controller = new AbortController();
 		(options as any).signal = controller.signal;
 		return [controller, options];
-	} else {
-		return [undefined, options];
 	}
+	return [undefined, options];
 }
 
 function checkAllSupport(ele: IEventHostObject<any>) {

package/src/lifecycle/dispose/disposedError.ts

@@ -9,7 +9,7 @@ export class DisposedError extends Error {
 	public readonly inspectString: string;
 	constructor(
 		object: any,
-		public readonly previous: Error,
+		public readonly previous: Error
 	) {
 		const insp = tryInspect(object);
 		super(`Object [${insp}] has already disposed ${getErrorFrame(previous, 2)}.`);

package/src/lifecycle/dispose/lifecycle.async.ts

@@ -1,7 +1,7 @@
 import { convertCatchedError } from '../../error/convertUnknown.js';
-import { Emitter, EventRegister } from '../event/event.js';
+import { Emitter, type EventRegister } from '../event/event.js';
 import { DisposedError } from './disposedError.js';
-import { IAsyncDisposable, IDisposableEvents } from './lifecycle.js';
+import type { IAsyncDisposable, IDisposableEvents } from './lifecycle.js';
 
 /**
  * Async version of Disposable

package/src/lifecycle/dispose/lifecycle.global.ts

@@ -1,6 +1,6 @@
 import { globalSingletonStrong } from '../../platform/globalSingleton.js';
 import { createSymbol } from '../../platform/globalSymbol.js';
-import { IDisposable } from './lifecycle.js';
+import type { IDisposable } from './lifecycle.js';
 import { AsyncDisposable } from './lifecycle.async.js';
 
 const symbol = createSymbol('lifecycle', 'application');
@@ -23,9 +23,8 @@ export function ensureDisposeGlobal() {
 	const obj = globalSingletonStrong<AsyncDisposable>(symbol);
 	if (obj && !obj.hasDisposed) {
 		return Promise.resolve(obj.dispose());
-	} else {
-		return Promise.resolve();
 	}
+	return Promise.resolve();
 }
 
 /**
@@ -36,13 +35,13 @@ export function ensureDisposeGlobal() {
  */
 export function disposeGlobal() {
 	const obj = globalSingletonStrong<AsyncDisposable>(symbol);
-	if (obj && obj.hasDisposed) {
+	if (obj?.hasDisposed) {
 		throw new Error('global already disposed.');
-	} else if (obj) {
+	}
+	if (obj) {
 		return Promise.resolve(obj.dispose());
-	} else {
-		return Promise.resolve();
 	}
+	return Promise.resolve();
 }
 
 /**

package/src/lifecycle/dispose/lifecycle.sync.ts

@@ -1,6 +1,6 @@
-import { Emitter, EventRegister } from '../event/event.js';
+import { Emitter, type EventRegister } from '../event/event.js';
 import { DisposedError } from './disposedError.js';
-import { IDisposable, IDisposableEvents } from './lifecycle.js';
+import type { IDisposable, IDisposableEvents } from './lifecycle.js';
 
 export abstract class DisposableOnce implements IDisposable {
 	private _disposed?: Error;
@@ -85,7 +85,7 @@ export class Disposable implements IDisposable, IDisposableEvents {
 					this._onDisposeError.fire(e);
 				} else {
 					console.error('error during dispose, throw:', e);
-					this._onDisposeError.fire(new Error('' + e));
+					this._onDisposeError.fire(new Error(`${e}`));
 				}
 			}
 		}

package/src/lifecycle/dispose/lifecycle.ts

@@ -1,4 +1,4 @@
-import { EventRegister } from '../event/event.js';
+import type { EventRegister } from '../event/event.js';
 
 /**
  * @private

package/src/lifecycle/event/event.ts

@@ -1,12 +1,8 @@
-import { IDisposable } from '../dispose/lifecycle.js';
+import type { IDisposable } from '../dispose/lifecycle.js';
 
-export interface EventHandler<T> {
-	(data: T): void;
-}
+export type EventHandler<T> = (data: T) => void;
 
-export interface EventRegister<T> {
-	(callback: EventHandler<T>): IDisposable;
-}
+export type EventRegister<T> = (callback: EventHandler<T>) => IDisposable;
 
 type DeferFn = () => void;
 
@@ -16,7 +12,7 @@ type DeferFn = () => void;
  */
 export class Emitter<T> implements IDisposable {
 	protected readonly _callbacks: EventHandler<T>[] = [];
-	private executing: boolean = false;
+	private executing = false;
 
 	constructor() {
 		this.handle = this.handle.bind(this);

package/src/lifecycle/event/memorized.ts

@@ -1,5 +1,5 @@
-import { IDisposable } from '../dispose/lifecycle.js';
-import { Emitter, EventHandler } from './event.js';
+import type { IDisposable } from '../dispose/lifecycle.js';
+import { Emitter, type EventHandler } from './event.js';
 
 /**
  * 会记住上次fire的内容，并在每个新的handler注册时立即调用一次的Emitter
@@ -8,7 +8,7 @@ import { Emitter, EventHandler } from './event.js';
  */
 export class MemorizedEmitter<T> extends Emitter<T> {
 	private _memo?: T;
-	private _is_memo: boolean = false;
+	private _is_memo = false;
 
 	public override fire(data: T) {
 		this._memo = data;
@@ -28,7 +28,7 @@ export class MemorizedEmitter<T> extends Emitter<T> {
 	}
 
 	public forget() {
-		delete this._memo;
+		this._memo = undefined;
 		this._is_memo = false;
 	}
 

package/src/lifecycle/promise/cancellationToken/driver.browser.ts

@@ -1,4 +1,4 @@
-import { EventHandler } from '../../event/event.js';
+import type { EventHandler } from '../../event/event.js';
 
 import type { CancellationDriver, __CancellationToken } from './source.js';
 

package/src/lifecycle/promise/cancellationToken/driver.common.ts

@@ -1,5 +1,5 @@
-import { IDisposable } from '../../dispose/lifecycle.js';
-import { Emitter, EventHandler } from '../../event/event.js';
+import type { IDisposable } from '../../dispose/lifecycle.js';
+import { Emitter, type EventHandler } from '../../event/event.js';
 
 import type { CancellationDriver, __CancellationToken } from './source.js';
 

package/src/lifecycle/promise/cancellationToken/source.ts

@@ -1,7 +1,7 @@
 import { globalObject } from '../../../platform/globalObject.js';
-import { IDisposable } from '../../dispose/lifecycle.js';
+import type { IDisposable } from '../../dispose/lifecycle.js';
 import { DisposableOnce } from '../../dispose/lifecycle.sync.js';
-import { EventHandler } from '../../event/event.js';
+import type { EventHandler } from '../../event/event.js';
 import { CancellationDriverBrowser } from './driver.browser.js';
 import { CancellationDriverCommon } from './driver.common.js';
 

package/src/lifecycle/promise/deferredPromise.ts

@@ -33,7 +33,7 @@ export class DeferredPromise<T, PT = any> {
 		);
 		this.p
 			.finally(() => {
-				delete this._progressList;
+				this._progressList = undefined;
 			})
 			.catch(() => void 0);
 	}
@@ -46,7 +46,7 @@ export class DeferredPromise<T, PT = any> {
 	}
 
 	progress(fn: ProgressCallback<PT>): void {
-		this._progressList!.push(fn);
+		this._progressList?.push(fn);
 	}
 
 	get completed(): boolean {

package/src/lifecycle/timeout/timeout.ts

@@ -42,7 +42,6 @@ export function timeoutPromise<T>(ms: number, message: string | T, p?: T): T {
 	}
 	if (p instanceof DeferredPromise) {
 		return Promise.race([p.p, timeout(ms, msg)]).then(() => p) as any;
-	} else {
-		return Promise.race([p, timeout(ms, msg)]).then(() => p) as any;
 	}
+	return Promise.race([p, timeout(ms, msg)]).then(() => p) as any;
 }

package/src/lifecycle/timeout/timeoutError.ts

@@ -5,7 +5,7 @@ import { humanDate } from '../../date/timeString.js';
  * @public
  */
 export class TimeoutError extends Error {
-	constructor(time: number, what: string = 'no response') {
+	constructor(time: number, what = 'no response') {
 		super(`Timeout: ${what} in ${humanDate.deltaTiny(time)}`);
 	}
 }

package/src/log/logger.ts

@@ -2,10 +2,10 @@ import { nameFunction } from '../function/functionName.js';
 import { isWeb } from '../platform/os.js';
 
 export enum ColorKind {
-	DISABLE,
-	TERMINAL,
-	WEB,
-	DETECT,
+	DISABLE = 0,
+	TERMINAL = 1,
+	WEB = 2,
+	DETECT = 3,
 }
 
 export interface WrappedConsoleOptions {
@@ -71,13 +71,12 @@ export abstract class WrappedConsole {
 	protected wrap<T extends keyof Omit<Console & { Console: any }, 'Console'>>(original: T): Function {
 		if (this.bind) {
 			return this.parent[original].bind(this.parent) as any;
-		} else {
-			return this.parent[original];
 		}
+		return this.parent[original];
 	}
 
 	private wrapSimple<T extends keyof Omit<Console & { Console: any }, 'Console'>>(original: T): Console[T] {
-		return nameFunction('console:' + original, this.wrap(original) as any);
+		return nameFunction(`console:${original}`, this.wrap(original) as any);
 	}
 
 	private wrapExtra<T extends keyof Omit<Console & { Console: any }, 'Console'>>(
@@ -85,7 +84,7 @@ export abstract class WrappedConsole {
 		exMessage: string
 	): Console[T] {
 		const bindedFn = this.wrap(original);
-		return nameFunction('console:' + original, (...args: any[]) => {
+		return nameFunction(`console:${original}`, (...args: any[]) => {
 			this.log(exMessage);
 			bindedFn(...args);
 		});
@@ -115,7 +114,7 @@ export abstract class WrappedConsole {
 
 		const fn = this.wrap(original);
 
-		return nameFunction('console:' + original, (...args: any[]) => {
+		return nameFunction(`console:${original}`, (...args: any[]) => {
 			this.convertObjectArg(args, messageLoc);
 			this.processColorLabel(args, messageLoc, original, prefix);
 			fn(...args);

package/src/mapSet/customSet.ts

@@ -1,7 +1,5 @@
 /** Find the index of given item */
-export interface Finder<Type> {
-	(this: Type[], item: Type): number;
-}
+export type Finder<Type> = (this: Type[], item: Type) => number;
 
 type MyFinder<Type> = (item: Type) => number;
 
@@ -34,9 +32,8 @@ export class CustomSet<Type = string> {
 		if (index === -1) {
 			this.registry.push(item);
 			return true;
-		} else {
-			return false;
 		}
+		return false;
 	}
 
 	/**
@@ -50,10 +47,9 @@ export class CustomSet<Type = string> {
 		const index = this.finder(item);
 		if (index === -1) {
 			return false;
-		} else {
-			this.registry.splice(index, 1);
-			return true;
 		}
+		this.registry.splice(index, 1);
+		return true;
 	}
 
 	/**

package/src/mapSet/extendMap.ts

@@ -18,11 +18,11 @@ export class ExtendMap<K, V> extends Map<K, V> {
 	public override get(id: K, def?: V): V {
 		if (super.has(id)) {
 			return super.get(id)!;
-		} else if (arguments.length === 2) {
+		}
+		if (arguments.length === 2) {
 			return def!;
-		} else {
-			throw new Error(`Unknown key {${id}} in map.`);
 		}
+		throw new Error(`Unknown key {${id}} in map.`);
 	}
 
 	/**
@@ -31,10 +31,9 @@ export class ExtendMap<K, V> extends Map<K, V> {
 	public entry(id: K, init: (id: K) => V): V {
 		if (super.has(id)) {
 			return super.get(id)!;
-		} else {
-			const nv = init(id);
-			super.set(id, nv);
-			return nv;
 		}
+		const nv = init(id);
+		super.set(id, nv);
+		return nv;
 	}
 }

package/src/misc/assertNotNull.ts

@@ -15,7 +15,6 @@ export function assertNotNull<T>(val: T | null | undefined): T {
 export function throwNull<T>(val: T) {
 	if (val === undefined || val === null) {
 		return val!;
-	} else {
-		throw new Error('Value is ' + typeof val);
 	}
+	throw new Error(`Value is ${typeof val}`);
 }

package/src/misc/package.json.ts

@@ -42,7 +42,7 @@ export function parseExportsField(exports: IExportsField): IFullExportsField {
 	if (!isPathMap(exports)) {
 		return { '.': exports };
 	}
-	let ret: IFullExportsField = {};
+	const ret: IFullExportsField = {};
 	for (const [path, def] of Object.entries(exports)) {
 		if (typeof def === 'string') {
 			ret[path] = { default: def };

package/src/object/initOnRead.ts

@@ -1,7 +1,5 @@
 /** @public */
-export interface InitFunc<O, T> {
-	(this: O): T;
-}
+export type InitFunc<O, T> = (this: O) => T;
 
 /**
  * Define property on target, call init it when first use, them memorize

package/src/object/objectSame.ts

@@ -33,8 +33,8 @@ export function isObjectSameRecursive(a: any, b: any) {
 
 	for (const k of aks) {
 		if (a[k] !== b[k]) {
-			const av = a[k],
-				bv = b[k];
+			const av = a[k];
+			const bv = b[k];
 			if (av && bv && typeof av === 'object' && typeof bv === 'object') {
 				if (Array.isArray(av)) {
 					if (Array.isArray(bv)) {