@savvy-web/silk-effects 4.1.0 → 4.2.0

package/changesets/services/config-inspector.js

@@ -5,7 +5,7 @@ import { SilkPublishability, readTargetsBinding } from "../../services/SilkPubli
 import { Context, Effect, FileSystem, Layer, Path, Result, Schema } from "effect";
 import { isAbsolute, join, relative, resolve } from "node:path";
 import { GlobPattern, GlobPatternOptions } from "@effected/glob";
-import { descend } from "@effected/walker";
+import { compileAndExpand } from "@effected/walker";
 import { WorkspaceDiscovery } from "@effected/workspaces";
 
 //#region src/changesets/services/config-inspector.ts
@@ -172,23 +172,13 @@ function normalizeLegacyOptions(options, configPath) {
 /** Match dotfiles, mirroring the former tinyglobby `dot: true` behavior. */
 const GLOB_OPTIONS = GlobPatternOptions.make({ dot: true });
 /**
-* Compile `glob` via `@effected/glob`, folding a compile-guard trip
-* (over-length pattern, brace-expansion budget, nesting depth) into a
-* {@link ConfigurationError} naming the offending glob on the typed channel.
-*/
-function compileGlob(glob) {
-	return GlobPattern.compile(glob, GLOB_OPTIONS).pipe(Effect.mapError((error) => new ConfigurationError({
-		field: "glob",
-		reason: `Invalid glob pattern ${JSON.stringify(glob)}: ${error.message}`
-	})));
-}
 /**
 * Pure attribution helper: does `glob` (under this service's `dot: true`
 * semantics) match the repo-relative POSIX path `rel`? An uncompilable
 * pattern matches nothing.
 */
 function globMatchesRel(glob, rel) {
-	const result = Effect.runSync(Effect.result(GlobPattern.compile(glob, GLOB_OPTIONS)));
+	const result = GlobPattern.compileResult(glob, GLOB_OPTIONS);
 	return Result.isSuccess(result) && result.success.matches(rel);
 }
 /**
@@ -204,13 +194,14 @@ function globMatchesRel(glob, rel) {
 * module already speaks POSIX-relative match paths).
 */
 function materializeGlob(glob, cwd) {
-	return compileGlob(glob).pipe(Effect.flatMap((pattern) => descend(pattern, {
+	return compileAndExpand(glob, {
 		cwd,
-		onUnreadable: "skip"
+		onUnreadable: "skip",
+		glob: GLOB_OPTIONS
 	}).pipe(Effect.mapError((error) => new ConfigurationError({
 		field: "glob",
-		reason: `Failed to materialize glob ${JSON.stringify(glob)}: ${error.message}`
-	})), Effect.provide(Path.layer))));
+		reason: error.stage === "compile" ? `Invalid glob pattern ${JSON.stringify(glob)}: ${error.cause.message}` : `Failed to materialize glob ${JSON.stringify(glob)}: ${error.cause.message}`
+	})), Effect.provide(Path.layer));
 }
 /**
 * Determine whether `child` is the same directory as `parent` or sits inside

package/changesets/utils/version-files.js

@@ -1,10 +1,10 @@
 import { LegacyVersionFilesSchema } from "../schemas/version-files.js";
 import { jsonPathGet, jsonPathResolve, parseJsonPath } from "./jsonpath.js";
-import { Effect, Option, Path, Schema } from "effect";
+import { Effect, Path, Schema } from "effect";
 import { readFileSync, writeFileSync } from "node:fs";
 import { join, relative, resolve } from "node:path";
-import { GlobPattern } from "@effected/glob";
-import { descend } from "@effected/walker";
+import { GlobPatternOptions } from "@effected/glob";
+import { compileAndExpand } from "@effected/walker";
 import { Jsonc, JsoncEdit, JsoncFormattingOptions, JsoncModifier } from "@effected/jsonc";
 
 //#region src/changesets/utils/version-files.ts
@@ -405,19 +405,29 @@ var VersionFiles = class VersionFiles {
 	}
 };
 /**
+* Match dotfiles, matching `ConfigInspector`'s glob dialect.
+*
+* @remarks
+* This module previously compiled with minimatch DEFAULTS while
+* `ConfigInspector` compiled with `dot: true`, so a wildcard segment matching
+* a dotted directory was attributed to a package but never materialized (or
+* the reverse). The two paths must agree: attribution and materialization
+* answer the same question about the same glob.
+*/
+const GLOB_OPTIONS = GlobPatternOptions.make({ dot: true });
+/**
 * Expand a glob pattern against the filesystem, returning matching FILE paths
 * relative to `cwd` (POSIX separators), sorted by relative path.
 *
 * @remarks
-* The walk is `@effected/walker`'s `descend` (literal fast path,
+* The walk is `@effected/walker`'s `compileAndExpand` (literal fast path,
 * `enumerationPrefix` bounding, `node_modules`/`.git` pruning), with
 * `onUnreadable: "skip"` preserving this module's silent-skip policy for
-* unreadable directories. Matching semantics are minimatch DEFAULTS via the
-* compiled pattern — notably, wildcards do not match dotfiles, same as the
-* previous `tinyglobby` defaults. An uncompilable pattern expands to no
-* matches. `descend`'s `Path` requirement is satisfied internally with the
-* core POSIX `Path.layer` — this module already speaks POSIX relative match
-* paths and node-bound absolute paths throughout.
+* unreadable directories. Matching semantics are {@link GLOB_OPTIONS} —
+* wildcards DO match dotfiles, aligning this module with `ConfigInspector`. An
+* uncompilable pattern expands to no matches. The `Path` requirement is
+* satisfied internally with the core POSIX `Path.layer` — this module already
+* speaks POSIX relative match paths and node-bound absolute paths throughout.
 *
 * @param source - The glob pattern, repo-relative
 * @param cwd - Absolute directory the pattern is resolved against
@@ -426,13 +436,11 @@ var VersionFiles = class VersionFiles {
 * @internal
 */
 function expandGlob(source, cwd) {
-	return Effect.option(GlobPattern.compile(source)).pipe(Effect.flatMap(Option.match({
-		onNone: () => Effect.succeed([]),
-		onSome: (pattern) => descend(pattern, {
-			cwd,
-			onUnreadable: "skip"
-		})
-	})), Effect.provide(Path.layer));
+	return compileAndExpand(source, {
+		cwd,
+		onUnreadable: "skip",
+		glob: GLOB_OPTIONS
+	}).pipe(Effect.catch((error) => error.stage === "compile" ? Effect.succeed([]) : Effect.fail(error)), Effect.provide(Path.layer));
 }
 /**
 * Read the `version` field from a `package.json` in the given directory.

package/index.d.ts

@@ -3,7 +3,7 @@ import { Plugin } from "unified";
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
 import { PackageManagerDetector, PublishConfig, PublishTarget, PublishabilityDetector, WorkspaceDiscovery, WorkspaceDiscoveryFailure, WorkspacePackage, WorkspaceRoot, WorkspaceSnapshotAtFailure, WorkspaceSnapshotWorktreeFailure, WorkspaceSnapshots, WorkspaceStateSnapshot, WorkspacesOptions } from "@effected/workspaces";
 import { Git } from "@effected/git";
-import { DescendError } from "@effected/walker";
+import { GlobExpansionError } from "@effected/walker";
 //#endregion
 //#region src/changesets/categories/types.d.ts
 /**
@@ -4931,7 +4931,7 @@ declare class VersionFiles {
    * @param cwd - Project root directory
    * @returns Effect of `[filePath, config]` tuples
    */
