@pipelab/plugin-poki 1.0.0-beta.28 → 1.0.0-beta.32

package/dist/index.cjs

@@ -89525,7 +89525,7 @@ const runWithLiveLogs = async (command, args, execaOptions, log, hooks, abortSig
 			TERM: "xterm-256color",
 			FORCE_STDERR_LOGGING: "1"
 		},
-		cancelSignal: abortSignal
+		cancelSignal: abortSignal ?? execaOptions.cancelSignal
 	});
 	hooks?.onCreated?.(subprocess);
 	subprocess.stdout?.on("data", (data) => {
@@ -151231,6 +151231,17 @@ async function isOnline() {
 	lastCheckTime = now;
 	return isOnlineCached;
 }
+function allowPrereleaseInRange(rangeStr) {
+	try {
+		return new import_semver.default.Range(rangeStr).set.map((conj) => conj.map((c) => {
+			const v = c.semver;
+			if (v.prerelease && v.prerelease.length) return c.operator + v.format();
+			return c.operator + v.major + "." + v.minor + "." + v.patch + "-0";
+		}).join(" ")).join(" || ");
+	} catch {
+		return rangeStr;
+	}
+}
 /**
 * Robust utility to fetch, cache, and resolve an NPM package.
 * Centralized in core-node to avoid circular dependencies.
@@ -151253,6 +151264,7 @@ async function fetchPackage(packageName, versionOrRange, options) {
 	const ctx = options.context;
 	const baseDir = ctx.getPackagesPath(packageName);
 	let resolvedVersion;
+	const includePrerelease = !!(ctx.releaseTag && ctx.releaseTag !== "latest");
 	let resolvedVersionOrRange = versionOrRange;
 	if (resolvedVersionOrRange === "local") resolvedVersionOrRange = "latest";
 	console.log(`[Fetcher] Resolving ${packageName}@${resolvedVersionOrRange || "latest"}...`);
@@ -151260,7 +151272,7 @@ async function fetchPackage(packageName, versionOrRange, options) {
 	if (!await isOnline()) {
 		console.warn(`[Fetcher] ${packageName}: offline mode detected (${Date.now() - resolveStart}ms), trying local fallback...`);
 		const fallbackStart = Date.now();
-		const fallbackVersion = await tryLocalFallback(resolvedVersionOrRange, /* @__PURE__ */ new Error("Offline"), baseDir, packageName);
+		const fallbackVersion = await tryLocalFallback(resolvedVersionOrRange, /* @__PURE__ */ new Error("Offline"), baseDir, packageName, includePrerelease);
 		if (fallbackVersion) {
 			resolvedVersion = fallbackVersion;
 			console.log(`[Fetcher] ${packageName}: Resolved to local fallback ${resolvedVersion} (${Date.now() - fallbackStart}ms)`);
@@ -151275,7 +151287,27 @@ async function fetchPackage(packageName, versionOrRange, options) {
 		const packument = await packumentPromise;
 		const versions = Object.keys(packument.versions);
 		const range = resolvedVersionOrRange || "latest";
-		let foundVersion = packument["dist-tags"]?.[range] || import_semver.default.maxSatisfying(versions, range);
+		let foundVersion = packument["dist-tags"]?.[range] || import_semver.default.maxSatisfying(versions, range, { includePrerelease });
+		if (!foundVersion && ctx.releaseTag && ctx.releaseTag !== "latest") {
+			const releaseTagVersion = packument["dist-tags"]?.[ctx.releaseTag];
+			if (releaseTagVersion && import_semver.default.valid(releaseTagVersion)) {
+				const rewrittenRangeForCheck = allowPrereleaseInRange(range);
+				if (import_semver.default.satisfies(releaseTagVersion, rewrittenRangeForCheck, { includePrerelease: true })) {
+					console.log(`[Fetcher] Using release tag "${ctx.releaseTag}" (${releaseTagVersion}) for ${packageName}@${range} because it satisfies the range`);
+					foundVersion = releaseTagVersion;
+				}
+			}
+		}
+		if (!foundVersion && includePrerelease) {
+			const rewrittenRange = allowPrereleaseInRange(range);
+			if (rewrittenRange !== range) {
+				const matched = import_semver.default.maxSatisfying(versions, rewrittenRange, { includePrerelease });
+				if (matched) {
+					console.log(`[Fetcher] Resolved ${packageName}@${range} to ${matched} via rewritten range ${rewrittenRange}`);
+					foundVersion = matched;
+				}
+			}
+		}
 		if (range === "latest" && ctx.releaseTag && ctx.releaseTag !== "latest") {
 			const releaseTagVersion = packument["dist-tags"]?.[ctx.releaseTag];
 			if (releaseTagVersion && import_semver.default.valid(releaseTagVersion)) {
@@ -151291,7 +151323,7 @@ async function fetchPackage(packageName, versionOrRange, options) {
 	} catch (error) {
 		console.warn(`[Fetcher] ${packageName}: remote resolution failed (${Date.now() - resolveStart}ms), trying local fallback...`);
 		const fallbackStart = Date.now();
-		const fallbackVersion = await tryLocalFallback(resolvedVersionOrRange, error, baseDir, packageName);
+		const fallbackVersion = await tryLocalFallback(resolvedVersionOrRange, error, baseDir, packageName, includePrerelease);
 		if (fallbackVersion) {
 			resolvedVersion = fallbackVersion;
 			console.log(`[Fetcher] ${packageName}: Resolved to local fallback ${resolvedVersion} (${Date.now() - fallbackStart}ms)`);
@@ -151546,7 +151578,7 @@ async function crawlMonorepoPackages() {
 	}
 	return cache;
 }
-async function tryLocalFallback(versionOrRange, _error, baseDir, logPrefix) {
+async function tryLocalFallback(versionOrRange, _error, baseDir, logPrefix, includePrerelease = false) {
 	if (!(0, node_fs.existsSync)(baseDir)) return null;
 	try {
 		const localVersions = (await (0, node_fs_promises.readdir)(baseDir, { withFileTypes: true })).filter((e) => e.isDirectory() || e.isSymbolicLink()).map((e) => e.name).filter((name) => !!import_semver.default.valid(name));
@@ -151559,7 +151591,7 @@ async function tryLocalFallback(versionOrRange, _error, baseDir, logPrefix) {
 				return latestLocal;
 			}
 		} else {
-			const matched = import_semver.default.maxSatisfying(localVersions, range);
+			const matched = import_semver.default.maxSatisfying(localVersions, range, { includePrerelease });
 			if (matched) {
 				console.info(`[Fetcher] ${logPrefix}: Using locally cached matching version: ${matched} for range ${range}`);
 				return matched;

package/dist/index.mjs

@@ -89518,7 +89518,7 @@ const runWithLiveLogs = async (command, args, execaOptions, log, hooks, abortSig
 			TERM: "xterm-256color",
 			FORCE_STDERR_LOGGING: "1"
 		},
-		cancelSignal: abortSignal
+		cancelSignal: abortSignal ?? execaOptions.cancelSignal
 	});
 	hooks?.onCreated?.(subprocess);
 	subprocess.stdout?.on("data", (data) => {
@@ -151225,6 +151225,17 @@ async function isOnline() {
 	lastCheckTime = now;
 	return isOnlineCached;
 }
+function allowPrereleaseInRange(rangeStr) {
+	try {
+		return new import_semver.default.Range(rangeStr).set.map((conj) => conj.map((c) => {
+			const v = c.semver;
+			if (v.prerelease && v.prerelease.length) return c.operator + v.format();
+			return c.operator + v.major + "." + v.minor + "." + v.patch + "-0";
+		}).join(" ")).join(" || ");
+	} catch {
+		return rangeStr;
+	}
+}
 /**
 * Robust utility to fetch, cache, and resolve an NPM package.
 * Centralized in core-node to avoid circular dependencies.
@@ -151247,6 +151258,7 @@ async function fetchPackage(packageName, versionOrRange, options) {
 	const ctx = options.context;
 	const baseDir = ctx.getPackagesPath(packageName);
 	let resolvedVersion;
+	const includePrerelease = !!(ctx.releaseTag && ctx.releaseTag !== "latest");
 	let resolvedVersionOrRange = versionOrRange;
 	if (resolvedVersionOrRange === "local") resolvedVersionOrRange = "latest";
 	console.log(`[Fetcher] Resolving ${packageName}@${resolvedVersionOrRange || "latest"}...`);
@@ -151254,7 +151266,7 @@ async function fetchPackage(packageName, versionOrRange, options) {
 	if (!await isOnline()) {
 		console.warn(`[Fetcher] ${packageName}: offline mode detected (${Date.now() - resolveStart}ms), trying local fallback...`);
 		const fallbackStart = Date.now();
-		const fallbackVersion = await tryLocalFallback(resolvedVersionOrRange, /* @__PURE__ */ new Error("Offline"), baseDir, packageName);
+		const fallbackVersion = await tryLocalFallback(resolvedVersionOrRange, /* @__PURE__ */ new Error("Offline"), baseDir, packageName, includePrerelease);
 		if (fallbackVersion) {
 			resolvedVersion = fallbackVersion;
 			console.log(`[Fetcher] ${packageName}: Resolved to local fallback ${resolvedVersion} (${Date.now() - fallbackStart}ms)`);
@@ -151269,7 +151281,27 @@ async function fetchPackage(packageName, versionOrRange, options) {
 		const packument = await packumentPromise;
 		const versions = Object.keys(packument.versions);
 		const range = resolvedVersionOrRange || "latest";
-		let foundVersion = packument["dist-tags"]?.[range] || import_semver.default.maxSatisfying(versions, range);
+		let foundVersion = packument["dist-tags"]?.[range] || import_semver.default.maxSatisfying(versions, range, { includePrerelease });
+		if (!foundVersion && ctx.releaseTag && ctx.releaseTag !== "latest") {
+			const releaseTagVersion = packument["dist-tags"]?.[ctx.releaseTag];
+			if (releaseTagVersion && import_semver.default.valid(releaseTagVersion)) {
+				const rewrittenRangeForCheck = allowPrereleaseInRange(range);
+				if (import_semver.default.satisfies(releaseTagVersion, rewrittenRangeForCheck, { includePrerelease: true })) {
+					console.log(`[Fetcher] Using release tag "${ctx.releaseTag}" (${releaseTagVersion}) for ${packageName}@${range} because it satisfies the range`);
+					foundVersion = releaseTagVersion;
+				}
+			}
+		}
+		if (!foundVersion && includePrerelease) {
+			const rewrittenRange = allowPrereleaseInRange(range);
+			if (rewrittenRange !== range) {
+				const matched = import_semver.default.maxSatisfying(versions, rewrittenRange, { includePrerelease });
+				if (matched) {
+					console.log(`[Fetcher] Resolved ${packageName}@${range} to ${matched} via rewritten range ${rewrittenRange}`);
+					foundVersion = matched;
+				}
+			}
+		}
 		if (range === "latest" && ctx.releaseTag && ctx.releaseTag !== "latest") {
 			const releaseTagVersion = packument["dist-tags"]?.[ctx.releaseTag];
 			if (releaseTagVersion && import_semver.default.valid(releaseTagVersion)) {
@@ -151285,7 +151317,7 @@ async function fetchPackage(packageName, versionOrRange, options) {
 	} catch (error) {
 		console.warn(`[Fetcher] ${packageName}: remote resolution failed (${Date.now() - resolveStart}ms), trying local fallback...`);
 		const fallbackStart = Date.now();
-		const fallbackVersion = await tryLocalFallback(resolvedVersionOrRange, error, baseDir, packageName);
+		const fallbackVersion = await tryLocalFallback(resolvedVersionOrRange, error, baseDir, packageName, includePrerelease);
 		if (fallbackVersion) {
 			resolvedVersion = fallbackVersion;
 			console.log(`[Fetcher] ${packageName}: Resolved to local fallback ${resolvedVersion} (${Date.now() - fallbackStart}ms)`);
@@ -151540,7 +151572,7 @@ async function crawlMonorepoPackages() {
 	}
 	return cache;
 }
-async function tryLocalFallback(versionOrRange, _error, baseDir, logPrefix) {
+async function tryLocalFallback(versionOrRange, _error, baseDir, logPrefix, includePrerelease = false) {
 	if (!existsSync(baseDir)) return null;
 	try {
 		const localVersions = (await readdir(baseDir, { withFileTypes: true })).filter((e) => e.isDirectory() || e.isSymbolicLink()).map((e) => e.name).filter((name) => !!import_semver.default.valid(name));
@@ -151553,7 +151585,7 @@ async function tryLocalFallback(versionOrRange, _error, baseDir, logPrefix) {
 				return latestLocal;
 			}
 		} else {
-			const matched = import_semver.default.maxSatisfying(localVersions, range);
+			const matched = import_semver.default.maxSatisfying(localVersions, range, { includePrerelease });
 			if (matched) {
 				console.info(`[Fetcher] ${logPrefix}: Using locally cached matching version: ${matched} for range ${range}`);
 				return matched;