@idlebox/node 1.4.1 → 1.4.3

package/src/error/types.ts

@@ -1,5 +1,5 @@
-import { LinuxError } from './linux';
-import { NodeError } from './nodejs-error-code.generated';
+import { LinuxError } from './linux.js';
+import { NodeError } from './nodejs-error-code.generated.js';
 
 type NodeException<T extends string = any> = NodeJS.ErrnoException & { code: T };
 

package/src/fs/commandExists.ts

@@ -1,6 +1,6 @@
 import { isWindows } from '@idlebox/common';
 import { access, constants, accessSync } from 'fs';
-import { PathEnvironment } from '../environment/pathEnvironment';
+import { PathEnvironment } from '../environment/pathEnvironment.js';
 
 const windowsExecExtensions = ['.exe', '.bat', '.cmd', '.com', '.ps1'];
 

package/src/fs/exists.ts

@@ -1,6 +1,6 @@
 import { ObjectEncodingOptions } from 'fs';
 import { access, readFile } from 'fs/promises';
-import { isNotExistsError } from '../error/types';
+import { isNotExistsError } from '../error/types.js';
 export { existsSync } from 'fs';
 
 export async function exists(path: string) {

package/src/fs/tempFolder.ts

@@ -1,7 +1,7 @@
 import { mkdirSync, readdirSync, rmdirSync, statSync, unlinkSync } from 'fs';
 import { resolve } from 'path';
 import { IDisposable } from '@idlebox/common';
-import { existsSync } from './exists';
+import { existsSync } from './exists.js';
 
 let registered = false;
 const tempFolders = new Set<string>();

package/src/fs/weiteChanged.ts

@@ -1,6 +1,6 @@
 import { readFile as readFileAsync, readFileSync, writeFile as writeFileAsync, writeFileSync } from 'fs';
 import { promisify } from 'util';
-import { exists, existsSync } from './exists';
+import { exists, existsSync } from './exists.js';
 
 const readFile = promisify(readFileAsync);
 const writeFile = promisify(writeFileAsync);

package/src/path-resolve/findPackageRoot.ts

@@ -1,6 +1,6 @@
 import { createRequire } from 'module';
 import { dirname } from 'path';
-import { findUpUntilSync } from './findUp';
+import { findUpUntilSync } from './findUp.js';
 
 export function findPackageRoot(packageName: string, require = createRequire(process.cwd())) {
 	try {

package/src/path-resolve/findUp.ts

@@ -1,33 +1,94 @@
-import { dirname, resolve } from 'path';
-import { exists, existsSync } from '../fs/exists';
-
-export async function findUpUntil(from: string, file: string): Promise<string | null> {
-	for (let _from = resolve(from); _from !== '/'; _from = dirname(_from)) {
-		const want = resolve(_from, file);
-		if (await exists(want)) {
-			return want;
+import { isWindows } from '@idlebox/common';
+import { dirname, resolve } from 'node:path';
+import { deprecate } from 'node:util';
+import { exists, existsSync } from '../fs/exists.js';
+
+export interface IFindOptions {
+	/** 从哪开始找，必须是绝对路径 */
+	from: string;
+	/** 要找的文件 */
+	file: string | string[];
+	/** 最外层目录，超出或偏离都会停止搜索 */
+	top?: string;
+}
+
+const isRoot = isWindows ? /^[A-Z]:[/\\]$/i : /^\/$/;
+
+export async function findUpUntil(opts: IFindOptions): Promise<string | null>;
+/** @deprecated */
+export async function findUpUntil(from: string, file: string): Promise<string | null>;
+
+export async function findUpUntil(opts: string | IFindOptions, file?: string): Promise<string | null> {
+	if (typeof opts === 'string') {
+		deprecate(findUpUntil, 'findUpUntil is deprecated. Use findUpUntil(opts) instead.');
+		opts = { from: opts, file: [file!] };
+	}
+	if (typeof opts.file === 'string') {
+		opts.file = [opts.file];
+	}
+	if (opts.top) {
+		opts.top = resolve(opts.top);
+	}
+
+	const { from, file: files, top } = opts;
+
+	for (let _from = resolve(from); !isRoot.test(_from); _from = dirname(_from)) {
+		if (top && !_from.startsWith(top)) {
+			return null;
+		}
+		for (const file of files) {
+			const want = resolve(_from, file);
+			if (await exists(want)) {
+				return want;
+			}
 		}
 	}
 
-	const final = resolve('/', file);
-	if (await exists(final)) {
-		return final;
+	for (const file of files) {
+		const final = resolve(from, '/', file);
+		if (await exists(final)) {
+			return final;
+		}
 	}
 
 	return null;
 }
 
-export function findUpUntilSync(from: string, file: string): string | null {
-	for (let _from = resolve(from); _from !== '/'; _from = dirname(_from)) {
-		const want = resolve(_from, file);
-		if (existsSync(want)) {
-			return want;
+export function findUpUntilSync(opts: IFindOptions): string | null;
+/** @deprecated */
+export function findUpUntilSync(from: string, file: string): string | null;
+
+export function findUpUntilSync(opts: string | IFindOptions, file?: string): string | null {
+	if (typeof opts === 'string') {
+		deprecate(findUpUntil, 'findUpUntil is deprecated. Use findUpUntil(opts) instead.');
+		opts = { from: opts, file: [file!] };
+	}
+	if (typeof opts.file === 'string') {
+		opts.file = [opts.file];
+	}
+	if (opts.top) {
+		opts.top = resolve(opts.top);
+	}
+
+	const { from, file: files, top } = opts;
+
+	for (let _from = resolve(from); !isRoot.test(_from); _from = dirname(_from)) {
+		if (top && !_from.startsWith(top)) {
+			return null;
+		}
+		for (const file of files) {
+			const want = resolve(_from, file);
+			if (existsSync(want)) {
+				return want;
+			}
 		}
 	}
 
-	const final = resolve('/', file);
-	if (existsSync(final)) {
-		return final;
+	for (const file of files) {
+		const final = resolve(from, '/', file);
+		if (existsSync(final)) {
+			return final;
+		}
 	}
 
 	return null;

package/src/stream/collectingStream.ts

@@ -1,5 +1,5 @@
-import { Writable } from 'stream';
-import { streamPromise } from './streamPromise';
+import { Writable } from "stream";
+import { streamPromise } from "./streamPromise.js";
 
 export function streamToBuffer(stream: NodeJS.ReadableStream, raw: false): Promise<string>;
 export function streamToBuffer(stream: NodeJS.ReadableStream, raw: true): Promise<Buffer>;
@@ -19,8 +19,8 @@ export class RawCollectingStream extends Writable {
 		super();
 		if (sourceStream) {
 			sourceStream.pipe(this);
-			sourceStream.on('error', (e) => {
-				this.emit('error', e);
+			sourceStream.on("error", (e) => {
+				this.emit("error", e);
 			});
 		}
 	}
@@ -30,7 +30,7 @@ export class RawCollectingStream extends Writable {
 		callback();
 	}
 
-	getOutput() {
+	getOutput(): Buffer {
 		return this.buffer!;
 	}
 
@@ -41,29 +41,29 @@ export class RawCollectingStream extends Writable {
 					const buffer = this.buffer!;
 					delete this.buffer;
 					return buffer;
-			  }));
+				}));
 	}
 }
 
 export class CollectingStream extends Writable {
-	private buffer? = '';
+	private buffer? = "";
 	private _promise?: Promise<string>;
 
 	constructor(sourceStream?: NodeJS.ReadableStream) {
 		super();
 		if (sourceStream) {
 			sourceStream.pipe(this);
-			sourceStream.on('error', (e) => {
-				this.emit('error', e);
+			sourceStream.on("error", (e) => {
+				this.emit("error", e);
 			});
 		}
 	}
 
 	override _write(chunk: Buffer, encoding: BufferEncoding, callback: (error?: Error | null) => void): void {
 		if (!encoding) {
-			encoding = 'utf8';
-		} else if ((encoding as any) === 'buffer' || encoding === 'binary') {
-			encoding = 'utf8';
+			encoding = "utf8";
+		} else if ((encoding as any) === "buffer" || encoding === "binary") {
+			encoding = "utf8";
 		}
 		this.buffer += chunk.toString(encoding);
 		callback();
@@ -80,6 +80,6 @@ export class CollectingStream extends Writable {
 					const buffer = this.buffer!;
 					delete this.buffer;
 					return buffer;
-			  }));
+				}));
 	}
 }

package/src/stream/streamPromise.ts

@@ -7,10 +7,11 @@ export function streamPromise(stream: NodeJS.ReadableStream | NodeJS.WritableStr
 		return Promise.resolve();
 	} else {
 		return new Promise((resolve, reject) => {
-			stream.once('end', () => resolve());
-			stream.once('finish', () => resolve());
-			stream.once('close', () => resolve());
-			stream.once('error', reject);
+			const r = stream as NodeJS.EventEmitter;
+			r.once('end', () => resolve());
+			r.once('finish', () => resolve());
+			r.once('close', () => resolve());
+			r.once('error', reject);
 		});
 	}
 }