fyn 3.2.1 → 3.2.2

package/README.md

@@ -75,6 +75,7 @@ progress: normal
 logLevel: info
 production: false
 centralStore: false
+hardlink: true
 ```
 
 Or as an ini:
@@ -89,6 +90,7 @@ progress=normal
 logLevel=info
 production=false
 centralStore=false
+hardlink=true
 ```
 
 ### Local source exports (`fyn.localExports`)

package/dist/fyn.mjs

@@ -92008,6 +92008,25 @@ async function unlinkDest(destFp) {
 	}
 }
 /**
+* Copy with COPYFILE_EXCL, so a new destination takes one call instead of an unlink and a copy.
+* An existing destination is unlinked and copied again, never written through - see
+* {@link unlinkDest}. replicate writes into a cleared dir, so the retry is rare.
+*
+* @param {*} srcFp
+* @param {*} destFp
+* @param {*} mode - extra copyFile flags, such as COPYFILE_FICLONE
+* @returns
+*/
+async function copyNew(srcFp, destFp, mode = 0) {
+	try {
+		return await fs.promises.copyFile(srcFp, destFp, mode | fs.constants.COPYFILE_EXCL);
+	} catch (err) {
+		if (err.code !== "EEXIST") throw err;
+	}
+	await unlinkDest(destFp);
+	return fs.promises.copyFile(srcFp, destFp, mode | fs.constants.COPYFILE_EXCL);
+}
+/**
 * Copy a file, replacing the destination rather than writing through it.
 *
 * @param {*} srcFp
@@ -92015,16 +92034,17 @@ async function unlinkDest(destFp) {
 * @returns
 */
 async function copyFile(srcFp, destFp) {
-	await unlinkDest(destFp);
-	if (file_ops_default.copyFile) return file_ops_default.copyFile(srcFp, destFp);
+	if (file_ops_default.copyFile) return copyNew(srcFp, destFp);
 	else {
+		await unlinkDest(destFp);
 		const srcData = await file_ops_default.readFile(srcFp);
 		return file_ops_default.writeFile(destFp, srcData);
 	}
 }
 /**
-* Clone a file using copy-on-write if supported (macOS APFS, Linux btrfs/xfs).
-* Falls back to regular copy if CoW is not available.
+* Clone a file using copy-on-write if supported (Linux btrfs/xfs).
+* Falls back to regular copy if CoW is not available. libuv has no clonefile on macOS, so
+* there it is always a full copy.
 *
 * Replaces the destination rather than writing through it - see {@link unlinkDest}.
 *
@@ -92033,8 +92053,7 @@ async function copyFile(srcFp, destFp) {
 * @returns
 */
 async function cloneFile(srcFp, destFp) {
-	await unlinkDest(destFp);
-	return fs.promises.copyFile(srcFp, destFp, fs.constants.COPYFILE_FICLONE);
+	return copyNew(srcFp, destFp, fs.constants.COPYFILE_FICLONE);
 }
 async function prepDestDir(dest) {
 	const statDest = await tryCatch(() => file_ops_default.lstat(dest));
@@ -94791,12 +94810,8 @@ var PkgSrcManager = class {
 				if (hasCentral) {
 					if (!await central.validate(integrity)) {
 						const contentPath = await central.getContentPath(integrity);
-						logger$1.error(`Corrupted central store package detected
-  -- CORRUPTED CENTRAL STORE PACKAGE DETECTED, removing --
-  ID: ${verId}
-  integrity: ${integrity}
-  path: '${contentPath}'
-`);
+						logger$1.info(`central store copy of ${dispId} has changed, likely from an edit under a project's node_modules. fyn is replacing it with a clean copy. Projects installed earlier keep their edited files.`);
+						logger$1.debug(`replacing central store package ${verId} integrity ${integrity} at '${contentPath}'`);
 						await central.delete(integrity);
 						hasCentral = false;
 					}
@@ -96917,6 +96932,14 @@ const { missPipe } = fyntil;
 function isTreeFileContent(obj) {
 	return typeof obj === "object" && obj !== null && "_" in obj && typeof obj._ === "number";
 }
+/** link errors that mean the filesystem can't hardlink from the store at all */
+const NO_LINK_CODES = [
+	"EXDEV",
+	"EPERM",
+	"ENOTSUP",
+	"EOPNOTSUPP",
+	"ENOSYS"
+];
 /**
 * Convert a directory tree structure to a flatten one like:
 * ```
@@ -96954,9 +96977,11 @@ function flattenTree(tree, output, baseDir) {
 var FynCentral = class {
 	_centralDir;
 	_map;
-	constructor({ centralDir = ".fyn/_central-storage" } = {}) {
+	_hardlink;
+	constructor({ centralDir = ".fyn/_central-storage", hardlink = true } = {}) {
 		this._centralDir = Path.resolve(centralDir);
 		this._map = /* @__PURE__ */ new Map();
+		this._hardlink = hardlink;
 	}
 	_analyze(integrity) {
 		const sri = import_lib$1.default.parse(integrity, { single: true });
@@ -97129,13 +97154,32 @@ var FynCentral = class {
 				const src = Path.join(info.contentPath, "package", file);
 				const dest = Path.join(destDir, file);
 				if (file === "package.json") return copyFile(src, dest);
-				return cloneFile(src, dest);
+				return this._hardlink ? this._linkFile(src, dest) : cloneFile(src, dest);
 			}, { concurrency: 5 });
 		} catch (err) {
 			const msg = `fyn-central can't replicate package at ${destDir} for integrity ${integrity}`;
 			throw new AggregateError$1([err], msg);
 		}
 	}
