@savvy-web/silk-effects 2.1.0 → 3.0.1

package/changesets/api/changelog.js

@@ -106,7 +106,7 @@ var Changelog = class {
 	*   Pass `null` to use defaults (no GitHub link resolution).
 	* @returns A promise resolving to the formatted markdown string
 	*/
-	static formatReleaseLine(changeset, versionType, options) {
+	static async formatReleaseLine(changeset, versionType, options) {
 		return changelogFunctions.getReleaseLine(changeset, versionType, options);
 	}
 	/**
@@ -125,7 +125,7 @@ var Changelog = class {
 	* @returns A promise resolving to the formatted markdown string containing
 	*   the dependency update table
 	*/
-	static formatDependencyReleaseLine(changesets, dependenciesUpdated, options) {
+	static async formatDependencyReleaseLine(changesets, dependenciesUpdated, options) {
 		return changelogFunctions.getDependencyReleaseLine(changesets, dependenciesUpdated, options);
 	}
 };

package/changesets/services/release-planner.js

@@ -6,9 +6,9 @@ import { VersionFiles } from "../utils/version-files.js";
 import { Context, Effect, Layer } from "effect";
 import { dirname, isAbsolute, join, relative } from "node:path";
 import { FileSystem } from "@effect/platform";
-import applyReleasePlan from "@changesets/apply-release-plan";
-import { read } from "@changesets/config";
-import getReleasePlan from "@changesets/get-release-plan";
+import { applyReleasePlan } from "@changesets/apply-release-plan";
+import { readConfig } from "@changesets/config";
+import { getReleasePlan } from "@changesets/get-release-plan";
 import { getPackages } from "@manypkg/get-packages";
 
 //#region src/changesets/services/release-planner.ts
@@ -24,37 +24,21 @@ import { getPackages } from "@manypkg/get-packages";
 * (e.g. `getChangelogEntry`) is re-implemented.
 *
 */
-const V1_TOOLS = /* @__PURE__ */ new Set([
-	"yarn",
-	"bolt",
-	"pnpm",
-	"lerna",
-	"root"
-]);
+const errMsg = (e) => e instanceof Error ? e.message : String(e);
 /**
-* Single workspace-discovery seam; swap to an Effect-native stack later here.
-*
-* Discovers with `@manypkg/get-packages@3.x` and adapts to the v1 shape:
-* `tool` collapses to its type string (tools unknown to v1 map to `"root"` —
-* the engine never reads `tool` at runtime, only `root.dir`), and
-* `rootDir`/`rootPackage` fold back into `root`.
+* Read the changesets config, surfacing non-throwing `readConfig` errors as a
+* thrown `Error` so callers inside `Effect.tryPromise` land on the existing
+* `ReleasePlanError` mapping. Warnings are returned alongside the config so
+* the caller can log them via the Effect runtime rather than console output.
 */
-const buildPackages = async (root) => {
-	const { tool, rootDir, rootPackage, packages } = await getPackages(root);
-	if (!rootPackage) throw new Error(`Workspace root has no package.json: ${rootDir}`);
+async function loadConfig(root, packages) {
+	const configResult = await readConfig(root, packages);
+	if (configResult.config === void 0) throw new Error(`Invalid changeset config:\n${configResult.errors.join("\n")}`);
 	return {
-		tool: V1_TOOLS.has(tool.type) ? tool.type : "root",
-		root: {
-			dir: rootPackage.dir,
-			packageJson: rootPackage.packageJson
-		},
-		packages: packages.map((p) => ({
-			dir: p.dir,
-			packageJson: p.packageJson
-		}))
+		config: configResult.config,
+		warnings: configResult.warnings
 	};
-};
-const errMsg = (e) => e instanceof Error ? e.message : String(e);
+}
 const _tag = Context.Tag("ReleasePlanner");
 /**
 * Base class for {@link ReleasePlanner}.
@@ -75,7 +59,7 @@ function makeShape(inspector, fs) {
 		})
 	});
 	const preview = (root) => previewEffect(root, fs);
-	const apply = (root, options) => applyEffect(root, options?.dryRun ?? false, inspector, fs);
+	const apply = (root, options) => applyEffect(root, options?.dryRun ?? false, options?.changelogModules, inspector, fs);
 	return {
 		plan,
 		preview,
@@ -133,19 +117,25 @@ function maintenanceReasons(plan, config) {
 function previewEffect(root, fs) {
 	const program = Effect.gen(function* () {
 		const [plan, packages] = yield* Effect.tryPromise({
-			try: () => Promise.all([getReleasePlan(root), buildPackages(root)]),
+			try: () => Promise.all([getReleasePlan(root), getPackages(root)]),
 			catch: (e) => new ReleasePlanError({
 				phase: "preview",
 				reason: errMsg(e)
 			})
 		});
-		const config = yield* Effect.tryPromise({
-			try: () => read(root, packages),
+		if (!packages.rootPackage) return yield* Effect.fail(new ReleasePlanError({
+			phase: "preview",
+			reason: `Workspace root has no package.json: ${root}`
+		}));
+		const rootPackage = packages.rootPackage;
+		const { config, warnings } = yield* Effect.tryPromise({
+			try: () => loadConfig(root, packages),
 			catch: (e) => new ReleasePlanError({
 				phase: "preview",
 				reason: errMsg(e)
 			})
 		});
+		yield* Effect.forEach(warnings, (w) => Effect.logWarning(w));
 		const reasonByName = maintenanceReasons(plan, config);
 		const preMode = plan.preState ? plan.preState.mode : null;
 		const changesets = plan.changesets.map((cs) => ({
@@ -164,7 +154,7 @@ function previewEffect(root, fs) {
 		};
 		const tempRoot = yield* fs.makeTempDirectoryScoped({ prefix: "silk-preview-" });
 		const mapDir = (dir) => {
-			const rel = relative(packages.root.dir, dir);
+			const rel = relative(packages.rootDir, dir);
 			if (rel.startsWith("..") || isAbsolute(rel)) return Effect.fail(new ReleasePlanError({
 				phase: "preview",
 				reason: `Package directory is outside the workspace root: ${dir}`
@@ -174,13 +164,12 @@ function previewEffect(root, fs) {
 		const tempDirs = yield* Effect.forEach(packages.packages, (p) => mapDir(p.dir));
 		const tempPackages = {
 			tool: packages.tool,
-			root: {
-				...packages.root,
+			rootDir: tempRoot,
+			rootPackage: {
 				dir: tempRoot,
-				packageJson: structuredClone(packages.root.packageJson)
+				packageJson: structuredClone(rootPackage.packageJson)
 			},
 			packages: packages.packages.map((p, i) => ({
-				...p,
 				dir: tempDirs[i],
 				packageJson: structuredClone(p.packageJson)
 			}))
@@ -197,7 +186,7 @@ function previewEffect(root, fs) {
 			const realCl = join(p.dir, "CHANGELOG.md");
 			if (yield* fs.exists(realCl)) yield* fs.copyFile(realCl, join(tDir, "CHANGELOG.md"));
 		}
-		const rootCl = join(packages.root.dir, "CHANGELOG.md");
+		const rootCl = join(packages.rootDir, "CHANGELOG.md");
 		if (yield* fs.exists(rootCl)) yield* fs.copyFile(rootCl, join(tempRoot, "CHANGELOG.md"));
 		yield* Effect.tryPromise({
 			try: () => applyReleasePlan(plan, tempPackages, config, void 0, root),
@@ -208,7 +197,7 @@ function previewEffect(root, fs) {
 		});
 		const dirByName = /* @__PURE__ */ new Map();
 		for (const p of tempPackages.packages) dirByName.set(p.packageJson.name, p.dir);
-		if (tempPackages.root.packageJson.name) dirByName.set(tempPackages.root.packageJson.name, tempRoot);
+		if (tempPackages.rootPackage?.packageJson.name) dirByName.set(tempPackages.rootPackage.packageJson.name, tempRoot);
 		const releases = [];
 		for (const r of releasesToRender) {
 			const dir = dirByName.get(r.name);
@@ -251,15 +240,17 @@ function previewEffect(root, fs) {
 function diskVersion(workspaceDir, fallback, fs) {
 	return fs.readFileString(join(workspaceDir, "package.json")).pipe(Effect.flatMap((raw) => Effect.try(() => JSON.parse(raw).version ?? fallback)), Effect.orElseSucceed(() => fallback));
 }
-function applyEffect(root, dryRun, inspector, fs) {
+function applyEffect(root, dryRun, changelogModules, inspector, fs) {
 	return Effect.gen(function* () {
-		const { plan, packages, config } = yield* Effect.tryPromise({
+		const { plan, packages, config, warnings } = yield* Effect.tryPromise({
 			try: async () => {
-				const [plan, packages] = await Promise.all([getReleasePlan(root), buildPackages(root)]);
+				const [plan, packages] = await Promise.all([getReleasePlan(root), getPackages(root)]);
+				const { config, warnings } = await loadConfig(root, packages);
 				return {
 					plan,
 					packages,
-					config: await read(root, packages)
+					config,
+					warnings
 				};
 			},
 			catch: (e) => new ReleasePlanError({
@@ -267,6 +258,29 @@ function applyEffect(root, dryRun, inspector, fs) {
 				reason: errMsg(e)
 			})
 		});
+		yield* Effect.forEach(warnings, (w) => Effect.logWarning(w));
+		let engineConfig = config;
+		if (changelogModules) {
+			engineConfig = {
+				...config,
+				format: false
+			};
+			if (Array.isArray(config.changelog)) {
+				const configuredId = config.changelog[0];
+				const mapped = changelogModules[configuredId];
+				if (mapped === void 0) {
+					const supported = Object.keys(changelogModules).join(", ");
+					return yield* Effect.fail(new ReleasePlanError({
+						phase: "apply",
+						reason: `changelog id "${configuredId}" is not in changelogModules (supported: ${supported})`
+					}));
+				}
+				engineConfig = {
+					...engineConfig,
+					changelog: [mapped, config.changelog[1]]
+				};
+			}
+		}
 		const releases = plan.releases.filter((r) => r.type !== "none").map((r) => ({
 			name: r.name,
 			type: r.type,
@@ -279,10 +293,10 @@ function applyEffect(root, dryRun, inspector, fs) {
 			const versionByPkgName = new Map(plan.releases.map((r) => [r.name, r.newVersion]));
 			const nameByDir = /* @__PURE__ */ new Map();
 			for (const p of packages.packages) nameByDir.set(p.dir, p.packageJson.name);
-			if (packages.root.packageJson.name) nameByDir.set(packages.root.dir, packages.root.packageJson.name);
+			if (packages.rootPackage?.packageJson.name) nameByDir.set(packages.rootDir, packages.rootPackage.packageJson.name);
 			touchedFiles = yield* Effect.tryPromise({
 				try: async () => {
-					const touched = await applyReleasePlan(plan, packages, config);
+					const touched = await applyReleasePlan(plan, packages, engineConfig);
 					for (const f of touched) {
 						if (!f.endsWith("CHANGELOG.md")) continue;
 						const pkgName = nameByDir.get(dirname(f));

package/changesets/vendor/github-info.js

@@ -1,6 +1,6 @@
 import { GitHubApiError } from "../errors.js";
 import { Effect } from "effect";
-import { getInfo } from "@changesets/get-github-info";
+import { getCommitInfo } from "@changesets/get-github-info";
 
 //#region src/changesets/vendor/github-info.ts
 /**
@@ -9,8 +9,14 @@ import { getInfo } from "@changesets/get-github-info";
 * @remarks
 * Bridges the `\@changesets/get-github-info` package (which returns
 * promises) into the Effect ecosystem. The {@link getGitHubInfo}
-* function wraps the upstream `getInfo()` call in `Effect.tryPromise`,
-* mapping failures to {@link GitHubApiError}.
+* function wraps the upstream `getCommitInfo()` call in `Effect.tryPromise`,
+* adapting its structured `CommitInfo | undefined` return back to the
+* legacy {@link GitHubCommitInfo} shape and mapping failures (including a
+* `not found` result) to {@link GitHubApiError}.
+*
+* The upstream v1 package added a `.env` fallback: it reads
+* `GITHUB_TOKEN` from `process.env` directly when no token is otherwise
+* configured, so the caller does not need to plumb one through.
 *
 * The {@link GitHubCommitInfo} type is the only item from this module
 * that is part of the public API (re-exported from the package root).
@@ -24,9 +30,13 @@ import { getInfo } from "@changesets/get-github-info";
 * Fetch GitHub info for a commit, wrapped in Effect.
 *
 * @remarks
-* Calls the upstream `getInfo()` from `\@changesets/get-github-info`
-* within `Effect.tryPromise`. Any thrown error is caught and mapped
-* to a {@link GitHubApiError} with the operation set to `"getInfo"`.
+* Calls the upstream `getCommitInfo()` from `\@changesets/get-github-info`
+* within `Effect.tryPromise`, adapting its structured `CommitInfo`
+* return to the legacy {@link GitHubCommitInfo} shape. An `undefined`
+* result (commit or repo not found) is treated as a thrown error so it
+* is mapped to the same {@link GitHubApiError} failure channel. Any
+* thrown error is caught and mapped to a {@link GitHubApiError} with
+* the operation set to `"getCommitInfo"`.
 *
 * Requires a `GITHUB_TOKEN` environment variable to be set for
 * authenticated API access (the upstream library reads it directly).
@@ -39,13 +49,25 @@ import { getInfo } from "@changesets/get-github-info";
 */
 function getGitHubInfo(params) {
 	return Effect.tryPromise({
-		try: () => getInfo({
-			commit: params.commit,
-			repo: params.repo
-		}),
+		try: async () => {
+			const info = await getCommitInfo({
+				commit: params.commit,
+				repo: params.repo
+			});
+			if (info === void 0) throw new Error(`commit ${params.commit} not found in ${params.repo}`);
+			return {
+				user: info.author?.login ?? null,
+				pull: info.pull?.number ?? null,
+				links: {
+					commit: info.commit.markdownLink,
+					pull: info.pull?.markdownLink ?? null,
+					user: info.author?.markdownLink ?? null
+				}
+			};
+		},
 		/* v8 ignore next 5 -- error mapping tested via GitHubService test layer */
 		catch: (error) => new GitHubApiError({
-			operation: "getInfo",
+			operation: "getCommitInfo",
 			reason: error instanceof Error ? error.message : String(error)
 		})
 	});

package/index.d.ts

@@ -284,7 +284,9 @@ declare class Categories {
   static isValidHeading(heading: string): boolean;
 }
 //#endregion
-//#region ../../node_modules/.pnpm/@changesets+types@6.1.0/node_modules/@changesets/types/dist/declarations/src/index.d.ts
+//#region ../../node_modules/.pnpm/@changesets+types@7.0.0-next.6/node_modules/@changesets/types/dist/index.d.mts
+//#region src/index.d.ts
+type MaybePromise<T> = T | Promise<T>;
 type VersionType$1 = "major" | "minor" | "patch" | "none";
 type AccessType = "public" | "restricted";
 type Release = {
@@ -333,6 +335,7 @@ type PackageJSON = {
     access?: AccessType;
     directory?: string;
     registry?: string;
+    [registry: `${string}:registry`]: string;
   };
 };
 type PackageGroup = ReadonlyArray<string>;
@@ -343,19 +346,23 @@ interface PrivatePackages {
   tag: boolean;
 }
 type Config = {
-  changelog: false | readonly [string, any];
-  commit: false | readonly [string, any];
+  changelog: false | readonly [string, null | Record<string, unknown>];
+  commit: false | readonly [string, null | Record<string, unknown>];
   fixed: Fixed;
   linked: Linked;
   access: AccessType;
   baseBranch: string;
-  changedFilePatterns: readonly string[]; /** When false, Changesets won't format with Prettier */
-  prettier: boolean; /** Features enabled for Private packages */
+  changedFilePatterns: readonly string[];
+  /**
+   * The formatter to use to format changesets and changelogs. Set `false` to disable formatting.
+   * The default value of `"auto"` will auto-detect the formatter based on the project's configuration files.
+   */
+  format: "auto" | "prettier" | "oxfmt" | "deno" | "dprint" | false; /** Features enabled for Private packages */
   privatePackages: PrivatePackages; /** The minimum bump type to trigger automatic update of internal dependencies that are part of the same release */
   updateInternalDependencies: "patch" | "minor";
   ignore: ReadonlyArray<string>; /** This is supposed to be used with pnpm's `link-workspace-packages: false` and Berry's `enableTransparentWorkspaces: false` */
   bumpVersionsWithWorkspaceProtocolOnly?: boolean;
-  ___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH: Omit<Required<ExperimentalOptions>, "useCalculatedVersionForSnapshots">;
+  ___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH: Required<ExperimentalOptions>;
   snapshot: {
     useCalculatedVersion: boolean;
     prereleaseTemplate: string | null;
@@ -363,8 +370,7 @@ type Config = {
 };
 type ExperimentalOptions = {
   onlyUpdatePeerDependentsWhenOutOfRange?: boolean;
-  updateInternalDependents?: "always" | "out-of-range"; /** @deprecated Since snapshot feature is now stable, you should migrate to use "snapshot.useCalculatedVersion". */
-  useCalculatedVersionForSnapshots?: boolean;
+  updateInternalDependents?: "always" | "out-of-range";
 };
 type NewChangesetWithCommit = NewChangeset & {
   commit?: string;
@@ -373,8 +379,8 @@ type ModCompWithPackage = ComprehensiveRelease & {
   packageJson: PackageJSON;
   dir: string;
 };
-type GetReleaseLine = (changeset: NewChangesetWithCommit, type: VersionType$1, changelogOpts: null | Record<string, any>) => Promise<string>;
-type GetDependencyReleaseLine = (changesets: NewChangesetWithCommit[], dependenciesUpdated: ModCompWithPackage[], changelogOpts: any) => Promise<string>;
+type GetReleaseLine = (changeset: NewChangesetWithCommit, type: VersionType$1, changelogOpts: null | Record<string, unknown>) => MaybePromise<string>;
+type GetDependencyReleaseLine = (changesets: NewChangesetWithCommit[], dependenciesUpdated: ModCompWithPackage[], changelogOpts: null | Record<string, unknown>) => MaybePromise<string>;
 type ChangelogFunctions = {
   getReleaseLine: GetReleaseLine;
   getDependencyReleaseLine: GetDependencyReleaseLine;
@@ -382,9 +388,6 @@ type ChangelogFunctions = {
 type PreState = {
   mode: "pre" | "exit";
   tag: string;
-  initialVersions: {
-    [pkgName: string]: string;
-  };
   changesets: string[];
 };
 //#endregion
@@ -2697,7 +2700,7 @@ declare class ChangesetConfigError extends ChangesetConfigError_base<{
 //#endregion
 //#region src/schemas/VersioningSchemas.d.ts
 /**
- * Standard changesets configuration matching the `@changesets/config@3.1.1` spec.
+ * Standard changesets configuration matching the `@changesets/config@4.0.0-next.6` spec.
  *
  * @remarks
  * Represents the parsed `.changeset/config.json` file. All fields are optional
@@ -3961,6 +3964,13 @@ interface ReleasePlannerShape {
   /** Natively apply the release (destructive unless `dryRun`). */
   readonly apply: (root: string, options?: {
     readonly dryRun?: boolean;
+    /**
+     * Map configured changelog ids to absolute module paths. When set,
+     * `config.changelog[0]` must be a key of this map (rewritten before the
+     * engine call; unmapped ids fail) and the engine's `format` integration
+     * is disabled — callers in no-`node_modules` contexts own formatting.
+     */
+    readonly changelogModules?: Readonly<Record<string, string>>;
   }) => Effect.Effect<AppliedRelease, ReleasePlanError>;
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@savvy-web/silk-effects",
-	"version": "2.1.0",
+	"version": "3.0.1",
 	"private": false,
 	"description": "Shared Effect library for Silk Suite conventions",
 	"homepage": "https://github.com/savvy-web/systems/tree/main/packages/silk-effects",
@@ -28,10 +28,10 @@
 		"./package.json": "./package.json"
 	},
 	"dependencies": {
-		"@changesets/apply-release-plan": "^7.1.1",
-		"@changesets/config": "^3.1.4",
-		"@changesets/get-github-info": "^0.8.0",
-		"@changesets/get-release-plan": "^4.0.16",
+		"@changesets/apply-release-plan": "^8.0.0-next.7",
+		"@changesets/config": "^4.0.0-next.6",
+		"@changesets/get-github-info": "^1.0.0-next.3",
+		"@changesets/get-release-plan": "^5.0.0-next.7",
 		"@manypkg/get-packages": "^3.1.0",
 		"jsonc-effect": "^0.3.0",
 		"mdast-util-heading-range": "^4.0.0",

package/schemas/VersioningSchemas.js

@@ -30,7 +30,7 @@ const SnapshotConfig = Schema.Struct({
 	prereleaseTemplate: Schema.optional(Schema.String)
 });
 /**
-* Standard changesets configuration matching the `@changesets/config@3.1.1` spec.
+* Standard changesets configuration matching the `@changesets/config@4.0.0-next.6` spec.
 *
 * @remarks
 * Represents the parsed `.changeset/config.json` file. All fields are optional

package/services/ChangesetConfigReader.js

@@ -7,12 +7,18 @@ import { FileSystem } from "@effect/platform";
 /**
 * Substrings that identify a Silk changelog adapter entry in `.changeset/config.json`.
 *
-* Both the standalone package (`@savvy-web/changesets/changelog`) and the
-* consolidated Silk re-export (`@savvy-web/silk/changesets/changelog`) are Silk
-* adapters. The `/silk/` segment in the consolidated path breaks the original
+* `@savvy-web/changelog` is the canonical standalone changelog id that `savvy init`
+* now writes. The two legacy forms — the original standalone package
+* (`@savvy-web/changesets/changelog`) and the consolidated Silk re-export
+* (`@savvy-web/silk/changesets/changelog`) — remain accepted for configs written
+* before the rename. The `/silk/` segment in the consolidated path breaks the
 * `@savvy-web/changesets` substring, so each form needs its own marker.
 */
-const SILK_CHANGELOG_MARKERS = ["@savvy-web/changesets", "@savvy-web/silk/changesets"];
+const SILK_CHANGELOG_MARKERS = [
+	"@savvy-web/changelog",
+	"@savvy-web/changesets",
+	"@savvy-web/silk/changesets"
+];
 function matchesSilkMarker(value) {
 	return SILK_CHANGELOG_MARKERS.some((marker) => value.includes(marker));
 }