@savvy-web/silk-effects 11.0.1 → 11.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@savvy-web/silk-effects",
-	"version": "11.0.1",
+	"version": "11.0.2",
 	"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,24 @@
 		"@changesets/get-release-plan": "^5.0.2",
 		"@changesets/pre": "^3.0.0",
 		"@changesets/read": "^1.0.1",
+		"@effected/files": "^0.1.0",
 		"@effected/github-references": "^0.14.0",
-		"@effected/glob": "^0.18.0",
-		"@effected/jsonc": "^0.23.0",
-		"@effected/markdown": "^0.26.0",
-		"@effected/package-json": "^0.29.0",
-		"@effected/toml": "^0.19.0",
-		"@effected/walker": "^0.25.0",
-		"@effected/yaml": "^0.28.0",
+		"@effected/glob": "^0.19.0",
+		"@effected/jsonc": "^0.24.0",
+		"@effected/markdown": "^0.27.0",
+		"@effected/package-json": "^0.30.0",
+		"@effected/toml": "^0.19.1",
+		"@effected/walker": "^0.25.1",
+		"@effected/yaml": "^0.29.0",
 		"@manypkg/get-packages": "^3.1.0",
-		"@savvy-web/silk-core": "^0.6.1",
+		"@savvy-web/silk-core": "^0.6.2",
 		"shell-quote": "^1.12.0"
 	},
 	"peerDependencies": {
 		"@effected/commands": "^0.20.0",
 		"@effected/git": "^0.30.0",
-		"@effected/templates": "^0.17.0",
-		"@effected/workspaces": "^0.42.0",
+		"@effected/templates": "^0.18.0",
+		"@effected/workspaces": "^0.43.0",
 		"effect": "~4.1.2"
 	}
 }

package/repos/services/config-store.js

@@ -2,6 +2,7 @@ import { MANIFEST_PATH, REPOS_DIR } from "../constants.js";
 import { ReposConfigError } from "../errors.js";
 import { ReposManifestFile } from "../schemas/manifest.js";
 import { Clock, Context, Effect, FileSystem, Layer, Option, Path, Schedule, Schema } from "effect";
+import { AtomicFile } from "@effected/files";
 
 // src/repos/services/config-store.ts
 /**
@@ -59,17 +60,11 @@ var ReposConfigStore = class extends Context.Service()("@savvy-web/silk-effects/
 				reason: String(cause),
 				kind: "invalid"
 			})));
-			const tmpPath = `${manifestPath(root)}.tmp`;
-			yield* fs.writeFileString(tmpPath, `${JSON.stringify(encoded, null, "	")}\n`).pipe(Effect.mapError((cause) => new ReposConfigError({
+			yield* AtomicFile.write(manifestPath(root), `${JSON.stringify(encoded, null, "	")}\n`).pipe(Effect.provideService(FileSystem.FileSystem, fs), Effect.provideService(Path.Path, path), Effect.mapError((cause) => new ReposConfigError({
 				path: manifestPath(root),
 				reason: String(cause),
 				kind: "invalid"
 			})));
-			yield* fs.rename(tmpPath, manifestPath(root)).pipe(Effect.mapError((cause) => new ReposConfigError({
-				path: manifestPath(root),
-				reason: `rename failed: ${String(cause)}`,
-				kind: "invalid"
-			})));
 		});
 		const lockSchedule = Schedule.exponential("25 millis").pipe(Schedule.upTo({ duration: "2 seconds" }));
 		const LOCK_MAX_AGE_MS = 6e4;

package/repos/services/drift.js

@@ -72,7 +72,7 @@ var ReposDrift = class extends Context.Service()("@savvy-web/silk-effects/ReposD
 		*/
 		const localRegistrationDrifts = (root, manifestEntries) => Effect.gen(function* () {
 			const found = [];
-			const configEntries = yield* git.configList(root).pipe(Effect.mapError(asSubmoduleError("git config --list", root)));
+			const configEntries = yield* git.configList(root, { scope: "local" }).pipe(Effect.mapError(asSubmoduleError("git config --local --list", root)));
 			const registeredNames = new Set(configEntries.map((configEntry) => submoduleNameFromKey(configEntry.key)).filter((registeredName) => registeredName !== void 0));
 			const modulesRoot = path.join(root, ".git", "modules");
 			const canonicalNames = new Set(manifestEntries.map(([name]) => `${REPOS_DIR}/${name}`));

package/repos/services/manager.js

@@ -5,7 +5,7 @@ import { ReposConfigStore } from "./config-store.js";
 import { submoduleNameFromKey } from "./drift.js";
 import { ReposLockdown, resolveModuleDir } from "./lockdown.js";
 import { Clock, Context, Effect, Exit, FileSystem, Layer, Option, Path, Result, Schema } from "effect";
-import { Git, GitConfig, GitFile, GitRemote, Gitmodules, LsRemoteEntry } from "@effected/git";
+import { Git, GitConfig, GitRemote, Gitmodules, LsRemoteEntry } from "@effected/git";
 import { Digest } from "effect/crypto";
 
 // src/repos/services/manager.ts
@@ -662,34 +662,6 @@ var ReposManager = class extends Context.Service()("@savvy-web/silk-effects/Repo
 				stillDirty
 			};
 		});
