@idlebox/common 1.4.1 → 1.4.3

package/src/lifecycle/event/event.ts

@@ -1,12 +1,10 @@
-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;
 
 /**
  * 事件注册对象
@@ -14,6 +12,7 @@ export interface EventRegister<T> {
  */
 export class Emitter<T> implements IDisposable {
 	protected readonly _callbacks: EventHandler<T>[] = [];
+	private executing = false;
 
 	constructor() {
 		this.handle = this.handle.bind(this);
@@ -31,8 +30,15 @@ export class Emitter<T> implements IDisposable {
 	 * @param data 回调数据
 	 */
 	public fire(data: T) {
-		for (const callback of this._callbacks) {
-			callback(data);
+		this.requireNotExecuting();
+		this.executing = true;
+		try {
+			for (const callback of this._callbacks) {
+				callback(data);
+			}
+		} finally {
+			this.doDefer();
+			this.executing = false;
 		}
 	}
 
@@ -40,6 +46,8 @@ export class Emitter<T> implements IDisposable {
 	 * 与 `fire()`相同，但是忽略任何错误，并且即便出错也继续执行全部callback
 	 */
 	public fireNoError(data: T) {
+		this.requireNotExecuting();
+		this.executing = true;
 		for (const callback of this._callbacks) {
 			try {
 				callback(data);
@@ -47,6 +55,8 @@ export class Emitter<T> implements IDisposable {
 				console.error('Error ignored: ', e);
 			}
 		}
+		this.doDefer();
+		this.executing = false;
 	}
 
 	/**
@@ -61,18 +71,55 @@ export class Emitter<T> implements IDisposable {
 	 * @param callback 回调函数
 	 */
 	handle(callback: EventHandler<T>): IDisposable {
-		this._callbacks.unshift(callback);
+		this.requireNotExecuting();
+		let disposed = false;
+		this._callbacks.unshift((e) => {
+			if (!disposed) callback(e);
+		});
+		const realDispose = () => {
+			const index = this._callbacks.indexOf(callback);
+			if (index !== -1) {
+				this._callbacks.splice(index, 1);
+			}
+		};
 		return {
 			dispose: () => {
-				const index = this._callbacks.indexOf(callback);
-				if (index !== -1) {
-					this._callbacks.splice(index, 1);
+				disposed = true;
+				if (this.executing) {
+					this.defer(realDispose);
+				} else {
+					realDispose();
 				}
 			},
 		};
 	}
 
+	/**
+	 * 注册一次性回调
+	 * @param callback 回调函数
+	 */
+	once(callback: EventHandler<T>): IDisposable {
+		this.requireNotExecuting();
+		const disposable = this.handle((data) => {
+			callback(data);
+			disposable.dispose();
+		});
+		return disposable;
+	}
+
+	private defers: DeferFn[] = [];
+	public defer(fn: DeferFn) {
+		this.defers.push(fn);
+	}
+	private doDefer() {
+		for (const fn of this.defers) {
+			fn();
+		}
+		this.defers.length = 0;
+	}
+
 	dispose() {
+		this.requireNotExecuting();
 		this._callbacks.length = 0;
 		this.fireNoError =
 			this.fire =
@@ -81,4 +128,10 @@ export class Emitter<T> implements IDisposable {
 					throw new Error('Event is disposed');
 				};
 	}
+
+	private requireNotExecuting() {
+		if (this.executing) {
+			throw new Error('conflict state, emitter is firing');
+		}
+	}
 }

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)) {

package/src/path/normalizePath.ts

@@ -10,12 +10,12 @@ const winLetter = /^[a-z]:[\/\\]/i;
 const doubleSlash = /^[\/\\]{2}[^\/\\]/i;
 
 export enum PathKind {
-	url,
-	unc,
-	win,
-	cifs,
-	unix,
-	relative,
+	url = 0,
+	unc = 1,
+	win = 2,
+	cifs = 3,
+	unix = 4,
+	relative = 5,
 }
 export interface IPathInfo {
 	kind: PathKind;
@@ -31,18 +31,18 @@ export function analyzePath(p: string) {
 		const u = new URL(p);
 		r = {
 			kind: PathKind.url,
-			prefix: u.protocol + '//' + u.host,
+			prefix: `${u.protocol}//${u.host}`,
 			path: u.pathname.slice(1),
 			url: u,
 		};
 	} else if (unc.test(p)) {
 		p = p.replace(unc, '').replace(/^[\/\\]+/, '');
 		const i = /[\///]/.exec(p)?.index ?? -1;
-		if (i <= 0) throw new Error('invalid unc path: ' + inp);
+		if (i <= 0) throw new Error(`invalid unc path: ${inp}`);
 
 		r = {
 			kind: PathKind.unc,
-			prefix: '//?/UNC/' + p.slice(0, i),
+			prefix: `//?/UNC/${p.slice(0, i)}`,
 			path: p.slice(i + 1),
 		};
 	} else if (winSp.test(p) || winLetter.test(p)) {
@@ -56,11 +56,11 @@ export function analyzePath(p: string) {
 	} else if (doubleSlash.test(p)) {
 		p = p.replace(/^[\/\\]+/, '');
 		const i = /[\///]/.exec(p)?.index ?? -1;
-		if (i <= 0) throw new Error('invalid cifs url: ' + inp);
+		if (i <= 0) throw new Error(`invalid cifs url: ${inp}`);
 
 		r = {
 			kind: PathKind.cifs,
-			prefix: '//' + p.slice(0, i),
+			prefix: `//${p.slice(0, i)}`,
 			path: p.slice(i + 1),
 		};
 	} else if (p.startsWith('/')) {
@@ -103,9 +103,8 @@ export function normalizePath(p: string) {
 
 	if (r.prefix === undefined) {
 		return r.path;
-	} else {
-		return `${r.prefix}/${r.path}`;
 	}
+	return `${r.prefix}/${r.path}`;
 }
 
 export function relativePath(from: string, to: string) {
@@ -113,9 +112,7 @@ export function relativePath(from: string, to: string) {
 	const r2 = analyzePath(to);
 	if (r1.kind !== r2.kind)
 		throw new Error(
-			`cannot relative path between different kind: "${PathKind[r1.kind]}::${from}" * "${
-				PathKind[r2.kind]
-			}::${to}"`,
+			`cannot relative path between different kind: "${PathKind[r1.kind]}::${from}" * "${PathKind[r2.kind]}::${to}"`
 		);
 
 	if (r1.prefix !== r2.prefix) return to;
@@ -132,7 +129,7 @@ export function relativePath(from: string, to: string) {
 	p2arr.splice(0, i);
 
 	// add ..
-	const p1 = p1arr.length > 0 ? p1arr.map(() => '..').join('/') + '/' : '';
+	const p1 = p1arr.length > 0 ? `${p1arr.map(() => '..').join('/')}/` : '';
 	const p2 = p2arr.join('/');
 
 	return p1 + p2;

package/src/path/pathArray.ts

@@ -10,7 +10,7 @@ const isAbsolute = /^[a-z]:[/\\]/i;
 abstract class PathArrayAbstract extends Set<string> {
 	constructor(
 		init: string,
-		private readonly sep: ':' | ';' = isWindows ? ';' : ':',
+		private readonly sep: ':' | ';' = isWindows ? ';' : ':'
 	) {
 		super();
 		if (init) this.add(init);
@@ -44,7 +44,7 @@ abstract class PathArrayAbstract extends Set<string> {
 	 * @returns an array with `part` append to every element
 	 */
 	join(part: string) {
-		return [...this.values()].map((p) => normalizePath(p + '/' + part));
+		return [...this.values()].map((p) => normalizePath(`${p}/${part}`));
 	}
 }
 

package/src/platform/globalSingleton.ts

@@ -1,7 +1,7 @@
 import { functionName } from '../function/functionName.js';
 import { ensureGlobalObject } from './globalObject.js';
 
-const singletonRegistry = ensureGlobalObject(`@@idlebox/global-singleton`, () => {
+const singletonRegistry = ensureGlobalObject('@@idlebox/global-singleton', () => {
 	return new Map<string | symbol, any>();
 });
 

package/src/platform/globalSymbol.ts

@@ -1,6 +1,6 @@
 import { ensureGlobalObject } from './globalObject.js';
 
-const symbolRegistry = ensureGlobalObject(`@@idlebox/global-symbol`, () => {
+const symbolRegistry = ensureGlobalObject('@@idlebox/global-symbol', () => {
 	return {} as Record<string, Record<string, symbol>>;
 });
 
@@ -12,15 +12,14 @@ const symbolRegistry = ensureGlobalObject(`@@idlebox/global-symbol`, () => {
  */
 export function createSymbol(category: string, name: string): symbol {
 	if (symbolRegistry[category]?.[name]) {
-		return symbolRegistry[category]![name]!;
-	} else {
-		if (!symbolRegistry[category]) {
-			symbolRegistry[category] = {};
-		}
-		const c = symbolRegistry[category]!;
-
-		return (c[name] = Symbol(name));
+		return symbolRegistry[category]?.[name]!;
 	}
+	if (!symbolRegistry[category]) {
+		symbolRegistry[category] = {};
+	}
+	const c = symbolRegistry[category]!;
+
+	return (c[name] = Symbol(name));
 }
 
 /**

package/src/promise/promiseCollection.ts

@@ -10,7 +10,7 @@ export class PromiseCollection {
 
 	create(id: string) {
 		if (this.promiseList[id]) {
-			throw new Error('duplicate promise with id ' + id);
+			throw new Error(`duplicate promise with id ${id}`);
 		}
 		const dfd = new DeferredPromise<any>();
 		this.promiseList[id] = dfd;
@@ -22,12 +22,12 @@ export class PromiseCollection {
 	}
 
 	done(id: string, data: any) {
-		this.promiseList[id]!.complete(data);
+		this.promiseList[id]?.complete(data);
 		delete this.promiseList[id];
 	}
 
 	error(id: string, e: Error) {
-		this.promiseList[id]!.error(e);
+		this.promiseList[id]?.error(e);
 		delete this.promiseList[id];
 	}
 

package/src/reflection/classes/hookClass.ts

@@ -6,7 +6,7 @@ interface IConstructorOf<T> extends Object {
 
 interface IHooks<T, TC> {
 	afterConstruct?: ((obj: T) => void)[];
-	beforeConstruct?: ((obj: TC) => T | void)[];
+	beforeConstruct?: ((obj: TC) => T | undefined)[];
 }
 
 export function hookClass<TC extends IConstructorOf<T>, T>(target: TC): IHooks<T, TC> {

package/src/reflection/classes/singleton.ts

@@ -3,8 +3,8 @@ import { hookClass } from './hookClass.js';
 export const singletonSymbol = Symbol('@gongt/singleton');
 
 export enum SingletonType {
-	Throw,
-	Return,
+	Throw = 0,
+	Return = 1,
 }
 
 export function singleton(type: SingletonType = SingletonType.Return): ClassDecorator {
@@ -21,9 +21,8 @@ export function singleton(type: SingletonType = SingletonType.Return): ClassDeco
 			if (cls[singletonSymbol]) {
 				if (type === SingletonType.Return) {
 					return cls[singletonSymbol];
-				} else {
-					throw new Error(`Duplicate new singleton class [${target.name}]`);
 				}
+				throw new Error(`Duplicate new singleton class [${target.name}]`);
 			}
 		});
 		hook.afterConstruct.push((obj) => {

package/src/reflection/methods/bind.ts

@@ -24,7 +24,6 @@ export const bindThis: MethodDecorator = <T>(
 				return fn;
 			},
 		};
-	} else {
-		throw new TypeError('@bindThis can only use with method, but not property.');
 	}
+	throw new TypeError('@bindThis can only use with method, but not property.');
 };

package/src/reflection/methods/initOnRead.ts

@@ -1,11 +1,11 @@
-import { InitFunc, initOnRead } from '../../object/initOnRead.js';
+import { type InitFunc, initOnRead } from '../../object/initOnRead.js';
 
 /**
  * Decorater version of `initOnRead`
  * @see initOnRead
  */
 export function init<O, T extends keyof O>(init: InitFunc<O, O[T]>): PropertyDecorator {
-	return function (target: O, propertyKey: T) {
+	return ((target: O, propertyKey: T) => {
 		initOnRead<O, T>(target, propertyKey, init);
-	} as any;
+	}) as any;
 }

package/src/string/castCase.ts

@@ -2,7 +2,7 @@
 export function camelCase(str: string) {
 	return str
 		.replace(/[-.\/_]+[a-z]/g, (s) => {
-			return s[1]!.toUpperCase();
+			return s[1]?.toUpperCase();
 		})
 		.replace(/[-.\/_]+/g, '');
 }
@@ -12,7 +12,7 @@ export function camelCase(str: string) {
  * @public
  */
 export function ucfirst<T extends string>(str: T): Capitalize<T> {
-	return <any>(str[0]!.toUpperCase() + str.slice(1));
+	return <any>(str[0]?.toUpperCase() + str.slice(1));
 }
 
 /**
@@ -20,7 +20,7 @@ export function ucfirst<T extends string>(str: T): Capitalize<T> {
  * @public
  */
 export function lcfirst<T extends string>(str: T): Uncapitalize<T> {
-	return <any>(str[0]!.toLowerCase() + str.slice(1));
+	return <any>(str[0]?.toLowerCase() + str.slice(1));
 }
 
 /** @public */
@@ -30,7 +30,7 @@ export function linux_case(str: string) {
 			return s.toLowerCase();
 		})
 		.replace(/[A-Z]+/g, (s) => {
-			return '_' + s.toLowerCase();
+			return `_${s.toLowerCase()}`;
 		})
 		.replace(/[-.\/_]+/g, '_');
 }
@@ -42,7 +42,7 @@ export function linux_case_hyphen(str: string) {
 			return s.toLowerCase();
 		})
 		.replace(/[A-Z]+/g, (s) => {
-			return '-' + s.toLowerCase();
+			return `-${s.toLowerCase()}`;
 		})
 		.replace(/[-.\/_]+/g, '-');
 }

package/src/string/pad2.ts

@@ -4,8 +4,7 @@
  */
 export function pad2(s: number) {
 	if (s < 10) {
-		return '0' + s;
-	} else {
-		return '' + s;
+		return `0${s}`;
 	}
+	return `${s}`;
 }