+	/**
+	* Hardlink a file from the store, or clone it where the filesystem can't link it, such as a
+	* store on another volume. That failure turns linking off for the rest of the run.
+	*/
+	async _linkFile(src, dest) {
+		try {
+			await linkFile(src, dest);
+			return;
+		} catch (err) {
+			const code = err.code;
+			if (NO_LINK_CODES.includes(code)) {
+				if (this._hardlink) {
+					this._hardlink = false;
+					logger$1.info(`fyn-central: can't hardlink from ${this._centralDir} (${code}), copying instead`);
+				}
+			} else if (code !== "EMLINK") throw err;
+		}
+		await cloneFile(src, dest);
+	}
 	_untarStream(tarStream, targetDir) {
 		const newDirObj = () => {
 			const n = Object.create(null);
@@ -101514,7 +101558,10 @@ var Fyn = class Fyn {
 			}
 			logger$1.info(`Enabling central store by fynpo monorepo using dir ${centralDir}`);
 		}
-		return this._central = new FynCentral({ centralDir });
+		return this._central = new FynCentral({
+			centralDir,
+			hardlink: this.hardlink
+		});
 	}
 	async _initialize({ noLock = false } = {}) {
 		await this._initializePkg();
@@ -101841,6 +101888,7 @@ var Fyn = class Fyn {
 				fynlocal: Boolean(this.fynlocal),
 				layout: this._options.layout,
 				shortPkgDir: this._shortPkgDir,
+				hardlink: this.hardlink,
 				blockedScripts: this._blockedScripts || this._installConfig.blockedScripts || [],
 				pendingScripts: this._pendingScripts || this._installConfig.pendingScripts || []
 			};
@@ -102098,6 +102146,16 @@ var Fyn = class Fyn {
 	get production() {
 		return this._options.production;
 	}
+	/**
+	* Whether the central store hardlinks files into node_modules. --no-hardlink or
+	* FYN_HARDLINK=false turns it off, and .fyn.json keeps the choice for later installs.
+	* Precedence: CLI or rc, then env, then .fyn.json, then on.
+	*/
+	get hardlink() {
+		if (this._options.hardlink !== void 0) return this._options.hardlink !== false;
+		if (process.env.FYN_HARDLINK !== void 0) return fyntil.strToBool(process.env.FYN_HARDLINK);
+		return this._installConfig.hardlink !== false;
+	}
 	get concurrency() {
 		return this._options.concurrency;
 	}
@@ -116270,7 +116328,10 @@ const pickOptions = async (cmd, checkFynpo = true) => {
 	return {
 		opts: allOpts,
 		rcData,
-		_cliSource: meta.source,
+		_cliSource: {
+			...cmd.rootCmd?.jsonMeta.source,
+			...meta.source
+		},
 		_fynpo: fynpo
 	};
 };
@@ -116332,6 +116393,10 @@ const options = {
 		desc: "keep single copy of packages in central store",
 		argDefault: "false"
 	},
+	hardlink: {
+		args: "<flag boolean>",
+		desc: "hardlink central store files into node_modules (default). --no-hardlink copies them, and is remembered"
+	},
 	copy: {
 		args: "[packages string..]",
 		alias: "cp",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "fyn",
   "type": "module",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "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",