-  static resolveGlobs(configs: readonly LegacyVersionFileConfig[], cwd: string): Effect.Effect<Array<[string, LegacyVersionFileConfig]>, DescendError, FileSystem.FileSystem>;
+  static resolveGlobs(configs: readonly LegacyVersionFileConfig[], cwd: string): Effect.Effect<Array<[string, LegacyVersionFileConfig]>, GlobExpansionError, FileSystem.FileSystem>;
   /**
    * Detect indentation from file content.
    *
@@ -5033,7 +5033,7 @@ declare class VersionFiles {
     name: string;
     version: string;
     path: string;
-  }>): Effect.Effect<VersionFileUpdate[], DescendError, FileSystem.FileSystem>;
+  }>): Effect.Effect<VersionFileUpdate[], GlobExpansionError, FileSystem.FileSystem>;
   /**
    * Apply version-file updates from the resolved (post-`ConfigInspector`)
    * representation. Each {@link ResolvedPackageScope} already names the
@@ -7284,7 +7284,7 @@ declare class Markdown {
 /**
  * Handler for package.json files.
  *
- * Sorts fields with sort-package-json and formats with Biome.
+ * Sorts fields with @effected/package-json and formats with Biome.
  *
  * @example
  * ```typescript
@@ -7353,12 +7353,20 @@ declare class PackageJson {
    * Sort the keys of a package.json document string.
    *
    * @remarks
-   * Pure transform over the file contents using `sort-package-json`. Used by
-   * the `savvy lint fmt package-json` subcommand so the CLI does not depend on
-   * `sort-package-json` directly.
+   * Pure transform over the file contents using `@effected/package-json`'s
+   * `PackageJsonFormat.formatToString` — the tolerant text path, which sorts
+   * canonically without decoding through the strict `Package` schema (so a
+   * private or version-less root is sorted rather than rejected). Byte-verified
+   * identical to the previous `sort-package-json` output on this repo's
+   * manifests. Used by the `savvy lint fmt package-json` subcommand so the CLI
+   * does not depend on a sorter directly.
+   *
+   * Unparseable content is returned UNCHANGED rather than throwing: a formatter
+   * must not mangle a file it cannot read, and the surrounding Biome pass
+   * reports the syntax error.
    *
    * @param content - The raw package.json file contents
-   * @returns The sorted package.json file contents
+   * @returns The sorted package.json file contents, or `content` if unparseable
    */
   static sortContent(content: string): string;
   /**
@@ -7444,17 +7452,18 @@ declare class PnpmWorkspace {
    * {@link create} and the `savvy lint fmt pnpm-workspace` CLI subcommand route
    * through here so the two paths cannot drift.
    *
-   * `@effected/yaml` emits block sequences without the leading two-space
-   * indentation and prefers single-quoted scalars; Prettier's YAML printer
-   * normalizes both back to the v3 `yaml` posture (indented sequences,
-   * double-quoted scalars). Do NOT write `EffectedYaml.stringify` output
-   * directly — that regresses the file on every format pass.
+   * {@link DEFAULT_STRINGIFY_OPTIONS} produces the repo's byte format directly.
+   * The former Prettier post-process — which existed only to re-indent block
+   * sequences and re-quote scalars — is gone: `indentSequences` and
+   * `quoteStyle` now express both, so there is no second printer to drift from.
+   *
+   * Still `async` for source compatibility with existing callers; it performs
+   * no asynchronous work and can become synchronous in the next major.
    *
    * @param content - Sorted pnpm-workspace.yaml content
-   * @param filepath - Path used to resolve Prettier config
    * @returns The formatted YAML source
    */
