fyn 3.1.6 → 3.1.8

package/README.md

@@ -16,6 +16,12 @@ cd <your-project>
 fyn
 ```
 
+On an existing install, fyn checks file modification times before reinstalling. This scan
+prunes directories and files matched by repository and nested `.gitignore` rules, alongside
+its built-in exclusions. The rules apply even to tracked source files; manifests, lockfiles,
+install configuration and changes to the consulted ignore rules are still checked.
+Use `fyn --fi` to bypass this freshness check and force installation.
+
 Want to add a package on your local disk as a dependency to your project? Do this:
 
 ```sh

package/dist/fyn.mjs

@@ -26965,6 +26965,65 @@ const join2 = (sep, a, b) => {
 	else return a + sep + b;
 };
 
+//#endregion
+//#region node_modules/filter-scan-dir/dist/gitignore.js
+function ancestorDirs(dir) {
+	const dirs = [dir];
+	for (let current = dir;;) {
+		if (fs.existsSync(Path.join(current, ".git"))) return dirs.reverse();
+		const parent = Path.dirname(current);
+		if (parent === current) return [dir];
+		dirs.push(parent);
+		current = parent;
+	}
+}
+var GitignoreRules = class GitignoreRules {
+	constructor(rules = []) {
+		this.rules = rules;
+	}
+	ignores(file, directory) {
+		let ignored = false;
+		for (const { dir, matcher } of this.rules) {
+			const relative = Path.relative(dir, file).split(Path.sep).join("/");
+			if (!relative) continue;
+			const result = matcher.test(relative + (directory ? "/" : ""));
+			if (result.ignored) ignored = true;
+			else if (result.unignored) ignored = false;
+		}
+		return ignored;
+	}
+	add(dir, source, parse) {
+		return new GitignoreRules([...this.rules, {
+			dir,
+			matcher: parse(source)
+		}]);
+	}
+	static loadSync(dir, parse, parent) {
+		let rules = parent || new GitignoreRules();
+		for (const base of parent ? [dir] : ancestorDirs(dir)) {
+			if (!parent && rules.ignores(base, true)) rules = new GitignoreRules();
+			try {
+				rules = rules.add(base, fs.readFileSync(Path.join(base, ".gitignore"), "utf8"), parse);
+			} catch (error) {
+				if (error.code !== "ENOENT" && error.code !== "ENOTDIR") throw error;
+			}
+		}
+		return rules;
+	}
+	static async load(dir, parse, parent) {
+		let rules = parent || new GitignoreRules();
+		for (const base of parent ? [dir] : ancestorDirs(dir)) {
+			if (!parent && rules.ignores(base, true)) rules = new GitignoreRules();
+			try {
+				rules = rules.add(base, await fs.promises.readFile(Path.join(base, ".gitignore"), "utf8"), parse);
+			} catch (error) {
+				if (error.code !== "ENOENT" && error.code !== "ENOTDIR") throw error;
+			}
+		}
+		return rules;
+	}
+};
+
 //#endregion
 //#region node_modules/filter-scan-dir/dist/index.js
 /**
@@ -27051,9 +27110,10 @@ function processFile(options, extras) {
 	}
 	return false;
 }
-function acceptEntry(options, entry, path) {
+function acceptEntry(options, entry, path, gitignore) {
 	const isDirectory = entry.isDirectory();
 	if (isDirectory && options._ignoreDirs.has(entry.name)) return false;
+	if (gitignore === null || gitignore === void 0 ? void 0 : gitignore.ignores(Path.resolve(options.dir, path, entry.name), isDirectory)) return false;
 	if (options.prefilter && !options.prefilter(entry.name, path, entry)) return false;
 	if (isDirectory) return true;
 	if (options.ignoreExt.length || options.filterExt.length) {
@@ -27096,7 +27156,7 @@ function releaseDirectory(options) {
 * @param level
 * @returns
 */
