fyn 3.1.5 → 3.1.6

package/dist/fyn.mjs

@@ -27044,8 +27044,6 @@ function processDir(options, extras) {
 */
 function processFile(options, extras) {
 	if (!options.includeDir && !options.includeSymlink && extras.stat && extras.stat.isSymbolicLink && extras.stat.isSymbolicLink()) return false;
-	if (options.ignoreExt.length > 0 && options.ignoreExt.indexOf(extras.ext) >= 0) return false;
-	if (options.filterExt.length > 0 && options.filterExt.indexOf(extras.ext) < 0) return false;
 	const filterResult = options.filter ? options.filter(extras.file, extras.path, extras) : true;
 	if (filterResult) {
 		if (filterResult.skip !== true) addResult(filterResult, options, extras);
@@ -27053,6 +27051,19 @@ function processFile(options, extras) {
 	}
 	return false;
 }
+function acceptEntry(options, entry, path) {
+	const isDirectory = entry.isDirectory();
+	if (isDirectory && options._ignoreDirs.has(entry.name)) return false;
+	if (options.prefilter && !options.prefilter(entry.name, path, entry)) return false;
+	if (isDirectory) return true;
+	if (options.ignoreExt.length || options.filterExt.length) {
+		const ix = entry.name.lastIndexOf(".");
+		const ext = ix > 0 ? entry.name.substring(ix) : "";
+		if (options.ignoreExt.indexOf(ext) >= 0) return false;
+		if (options.filterExt.length && options.filterExt.indexOf(ext) < 0) return false;
+	}
+	return true;
+}
 /**
 * get the result base on grouping enable flag
 *
@@ -27060,10 +27071,23 @@ function processFile(options, extras) {
 * @returns
 */
 function getResult(options) {
-	return options.grouping ? Object.assign({ files: [] }, options.result) : options.result.files || [];
+	return options.grouping ? {
+		files: [],
+		...options.result
+	} : options.result.files || [];
 }
 const asyncReaddir = Util.promisify(fs.readdir);
 const asyncLStat = Util.promisify(fs.lstat);
+function releaseDirectory(options) {
+	if (options._waitIndex < options._waiting.length) {
+		const resume = options._waiting[options._waitIndex++];
+		if (options._waitIndex === options._waiting.length) {
+			options._waiting = [];
+			options._waitIndex = 0;
+		}
+		resume();
+	} else options._concurrentCount--;
+}
 /**
 * async version of dir walk
 *
@@ -27073,59 +27097,73 @@ const asyncLStat = Util.promisify(fs.lstat);
 * @returns
 */
 async function walk(path, options, level = 0) {
+	let promises = [];
+	let hasSlot = false;
 	try {
+		if (options.concurrency > 1) {
+			if (options._concurrentCount >= options.concurrency) await new Promise((resolve) => options._waiting.push(resolve));
+			else options._concurrentCount++;
+			hasSlot = true;
+		}
+		if (options._stopped) return void 0;
 		const dir = Path.join(options.dir, path);
 		let files = await asyncReaddir(dir, options.readdirOpts);
 		if (options.sortFiles) {
-			if (options.fullStat) files = files.sort();
+			if (!options.readdirOpts) files = files.sort();
 			else files = files.sort(direntCmp);
 		}
 		const dirs = [];
-		let stop = false;
-		for (let ix = 0; !stop && ix < files.length; ix++) {
+		const extrasFiles = options.fullStat && options._earlyFilter && (options.filter || options.filterDir) ? files.map((entry) => entry.name) : files;
+		for (let ix = 0; !options._stopped && ix < files.length; ix++) {
 			const file = files[ix];
+			if (options._earlyFilter && !acceptEntry(options, file, path)) continue;
 			let extras;
 			if (options.fullStat) {
-				const fullFile = join2(options._sep, dir, file);
-				extras = makeExtrasData(file, fullFile, path, await asyncLStat(fullFile), files, options);
+				const name = options._earlyFilter ? file.name : file;
+				const fullFile = join2(options._sep, dir, name);
+				const stat = await asyncLStat(fullFile);
+				if (options._stopped) break;
+				extras = makeExtrasData(name, fullFile, path, stat, extrasFiles, options);
 			} else {
 				const fullFile = join2(options._sep, dir, file.name);
 				extras = makeExtrasData(file.name, fullFile, path, file, files, options);
 			}
 			if (extras.stat.isDirectory()) dirs.push(extras);
-			else stop = processFile(options, extras);
-		}
-		if (!stop && dirs.length > 0) {
-			let promises = [];
-			for (let ix = 0; ix < dirs.length; ix++) {
-				const extras = dirs[ix];
-				const flags = processDir(options, extras);
-				if (flags.stop) break;
-				if (!flags.skip && level < options.maxLevel) {
-					const walkP = walk(extras.dirFile, options, level + 1);
-					if (options.concurrency > 1) {
-						if (options._concurrentCount < options.concurrency) {
-							options._concurrentCount++;
-							promises.push(walkP);
-						} else if (promises.length) {
-							await Promise.all(promises);
-							options._concurrentCount -= promises.length;
-							promises = [walkP];
-							options._concurrentCount++;
-						} else await walkP;
-					} else await walkP;
-				}
-			}
-			if (promises.length) {
-				await Promise.all(promises);
-				options._concurrentCount -= promises.length;
-				promises = [];
+			else options._stopped = !!processFile(options, extras);
+		}
+		if (hasSlot) {
+			releaseDirectory(options);
+			hasSlot = false;
+		}
+		if (!options._stopped && dirs.length > 0) for (let ix = 0; !options._stopped && ix < dirs.length; ix++) {
+			const extras = dirs[ix];
+			const flags = processDir(options, extras);
+			if (flags.stop) {
+				options._stopped = true;
+				break;
+			}
+			if (!flags.skip && level < options.maxLevel) {
+				const walkP = walk(extras.dirFile, options, level + 1);
+				if (options.concurrency > 1) {
+					promises.push(walkP);
+					if (promises.length >= options.concurrency) {
+						await Promise.all(promises);
+						promises = [];
+					}
+				} else await walkP;
 			}
 		}
 	} catch (err) {
-		if (options.rethrowError) throw err;
+		if (options.rethrowError) {
+			if (!options._error) options._error = { cause: err };
+			options._stopped = true;
+		}
+	} finally {
+		if (hasSlot) releaseDirectory(options);
+		if (promises.length) await Promise.all(promises);
 	}
-	return getResult(options);
+	if (level === 0 && options._error) throw options._error.cause;
+	return level === 0 ? getResult(options) : void 0;
 }
 /**
 * make a copy of the user's options with proper defaults
@@ -27135,6 +27173,7 @@ async function walk(path, options, level = 0) {
 */
 function makeOptions(opts) {
 	const options = typeof opts === "string" ? { cwd: opts } : opts;
+	if (options.prefilter && options.fullStat === false) throw new TypeError("prefilter requires fullStat: true");
 	const sep = options.pathSep || Path.posix.sep;
 	let cwd = options.cwd || options.dir || process.cwd();
 	if (!options.hasOwnProperty("pathSep") && cwd.includes("\\")) cwd = cwd.replace(/\\/g, "/");
@@ -27156,12 +27195,20 @@ function makeOptions(opts) {
 		grouping: void 0
 	}, options, {
 		dir: cwd,
-		result: {},
+		fullStat: options.fullStat === void 0 ? true : options.fullStat,
+		result: Object.create(null),
 		ignoreExt: [].concat(options.ignoreExt).map(cleanExt).filter((x) => x),
 		filterExt: [].concat(options.filterExt).map(cleanExt).filter((x) => x),
-		_concurrentCount: 0
+		_concurrentCount: 0,
+		_waiting: [],
+		_waitIndex: 0,
+		_stopped: false,
+		_error: void 0,
+		_earlyFilter: false,
+		_ignoreDirs: new Set([].concat(options.ignoreDirs || []))
 	});
-	if (!opts2.fullStat) opts2.readdirOpts = { withFileTypes: true };
+	opts2._earlyFilter = !!opts2.prefilter || opts2._ignoreDirs.size > 0 || opts2.ignoreExt.length > 0 || opts2.filterExt.length > 0;
+	if (!opts2.fullStat || opts2._earlyFilter) opts2.readdirOpts = { withFileTypes: true };
 	return opts2;
 }
 function filterScanDir(options = {}) {
@@ -102357,7 +102404,6 @@ function createAbortError(context) {
 	return err;
 }
 function lastLines(text, n) {
-	if (!text) return [];
 	return text.split("\n").filter(Boolean).slice(-n);
 }
 function enhanceError(err, context) {
@@ -102446,12 +102492,11 @@ var VisualExec = class {
 		if (typeof command !== "string") command = "user command";
 		return `Running ${command}`;
 	}
-	_createOutputFileStream() {
-		if (typeof this._outputFile !== "string") return void 0;
+	_createOutputFileStream(outputFile) {
 		const flags = this._outputFileOptions.append ? "a" : "w";
-		const dir = Path$1.dirname(this._outputFile);
+		const dir = Path$1.dirname(outputFile);
 		if (!fs$2.existsSync(dir)) fs$2.mkdirSync(dir, { recursive: true });
-		return fs$2.createWriteStream(this._outputFile, { flags });
+		return fs$2.createWriteStream(outputFile, { flags });
 	}
 	_writeToOutputFile(data, stream) {
 		var _a;
@@ -102571,7 +102616,7 @@ var VisualExec = class {
 		child.stdout.on("data", this._onStdoutData);
 		child.stderr.on("data", this._onStderrData);
 		this._child = child;
-		if (typeof this._outputFile === "string") this._outputStream = this._createOutputFileStream();
+		if (typeof this._outputFile === "string") this._outputStream = this._createOutputFileStream(this._outputFile);
 		else if (this._outputFile) this._outputStream = void 0;
 		let timeoutId;
 		const startTime = Date.now();
@@ -102707,6 +102752,7 @@ var VisualExec = class {
 			child: result.child
 		};
 		const duration = () => Date.now() - this._startTime;
+		/* v8 ignore next -- @preserve Every field is overwritten in the context below. */
 		const baseContext = (output) => {
 			var _a, _b, _c, _d;
 			return {
@@ -102726,7 +102772,8 @@ var VisualExec = class {
 				stderr: ""
 			};
 			const exitCode = (_c = err.code) !== null && _c !== void 0 ? _c : 1;
-			const signal = (_e = (_d = err.signal) !== null && _d !== void 0 ? _d : ((_a = result.child) === null || _a === void 0 ? void 0 : _a.killed) ? "SIGTERM" : null) !== null && _e !== void 0 ? _e : null;
+			const signal = (_e = (_d = err.signal) !== null && _d !== void 0 ? _d : ((_a = result.child) === null || _a === void 0 ? void 0 : _a.killed) ? "SIGTERM" : null) !== null && _e !== void 0 ? _e : 
+			/* v8 ignore next -- @preserve The preceding fallback already returns null. */ null;
 			const context = {
 				...baseContext(output),
 				exitCode,
@@ -114834,7 +114881,7 @@ async function _internalCheck(options) {
 	const existMeta = await readMetaFile();
 	const shouldFetch = now - existMeta.time >= checkInterval || !existMeta.distTags;
 	const distTags = shouldFetch ? await fetchDistTags() : existMeta.distTags;
-	const saveMetaFile = async (notifiedVersion = "", notifiedTime = 0) => {
+	const saveMetaFile = async (notifiedVersion = "", notifiedTime) => {
 		await promises.writeFile(metaFile, JSON.stringify({
 			...pkg,
 			distTags,
@@ -115883,6 +115930,7 @@ var CliBase = class {
 				required,
 				name,
 				type,
+				array: xm[4] ? true : void 0,
 				variadic,
 				min,
 				max
@@ -116019,9 +116067,9 @@ var Options = class {
 	match(data) {
 		const alias = data.name;
 		let name;
-		let option = this._options[alias];
+		let option = Object.hasOwn(this._options, alias) ? this._options[alias] : void 0;
 		if (option) name = alias;
-		else if (this._optAlias[alias]) {
+		else if (Object.hasOwn(this._optAlias, alias)) {
 			name = this._optAlias[alias];
 			option = this._options[name];
 		} else return false;
@@ -116154,7 +116202,7 @@ var CommandBase = class CommandBase extends CliBase {
 	*/
 	setCommandAliases(alias, name) {
 		alias.forEach((a) => {
-			if (this.subAliases[a]) throw new Error(`Command ${name} alias ${a} already used by command ${this.subAliases[a]}`);
+			if (Object.hasOwn(this.subAliases, a)) throw new Error(`Command ${name} alias ${a} already used by command ${this.subAliases[a]}`);
 			this.subAliases[a] = name;
 		});
 	}
@@ -116235,10 +116283,10 @@ var CommandBase = class CommandBase extends CliBase {
 	* ```
 	*/
 	matchSubCommand(alias) {
-		let cmd = this.subCmdsBase[alias];
+		let cmd = Object.hasOwn(this.subCmdsBase, alias) ? this.subCmdsBase[alias] : void 0;
 		let name = alias;
 		if (!cmd) {
-			name = this.subAliases[alias];
+			name = Object.hasOwn(this.subAliases, alias) ? this.subAliases[alias] : void 0;
 			if (name) cmd = this.subCmdsBase[name];
 			else name = alias;
 		}
@@ -116535,11 +116583,18 @@ var CommandNode = class extends ClapNode {
 			if (matchOpt) {
 				const optNode = this.optNodes[matchOpt.name];
 				if (!optNode || !optNode.source.startsWith("cli")) {
+					const camelCaseKey = camelCase(matchOpt.name);
+					const aliasNode = this.optNodes[camelCaseKey];
 					this.removeOptionNode(matchOpt.name);
 					new ClapNodeGenerator(this).addOptionWithArgs(matchOpt.name, [].concat(data.arg), matchOpt.option, src);
+					if (optNode && aliasNode === optNode) {
+						this.optNodes[camelCaseKey] = this.optNodes[matchOpt.name];
+						this.optCount[camelCaseKey] = this.optCount[matchOpt.name];
+					}
 				}
 			} else if (!this.optNodes[key]) new ClapNodeGenerator(this).addOptionWithArgs(key, [].concat(data.arg), void 0, src);
 		}
+		for (let command = this; command; command = command.getParent()) command._jsonMeta = void 0;
 	}
 	/**
 	* For options that has names with - in them, add it using its name converted to camelCase.
@@ -116720,6 +116775,7 @@ var ClapNodeGenerator = class ClapNodeGenerator {
 					fallbackBuilder.parent = this;
 					fallbackNode.addVerbatimArg(arg);
 					fallbackBuilder.node.addArg(arg);
+					if (fallbackMatched.cmd.expectArgs === fallbackNode.argsList.length) fallbackBuilder.endArgGathering();
 					return [fallbackBuilder];
 				}
 			}
@@ -116921,8 +116977,8 @@ var ClapNodeGenerator = class ClapNodeGenerator {
 		optNode.getParent();
 		this.cmdNode;
 		const builder = new ClapNodeGenerator(optNode, this);
-		const minArg = data.value ? 1 : 0;
-		if (!(optNode.option.args.length > minArg)) builder.complete();
+		const minArg = data.value !== void 0 ? 1 : 0;
+		if (!(optNode.option.expectArgs > minArg)) builder.complete();
 		return [builder];
 	}
 	/**
@@ -116940,7 +116996,7 @@ var ClapNodeGenerator = class ClapNodeGenerator {
 		};
 		if (opt.hasArgs) for (let i = 0; i < args.length && i < node.argsList.length; i++) setArg(i, args[i], node.argsList[i]);
 		else node.argsMap[0] = node.argsList.length > 0 ? this.convertValue(isBoolean(node.argsList[0]) ? "boolean" : isNumber(node.argsList[0]) ? "number" : "string", node.argsList[0], opt) : true;
-		if (opt.isVariadicArgs) {
+		if (args.length > 0 && args[args.length - 1].array) {
 			const lastIx = args.length - 1;
 			if (node.argsList.length > lastIx) setArg(lastIx, args[lastIx], node.argsList.slice(lastIx));
 		}
@@ -116959,7 +117015,7 @@ var ClapNodeGenerator = class ClapNodeGenerator {
 			node.argsMap[argIx] = setValue;
 		};
 		for (let i = 0; i < args.length && i < node.argsList.length; i++) setArg(i, args[i], node.argsList[i]);
-		if (cmd.isVariadicArgs) {
+		if (args.length > 0 && args[args.length - 1].array) {
 			const lastIx = args.length - 1;
 			if (node.argsList.length > lastIx) setArg(lastIx, args[lastIx], node.argsList.slice(lastIx));
 		}
@@ -117105,7 +117161,7 @@ var Parser = class {
 	* @param arg - a raw argv entry already known to start with '-'
 	* @returns count of subsequent argv entries taken as this option's value
 	*/
-	_optionValueCount(arg) {
+	_optionValueCount(arg, nextArg) {
 		if (arg.startsWith("--no-")) return 0;
 		const dashes = arg.startsWith("--") ? 2 : 1;
 		let name = arg.substring(dashes);
@@ -117126,7 +117182,10 @@ var Parser = class {
 				dashes,
 				arg
 			});
-			if (matched && matched.option) return matched.option.expectArgs || 0;
+			if (matched && matched.option) {
+				if (matched.option.expectArgs > 0 && matched.option.args[0].type === "boolean" && !isBoolean(nextArg)) return 0;
+				return matched.option.expectArgs || 0;
+			}
 		}
 		return 0;
 	}
@@ -117146,7 +117205,7 @@ var Parser = class {
 				hasNonOptionArgs = true;
 				break;
 			}
-			i += this._optionValueCount(arg);
+			i += this._optionValueCount(arg, argv[i + 1]);
 			if (arg === "--help" || arg === "-h" || arg === "-?" || arg === "--version" || arg === "-v" || arg === "-V") hasHelpOrVersion = true;
 		}
 		const hasDefaultCommand = this._nc._rootCommand?.ncConfig?.defaultCommand !== void 0;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "fyn",
   "type": "module",
-  "version": "3.1.5",
+  "version": "3.1.6",
   "description": "fyn is a node.js package manager, and supports fynpo -- a zero setup monorepo tool",
   "main": "./bin/index.mjs",
   "homepage": "https://github.com/jchip/fynjs/tree/main/packages/fyn",
@@ -82,8 +82,8 @@
     "Walmart GTP.js Team and Contributors"
   ],
   "devDependencies": {
-    "@fynjs/run": "^1.1.4",
-    "@fynjs/ts-resolve": "^1.0.2",
+    "@fynjs/run": "^1.1.5",
+    "@fynjs/ts-resolve": "^1.0.3",
     "@types/node": "^26.4.1",
     "@vitest/coverage-v8": "^5.0.0",
     "@vitest/ui": "^5.0.0",
@@ -92,7 +92,7 @@
     "patch-package": "^8.0.0",
     "prettier": "^3.5.3",
     "rolldown": "^1.2.6",
-    "run-verify": "^2.1.4",
+    "run-verify": "^2.1.5",
     "typescript": "^7.0.2",
     "vite": "^8.2.2",
     "vitest": "^5.0.0",