@orkestrel/scaffold 0.0.46 → 0.0.47

package/dist/src/server/index.d.cts

@@ -908,7 +908,7 @@ export declare class Materializer implements MaterializerInterface {
               */
           catalog(entries: readonly CatalogEntry[], target: string): MaterializeResult;
           /**
-           * Rewrite the `@orkestrel/*` range set in the target's manifest.
+           * Rewrite the declared dependency ranges the caller names in the target's manifest.
            *
            * @param dependencies - The names and ranges the manifest must declare.
            * @param target - The directory to write into.
@@ -1062,7 +1062,7 @@ export declare class Materializer implements MaterializerInterface {
                 */
                catalog(entries: readonly CatalogEntry[], target: string): MaterializeResult;
                /**
-                * Rewrite the `@orkestrel/*` range set in the target's manifest.
+                * Rewrite the declared dependency ranges the caller names in the target's manifest.
                 *
                 * @param dependencies - The names and ranges the manifest must declare.
                 * @param target - The directory to write into.
@@ -1630,7 +1630,7 @@ export declare class Materializer implements MaterializerInterface {
                 /** The upstream reader's observation channel. */
                 get emitter(): EmitterInterface<UpstreamEventMap>;
                 /**
-                 * Look up the registry's latest release for each declared dependency.
+                 * Look up the newest release each declared range admits.
                  *
                  * @param dependencies - The declared dependencies to look up.
                  * @returns One release verdict per dependency, in input order.
@@ -1639,10 +1639,11 @@ export declare class Materializer implements MaterializerInterface {
                      * torn down before or during the call.
                      *
                      * @remarks
-                     * Whether the declared range already admits the reported version is not
-                     * decided here and is not stored on the verdict: it is a function of the
-                     * `range` and `latest` sitting beside each other, and one centralized helper
-                     * answers it for every caller.
+                     * The reader selects across the packument's stable version map before any
+                     * collection bound can truncate it. It falls back to `dist-tags.latest` only
+                     * when that version satisfies the declared range. `*` requests the newest
+                     * stable version outright. The verdict's `major` field carries the stable
+                     * major from the latest tag when that tag can be read.
                      *
                      * @example
                      * ```ts
@@ -1760,7 +1761,7 @@ export declare class Materializer implements MaterializerInterface {
                   export declare interface UpstreamInterface {
                       readonly emitter: EmitterInterface<UpstreamEventMap>;
                       /**
-                       * Look up the registry's latest release for each declared dependency.
+                       * Look up the newest release each declared range admits.
                        *
                        * @param dependencies - The declared dependencies to look up.
                        * @returns One release verdict per dependency, in input order.

package/dist/src/server/index.d.ts

@@ -908,7 +908,7 @@ export declare class Materializer implements MaterializerInterface {
               */
           catalog(entries: readonly CatalogEntry[], target: string): MaterializeResult;
           /**
-           * Rewrite the `@orkestrel/*` range set in the target's manifest.
+           * Rewrite the declared dependency ranges the caller names in the target's manifest.
            *
            * @param dependencies - The names and ranges the manifest must declare.
            * @param target - The directory to write into.
@@ -1062,7 +1062,7 @@ export declare class Materializer implements MaterializerInterface {
                 */
                catalog(entries: readonly CatalogEntry[], target: string): MaterializeResult;
                /**
-                * Rewrite the `@orkestrel/*` range set in the target's manifest.
+                * Rewrite the declared dependency ranges the caller names in the target's manifest.
                 *
                 * @param dependencies - The names and ranges the manifest must declare.
                 * @param target - The directory to write into.
@@ -1630,7 +1630,7 @@ export declare class Materializer implements MaterializerInterface {
                 /** The upstream reader's observation channel. */
                 get emitter(): EmitterInterface<UpstreamEventMap>;
                 /**
-                 * Look up the registry's latest release for each declared dependency.
+                 * Look up the newest release each declared range admits.
                  *
                  * @param dependencies - The declared dependencies to look up.
                  * @returns One release verdict per dependency, in input order.
@@ -1639,10 +1639,11 @@ export declare class Materializer implements MaterializerInterface {
                      * torn down before or during the call.
                      *
                      * @remarks
-                     * Whether the declared range already admits the reported version is not
-                     * decided here and is not stored on the verdict: it is a function of the
-                     * `range` and `latest` sitting beside each other, and one centralized helper
-                     * answers it for every caller.
+                     * The reader selects across the packument's stable version map before any
+                     * collection bound can truncate it. It falls back to `dist-tags.latest` only
+                     * when that version satisfies the declared range. `*` requests the newest
+                     * stable version outright. The verdict's `major` field carries the stable
+                     * major from the latest tag when that tag can be read.
                      *
                      * @example
                      * ```ts
@@ -1760,7 +1761,7 @@ export declare class Materializer implements MaterializerInterface {
                   export declare interface UpstreamInterface {
                       readonly emitter: EmitterInterface<UpstreamEventMap>;
                       /**
-                       * Look up the registry's latest release for each declared dependency.
+                       * Look up the newest release each declared range admits.
                        *
                        * @param dependencies - The declared dependencies to look up.
                        * @returns One release verdict per dependency, in input order.

package/dist/src/server/index.js

@@ -1,5 +1,5 @@
 import { andOf, arrayOf, attempt, boundsOf, holds, isArray, isBoolean, isError, isFunction, isInteger, isRecord, isString, parseJSON, parseJSONAs, parseStringField, recordOf, stringOf } from "@orkestrel/contract";
-import { CATALOG_AGENT_PATH, CONTROL_CHARACTER_PATTERN, EXECUTABLE_PATHS, HOST_PATHS, MAX_ARTIFACT_BYTES, MAX_COLLECTION_ITEMS, MAX_DEPENDENCY_NAME_LENGTH, MAX_MANIFEST_BYTES, MAX_PATH_LENGTH, MAX_RANGE_LENGTH, MAX_TOTAL_ARTIFACT_BYTES, ScaffoldError, WORKSPACE_OWNED_PATHS, bytesToHex, catalogToLayers, cloneValue, computeBytes, contentToHex, inferGroup, isAudit, isCatalogEntry, isCollection, isDependency, isDependencyName, isMirror, isPath, isPlan, isSnapshot, matchesDriftReachability, nameToGuide, planToFindings } from "../core/index.js";
+import { CATALOG_AGENT_PATH, CONTROL_CHARACTER_PATTERN, EXECUTABLE_PATHS, HOST_PATHS, MAX_ARTIFACT_BYTES, MAX_COLLECTION_ITEMS, MAX_DEPENDENCY_NAME_LENGTH, MAX_MANIFEST_BYTES, MAX_PATH_LENGTH, MAX_RANGE_LENGTH, MAX_REGISTRY_BYTES, MAX_TOTAL_ARTIFACT_BYTES, MAX_TOTAL_REGISTRY_BYTES, ScaffoldError, WORKSPACE_OWNED_PATHS, bytesToHex, catalogToLayers, cloneValue, compareVersions, computeBytes, contentToHex, extractRangeMajor, extractVersion, inferGroup, isAudit, isCatalogEntry, isCollection, isDependency, isDependencyName, isMirror, isPath, isPlan, isSnapshot, matchesDriftReachability, matchesRange, nameToGuide, planToFindings, replaceManifestRanges } from "../core/index.js";
 import { createHash, randomUUID } from "node:crypto";
 import { chmodSync, closeSync, constants, copyFileSync, fstatSync, linkSync, lstatSync, mkdirSync, openSync, opendirSync, readSync, readdirSync, readlinkSync, realpathSync, renameSync, rmSync, rmdirSync, writeFileSync } from "node:fs";
 import { basename, dirname, join, parse, relative, resolve, sep } from "node:path";
@@ -2425,7 +2425,7 @@ var Materializer = class Materializer {
 		return this.#rewrite(directory, CATALOG_AGENT_PATH, MAX_ARTIFACT_BYTES, this.#recatalog(accepted));
 	}
 	/**
-	* Rewrite the `@orkestrel/*` range set in the target's manifest.
+	* Rewrite the declared dependency ranges the caller names in the target's manifest.
 	*
 	* @param dependencies - The names and ranges the manifest must declare.
 	* @param target - The directory to write into.
@@ -2924,45 +2924,12 @@ var Materializer = class Materializer {
 	}
 	#redeclare(dependencies) {
 		return (text) => {
-			let manifest = text;
-			for (const dependency of dependencies) {
-				const key = JSON.stringify(dependency.name);
-				const range = JSON.stringify(dependency.range);
-				let index = manifest.indexOf(key);
-				let declared = false;
-				while (index >= 0) {
-					const span = this.#span(manifest, index + key.length);
-					if (span === void 0) {
-						index = manifest.indexOf(key, index + key.length);
-						continue;
-					}
-					manifest = manifest.slice(0, span[0]) + range + manifest.slice(span[1]);
-					declared = true;
-					index = manifest.indexOf(key, span[0] + range.length);
-				}
-				if (!declared) throw this.#error("INVALID", `The manifest does not declare ${dependency.name}, so its range cannot be rewritten.`, { name: dependency.name });
-			}
-			return manifest;
+			const manifest = replaceManifestRanges(text, dependencies);
+			if (manifest !== void 0) return manifest;
+			const missing = dependencies.find((dependency) => !text.includes(JSON.stringify(dependency.name)));
+			throw this.#error("INVALID", `The manifest does not declare ${missing?.name ?? "a requested package"}, so its range cannot be rewritten.`, missing === void 0 ? void 0 : { name: missing.name });
 		};
 	}
-	#span(text, from) {
-		let index = from;
-		while (index < text.length && /\s/u.test(text.charAt(index))) index += 1;
-		if (text.charAt(index) !== ":") return void 0;
-		index += 1;
-		while (index < text.length && /\s/u.test(text.charAt(index))) index += 1;
-		if (text.charAt(index) !== "\"") return void 0;
-		const start = index;
-		index += 1;
-		while (index < text.length) {
-			if (text.charAt(index) === "\\") {
-				index += 2;
-				continue;
-			}
-			if (text.charAt(index) === "\"") return [start, index + 1];
-			index += 1;
-		}
-	}
 	#finish(result) {
 		this.#emitter.emit("finish", result);
 		return result;
@@ -3027,7 +2994,6 @@ var Upstream = class Upstream {
 	static #defaultTimeout = 1e4;
 	static #defaultConcurrency = 6;
 	static #defaultRetries = 0;
-	static #defaultBudget = 16777216;
 	static #scope = "orkestrel";
 	static #unreadable = "the answer carries no readable latest version";
 	static #packument = "application/vnd.npm.install-v1+json";
@@ -3075,15 +3041,15 @@ var Upstream = class Upstream {
 		this.#registryTimeout = options?.registry?.timeout ?? Upstream.#defaultTimeout;
 		this.#concurrency = options?.concurrency ?? Upstream.#defaultConcurrency;
 		this.#retries = options?.retries ?? Upstream.#defaultRetries;
-		this.#limit = options?.limit ?? MAX_ARTIFACT_BYTES;
-		this.#budget = options?.budget ?? Upstream.#defaultBudget;
+		this.#limit = options?.limit ?? MAX_REGISTRY_BYTES;
+		this.#budget = options?.budget ?? MAX_TOTAL_REGISTRY_BYTES;
 	}
 	/** The upstream reader's observation channel. */
 	get emitter() {
 		return this.#emitter;
 	}
 	/**
-	* Look up the registry's latest release for each declared dependency.
+	* Look up the newest release each declared range admits.
 	*
 	* @param dependencies - The declared dependencies to look up.
 	* @returns One release verdict per dependency, in input order.
@@ -3092,10 +3058,11 @@ var Upstream = class Upstream {
 	* torn down before or during the call.
 	*
 	* @remarks
-	* Whether the declared range already admits the reported version is not
-	* decided here and is not stored on the verdict: it is a function of the
-	* `range` and `latest` sitting beside each other, and one centralized helper
-	* answers it for every caller.
+	* The reader selects across the packument's stable version map before any
+	* collection bound can truncate it. It falls back to `dist-tags.latest` only
+	* when that version satisfies the declared range. `*` requests the newest
+	* stable version outright. The verdict's `major` field carries the stable
+	* major from the latest tag when that tag can be read.
 	*
 	* @example
 	* ```ts
@@ -3224,17 +3191,21 @@ var Upstream = class Upstream {
 	}
 	async #release(dependency, allowance) {
 		const outcome = await this.#read(this.#registryURL(dependency.name), this.#registryTimeout, allowance, Upstream.#packument);
-		const latest = outcome.lookup === "found" ? this.#latest(outcome.content) : void 0;
+		const latest = outcome.lookup === "found" ? this.#releaseVersion(outcome.content, dependency.range) : void 0;
+		const tagged = outcome.lookup === "found" ? this.#latest(outcome.content) : void 0;
+		const major = tagged === void 0 ? void 0 : extractVersion(tagged)?.[0];
 		const release = latest === void 0 ? {
 			name: dependency.name,
 			range: dependency.range,
 			lookup: outcome.lookup === "missing" ? "missing" : "failed",
-			note: outcome.lookup === "found" ? Upstream.#unreadable : outcome.note
+			note: outcome.lookup === "found" ? Upstream.#unreadable : outcome.note,
+			...major === void 0 ? {} : { major }
 		} : {
 			name: dependency.name,
 			range: dependency.range,
 			lookup: "found",
-			latest
+			latest,
+			...major === void 0 ? {} : { major }
 		};
 		this.#emitter.emit("release", release);
 		return release;
@@ -3319,6 +3290,27 @@ var Upstream = class Upstream {
 		if (latest === void 0 || latest.length === 0 || latest.length > MAX_RANGE_LENGTH) return;
 		return CONTROL_CHARACTER_PATTERN.test(latest) ? void 0 : latest;
 	}
+	#releaseVersion(content, range) {
+		const parsed = parseJSON(content);
+		if (!isRecord(parsed)) return void 0;
+		const versions = parsed.versions;
+		let selected;
+		if (isRecord(versions)) for (const version of Object.keys(versions)) {
+			if (!this.#admits(range, version)) continue;
+			if (selected === void 0 || compareVersions(version, selected) > 0) selected = version;
+		}
+		if (selected !== void 0) return selected;
+		const latest = this.#latest(content);
+		return latest !== void 0 && this.#admits(range, latest) ? latest : void 0;
+	}
+	#admits(range, version) {
+		const extracted = extractVersion(version);
+		if (extracted === void 0) return false;
+		if (range === "*") return true;
+		const major = extractRangeMajor(range);
+		if (major !== void 0 && range === `^${String(major)}`) return extracted[0] === major;
+		return matchesRange(range, version);
+	}
 	#registryURL(name) {
 		return `${this.#registryBase}/${encodeURIComponent(name).replaceAll("%40", "@")}`;
 	}