fyn 3.1.6 → 3.1.7

package/dist/fyn.mjs

@@ -28835,18 +28835,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: false
 	};
 	if (val && typeof val === "object") {
 		const obj = val;
 		return {
 			enable: obj.enable !== false,
-			respectGitignore: obj.respectGitignore === true
+			respectGitignore: obj.respectGitignore === true,
+			stopOnPackageJsonFound: obj.stopOnPackageJsonFound === true
 		};
 	}
 	return {
 		enable: true,
-		respectGitignore: false
+		respectGitignore: false,
+		stopOnPackageJsonFound: false
 	};
 };
 /**
@@ -28870,7 +28873,8 @@ function resolvePackagesConfig(packages) {
 		return {
 			autoSearch: {
 				enable: true,
-				respectGitignore: false
+				respectGitignore: false,
+				stopOnPackageJsonFound: false
 			},
 			include: list,
 			exclude: [],
@@ -29732,7 +29736,7 @@ var FynpoDepGraph = class {
 			groups = groupMM(mms, {});
 		}
 		const foundInAutoSearch = (path) => {
-			if (!autoSearch) return false;
+			if (!autoSearch || !pkgConfig.autoSearch.stopOnPackageJsonFound) return false;
 			for (const e of autoSearchFound) if (isPathInside$1(path, e)) return true;
 			return false;
 		};
@@ -29761,8 +29765,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 (!included && !nested) 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 +29803,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 +29816,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 +29837,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 +29864,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 +29941,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");

package/package.json

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