@effected/workspaces 0.9.1 → 0.9.3

package/ConfigDependencyHooks.js

@@ -153,7 +153,8 @@ var ConfigDependencyHooks = class ConfigDependencyHooks extends Context.Service(
 			let loaded;
 			let found = false;
 			for (const filename of ["pnpmfile.mjs", "pnpmfile.cjs"]) {
-				const candidateUrl = pathToFileURL(join(root, "node_modules", ".pnpm-config", name, filename)).href;
+				const candidatePath = join(root, "node_modules", ".pnpm-config", name, filename);
+				const candidateUrl = pathToFileURL(candidatePath).href;
 				const result = yield* Effect.result(Effect.tryPromise({
 					try: () => import(candidateUrl),
 					catch: (cause) => cause

package/DependencyGraph.js

@@ -147,10 +147,9 @@ packages: Schema.Array(WorkspacePackage) }) {
 		const { reverse } = this.#index();
 		const affected = /* @__PURE__ */ new Set();
 		const queue = [...names];
-		while (queue.length > 0) {
-			const current = queue.shift();
-			/* v8 ignore next */
-			if (current === void 0) break;
+		for (let head = 0; head < queue.length; head += 1) {
+			const current = queue[head];
+			if (current === void 0) continue;
 			if (affected.has(current)) continue;
 			affected.add(current);
 			for (const dependent of reverse.get(current) ?? []) if (!affected.has(dependent)) queue.push(dependent);
@@ -181,10 +180,9 @@ packages: Schema.Array(WorkspacePackage) }) {
 		}));
 		const needed = /* @__PURE__ */ new Set();
 		const queue = [...names];
-		while (queue.length > 0) {
-			const current = queue.shift();
-			/* v8 ignore next */
-			if (current === void 0) break;
+		for (let head = 0; head < queue.length; head += 1) {
+			const current = queue[head];
+			if (current === void 0) continue;
 			if (needed.has(current)) continue;
 			needed.add(current);
 			for (const dependency of forward.get(current) ?? []) if (!needed.has(dependency)) queue.push(dependency);

package/WorkspaceDiscovery.js

@@ -207,12 +207,13 @@ var WorkspaceDiscovery = class WorkspaceDiscovery extends Context.Service()("@ef
 				kind: failure.kind,
 				cause: failure.cause
 			})));
-			const directories = yield* enumerate(root, yield* GlobSet.compile(patterns).pipe(Effect.mapError((error) => new WorkspacePatternError({
+			const globs = yield* GlobSet.compile(patterns).pipe(Effect.mapError((error) => new WorkspacePatternError({
 				root,
 				pattern: error.pattern,
 				kind: "uncompilable",
 				detail: error.message
-			}))), { maxDepth: options?.maxDepth ?? 32 }).pipe(Effect.mapError((failure) => new WorkspacePatternError({
+			})));
+			const directories = yield* enumerate(root, globs, { maxDepth: options?.maxDepth ?? 32 }).pipe(Effect.mapError((failure) => new WorkspacePatternError({
 				root,
 				pattern: failure.pattern,
 				kind: patternKindOf(failure.kind),

package/WorkspaceSnapshots.js

@@ -127,11 +127,12 @@ var WorkspaceSnapshots = class WorkspaceSnapshots extends Context.Service()("@ef
 			let inline;
 			let recorded;
 			if (Option.isSome(pnpmWorkspaceText)) {
-				const pnpmPatterns = pnpmPatternsOf(yield* Yaml.parse(pnpmWorkspaceText.value).pipe(Effect.mapError((cause) => new CatalogAssemblyError({
+				const document = yield* Yaml.parse(pnpmWorkspaceText.value).pipe(Effect.mapError((cause) => new CatalogAssemblyError({
 					source: "manifest",
 					path: "pnpm-workspace.yaml",
 					cause
-				}))));
+				})));
+				const pnpmPatterns = pnpmPatternsOf(document);
 				patterns = pnpmPatterns.length > 0 ? pnpmPatterns : manifestPatternsOf(rootManifest);
 				inline = yield* CatalogSet.fromWorkspaceYaml(pnpmWorkspaceText.value);
 				recorded = yield* lockfileRecord(root, ref, "pnpm");

package/internal/catalogs.js

@@ -53,10 +53,11 @@ const define = (target, key, value) => {
 */
 const rangeOf = (catalogs, dependency, specifier) => {
 	if (catalogNameOf(specifier) === null) return void 0;
-	return matchCatalogResolveResult(resolveFromCatalog(catalogs, {
+	const result = resolveFromCatalog(catalogs, {
 		alias: dependency,
 		bareSpecifier: specifier
-	}), {
+	});
+	return matchCatalogResolveResult(result, {
 		found: (hit) => hit.resolution.specifier,
 		misconfiguration: (bad) => ({
 			catalogName: bad.catalogName,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@effected/workspaces",
-	"version": "0.9.1",
+	"version": "0.9.3",
 	"private": false,
 	"description": "Monorepo workspace tooling as Effect services — root discovery, package enumeration, the dependency graph, package-manager detection, pnpm catalog resolution, lockfile IO and git-based change detection.",
 	"keywords": [
@@ -49,10 +49,10 @@
 		"@effected/commands": "~0.2.0",
 		"@effected/git": "~0.5.1",
 		"@effected/glob": "~0.2.1",
-		"@effected/lockfiles": "~0.2.2",
-		"@effected/npm": "~0.6.0",
-		"@effected/package-json": "~0.6.1",
-		"@effected/semver": "~0.2.1",
+		"@effected/lockfiles": "~0.3.0",
+		"@effected/npm": "~0.8.0",
+		"@effected/package-json": "~0.7.1",
+		"@effected/semver": "~0.3.0",
 		"@effected/walker": "~0.3.3",
 		"@effected/yaml": "~0.6.0",
 		"@pnpm/catalogs.config": "^1100.0.0",