-		/**
-		* Resolve the file git's `--local` scope actually targets for `root`.
-		* A plain checkout is `<root>/.git/config`; a LINKED WORKTREE's
-		* `<root>/.git` is a pointer FILE whose `gitdir:` names
-		* `.git/worktrees/<name>`, and the local config git uses there is the
-		* SHARED one at the main gitdir named by that dir's `commondir` file.
-		* Every unreadable/malformed step degrades to the plain
-		* `<root>/.git/config` path rather than failing — the same
-		* never-fails posture as `resolveModuleDir`.
-		*/
-		const resolveLocalConfigPath = (root) => Effect.gen(function* () {
-			const dotGit = path.join(root, ".git");
-			const fallback = path.join(dotGit, "config");
-			const info = yield* fs.stat(dotGit).pipe(Effect.option);
-			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 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)) {
-				const common = commondir.value.trim();
-				return path.join(path.isAbsolute(common) ? common : path.resolve(gitdir, common), "config");
-			}
-			return path.join(gitdir, "config");
-		});
 		const deregister = (root, section) => Effect.gen(function* () {
 			if (!section.startsWith(`${".repos"}/`) || section === `${".repos"}/`) return yield* Effect.fail(new ReposConfigError({
 				path: MANIFEST_PATH,
@@ -702,12 +674,11 @@ var ReposManager = class extends Context.Service()("@savvy-web/silk-effects/Repo
 				reason: `"${section}" is the canonical registration of manifest entry "${name}" — deregister clears STALE registrations only; use remove to unvendor, or sync to reconcile`,
 				kind: "invalid"
 			}));
-			const localConfigPath = yield* resolveLocalConfigPath(root);
-			const configEntries = yield* git.configList(root, { file: localConfigPath }).pipe(Effect.mapError(asSubmoduleError(`git config -f ${localConfigPath} --list`, root)));
+			const configEntries = yield* git.configList(root, { scope: "local" }).pipe(Effect.mapError(asSubmoduleError("git config --local --list", root)));
 			const registeredNames = new Set(configEntries.map((configEntry) => submoduleNameFromKey(configEntry.key)).filter((registeredName) => registeredName !== void 0));
 			const removedKeys = configEntries.map((configEntry) => configEntry.key).filter((key) => submoduleNameFromKey(key) === section);
 			if (removedKeys.length === 0) return yield* Effect.fail(new ReposConfigError({
-				path: localConfigPath,
+				path: path.join(root, ".git", "config"),
 				reason: `no submodule.${section} section registered in the local git config — nothing to deregister`,
 				kind: "invalid"
 			}));