@savvy-web/silk-effects 10.2.0 → 10.2.1

package/commitlint/detection/dco.js

@@ -1,5 +1,8 @@
+import { Option } from "effect";
 import { existsSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
+import { Walker } from "@effected/walker";
+import { nodeWalkerSyncOps } from "@effected/walker/node-sync";
 
 // src/commitlint/detection/dco.ts
 /**
@@ -24,13 +27,12 @@ const ROOT_MARKERS = [
 * @internal
 */
 function findProjectRoot(cwd) {
-	let dir = resolve(cwd);
-	while (true) {
-		for (const marker of ROOT_MARKERS) if (existsSync(join(dir, marker))) return dir;
-		const parent = dirname(dir);
-		if (parent === dir) return null;
-		dir = parent;
-	}
+	const dirs = Walker.ascendSync(resolve(cwd), { path: nodeWalkerSyncOps.path });
+	const marker = Walker.findUpwardSync(dirs, (dir) => ROOT_MARKERS.map((name) => join(dir, name)), nodeWalkerSyncOps);
+	return Option.match(marker, {
+		onNone: () => null,
+		onSome: dirname
+	});
 }
 /**
 * Detect if DCO signoff should be required.

package/lint/utils/Command.js

@@ -1,7 +1,8 @@
-import { Result } from "effect";
-import { existsSync } from "node:fs";
+import { Option, Result } from "effect";
 import { dirname, join, resolve } from "node:path";
+import { Walker } from "@effected/walker";
 import { detectPackageManagerSync } from "@effected/workspaces";
+import { nodeWalkerSyncOps } from "@effected/walker/node-sync";
 import { LocalExec, Tool, makeToolDiscoverySync } from "@effected/commands";
 import { nodeSyncOps } from "@effected/workspaces/node-sync";
 import { execSync } from "node:child_process";
@@ -84,18 +85,13 @@ var Command = class Command {
 	*/
 	static findRoot(cwd = process.cwd()) {
 		if (Command.cachedRoot !== null) return Command.cachedRoot;
-		let dir = resolve(cwd);
-		while (true) {
-			if (existsSync(join(dir, "package.json"))) {
-				Command.cachedRoot = dir;
-				return dir;
-			}
-			const parent = dirname(dir);
-			if (parent === dir) break;
-			dir = parent;
-		}
-		Command.cachedRoot = cwd;
-		return cwd;
+		const dirs = Walker.ascendSync(resolve(cwd), { path: nodeWalkerSyncOps.path });
+		const manifest = Walker.findUpwardSync(dirs, (dir) => [join(dir, "package.json")], nodeWalkerSyncOps);
+		Command.cachedRoot = Option.match(manifest, {
+			onNone: () => cwd,
+			onSome: dirname
+		});
+		return Command.cachedRoot;
 	}
 	/**
 	* Detect the package manager declared by the root package.json.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@savvy-web/silk-effects",
-	"version": "10.2.0",
+	"version": "10.2.1",
 	"private": false,
 	"description": "Shared Effect library for Silk Suite conventions",
 	"homepage": "https://github.com/savvy-web/systems/tree/main/packages/silk-effects",
@@ -37,23 +37,23 @@
 		"@changesets/get-release-plan": "^5.0.2",
 		"@changesets/pre": "^3.0.0",
 		"@changesets/read": "^1.0.1",
-		"@effected/github-references": "^0.11.0",
-		"@effected/glob": "^0.15.0",
-		"@effected/jsonc": "^0.20.1",
-		"@effected/markdown": "^0.23.0",
-		"@effected/package-json": "^0.26.1",
-		"@effected/toml": "^0.16.0",
-		"@effected/walker": "^0.21.0",
-		"@effected/yaml": "^0.25.1",
+		"@effected/github-references": "^0.12.0",
+		"@effected/glob": "^0.16.0",
+		"@effected/jsonc": "^0.21.0",
+		"@effected/markdown": "^0.24.0",
+		"@effected/package-json": "^0.27.0",
+		"@effected/toml": "^0.17.0",
+		"@effected/walker": "^0.22.0",
+		"@effected/yaml": "^0.26.0",
 		"@manypkg/get-packages": "^3.1.0",
-		"@savvy-web/silk-core": "^0.5.2",
+		"@savvy-web/silk-core": "^0.5.3",
 		"shell-quote": "^1.12.0"
 	},
 	"peerDependencies": {
-		"@effected/commands": "^0.17.0",
-		"@effected/git": "^0.26.0",
-		"@effected/templates": "^0.14.0",
-		"@effected/workspaces": "^0.39.0",
+		"@effected/commands": "^0.18.0",
+		"@effected/git": "^0.27.0",
+		"@effected/templates": "^0.15.0",
+		"@effected/workspaces": "^0.40.0",
 		"effect": "^4.0.0"
 	}
 }

package/repos/services/lockdown.js

@@ -1,6 +1,7 @@
 import { REPOS_DIR } from "../constants.js";
 import { ReposLockdownError } from "../errors.js";
-import { Context, Effect, Exit, FileSystem, Layer, Option, Path } from "effect";
+import { Context, Effect, Exit, FileSystem, Layer, Option, Path, Result } from "effect";
+import { GitFile } from "@effected/git";
 
 // src/repos/services/lockdown.ts
 const FILE_LOCKED_BASE_MODE = 292;
@@ -47,9 +48,9 @@ const resolveModuleDir = (fs, path, root, name) => Effect.gen(function* () {
 	if (info.value.type === "Directory") return dotGit;
 	const content = yield* fs.readFileString(dotGit).pipe(Effect.option);
 	if (Option.isNone(content)) return fallback;
-	const match = /^gitdir:\s*(.+)$/m.exec(content.value);
-	if (!match?.[1]) return fallback;
-	const pointer = match[1].trim();
+	const gitFile = GitFile.parseResult(content.value);
+	if (Result.isFailure(gitFile)) return fallback;
+	const pointer = gitFile.success.gitdir;
 	const resolved = path.isAbsolute(pointer) ? pointer : path.resolve(path.dirname(dotGit), pointer);
 	const relative = path.relative(root, resolved);
 	if (relative.startsWith("..") || path.isAbsolute(relative)) return fallback;

package/repos/services/manager.js

@@ -5,7 +5,7 @@ import { ReposConfigStore } from "./config-store.js";
 import { ReposLockdown, resolveModuleDir } from "./lockdown.js";
 import { submoduleNameFromKey } from "./drift.js";
 import { Clock, Context, Effect, Exit, FileSystem, Layer, Option, Path, Result, Schema } from "effect";
-import { Git, GitConfig, GitRemote, Gitmodules, LsRemoteEntry } from "@effected/git";
+import { Git, GitConfig, GitFile, GitRemote, Gitmodules, LsRemoteEntry } from "@effected/git";
 import { createHash } from "node:crypto";
 
 // src/repos/services/manager.ts
@@ -678,9 +678,9 @@ var ReposManager = class extends Context.Service()("@savvy-web/silk-effects/Repo
 			if (Option.isNone(info) || info.value.type === "Directory") return fallback;
 			const content = yield* fs.readFileString(dotGit).pipe(Effect.option);
 			if (Option.isNone(content)) return fallback;
-			const match = /^gitdir:\s*(.+)$/m.exec(content.value);
-			if (!match?.[1]) return fallback;
-			const pointer = match[1].trim();
+			const gitFile = GitFile.parseResult(content.value);
+			if (Result.isFailure(gitFile)) return fallback;
+			const pointer = gitFile.success.gitdir;
 			const gitdir = path.isAbsolute(pointer) ? pointer : path.resolve(root, pointer);
 			const commondir = yield* fs.readFileString(path.join(gitdir, "commondir")).pipe(Effect.option);
 			if (Option.isSome(commondir)) {

package/tsdoc-metadata.json

@@ -5,7 +5,7 @@
   "toolPackages": [
     {
       "packageName": "@microsoft/api-extractor",
-      "packageVersion": "7.59.4"
+      "packageVersion": "7.60.0"
     }
   ]
 }