-  static formatContent(content: PnpmWorkspaceContent, filepath?: string): Promise<string>;
+  static formatContent(content: PnpmWorkspaceContent): Promise<string>;
   /**
    * Create a handler that returns a CLI command to sort/format pnpm-workspace.yaml.
    *
@@ -10260,9 +10269,9 @@ declare const SilkPublishabilityDetectorLive: Layer.Layer<PublishabilityDetector
  *
  * @remarks Requires `FileSystem` and {@link ChangesetConfig} at build.
  * The kit's `detect` contract no longer receives the workspace root, so the changeset
- * lookups derive it per package from the package's own discovery coordinates
- * (`pkg.path` ascended by `pkg.relativePath` — never a filesystem marker walk,
- * which could escape an unmarked root and read the wrong `.changeset/config.json`).
+ * lookups read it from `pkg.workspaceRoot` — the discovery root the package was found
+ * against, never a filesystem marker walk, which could escape an unmarked root and read
+ * the wrong `.changeset/config.json`.
  *
  * @since 0.4.0
  * @public

package/lint/handlers/PackageJson.js

@@ -1,19 +1,20 @@
 import { Command } from "../utils/Command.js";
 import { Filter } from "../utils/Filter.js";
 import { isWorkspacePackagePath } from "../utils/Workspace.js";
+import { Result } from "effect";
 import { readFileSync, writeFileSync } from "node:fs";
-import sortPackageJson from "sort-package-json";
+import { PackageJsonFormat } from "@effected/package-json";
 
 //#region src/lint/handlers/PackageJson.ts
 /**
 * Handler for package.json files.
 *
-* Sorts fields with sort-package-json and formats with Biome.
+* Sorts fields with @effected/package-json and formats with Biome.
 */
 /**
 * Handler for package.json files.
 *
-* Sorts fields with sort-package-json and formats with Biome.
+* Sorts fields with @effected/package-json and formats with Biome.
 *
 * @example
 * ```typescript
@@ -91,15 +92,24 @@ var PackageJson = class PackageJson {
 	* Sort the keys of a package.json document string.
 	*
 	* @remarks
-	* Pure transform over the file contents using `sort-package-json`. Used by
-	* the `savvy lint fmt package-json` subcommand so the CLI does not depend on
-	* `sort-package-json` directly.
+	* Pure transform over the file contents using `@effected/package-json`'s
+	* `PackageJsonFormat.formatToString` — the tolerant text path, which sorts
+	* canonically without decoding through the strict `Package` schema (so a
+	* private or version-less root is sorted rather than rejected). Byte-verified
+	* identical to the previous `sort-package-json` output on this repo's
+	* manifests. Used by the `savvy lint fmt package-json` subcommand so the CLI
+	* does not depend on a sorter directly.
+	*
+	* Unparseable content is returned UNCHANGED rather than throwing: a formatter
+	* must not mangle a file it cannot read, and the surrounding Biome pass
+	* reports the syntax error.
 	*
 	* @param content - The raw package.json file contents
-	* @returns The sorted package.json file contents
+	* @returns The sorted package.json file contents, or `content` if unparseable
 	*/
 	static sortContent(content) {
-		return sortPackageJson(content);
+		const result = PackageJsonFormat.formatToString(content);
+		return Result.isSuccess(result) ? result.success : content;
 	}
 	/**
 	* Create a handler with custom options.
@@ -116,7 +126,7 @@ var PackageJson = class PackageJson {
 			if (filtered.length === 0) return [];
 			if (!skipSort) for (const filepath of filtered) {
 				const content = readFileSync(filepath, "utf-8");
-				const sorted = sortPackageJson(content);
+				const sorted = PackageJson.sortContent(content);
 				if (sorted !== content) writeFileSync(filepath, sorted, "utf-8");
 			}
 			if (skipFormat) return [];

package/lint/handlers/PnpmWorkspace.js

@@ -2,7 +2,6 @@ import { Command } from "../utils/Command.js";
 import { Effect, Result } from "effect";
 import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { Yaml, YamlStringifyOptions } from "@effected/yaml";
-import { format, resolveConfig } from "prettier";
 
 //#region src/lint/handlers/PnpmWorkspace.ts
 /**
@@ -14,18 +13,21 @@ import { format, resolveConfig } from "prettier";
 * Default YAML stringify options for consistent formatting.
 *
 * @remarks
-* `lineWidth: 0` disables line wrapping, matching the v3 `yaml` package
-* behavior. `@effected/yaml` emits block sequences without the extra
-* two-space indentation the v3 `yaml` package used, so the stringified
-* output is normalized through Prettier's YAML printer below — probed
-* byte-identical to the v3 `yaml.stringify(..., { indent: 2, lineWidth: 0,
-* singleQuote: false })` output on this repo's real `pnpm-workspace.yaml`
-* and on hostile synthetic shapes (quoted keys, block scalars, nested
-* sequences of maps).
+* `lineWidth: 0` disables line wrapping, `indentSequences: true` indents block
+* sequences one level under their key, and `quoteStyle: "double"` selects the
+* quote character for plain scalars that require quoting. Together these
+* reproduce the v3 `yaml.stringify(..., { indent: 2, lineWidth: 0,
+* singleQuote: false })` byte format directly — probed byte-identical to the
+* previous Prettier-normalized output on this repo's real
+* `pnpm-workspace.yaml` and on hostile synthetic shapes (scoped package keys,
+* block scalars, nested sequences of maps), which is what let the Prettier
+* post-process be removed.
 */
 const DEFAULT_STRINGIFY_OPTIONS = new YamlStringifyOptions({
 	indent: 2,
-	lineWidth: 0
+	lineWidth: 0,
+	indentSequences: true,
+	quoteStyle: "double"
 });
 /**
 * Handler for pnpm-workspace.yaml.
@@ -108,22 +110,19 @@ var PnpmWorkspace = class PnpmWorkspace {
 	* {@link create} and the `savvy lint fmt pnpm-workspace` CLI subcommand route
 	* through here so the two paths cannot drift.
 	*
-	* `@effected/yaml` emits block sequences without the leading two-space
-	* indentation and prefers single-quoted scalars; Prettier's YAML printer
-	* normalizes both back to the v3 `yaml` posture (indented sequences,
-	* double-quoted scalars). Do NOT write `EffectedYaml.stringify` output
-	* directly — that regresses the file on every format pass.
+	* {@link DEFAULT_STRINGIFY_OPTIONS} produces the repo's byte format directly.
+	* The former Prettier post-process — which existed only to re-indent block
+	* sequences and re-quote scalars — is gone: `indentSequences` and
+	* `quoteStyle` now express both, so there is no second printer to drift from.
+	*
+	* Still `async` for source compatibility with existing callers; it performs
+	* no asynchronous work and can become synchronous in the next major.
 	*
 	* @param content - Sorted pnpm-workspace.yaml content
-	* @param filepath - Path used to resolve Prettier config
 	* @returns The formatted YAML source
 	*/
