@effected/workspaces 0.32.0 → 0.33.0

package/SourceBoundary.js

@@ -1,5 +1,6 @@
 import { isIdentifierChar, lex, locate, references, specifierLiterals } from "./internal/sourceText.js";
-import { Effect, FileSystem, Option, Path, Schema } from "effect";
+import { DEFAULT_EXTENSIONS, walkSources } from "./internal/sourceWalk.js";
+import { Effect, FileSystem, Schema } from "effect";
 import { GlobSet } from "@effected/glob";
 
 //#region src/SourceBoundary.ts
@@ -57,15 +58,6 @@ var SourceScan = class extends Schema.Class("SourceScan")({
 		return this.offences.map((offence) => offence.label);
 	}
 };
-const DEFAULT_EXTENSIONS = [
-	".ts",
-	".mts",
-	".cts",
-	".js",
-	".mjs",
-	".cjs"
-];
-const DECLARATION = /\.d\.[cm]?ts$/;
 const byCodeUnit = (a, b) => a < b ? -1 : a > b ? 1 : 0;
 const byPosition = (a, b) => byCodeUnit(a.file, b.file) || a.line - b.line || a.column - b.column;
 const EXEMPT = ["process.env.__PACKAGE_VERSION__"];
@@ -548,9 +540,10 @@ var SourceBoundary = class SourceBoundary {
 	* Check every source file under `root` against `rules`.
 	*
 	* @remarks
-	* Walks with an explicit stack, visiting each real directory once (via
+	* Walks with the shared source walker (`internal/sourceWalk.ts`, which the
+	* `ImportGraph` checks also use): each real directory is visited once (via
 	* `realPath`), so a symlink loop terminates and a linked directory is not
-	* scanned twice. `node_modules` is never entered. Paths come back relative
+	* scanned twice, and `node_modules` is never entered. Paths come back relative
 	* and `/`-separated whatever the platform's separator, and that is also
 	* what `allow` globs match against. A missing root fails; it never scans
 	* nothing. A dangling symlink under the root is skipped, having nothing to
@@ -570,42 +563,24 @@ var SourceBoundary = class SourceBoundary {
 	*/
 	static scan = Effect.fn("SourceBoundary.scan")(function* (options) {
 		const fs = yield* FileSystem.FileSystem;
-		const path = yield* Path.Path;
 		const allow = yield* GlobSet.compile(options.allow ?? []);
 		const allowRules = /* @__PURE__ */ new Map();
 		for (const [rule, patterns] of Object.entries(options.allowRules ?? {})) if (patterns !== void 0) allowRules.set(rule, yield* GlobSet.compile(patterns));
-		const extensions = options.extensions ?? DEFAULT_EXTENSIONS;
-		const posix = (relative) => relative.split(path.sep).join("/");
+		const walked = yield* walkSources({
+			root: options.root,
+			extensions: options.extensions ?? DEFAULT_EXTENSIONS
+		});
 		const files = [];
 		const allowed = [];
 		const offences = [];
 		const waived = [];
-		const visited = /* @__PURE__ */ new Set();
-		const pending = [options.root];
-		while (pending.length > 0) {
-			const directory = pending.pop();
-			if (directory === void 0) break;
-			const real = yield* fs.realPath(directory);
-			if (visited.has(real)) continue;
-			visited.add(real);
-			for (const name of yield* fs.readDirectory(directory)) {
-				const full = path.join(directory, name);
-				const found = yield* fs.stat(full).pipe(Effect.map(Option.some), Effect.catch((error) => error.reason._tag === "NotFound" ? fs.readLink(full).pipe(Effect.as(Option.none()), Effect.mapError(() => error)) : Effect.fail(error)));
-				if (Option.isNone(found)) continue;
-				const info = found.value;
-				if (info.type === "Directory") {
-					if (name !== "node_modules") pending.push(full);
-					continue;
-				}
-				if (info.type !== "File" || DECLARATION.test(name) || !extensions.some((extension) => name.endsWith(extension))) continue;
-				const file = posix(path.relative(options.root, full));
-				files.push(file);
-				if (allow.matches(file)) {
-					allowed.push(file);
-					continue;
-				}
-				for (const offence of SourceBoundary.check(file, yield* fs.readFileString(full), options.rules, options)) (allowRules.get(offence.rule)?.matches(file) === true ? waived : offences).push(offence);
+		for (const source of walked) {
+			files.push(source.file);
+			if (allow.matches(source.file)) {
+				allowed.push(source.file);
+				continue;
 			}
+			for (const offence of SourceBoundary.check(source.file, yield* fs.readFileString(source.path), options.rules, options)) (allowRules.get(offence.rule)?.matches(source.file) === true ? waived : offences).push(offence);
 		}
 		return SourceScan.make({
 			files: files.sort(byCodeUnit),