fyn 3.1.8 → 3.1.9

package/bin/index.mjs

@@ -40,4 +40,7 @@ export const run = async (...args) => (await load()).run(...args);
  */
 export const fun = async (...args) => (await load()).fun(...args);
 
-export default { run, fun };
+/** Resolve the generated audit report path using fyn's installation configuration. */
+export const getAuditFilePath = async (...args) => (await load()).getAuditFilePath(...args);
+
+export default { run, fun, getAuditFilePath };

package/dist/fyn.mjs

@@ -1624,7 +1624,7 @@ var AveAzul = class AveAzul extends Promise {
 	* @returns Promise that resolves after the delay
 	*/
 	delay(ms) {
-		return delay$1(ms);
+		return this.then((value) => AveAzul.delay(ms, value));
 	}
 	/**
 	* Bluebird-style timeout() method
@@ -1662,8 +1662,8 @@ var AveAzul = class AveAzul extends Promise {
 	* @returns Promise that maintains the rejection
 	*/
 	tapCatch(fn) {
-		return this.catch((err) => {
-			fn(err);
+		return this.catch(async (err) => {
+			await fn(err);
 			throw err;
 		});
 	}
@@ -1703,7 +1703,9 @@ var AveAzul = class AveAzul extends Promise {
 	* @returns Promise that rejects with the given reason
 	*/
 	throw(reason) {
-		return AveAzul.reject(reason);
+		return this.then(() => {
+			throw reason;
+		});
 	}
 	/**
 	* Bluebird-style catchThrow() that catches an error and throws a new one
@@ -1756,6 +1758,8 @@ var AveAzul = class AveAzul extends Promise {
 		});
 	}
 	some(count) {
+		if ((count | 0) !== count || count < 0) return AveAzul.reject(/* @__PURE__ */ new TypeError("expecting a non-negative integer"));
+		if (count === 0) return AveAzul.resolve([]);
 		return this.then((args) => {
 			const arr = toArray$1(args);
 			return new AveAzul((resolve, reject) => {
@@ -1763,6 +1767,10 @@ var AveAzul = class AveAzul extends Promise {
 				const results = [];
 				const len = arr.length;
 				let settled = false;
+				if (count > len) {
+					settled = true;
+					reject(/* @__PURE__ */ new RangeError(`Input array must contain at least ${count} items but contains only ${len} items`));
+				}
 				const addDone = (result) => {
 					if (settled) return;
 					results.push(result);
@@ -2054,7 +2062,7 @@ AveAzul.OperationalError = OperationalError;
 AveAzul.isOperationalError = isOperationalError;
 AveAzul.isProgrammerError = isProgrammerError;
 AveAzul.Disposer = Disposer;
-addStaticAny(AveAzul);
+addStaticAny(AveAzul, true);
 setupNotImplemented(AveAzul);
 
 //#endregion
@@ -91926,6 +91934,7 @@ var hard_link_dir_exports = /* @__PURE__ */ __exportAll({
 	link: () => link$1,
 	linkFile: () => linkFile,
 	linkSym1: () => linkSym1,
+	localLinkNeedsRefresh: () => localLinkNeedsRefresh,
 	unlinkDest: () => unlinkDest
 });
 var import_lib$4 = /* @__PURE__ */ __toESM(require_lib$36(), 1);
@@ -92194,10 +92203,15 @@ async function handleSourceMap({ file, destFiles, src, dest, srcFp, destFp, sour
 * @param {*} dest
 * @param {*} sym1
 */
-async function linkPackTree({ tree, src, dest, sym1, sourceMaps, isRoot = false }) {
+async function linkPackTree({ tree, src, dest, sym1, sourceMaps, preserveInstall = false, isRoot = false }) {
 	const files = tree[SYM_FILES];
 	const destFiles = await prepDestDir(dest);
+	if (isRoot && preserveInstall) {
+		destFiles["package.json"] = true;
+		destFiles["node_modules"] = true;
+	}
 	for (const file of files) {
+		if (isRoot && preserveInstall && file === "package.json") continue;
 		if (!import_ci_info.isCI && file.match(/\.(js|mjs)\.map$/)) continue;
 		destFiles[file] = true;
 		const srcFp = Path.join(src, file);
@@ -92221,6 +92235,7 @@ async function linkPackTree({ tree, src, dest, sym1, sourceMaps, isRoot = false
 	}
 	const dirs = Object.keys(tree).sort();
 	for (const dir of dirs) {
+		if (isRoot && preserveInstall && dir.split("/")[0] === "node_modules") continue;
 		destFiles[dir.split("/")[0]] = true;
 		const srcFp = Path.join(src, dir);
 		const destFp = Path.join(dest, dir);
@@ -92235,15 +92250,47 @@ async function linkPackTree({ tree, src, dest, sym1, sourceMaps, isRoot = false
 	logger$1.debug(`linkPackTree src: ${src} dest: ${dest} - destFiles ${JSON.stringify(destFiles)}`);
 	await cleanExtraDest(dest, destFiles, isRoot);
 }
-async function link$1(src, dest, { sourceMaps = true } = {}) {
+async function link$1(src, dest, { sourceMaps = true, preserveInstall = false } = {}) {
 	return await linkPackTree({
 		tree: await generatePackTree(src),
 		src,
 		dest,
 		sourceMaps,
+		preserveInstall,
 		isRoot: true
 	});
 }
+async function localLinkNeedsRefresh(src, dest, installedAt) {
+	const tree = await generatePackTree(src);
+	const copyMode = fyntil.strToBool(process.env.FYN_LOCAL_COPY_MODE);
+	const inspectTree = async (tree, srcDir, destDir) => {
+		for (const file of tree[SYM_FILES]) {
+			const srcFile = Path.join(srcDir, file);
+			const srcStat = await file_ops_default.lstat(srcFile);
+			if (srcDir === src && file === "package.json" || !import_ci_info.isCI && /\.(js|mjs)\.map$/.test(file)) {
+				if (srcStat.mtimeMs > installedAt) return true;
+				continue;
+			}
+			const destFile = Path.join(destDir, file);
+			let destStat;
+			try {
+				destStat = await file_ops_default.lstat(destFile);
+			} catch (err) {
+				if (err.code === "ENOENT" || err.code === "ENOTDIR") return true;
+				throw err;
+			}
+			if (srcStat.isSymbolicLink()) {
+				if (!destStat.isSymbolicLink() || await file_ops_default.readlink(srcFile) !== await file_ops_default.readlink(destFile)) return true;
+			} else if (!destStat.isFile()) return true;
+			else if (copyMode) {
+				if (srcStat.mtimeMs > installedAt) return true;
+			} else if (srcStat.dev !== destStat.dev || srcStat.ino !== destStat.ino) return true;
+		}
+		for (const dir of Object.keys(tree)) if (await inspectTree(tree[dir], Path.join(srcDir, dir), Path.join(destDir, dir))) return true;
+		return false;
+	};
+	return inspectTree(tree, src, dest);
+}
 async function linkSym1(src, dest) {
 	return await linkPackTree({
 		tree: await generatePackTree(src),
@@ -110433,7 +110480,7 @@ var LocalPkgBuilder = class {
 		}
 		const checkPkg = await this._fyn.getLocalPkgInstall(item.fullPath);
 		this._waitItems[item.fullPath] = false;
-		if (!checkPkg.localBuild) {
+		if (!checkPkg.localBuild && !(this._fyn._options.forceInstall && checkPkg.hasScript)) {
 			logger$1.debug(`local pkg at ${item.fullPath} doesn't need build`, checkPkg);
 			return;
 		}
@@ -110472,7 +110519,8 @@ var LocalPkgBuilder = class {
 			this._fyn._options.registry && `--reg=${this._fyn._options.registry}`,
 			"-q=d --pg=simple --no-build-local --sl=fyn-debug.log",
 			!this._fyn._options.sourceMaps && "--no-source-maps",
-			"install --no-audit"
+			"install --no-audit",
+			this._fyn._options.forceInstall && "--force-install"
 		].filter((x) => x).join(" ");
 		const displayTitle = `building local pkg at ${dispPath}`;
 		logger$1.verbose(displayTitle);
@@ -111277,6 +111325,7 @@ var Fyn = class Fyn {
 			const localPkg = localPkgs[nmDir];
 			const fullPath = Path.join(this._cwd, localPkg.srcDir);
 			if ((await this.getLocalPkgInstall(fullPath)).changed) return true;
+			if (await localLinkNeedsRefresh(fullPath, Path.join(this._cwd, nmDir), this._installConfig.time)) return true;
 		}
 		if (await localExportsNeedInstall({
 			cwd: this._cwd,
@@ -111310,6 +111359,7 @@ var Fyn = class Fyn {
 				time: Date.now() + 5,
 				centralDir,
 				production: this.production,
+				fynlocal: Boolean(this.fynlocal),
 				layout: this._options.layout,
 				shortPkgDir: this._shortPkgDir,
 				blockedScripts: this._blockedScripts || this._installConfig.blockedScripts || [],
@@ -115361,7 +115411,7 @@ var FynCli = class {
 		const auditFile = argv.opts?.auditFile;
 		return dist_default.try(() => this.fyn._initializePkg()).then(async () => {
 			checkNewVersion(this.fyn._options);
-			if (!this.fyn._changeProdMode && !this.fyn._options.forceInstall && this.fyn._installConfig.time) {
+			if (!this.fyn._changeProdMode && !this.fyn._options.forceInstall && this.fyn._installConfig.fynlocal === Boolean(this.fyn.fynlocal) && this.fyn._installConfig.time) {
 				const stats = await scanFileStats(this.fyn.cwd, { moreIgnores: localExportsScanIgnores(this.fyn._pkg) });
 				const { latestMtimeMs } = stats;
 				logger$1.debug("time check from install config - last install time", this.fyn._installConfig.time, "latest file time", latestMtimeMs);
@@ -115455,6 +115505,16 @@ var FynCli = class {
 					dir: this.fyn.cwd
 				}
 			});
+			if (scripts.length > 0 || this.fyn._options.autoRun && fynpoNpmScripts.length > 0) {
+				const localPkgLinks = this.fyn._installConfig.localPkgLinks || {};
+				for (const vdir in localPkgLinks) {
+					const localPkg = localPkgLinks[vdir];
+					await link$1(Path.join(this.fyn.cwd, localPkg.srcDir), Path.join(this.fyn.cwd, vdir), {
+						sourceMaps: Boolean(localPkg.sourceMaps),
+						preserveInstall: true
+					});
+				}
+			}
 		}).then(async () => {
 			logger$1.removeItem(INSTALL_PACKAGE);
 			const end = Date.now();
@@ -124870,6 +124930,20 @@ const pickOptions = async (cmd, checkFynpo = true) => {
 		_fynpo: fynpo
 	};
 };
+/** Resolve bootstrap's generated report without resolving the package graph or installing. */
+const getAuditFilePath = async (cwd, { rcfile = true } = {}) => {
+	cwd = Path.resolve(cwd);
+	const manager = new FynpoConfigManager({ cwd });
+	await manager.load();
+	const rc = loadRc(rcfile ? cwd : false, manager.topDir);
+	return new Fyn({
+		opts: {
+			...rc.all || defaultRc,
+			cwd
+		},
+		_fynpo: false
+	}).getFvDir(".fyn-audit.json");
+};
 const makeFynGlobal = async (cmd, extra = {}) => {
 	const { opts } = await pickOptions(cmd, false);
 	const tag = cmd.getParent()?.opts?.tag;
@@ -125575,8 +125649,9 @@ var main_default = {
 	pickEnvOptions,
 	setLockfile,
 	hardLinkDir: hard_link_dir_exports,
-	reportFynpoLoadError
+	reportFynpoLoadError,
+	getAuditFilePath
 };
 
 //#endregion
-export { main_default as default, fun, getRunExitCode, hard_link_dir_exports as hardLinkDir, nodeGyp, pickEnvOptions, reportFynpoLoadError, run, setLockfile };
+export { main_default as default, fun, getAuditFilePath, getRunExitCode, hard_link_dir_exports as hardLinkDir, nodeGyp, pickEnvOptions, reportFynpoLoadError, run, setLockfile };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "fyn",
   "type": "module",
-  "version": "3.1.8",
+  "version": "3.1.9",
   "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,7 +82,7 @@
     "Walmart GTP.js Team and Contributors"
   ],
   "devDependencies": {
-    "@fynjs/run": "^1.1.5",
+    "@fynjs/run": "^1.1.6",
     "@fynjs/ts-resolve": "^1.0.3",
     "@types/node": "^26.4.1",
     "@vitest/coverage-v8": "^5.0.0",
@@ -92,7 +92,7 @@
     "patch-package": "^8.0.0",
     "prettier": "^3.5.3",
     "rolldown": "^1.2.6",
-    "run-verify": "^2.1.5",
+    "run-verify": "^2.1.6",
     "typescript": "^7.0.2",
     "vite": "^8.2.2",
     "vitest": "^5.0.0",