-async function walk(path, options, level = 0) {
+async function walk(path, options, level = 0, parentRules) {
 	let promises = [];
 	let hasSlot = false;
 	try {
@@ -27107,6 +27167,7 @@ async function walk(path, options, level = 0) {
 		}
 		if (options._stopped) return void 0;
 		const dir = Path.join(options.dir, path);
+		const gitignore = options.gitignore ? await GitignoreRules.load(Path.resolve(dir), options.gitignore, parentRules) : void 0;
 		let files = await asyncReaddir(dir, options.readdirOpts);
 		if (options.sortFiles) {
 			if (!options.readdirOpts) files = files.sort();
@@ -27116,7 +27177,7 @@ async function walk(path, options, level = 0) {
 		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;
+			if (options._earlyFilter && !acceptEntry(options, file, path, gitignore)) continue;
 			let extras;
 			if (options.fullStat) {
 				const name = options._earlyFilter ? file.name : file;
@@ -27143,7 +27204,7 @@ async function walk(path, options, level = 0) {
 				break;
 			}
 			if (!flags.skip && level < options.maxLevel) {
-				const walkP = walk(extras.dirFile, options, level + 1);
+				const walkP = walk(extras.dirFile, options, level + 1, gitignore);
 				if (options.concurrency > 1) {
 					promises.push(walkP);
 					if (promises.length >= options.concurrency) {
@@ -27207,7 +27268,7 @@ function makeOptions(opts) {
 		_earlyFilter: false,
 		_ignoreDirs: new Set([].concat(options.ignoreDirs || []))
 	});
-	opts2._earlyFilter = !!opts2.prefilter || opts2._ignoreDirs.size > 0 || opts2.ignoreExt.length > 0 || opts2.filterExt.length > 0;
+	opts2._earlyFilter = !!opts2.gitignore || !!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;
 }
@@ -28835,18 +28896,21 @@ const asPathRef = (ref) => REF_TYPES.some((t) => ref.startsWith(t)) ? ref : `pat
 const resolveAutoSearch = (val) => {
 	if (val === false) return {
 		enable: false,
-		respectGitignore: false
+		respectGitignore: false,
+		stopOnPackageJsonFound: true
 	};
 	if (val && typeof val === "object") {
 		const obj = val;
 		return {
 			enable: obj.enable !== false,
-			respectGitignore: obj.respectGitignore === true
+			respectGitignore: obj.respectGitignore === true,
+			stopOnPackageJsonFound: obj.stopOnPackageJsonFound !== false
 		};
 	}
 	return {
 		enable: true,
-		respectGitignore: false
+		respectGitignore: false,
+		stopOnPackageJsonFound: true
 	};
 };
 /**
@@ -28854,12 +28918,12 @@ const resolveAutoSearch = (val) => {
 *
 * Accepts both shapes:
 *
-* - **array** - the historical form. Treated as `publishInclude`, with auto-search on and
-*   `respectGitignore` off. It no longer narrows discovery.
+* - **array** - the historical form. Treated as additive `include` and `publishInclude`,
+*   with auto-search on and `respectGitignore` off. It no longer narrows discovery.
 * - **object** - `{ autoSearch, include, exclude, publishInclude, publishExclude }`.
 *
-* Defaults: `autoSearch` on, `respectGitignore` off. With auto-search off and no `include`,
-* `include` falls back to `["packages/*"]`.
+* Defaults: `autoSearch` on, `respectGitignore` off, stop at package.json. With auto-search
+* off and no `include`, `include` falls back to `["packages/*"]`.
 *
 * @param packages - the raw `packages` value from fynpo.json / fynpo.config.js
 * @returns the resolved config, every field populated
@@ -28870,7 +28934,8 @@ function resolvePackagesConfig(packages) {
 		return {
 			autoSearch: {
 				enable: true,
-				respectGitignore: false
+				respectGitignore: false,
+				stopOnPackageJsonFound: true
 			},
 			include: list,
 			exclude: [],
@@ -28894,9 +28959,9 @@ function resolvePackagesConfig(packages) {
 * Decide how to scan for packages.
 *
 * `include` does NOT turn auto-search off - auto-search is on by default and stays on, so it
-* still decides *how the tree is walked*. `include` then filters what the walk found, via
-* {@link includeFilter}. Only with auto-search off does `include` become the scan patterns
-* themselves, falling back to `packages/*`.
+* still decides *how the tree is walked*. `include` adds explicit paths below package
+* boundaries. Only with auto-search off does `include` restrict the scan paths,
+* falling back to `packages/*`.
 *
 * @param config - resolved packages config
 * @returns `null` to auto-search the whole repo, otherwise the patterns to scan
@@ -28906,9 +28971,8 @@ function scanPatterns(config) {
 	return config.include.length > 0 ? config.include : [...DEFAULT_INCLUDE];
 }
 /**
-* The patterns a discovered package must match to be kept.
-*
-* Empty means keep everything the scan found.
+* Explicit inclusion patterns, used to add nested paths and promote them to managed packages.
+* With auto-search disabled, they restrict discovery to the declared paths.
 *
 * @param config - resolved packages config
 * @returns patterns to match a package path against
@@ -29731,9 +29795,9 @@ var FynpoDepGraph = class {
 			const mms = resolved.map((p) => new Minimatch(p));
 			groups = groupMM(mms, {});
 		}
-		const foundInAutoSearch = (path) => {
-			if (!autoSearch) return false;
-			for (const e of autoSearchFound) if (isPathInside$1(path, e)) return true;
+		const foundInAutoSearch = (path, partial = false) => {
+			if (!autoSearch || !pkgConfig.autoSearch.stopOnPackageJsonFound) return false;
+			for (const e of autoSearchFound) if (isPathInside$1(path, e)) return !includeMms.some((m) => m.match(posixify$2(path), partial));
 			return false;
 		};
 		const files = [];
@@ -29753,7 +29817,7 @@ var FynpoDepGraph = class {
 				},
 				filterDir: (dir, path, extras) => {
 					if (dir !== "node_modules") {
-						if (foundInAutoSearch(path) || isExcluded(path) || skipForAutoSearch(path)) return false;
+						if (foundInAutoSearch(extras.dirFile, true) || isExcluded(path) || skipForAutoSearch(path)) return false;
 						return prefix === "." && groups[prefix] === null ? !dir.startsWith(".") : Boolean(groups[prefix].find((save) => save.mm.match(extras.dirFile)));
 					}
 					return false;
@@ -29761,8 +29825,36 @@ var FynpoDepGraph = class {
 			});
 			files.push(scanned);
 		}
-		const allFiles = [].concat(...files).filter((f) => isIncluded(Path.dirname(f))).sort();
-		for (const pkgFile of allFiles) await this.addPackageByFile(pkgFile);
+		const filesByDepth = [...[].concat(...files)].sort((a, b) => {
+			const depth = (file) => posixify$2(Path.dirname(file)).split("/").length;
+			return depth(a) - depth(b) || a.localeCompare(b);
+		});
+		const packageRoots = [];
+		const accepted = [];
+		for (const pkgFile of filesByDepth) {
+			const pkgPath = posixify$2(Path.dirname(pkgFile));
+			const nested = autoSearch && packageRoots.some((root) => isPathInside$1(pkgPath, root));
+			const included = isIncluded(pkgPath);
+			if (!autoSearch && !included) continue;
+			const managed = !autoSearch || !nested || includeMms.length > 0 && included;
+			const pkgStr = await promises.readFile(Path.join(cwd, pkgFile), "utf-8");
+			const pkgJson = JSON.parse(pkgStr);
+			if (pkgJson.fynpo === false) continue;
+			if (!pkgJson.name) continue;
+			accepted.push({
+				pkgFile,
+				pkgPath,
+				pkgStr,
+				pkgJson,
+				managed,
+				nested
+			});
+			packageRoots.push(pkgPath);
+		}
+		for (const pkg of accepted.sort((a, b) => a.pkgFile.localeCompare(b.pkgFile))) this.addPackage(pkg.pkgJson, pkg.pkgPath, pkg.pkgStr, {
+			managed: pkg.managed,
+			nested: pkg.nested
+		});
 		this.updateAuxPackageData();
 		return this.packages;
 	}
@@ -29771,10 +29863,10 @@ var FynpoDepGraph = class {
 	*
 	* @param pkgFile - path to the package.json file
 	*/
-	async addPackageByFile(pkgFile) {
+	async addPackageByFile(pkgFile, management = {}) {
 		const pkgStr = await promises.readFile(Path.join(this._options.cwd, pkgFile), "utf-8");
 		const pkgJson = JSON.parse(pkgStr);
-		this.addPackage(pkgJson, Path.dirname(pkgFile), pkgStr);
+		return this.addPackage(pkgJson, posixify$2(Path.dirname(pkgFile)), pkgStr, management);
 	}
 	/**
 	* Add a package to the graph using the data from its package.json
@@ -29784,7 +29876,7 @@ var FynpoDepGraph = class {
 	* @param pkgStr - string form of package.json
 	* @returns
 	*/
-	addPackage(pkgJson, pkgPath, pkgStr) {
+	addPackage(pkgJson, pkgPath, pkgStr, management = {}) {
 		if (pkgJson.fynpo === false) return;
 		assert(pkgJson.name, `package at ${pkgPath} doesn't have name`);
 		const pkgDir = pkgJson.name[0] === "@" && (pkgPath.endsWith(`/${pkgJson.name}`) || pkgPath === pkgJson.name) ? pkgJson.name : Path.basename(pkgPath);
@@ -29805,11 +29897,20 @@ var FynpoDepGraph = class {
 		};
 		Object.defineProperties(pkgInfo, {
 			pkgStr: { enumerable: false },
-			pkgJson: { enumerable: false }
+			pkgJson: { enumerable: false },
+			managed: {
+				value: management.managed !== false,
+				enumerable: false
+			},
+			nested: {
+				value: management.nested === true,
+				enumerable: false
+			}
 		});
 		const { byName } = this.packages;
 		if (byName[pkgJson.name]) byName[pkgJson.name].push(pkgInfo);
 		else byName[pkgJson.name] = [pkgInfo];
+		return pkgInfo;
 	}
 	/**
 	* update auxiliary package data
@@ -29823,11 +29924,17 @@ var FynpoDepGraph = class {
 		this.packages.byPath = {};
 		const { byName, byPath, byId } = this.packages;
 		for (const name in byName) {
+			byName[name].sort((a, b) => {
+				const versionOrder = import_semver.default.compare(b.version, a.version);
+				if (versionOrder !== 0) return versionOrder;
+				if (a.managed !== b.managed) return a.managed === false ? 1 : -1;
+				return a.path.localeCompare(b.path);
+			});
 			byName[name].forEach((pkg) => {
 				byPath[pkg.path] = pkg;
-				byId[`${pkg.name}@${pkg.version}`] = pkg;
+				const id = `${pkg.name}@${pkg.version}`;
+				if (!byId[id] || byId[id].managed === false && pkg.managed !== false) byId[id] = pkg;
 			});
-			if (byName[name].length > 1) byName[name].sort((a, b) => import_semver.default.compare(b.version, a.version));
 		}
 	}
 	/**
@@ -29894,8 +30001,8 @@ var FynpoDepGraph = class {
 			localDepsByPath: Object.create(null),
 			dependentsByPath: Object.create(null)
 		};
-		for (const id in byId) {
-			const pkgInfo = byId[id];
+		for (const path in byPath) {
+			const pkgInfo = byPath[path];
 			const depData = depMapByPath[pkgInfo.path];
 			doResolve(depData, pkgInfo.dependencies, "dep");
 			doResolve(depData, pkgInfo.devDependencies, "dev");
@@ -30620,7 +30727,7 @@ const fyntil = {
 			}
 			const graph = new FynpoDepGraph({
 				cwd: fcm.topDir,
-				patterns: config.packages,
+				packages: config.packages,
 				noFynLocal: config.noFynLocal
 			});
 			await graph.resolve();
@@ -106620,7 +106727,8 @@ var FynCentral = class {
 //#endregion
 //#region lib/util/stat-dir.ts
 async function _scanFileStats(dir, ignores, baseDir = "") {
-	const ignore = (fullPath) => ignores.find((pattern) => minimatch(fullPath, pattern, { dot: true }));
+	const patterns = ignores.map((pattern) => new Minimatch(pattern, { dot: true }));
+	const ignore = (fullPath) => patterns.find((pattern) => pattern.match(fullPath));
 	let latestMtimeMs = 0;
 	let latestFile = "";
 	const updateLatest = (mtimeMs, file) => {
@@ -106629,6 +106737,13 @@ async function _scanFileStats(dir, ignores, baseDir = "") {
 			latestFile = file;
 		}
 	};
+	const inspectFile = (file) => {
+		try {
+			updateLatest(file_ops_default.statSync(file).mtimeMs, file);
+		} catch (err) {
+			if (err.code !== "ENOENT" && err.code !== "ENOTDIR") throw err;
+		}
+	};
 	const filter = (file, path, extras) => {
 		if (ignore(extras.fullFile)) return false;
 		updateLatest(extras.stat.mtimeMs, extras.fullFile);
@@ -106636,11 +106751,45 @@ async function _scanFileStats(dir, ignores, baseDir = "") {
 	};
 	const fullDir = Path.join(baseDir, dir);
 	updateLatest((await file_ops_default.stat(fullDir)).mtimeMs, fullDir);
+	for (const file of [
+		"package.json",
+		"package-fyn.json",
+		"fyn-lock.yaml",
+		"package-lock.json",
+		"npm-shrinkwrap.json",
+		"yarn.lock",
+		".npmrc",
+		".fynrc",
+		"fynpo.json",
+		"fynpo.config.js",
+		"fynpo.config.json"
+	]) inspectFile(Path.join(fullDir, file));
+	const ruleDirs = [];
+	let ancestor = Path.resolve(fullDir);
+	while (true) {
+		ruleDirs.push(ancestor);
+		if (file_ops_default.existsSync(Path.join(ancestor, ".git"))) break;
+		const parent = Path.dirname(ancestor);
+		if (parent === ancestor) {
+			ruleDirs.length = 1;
+			break;
+		}
+		ancestor = parent;
+	}
+	for (const ruleDir of ruleDirs) {
+		inspectFile(ruleDir);
+		inspectFile(Path.join(ruleDir, ".gitignore"));
+	}
 	await filterScanDir({
 		cwd: fullDir,
 		prependCwd: false,
+		gitignore: (rules) => (0, import_ignore.default)().add(rules),
 		filter,
-		filterDir: filter,
+		filterDir: (file, path, extras) => {
+			if (!filter(file, path, extras)) return false;
+			inspectFile(Path.join(extras.fullFile, ".gitignore"));
+			return true;
+		},
 		concurrency: 500,
 		fullStat: true
 	});
@@ -106650,7 +106799,7 @@ async function _scanFileStats(dir, ignores, baseDir = "") {
 	};
 }
 function scanFileStats(dir, options = {}) {
-	return _scanFileStats(dir, [`**/?(node_modules|_fyn|.vscode|.DS_Store|coverage|.nyc_output|.fynpo|.git|.github|.gitignore)`, "**/*.?(log|md)"].concat(options.ignores || `**/?(docs|docusaurus|packages|tmp|.etmp|samples|dist)`).concat(options.moreIgnores).filter((x) => x), "");
+	return _scanFileStats(dir, [`**/?(node_modules|_fyn|.vscode|.DS_Store|coverage|.nyc_output|.fynpo|.git|.github|.gitignore)`, "**/*.?(log|md)"].concat(options.ignores || `**/?(docs|docusaurus|packages|tmp|.temp|.etmp|samples|dist)`).concat(options.moreIgnores).filter((x) => x), "");
 }
 
 //#endregion

package/package.json

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