-	static async formatContent(content, filepath = PnpmWorkspace.glob) {
-		return format(Effect.runSync(Yaml.stringify(content, DEFAULT_STRINGIFY_OPTIONS)), {
-			...await resolveConfig(filepath),
-			filepath,
-			parser: "yaml"
-		});
+	static async formatContent(content) {
+		return Effect.runSync(Yaml.stringify(content, DEFAULT_STRINGIFY_OPTIONS));
 	}
 	/**
 	* Create a handler that returns a CLI command to sort/format pnpm-workspace.yaml.
@@ -164,7 +163,7 @@ var PnpmWorkspace = class PnpmWorkspace {
 			let parsed = parseResult.success;
 			if (!skipSort) parsed = PnpmWorkspace.sortContent(parsed);
 			if (!skipSort || !skipFormat) {
-				writeFileSync(filepath, await PnpmWorkspace.formatContent(parsed, filepath), "utf-8");
+				writeFileSync(filepath, await PnpmWorkspace.formatContent(parsed), "utf-8");
 				return [];
 			}
 			return [];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@savvy-web/silk-effects",
-	"version": "4.1.0",
+	"version": "4.2.0",
 	"private": false,
 	"description": "Shared Effect library for Silk Suite conventions",
 	"homepage": "https://github.com/savvy-web/systems/tree/main/packages/silk-effects",
@@ -34,12 +34,12 @@
 		"@changesets/get-github-info": "^1.0.0-next.3",
 		"@changesets/get-release-plan": "^5.0.0-next.7",
 		"@effected/git": "^0.4.1",
-		"@effected/glob": "^0.1.2",
-		"@effected/jsonc": "^0.4.0",
-		"@effected/package-json": "^0.3.1",
-		"@effected/walker": "^0.2.2",
-		"@effected/workspaces": "^0.4.1",
-		"@effected/yaml": "^0.4.0",
+		"@effected/glob": "^0.2.0",
+		"@effected/jsonc": "^0.5.0",
+		"@effected/package-json": "^0.4.1",
+		"@effected/walker": "^0.3.1",
+		"@effected/workspaces": "^0.5.2",
+		"@effected/yaml": "^0.5.0",
 		"@manypkg/get-packages": "^3.1.0",
 		"mdast-util-heading-range": "^4.0.0",
 		"mdast-util-to-string": "^4.0.0",
@@ -48,7 +48,6 @@
 		"remark-parse": "^11.0.0",
 		"remark-stringify": "^11.0.0",
 		"shell-quote": "^1.10.0",
-		"sort-package-json": "^4.0.0",
 		"unified": "^11.0.5",
 		"unified-lint-rule": "^3.0.1",
 		"unist-util-visit": "^5.1.0",

package/services/SilkPublishability.js

@@ -244,34 +244,15 @@ const SilkPublishabilityDetectorLive = Layer.effect(PublishabilityDetector, Effe
 	}) };
 }));
 /**
-* The workspace root a package was discovered against, derived from its own
-* coordinates: `relativePath` is the package directory relative to the
-* discovery root (POSIX, `"."` for the root package), so ascending one level
-* per path segment from `pkg.path` lands exactly on that root.
-*
-* @remarks
-* Derivation is deliberate — probing the filesystem for workspace markers
-* (`WorkspaceRoot.find`) can walk PAST the intended root when that root
-* carries no marker (a fixture tree, a bare directory) and land on an
-* enclosing workspace, silently swapping in that outer root's
-* `.changeset/config.json` and dropping the ignore/mode gating (the #209
-* regression class). The discovery root needs no probing: whoever built the
-* `WorkspacePackage` already knew it.
-*/
-const packageRoot = (pkg) => {
-	const segments = pkg.relativePath.split("/").filter((segment) => segment !== "" && segment !== ".");
-	return segments.length === 0 ? pkg.path : join(pkg.path, ...segments.map(() => ".."));
-};
-/**
 * Ignore-aware override of `PublishabilityDetector`. `detect` short-circuits to `[]`
 * for changeset-ignored packages, then dispatches on `ChangesetConfig.mode`:
 * `none` → `[]`; `silk` → `SilkPublishability.detect`; `vanilla` → the library default.
 *
 * @remarks Requires `FileSystem` and {@link ChangesetConfig} at build.
 * The kit's `detect` contract no longer receives the workspace root, so the changeset
-* lookups derive it per package from the package's own discovery coordinates
-* (`pkg.path` ascended by `pkg.relativePath` — never a filesystem marker walk,
-* which could escape an unmarked root and read the wrong `.changeset/config.json`).
+* lookups read it from `pkg.workspaceRoot` — the discovery root the package was found
+* against, never a filesystem marker walk, which could escape an unmarked root and read
+* the wrong `.changeset/config.json`.
 *
 * @since 0.4.0
 * @public
@@ -281,7 +262,7 @@ const PublishabilityDetectorAdaptiveLive = Layer.effect(PublishabilityDetector,
 	const config = yield* ChangesetConfig;
 	const vanilla = yield* Effect.provide(PublishabilityDetector, PublishabilityDetector.layer);
 	return { detect: (pkg) => Effect.gen(function* () {
-		const root = packageRoot(pkg);
+		const root = pkg.workspaceRoot;
 		if (yield* config.isIgnored(pkg.name, root)) return [];
 		const mode = yield* config.mode(root);
 		if (mode === "none") return [];