@savvy-web/silk-effects 5.1.3 → 5.2.1

package/index.js

@@ -1,8 +1,8 @@
 import { ChangesetConfigError } from "./errors/ChangesetConfigError.js";
-import { ChangesetConfigReader, ChangesetConfigReaderLive } from "./services/ChangesetConfigReader.js";
+import { ChangesetConfigReader } from "./services/ChangesetConfigReader.js";
 import { PublishTargetBindingError } from "./errors/PublishTargetBindingError.js";
-import { ChangesetConfig, ChangesetConfigLive } from "./services/ChangesetConfig.js";
-import { PublishabilityDetectorAdaptiveLive, SilkPublishability, SilkPublishabilityDetectorLive, readTargetsBinding } from "./services/SilkPublishability.js";
+import { ChangesetConfig } from "./services/ChangesetConfig.js";
+import { SilkPublishability, readTargetsBinding } from "./services/SilkPublishability.js";
 import { changesets_exports } from "./changesets/index.js";
 import { commitlint_exports } from "./commitlint/index.js";
 import { BiomeSyncError } from "./errors/BiomeSyncError.js";
@@ -12,9 +12,9 @@ import { SavvyBaseSection, SavvyHooksSection, savvyBasePreamble, savvyHooksHygie
 import { lint_exports } from "./lint/index.js";
 import { repos_exports } from "./repos/index.js";
 import { AnalyzedWorkspace, SilkPublishConfig, WorkspaceAnalysis } from "./schemas/WorkspaceAnalysisSchemas.js";
-import { BiomeSchemaSync, BiomeSchemaSyncLive, buildSchemaUrl, extractSemver } from "./services/BiomeSchemaSync.js";
-import { ConfigDiscovery, ConfigDiscoveryLive } from "./services/ConfigDiscovery.js";
-import { SilkWorkspaceAnalyzer, SilkWorkspaceAnalyzerLive } from "./services/SilkWorkspaceAnalyzer.js";
+import { BiomeSchemaSync, buildSchemaUrl, extractSemver } from "./services/BiomeSchemaSync.js";
+import { ConfigDiscovery } from "./services/ConfigDiscovery.js";
+import { SilkWorkspaceAnalyzer } from "./services/SilkWorkspaceAnalyzer.js";
 import { turbo_exports } from "./turbo/index.js";
 
-export { AnalyzedWorkspace, BiomeSchemaSync, BiomeSchemaSyncLive, BiomeSyncError, ChangesetConfig, ChangesetConfigError, ChangesetConfigLive, ChangesetConfigReader, ChangesetConfigReaderLive, changesets_exports as Changesets, commitlint_exports as Commitlint, ConfigDiscovery, ConfigDiscoveryLive, ConfigNotFoundError, lint_exports as Lint, PublishTargetBindingError, PublishabilityDetectorAdaptiveLive, repos_exports as Repos, SavvyBaseSection, SavvyHooksSection, SilkPublishConfig, SilkPublishability, SilkPublishabilityDetectorLive, SilkWorkspaceAnalyzer, SilkWorkspaceAnalyzerLive, turbo_exports as Turbo, WorkspaceAnalysis, WorkspaceAnalysisError, buildSchemaUrl, extractSemver, readTargetsBinding, savvyBasePreamble, savvyHooksHygiene, savvyToolSection };
+export { AnalyzedWorkspace, BiomeSchemaSync, BiomeSyncError, ChangesetConfig, ChangesetConfigError, ChangesetConfigReader, changesets_exports as Changesets, commitlint_exports as Commitlint, ConfigDiscovery, ConfigNotFoundError, lint_exports as Lint, PublishTargetBindingError, repos_exports as Repos, SavvyBaseSection, SavvyHooksSection, SilkPublishConfig, SilkPublishability, SilkWorkspaceAnalyzer, turbo_exports as Turbo, WorkspaceAnalysis, WorkspaceAnalysisError, buildSchemaUrl, extractSemver, readTargetsBinding, savvyBasePreamble, savvyHooksHygiene, savvyToolSection };

package/lint/handlers/PnpmWorkspace.js

@@ -163,7 +163,8 @@ var PnpmWorkspace = class PnpmWorkspace {
 			let parsed = parseResult.success;
 			if (!skipSort) parsed = PnpmWorkspace.sortContent(parsed);
 			if (!skipSort || !skipFormat) {
-				writeFileSync(filepath, await PnpmWorkspace.formatContent(parsed), "utf-8");
+				const formatted = await PnpmWorkspace.formatContent(parsed);
+				writeFileSync(filepath, formatted, "utf-8");
 				return [];
 			}
 			return [];

package/lint/handlers/Yaml.js

@@ -101,11 +101,14 @@ var Yaml = class Yaml {
 	* @param filepath - Path to the YAML file
 	*/
 	static async formatFile(filepath) {
-		writeFileSync(filepath, await format(readFileSync(filepath, "utf-8"), {
-			...await resolveConfig(filepath),
+		const content = readFileSync(filepath, "utf-8");
+		const prettierConfig = await resolveConfig(filepath);
+		const formatted = await format(content, {
+			...prettierConfig,
 			filepath,
 			parser: "yaml"
-		}), "utf-8");
+		});
+		writeFileSync(filepath, formatted, "utf-8");
 	}
 	/**
 	* Validate a YAML file using yaml-lint.
@@ -115,7 +118,8 @@ var Yaml = class Yaml {
 	* @throws Error if the YAML is invalid
 	*/
 	static async validateFile(filepath, schema) {
-		await lint(readFileSync(filepath, "utf-8"), schema ? { schema } : void 0);
+		const content = readFileSync(filepath, "utf-8");
+		await lint(content, schema ? { schema } : void 0);
 	}
 	/**
 	* Create a handler that returns a CLI command to format YAML files.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@savvy-web/silk-effects",
-	"version": "5.1.3",
+	"version": "5.2.1",
 	"private": false,
 	"description": "Shared Effect library for Silk Suite conventions",
 	"homepage": "https://github.com/savvy-web/systems/tree/main/packages/silk-effects",
@@ -33,15 +33,15 @@
 		"@changesets/config": "^4.0.0-next.6",
 		"@changesets/get-github-info": "^1.0.0-next.4",
 		"@changesets/get-release-plan": "^5.0.0-next.9",
-		"@effected/commands": "^0.2.0",
-		"@effected/git": "^0.5.1",
-		"@effected/glob": "^0.2.1",
-		"@effected/jsonc": "^0.5.1",
-		"@effected/package-json": "^0.6.1",
-		"@effected/templates": "^0.1.0",
-		"@effected/walker": "^0.3.3",
-		"@effected/workspaces": "^0.9.1",
-		"@effected/yaml": "^0.6.0",
+		"@effected/commands": "^0.2.1",
+		"@effected/git": "^0.5.2",
+		"@effected/glob": "^0.2.2",
+		"@effected/jsonc": "^0.5.2",
+		"@effected/package-json": "^0.7.2",
+		"@effected/templates": "^0.1.1",
+		"@effected/walker": "^0.3.4",
+		"@effected/workspaces": "^0.9.4",
+		"@effected/yaml": "^0.6.1",
 		"@manypkg/get-packages": "^3.1.0",
 		"mdast-util-heading-range": "^4.0.0",
 		"mdast-util-to-string": "^4.0.0",

package/repos/index.js

@@ -3,8 +3,8 @@ import { MANIFEST_PATH, REPOS_DIR } from "./constants.js";
 import { GitSubmoduleError, GitSubmoduleErrorBase, NoteNotFoundError, NoteNotFoundErrorBase, RepoNotFoundError, RepoNotFoundErrorBase, ReposConfigError, ReposConfigErrorBase } from "./errors.js";
 import { RepoEntry, RepoName, RepoNote, RepoOrientation, ReposManifestFile } from "./schemas/manifest.js";
 import { RepoStatusEntry, ReposAddResult, ReposNoteResult, ReposPinResult, ReposStatusReport, ReposSyncReport } from "./schemas/reports.js";
-import { ReposConfigStore, ReposConfigStoreLive } from "./services/config-store.js";
-import { ReposManager, ReposManagerLive, STALE_LOCK_MAX_AGE_MS } from "./services/manager.js";
+import { ReposConfigStore } from "./services/config-store.js";
+import { ReposManager, STALE_LOCK_MAX_AGE_MS } from "./services/manager.js";
 
 //#region src/repos/index.ts
 var repos_exports = /* @__PURE__ */ __exportAll({
@@ -26,9 +26,7 @@ var repos_exports = /* @__PURE__ */ __exportAll({
 	ReposConfigError: () => ReposConfigError,
 	ReposConfigErrorBase: () => ReposConfigErrorBase,
 	ReposConfigStore: () => ReposConfigStore,
-	ReposConfigStoreLive: () => ReposConfigStoreLive,
 	ReposManager: () => ReposManager,
-	ReposManagerLive: () => ReposManagerLive,
 	ReposManifestFile: () => ReposManifestFile,
 	ReposNoteResult: () => ReposNoteResult,
 	ReposPinResult: () => ReposPinResult,
@@ -38,4 +36,4 @@ var repos_exports = /* @__PURE__ */ __exportAll({
 });
 
 //#endregion
-export { GitSubmoduleError, GitSubmoduleErrorBase, MANIFEST_PATH, NoteNotFoundError, NoteNotFoundErrorBase, REPOS_DIR, RepoEntry, RepoName, RepoNotFoundError, RepoNotFoundErrorBase, RepoNote, RepoOrientation, RepoStatusEntry, ReposAddResult, ReposConfigError, ReposConfigErrorBase, ReposConfigStore, ReposConfigStoreLive, ReposManager, ReposManagerLive, ReposManifestFile, ReposNoteResult, ReposPinResult, ReposStatusReport, ReposSyncReport, STALE_LOCK_MAX_AGE_MS, repos_exports };
+export { GitSubmoduleError, GitSubmoduleErrorBase, MANIFEST_PATH, NoteNotFoundError, NoteNotFoundErrorBase, REPOS_DIR, RepoEntry, RepoName, RepoNotFoundError, RepoNotFoundErrorBase, RepoNote, RepoOrientation, RepoStatusEntry, ReposAddResult, ReposConfigError, ReposConfigErrorBase, ReposConfigStore, ReposManager, ReposManifestFile, ReposNoteResult, ReposPinResult, ReposStatusReport, ReposSyncReport, STALE_LOCK_MAX_AGE_MS, repos_exports };

package/repos/services/config-store.js

@@ -8,75 +8,76 @@ import { Context, Effect, FileSystem, Layer, Path, Schema } from "effect";
 * Reads, validates, and writes the .repos/config.json manifest.
 * @public
 */
-var ReposConfigStore = class extends Context.Service()("@savvy-web/silk-effects/ReposConfigStore") {};
-/**
-* Live layer over the core FileSystem.
-* @public
-*/
-const ReposConfigStoreLive = Layer.effect(ReposConfigStore, Effect.gen(function* () {
-	const fs = yield* FileSystem.FileSystem;
-	const path = yield* Path.Path;
-	const manifestPath = (root) => path.join(root, MANIFEST_PATH);
-	const exists = (root) => fs.exists(manifestPath(root)).pipe(Effect.orElseSucceed(() => false));
-	const read = (root) => Effect.gen(function* () {
-		if (!(yield* fs.exists(manifestPath(root)).pipe(Effect.mapError((cause) => new ReposConfigError({
-			path: manifestPath(root),
-			reason: `stat failed: ${String(cause)}`,
-			kind: "invalid"
-		}))))) return yield* Effect.fail(new ReposConfigError({
-			path: manifestPath(root),
-			reason: "no such file",
-			kind: "missing"
-		}));
-		const text = yield* fs.readFileString(manifestPath(root)).pipe(Effect.mapError((cause) => new ReposConfigError({
-			path: manifestPath(root),
-			reason: String(cause),
-			kind: "invalid"
-		})));
-		const json = yield* Effect.try({
-			try: () => JSON.parse(text),
-			catch: (cause) => new ReposConfigError({
+var ReposConfigStore = class extends Context.Service()("@savvy-web/silk-effects/ReposConfigStore") {
+	/**
+	* Production layer over the core FileSystem.
+	* @public
+	*/
+	static layer = Layer.effect(this, Effect.gen(function* () {
+		const fs = yield* FileSystem.FileSystem;
+		const path = yield* Path.Path;
+		const manifestPath = (root) => path.join(root, MANIFEST_PATH);
+		const exists = (root) => fs.exists(manifestPath(root)).pipe(Effect.orElseSucceed(() => false));
+		const read = (root) => Effect.gen(function* () {
+			if (!(yield* fs.exists(manifestPath(root)).pipe(Effect.mapError((cause) => new ReposConfigError({
+				path: manifestPath(root),
+				reason: `stat failed: ${String(cause)}`,
+				kind: "invalid"
+			}))))) return yield* Effect.fail(new ReposConfigError({
+				path: manifestPath(root),
+				reason: "no such file",
+				kind: "missing"
+			}));
+			const text = yield* fs.readFileString(manifestPath(root)).pipe(Effect.mapError((cause) => new ReposConfigError({
+				path: manifestPath(root),
+				reason: String(cause),
+				kind: "invalid"
+			})));
+			const json = yield* Effect.try({
+				try: () => JSON.parse(text),
+				catch: (cause) => new ReposConfigError({
+					path: manifestPath(root),
+					reason: `invalid JSON: ${String(cause)}`,
+					kind: "invalid"
+				})
+			});
+			return yield* Schema.decodeUnknownEffect(ReposManifestFile)(json).pipe(Effect.mapError((cause) => new ReposConfigError({
+				path: manifestPath(root),
+				reason: String(cause),
+				kind: "invalid"
+			})));
+		});
+		const write = (root, manifest) => Effect.gen(function* () {
+			const dir = path.join(root, REPOS_DIR);
+			yield* fs.makeDirectory(dir, { recursive: true }).pipe(Effect.mapError((cause) => new ReposConfigError({
+				path: manifestPath(root),
+				reason: `mkdir failed: ${String(cause)}`,
+				kind: "invalid"
+			})));
+			const encoded = yield* Schema.encodeEffect(ReposManifestFile)(manifest).pipe(Effect.mapError((cause) => new ReposConfigError({
+				path: manifestPath(root),
+				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({
+				path: manifestPath(root),
+				reason: String(cause),
+				kind: "invalid"
+			})));
+			yield* fs.rename(tmpPath, manifestPath(root)).pipe(Effect.mapError((cause) => new ReposConfigError({
 				path: manifestPath(root),
-				reason: `invalid JSON: ${String(cause)}`,
+				reason: `rename failed: ${String(cause)}`,
 				kind: "invalid"
-			})
+			})));
 		});
-		return yield* Schema.decodeUnknownEffect(ReposManifestFile)(json).pipe(Effect.mapError((cause) => new ReposConfigError({
-			path: manifestPath(root),
-			reason: String(cause),
-			kind: "invalid"
-		})));
-	});
-	const write = (root, manifest) => Effect.gen(function* () {
-		const dir = path.join(root, REPOS_DIR);
-		yield* fs.makeDirectory(dir, { recursive: true }).pipe(Effect.mapError((cause) => new ReposConfigError({
-			path: manifestPath(root),
-			reason: `mkdir failed: ${String(cause)}`,
-			kind: "invalid"
-		})));
-		const encoded = yield* Schema.encodeEffect(ReposManifestFile)(manifest).pipe(Effect.mapError((cause) => new ReposConfigError({
-			path: manifestPath(root),
-			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({
-			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"
-		})));
-	});
-	return {
-		exists,
-		read,
-		write
-	};
-}));
+		return {
+			exists,
+			read,
+			write
+		};
+	}));
+};
 
 //#endregion
-export { ReposConfigStore, ReposConfigStoreLive };
+export { ReposConfigStore };