rolldown-pnpm-config 0.5.0 → 0.5.1

package/bin/rolldown-pnpm-config.js

@@ -12,7 +12,7 @@ const root = Command.make("rolldown-pnpm-config").pipe(Command.withSubcommands([
 	exportCommand,
 	previewCommand
 ]));
-Command.run(root, { version: "0.5.0" }).pipe(Effect.provide(NodeServices.layer), NodeRuntime.runMain);
+Command.run(root, { version: "0.5.1" }).pipe(Effect.provide(NodeServices.layer), NodeRuntime.runMain);
 
 //#endregion
 export {  };

package/cli/commands/upgrade.js

@@ -8,7 +8,7 @@ import { buildEdits } from "../edits.js";
 import { buildInteropEdits, interopEntryChanged, runInterop } from "../interop.js";
 import { buildGroupModel, computeGroupPeers } from "../interop-live.js";
 import { planEntry } from "../plan.js";
-import { combineReleaseAge, filterByReleaseAge, parsePnpmGate, readConfigReleaseAge } from "../release-age.js";
+import { parsePnpmGate, readConfigReleaseAge } from "../release-age.js";
 import { RegistryResolver, RegistryResolverLive } from "../resolve.js";
 import { applyEdits } from "../rewrite.js";
 import { renderSummary } from "../summary.js";
@@ -19,6 +19,7 @@ import { Data, Effect, Option, Result } from "effect";
 import { readFileSync, writeFileSync } from "node:fs";
 import { NodeServices } from "@effect/platform-node";
 import { Argument, Command, Flag } from "effect/unstable/cli";
+import { ReleaseAgeGate } from "@effected/npm";
 
 //#region src/cli/commands/upgrade.ts
 /**
@@ -33,7 +34,8 @@ function computeGate(source, file, resolver) {
 		const { config } = yield* Effect.try(() => evaluatePluginConfig(source, file)).pipe(Effect.catch(() => Effect.succeed({ config: null })));
 		const cfg = readConfigReleaseAge(config);
 		const [age, exc] = yield* Effect.all([resolver.pnpmConfig("minimumReleaseAge").pipe(Effect.catch(() => Effect.succeed(null))), resolver.pnpmConfig("minimumReleaseAgeExclude").pipe(Effect.catch(() => Effect.succeed(null)))], { concurrency: "unbounded" });
-		return combineReleaseAge(cfg, parsePnpmGate(age, exc));
+		const contributions = [cfg, parsePnpmGate(age, exc)].filter((g) => g !== null);
+		return ReleaseAgeGate.combine(...contributions);
 	});
 }
 /** Maximum number of per-package version+times fetches to issue concurrently. @internal */
@@ -66,7 +68,7 @@ function resolveGatedVersions(entries, resolver, gate, now, onProgress) {
 		onProgress?.(++resolved, total);
 		return [
 			pkg,
-			filterByReleaseAge(vr.success, times, gate, pkg, now),
+			[...gate.filterVersions(vr.success, times, pkg, now)],
 			vr.success
 		];
 	}), { concurrency: 12 }).pipe(Effect.map((triples) => ({

package/cli/release-age.js

@@ -1,38 +1,11 @@
 //#region src/cli/release-age.ts
-/** Combine two sources: strictest age (max), widest exempt set (union). @internal */
-function combineReleaseAge(a, b) {
-	const ages = [a?.ageMinutes, b?.ageMinutes].filter((n) => typeof n === "number");
-	return {
-		ageMinutes: ages.length ? Math.max(0, ...ages) : 0,
-		exclude: [.../* @__PURE__ */ new Set([...a?.exclude ?? [], ...b?.exclude ?? []])]
-	};
-}
-/** Match a package name against exact names or `*`-globs (e.g. `@effect/*`). @internal */
-function matchesExclude(pkg, patterns) {
-	for (const pat of patterns) {
-		if (pat === pkg) return true;
-		if (pat.includes("*")) {
-			if (new RegExp(`^${pat.replace(/[.+?^${}()|[\]\\]/g, "\\$&").replace(/\*/g, ".*")}$`).test(pkg)) return true;
-		}
-	}
-	return false;
-}
 /**
-* Drop versions younger than the gate's cutoff (and versions with no publish
-* timestamp). No-op when the age is 0 or the package is exempt.
-*
-* @internal
+* Read a release-age gate from config and pnpm and combine it with
+* {@link @effected/npm#ReleaseAgeGate.combine}. The gate model itself
+* (`ReleaseAgeGate`, `PartialReleaseAgeGate`, the age filter, and the
+* `@pnpm/matcher` exclude semantics) lives in `@effected/npm`; this module
+* only turns this repo's two config sources into partial contributions.
 */
-function filterByReleaseAge(versions, times, gate, pkg, now) {
-	if (gate.ageMinutes <= 0 || matchesExclude(pkg, gate.exclude)) return [...versions];
-	const cutoff = now - gate.ageMinutes * 6e4;
-	return versions.filter((v) => {
-		const t = times[v];
-		if (t === void 0) return false;
-		const published = Date.parse(t);
-		return Number.isFinite(published) && published <= cutoff;
-	});
-}
 /** Unwrap a managed field that may be a bare value or a `{ value, enforcement }` FieldInput. */
 function fieldValue(raw) {
 	if (raw && typeof raw === "object" && !Array.isArray(raw) && "value" in raw) return raw.value;
@@ -48,7 +21,7 @@ function readConfigReleaseAge(config) {
 	if (Array.isArray(exc)) out.exclude = exc.filter((x) => typeof x === "string");
 	return out.ageMinutes === void 0 && out.exclude === void 0 ? null : out;
 }
-/** Parse `pnpm config get minimumReleaseAge[Exclude]` stdout into a PartialGate. @internal */
+/** Parse `pnpm config get minimumReleaseAge[Exclude]` stdout into a PartialReleaseAgeGate. @internal */
 function parsePnpmGate(age, exclude) {
 	const out = {};
 	const trimmedAge = age?.trim();
@@ -71,4 +44,4 @@ function parsePnpmGate(age, exclude) {
 }
 
 //#endregion
-export { combineReleaseAge, filterByReleaseAge, matchesExclude, parsePnpmGate, readConfigReleaseAge };
+export { parsePnpmGate, readConfigReleaseAge };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "rolldown-pnpm-config",
-	"version": "0.5.0",
+	"version": "0.5.1",
 	"private": false,
 	"description": "A dogfooding example of our plugin",
 	"repository": {
@@ -36,12 +36,13 @@
 	},
 	"dependencies": {
 		"@effect/platform-node": "4.0.0-beta.99",
+		"@effected/npm": "^0.3.0",
 		"@effected/semver": "^0.2.0",
 		"@effected/yaml": "^0.5.0",
 		"effect": "4.0.0-beta.99",
 		"ink": "^7.1.1",
 		"ink-tab": "^5.2.0",
-		"oxc-parser": "^0.140.0",
+		"oxc-parser": "^0.141.0",
 		"react": "^19.2.7",
 		"std-env": "^4.2.0",
 		"std-osc8": "^0.2.0"