@effected/package-json 0.1.0 → 0.2.0

package/Package.js

@@ -5,7 +5,7 @@ import { renderJson } from "./internal/format.js";
 import { PackageManager } from "./PackageManager.js";
 import { InvalidPackageNameError, PackageName } from "./PackageName.js";
 import { Person } from "./Person.js";
-import { CatalogResolver, WorkspaceResolver } from "@effected/npm";
+import { CatalogResolver, DependencySpecifier, WorkspaceResolver } from "@effected/npm";
 import { Effect, Function, HashMap, Option, Pipeable, Schema, SchemaTransformation } from "effect";
 import { SemVer } from "@effected/semver";
 
@@ -106,23 +106,12 @@ const makeWire = (Class) => {
 		encode: (encoded) => {
 			const { rest, ...known } = encoded;
 			return {
-				...known,
-				...rest ?? {}
+				...rest ?? {},
+				...known
 			};
 		}
 	})));
 };
-const applyWorkspaceModifier = (specifier, version) => {
-	const modifier = specifier.slice(10);
-	if (modifier === "*" || modifier === "") return version;
-	if (modifier === "^") return `^${version}`;
-	if (modifier === "~") return `~${version}`;
-	return modifier;
-};
-const catalogName = (specifier) => {
-	const name = specifier.slice(8);
-	return name.length === 0 ? Option.none() : Option.some(name);
-};
 /**
 * A package.json document as a rich `Schema.Class`: typed known fields, a
 * `rest` catch-all preserving unknown top-level fields across a read/edit/write
@@ -290,20 +279,33 @@ var Package = class Package extends Schema.Class("Package")({
 	static removeScript = Function.dual(2, (pkg, name) => pkg.copyWith({ scripts: HashMap.remove(pkg.scripts, name) }));
 	/**
 	* Resolve `catalog:` and `workspace:` specifiers across all four dependency
-	* maps using the `CatalogResolver` and `WorkspaceResolver` from context.
-	* Specifiers the resolvers return `None` for are left unchanged. This is the
-	* explicit resolution step — `PackageJsonFile.write` never resolves.
+	* maps using the `CatalogResolver` and `WorkspaceResolver` from context,
+	* classifying and projecting through `@effected/npm`'s `DependencySpecifier`
+	* statics (`workspace:` uses the pnpm publish-time projection; the alias
+	* form `workspace:<name>@<range>` resolves the TARGET package's version and
+	* becomes the published `npm:<name>@<range>` alias). Specifiers the
+	* resolvers return `None` for are left unchanged — resolution still
+	* succeeds. A `CatalogResolver` whose catalog assembly failed surfaces
+	* typed as `@effected/npm`'s `CatalogAssemblyError`, alongside the
+	* contracts' `DependencyResolutionError`. This is the explicit resolution
+	* step — `PackageJsonFile.write` never resolves.
+	*
+	* @remarks
+	* Leaves unresolvable specifiers unchanged. For fail-typed manifest
+	* resolution over the tolerant model, see `@effected/npm`'s
+	* `Manifest#resolve`.
 	*/
 	static resolve = Effect.fn("Package.resolve")(function* (pkg) {
 		const workspace = yield* WorkspaceResolver;
 		const catalog = yield* CatalogResolver;
 		const resolveMap = Effect.fn("Package.resolve.map")(function* (map) {
 			let next = map;
-			for (const [name, specifier] of HashMap.entries(map)) if (specifier.startsWith("workspace:")) {
-				const version = yield* workspace.versionOf(name);
-				if (Option.isSome(version)) next = HashMap.set(next, name, applyWorkspaceModifier(specifier, version.value));
-			} else if (specifier.startsWith("catalog:")) {
-				const range = yield* catalog.rangeOf(name, catalogName(specifier));
+			for (const [name, specifier] of HashMap.entries(map)) if (DependencySpecifier.isWorkspace(specifier)) {
+				const target = Option.getOrElse(DependencySpecifier.workspaceTargetOf(specifier), () => name);
+				const version = yield* workspace.versionOf(target);
+				if (Option.isSome(version)) next = HashMap.set(next, name, DependencySpecifier.resolveWorkspace(specifier, version.value));
+			} else if (DependencySpecifier.isCatalog(specifier)) {
+				const range = yield* catalog.rangeOf(name, DependencySpecifier.catalogNameOf(specifier));
 				if (Option.isSome(range)) next = HashMap.set(next, name, range.value);
 			}
 			return next;

package/README.md

@@ -180,7 +180,7 @@ console.log(Effect.runSync(program));
 // => ["^4.0.0", "^1.4.0"]
 ```
 
-The `workspace:` range modifier is honored: `workspace:*` takes the bare version, `workspace:^` and `workspace:~` prefix it, and an explicit modifier is used as-is.
+The `workspace:` range modifier is honored: `workspace:*` takes the bare version, `workspace:^` and `workspace:~` prefix it, and an explicit modifier is used as-is. The projection is `@effected/npm`'s `DependencySpecifier` statics with full pnpm publish semantics: the alias form `workspace:<name>@<range>` resolves the *target* package's version and becomes the `npm:<name>@<range>` alias pnpm publishes, and a blank catalog name selects the default catalog. A failed catalog assembly surfaces typed as `@effected/npm`'s `CatalogAssemblyError`, alongside the contracts' `DependencyResolutionError`.
 
 ## Errors
 
@@ -206,7 +206,7 @@ Every failure is a `Schema.TaggedErrorClass` routed with `Effect.catchTag`. Caus
 - `Package.schema` / `Package.wireFor` — the open-JSON ↔ class wire codec, and the factory that builds one for a `.extend()`ed subclass so its custom fields decode as typed members instead of falling into `rest`.
 - `PackageJsonFile` — the IO surface: `read` and `write` over core `FileSystem` / `Path`, with the platform implementation supplied at the edge.
 - `PackageValidator` — rule-based validation aggregating every failure, with the default rule set, a parameterized `layerRules` factory, and the publish-gate rules `noUnresolvedDepsRule` and `noLocalDepsRule`.
-- `Package.resolve` — `catalog:` and `workspace:` expansion over the `@effected/npm` contracts, as an explicit step that `write` never performs for you.
+- `Package.resolve` — `catalog:` and `workspace:` expansion over the `@effected/npm` contracts with pnpm's publish-time projection (alias form included), as an explicit step that `write` never performs for you.
 - `PackageName`, `DependencySpecifier`, `Dependency`, `SpdxLicense`, `PackageManager`, `Person`, `DevEngine` — the leaf concepts, each owning its own statics, brand and error, usable independently of `Package`.
 - Field schemas (`DependencyMapField`, `BinField`, `ExportsField`, `RepositoryField`, `PublishConfigField`, `PeerDependenciesMetaField`, `StringMapField`) exported for subclasses that extend the model.
 

package/index.d.ts

@@ -525,11 +525,23 @@ declare class Package extends Package_base {
   };
   /**
    * Resolve `catalog:` and `workspace:` specifiers across all four dependency
-   * maps using the `CatalogResolver` and `WorkspaceResolver` from context.
-   * Specifiers the resolvers return `None` for are left unchanged. This is the
-   * explicit resolution step — `PackageJsonFile.write` never resolves.
+   * maps using the `CatalogResolver` and `WorkspaceResolver` from context,
+   * classifying and projecting through `@effected/npm`'s `DependencySpecifier`
+   * statics (`workspace:` uses the pnpm publish-time projection; the alias
+   * form `workspace:<name>@<range>` resolves the TARGET package's version and
+   * becomes the published `npm:<name>@<range>` alias). Specifiers the
+   * resolvers return `None` for are left unchanged — resolution still
+   * succeeds. A `CatalogResolver` whose catalog assembly failed surfaces
+   * typed as `@effected/npm`'s `CatalogAssemblyError`, alongside the
+   * contracts' `DependencyResolutionError`. This is the explicit resolution
+   * step — `PackageJsonFile.write` never resolves.
+   *
+   * @remarks
+   * Leaves unresolvable specifiers unchanged. For fail-typed manifest
+   * resolution over the tolerant model, see `@effected/npm`'s
+   * `Manifest#resolve`.
    */
-  static readonly resolve: (pkg: Package) => Effect.Effect<Package, import("@effected/npm").DependencyResolutionError, CatalogResolver | WorkspaceResolver>;
+  static readonly resolve: (pkg: Package) => Effect.Effect<Package, import("@effected/npm").CatalogAssemblyError | import("@effected/npm").DependencyResolutionError, CatalogResolver | WorkspaceResolver>;
   /**
    * Serialize to a formatted package.json string: encode through the wire
    * codec (flattening `rest`), then apply the canonical key order, dependency

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@effected/package-json",
-	"version": "0.1.0",
+	"version": "0.2.0",
 	"private": false,
 	"description": "package.json parsing, editing, validation and file IO as Effect schemas.",
 	"keywords": [
@@ -37,7 +37,7 @@
 		"./package.json": "./package.json"
 	},
 	"dependencies": {
-		"@effected/npm": "0.1.0",
+		"@effected/npm": "0.2.0",
 		"@effected/semver": "0.1.0",
 		"spdx-expression-parse": "^4.0.0"
 	},