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

package/dist/index.cjs

@@ -89549,7 +89549,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) => {
@@ -151255,6 +151255,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.
@@ -151277,6 +151288,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"}...`);
@@ -151284,7 +151296,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)`);
@@ -151299,7 +151311,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)) {
@@ -151315,7 +151347,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)`);
@@ -151570,7 +151602,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));
@@ -151583,7 +151615,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;
@@ -151651,11 +151683,29 @@ const fileExists = async (path) => {
 };
 //#endregion
 //#region ../plugin-core/src/archive-utils.ts
-const zipFolder = async (from, to, log) => {
+const zipFolder = async (from, to, log, abortSignal) => {
+	if (abortSignal?.aborted) {
+		const abortError = /* @__PURE__ */ new Error("Aborted");
+		abortError.name = "AbortError";
+		throw abortError;
+	}
 	const output = (0, node_fs.createWriteStream)(to);
 	const archive = (0, import_archiver.default)("zip", { zlib: { level: 9 } });
-	return new Promise(async (resolve, reject) => {
+	return new Promise((resolve, reject) => {
+		const onAbort = () => {
+			try {
+				archive.abort();
+			} catch {}
+			try {
+				output.destroy();
+			} catch {}
+			const abortError = /* @__PURE__ */ new Error("Aborted");
+			abortError.name = "AbortError";
+			reject(abortError);
+		};
+		if (abortSignal) abortSignal.addEventListener("abort", onAbort);
 		output.on("close", function() {
+			if (abortSignal) abortSignal.removeEventListener("abort", onAbort);
 			log(archive.pointer() + " total bytes");
 			log("archiver has been finalized and the output file descriptor has closed.");
 			resolve(to);
@@ -151664,11 +151714,15 @@ const zipFolder = async (from, to, log) => {
 			log("Data has been drained");
 		});
 		archive.on("error", function(err) {
+			if (abortSignal) abortSignal.removeEventListener("abort", onAbort);
 			reject(err);
 		});
 		archive.pipe(output);
 		archive.directory(from, false);
-		await archive.finalize();
+		archive.finalize().catch((err) => {
+			if (abortSignal) abortSignal.removeEventListener("abort", onAbort);
+			reject(err);
+		});
 	});
 };
 //#endregion
@@ -151920,10 +151974,11 @@ const sharedParams = {
 const exportc3p = async (file, { cwd, log, inputs, setOutput, paths, abortSignal, context: ctx }) => {
 	let browserContext = void 0;
 	let browser = void 0;
-	abortSignal.addEventListener("abort", () => {
+	const onAbort = () => {
 		console.error("aborted");
 		browserContext?.close();
-	});
+	};
+	abortSignal.addEventListener("abort", onAbort);
 	const newInputs = inputs;
 	const { thirdparty, node, pnpm } = paths;
 	const browserName = "chromium";
@@ -152020,6 +152075,7 @@ const exportc3p = async (file, { cwd, log, inputs, setOutput, paths, abortSignal
 		log("error, no result, crashed", e);
 		throw new Error("ConstructExport failed: " + e.message);
 	} finally {
+		abortSignal.removeEventListener("abort", onAbort);
 		if (browserContext) await browserContext.close();
 		if (browser) await browser.close();
 	}
@@ -152118,9 +152174,10 @@ const exportProjectAction = createAction({
 	icon: ""
 });
 const ExportProjectActionRunner = createActionRunner(async (options) => {
-	if (!await fileExists(options.inputs.folder)) throw new Error("You must specify a valid construct project folder");
-	const outputPath = (0, node_path.join)(options.cwd, "c3_tmp_proj.c3p");
-	await exportc3p(await zipFolder(options.inputs.folder, outputPath, options.log), options);
+	const folder = options.inputs.folder;
+	if (!folder) throw new Error("You must specify a valid construct project folder");
+	if (!await fileExists(folder)) throw new Error("You must specify a valid construct project folder");
+	await exportc3p(await zipFolder(folder, (0, node_path.join)(options.cwd, "c3_tmp_proj.c3p"), options.log, options.abortSignal), options);
 });
 //#endregion
 //#region src/index.ts

package/dist/index.mjs

@@ -89542,7 +89542,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) => {
@@ -151249,6 +151249,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.
@@ -151271,6 +151282,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"}...`);
@@ -151278,7 +151290,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)`);
@@ -151293,7 +151305,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)) {
@@ -151309,7 +151341,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)`);
@@ -151564,7 +151596,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));
@@ -151577,7 +151609,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;
@@ -151645,11 +151677,29 @@ const fileExists = async (path) => {
 };
 //#endregion
 //#region ../plugin-core/src/archive-utils.ts
-const zipFolder = async (from, to, log) => {
+const zipFolder = async (from, to, log, abortSignal) => {
+	if (abortSignal?.aborted) {
+		const abortError = /* @__PURE__ */ new Error("Aborted");
+		abortError.name = "AbortError";
+		throw abortError;
+	}
 	const output = createWriteStream(to);
 	const archive = (0, import_archiver.default)("zip", { zlib: { level: 9 } });
-	return new Promise(async (resolve, reject) => {
+	return new Promise((resolve, reject) => {
+		const onAbort = () => {
+			try {
+				archive.abort();
+			} catch {}
+			try {
+				output.destroy();
+			} catch {}
+			const abortError = /* @__PURE__ */ new Error("Aborted");
+			abortError.name = "AbortError";
+			reject(abortError);
+		};
+		if (abortSignal) abortSignal.addEventListener("abort", onAbort);
 		output.on("close", function() {
+			if (abortSignal) abortSignal.removeEventListener("abort", onAbort);
 			log(archive.pointer() + " total bytes");
 			log("archiver has been finalized and the output file descriptor has closed.");
 			resolve(to);
@@ -151658,11 +151708,15 @@ const zipFolder = async (from, to, log) => {
 			log("Data has been drained");
 		});
 		archive.on("error", function(err) {
+			if (abortSignal) abortSignal.removeEventListener("abort", onAbort);
 			reject(err);
 		});
 		archive.pipe(output);
 		archive.directory(from, false);
-		await archive.finalize();
+		archive.finalize().catch((err) => {
+			if (abortSignal) abortSignal.removeEventListener("abort", onAbort);
+			reject(err);
+		});
 	});
 };
 //#endregion
@@ -151914,10 +151968,11 @@ const sharedParams = {
 const exportc3p = async (file, { cwd, log, inputs, setOutput, paths, abortSignal, context: ctx }) => {
 	let browserContext = void 0;
 	let browser = void 0;
-	abortSignal.addEventListener("abort", () => {
+	const onAbort = () => {
 		console.error("aborted");
 		browserContext?.close();
-	});
+	};
+	abortSignal.addEventListener("abort", onAbort);
 	const newInputs = inputs;
 	const { thirdparty, node, pnpm } = paths;
 	const browserName = "chromium";
@@ -152014,6 +152069,7 @@ const exportc3p = async (file, { cwd, log, inputs, setOutput, paths, abortSignal
 		log("error, no result, crashed", e);
 		throw new Error("ConstructExport failed: " + e.message);
 	} finally {
+		abortSignal.removeEventListener("abort", onAbort);
 		if (browserContext) await browserContext.close();
 		if (browser) await browser.close();
 	}
@@ -152112,9 +152168,10 @@ const exportProjectAction = createAction({
 	icon: ""
 });
 const ExportProjectActionRunner = createActionRunner(async (options) => {
-	if (!await fileExists(options.inputs.folder)) throw new Error("You must specify a valid construct project folder");
-	const outputPath = join(options.cwd, "c3_tmp_proj.c3p");
-	await exportc3p(await zipFolder(options.inputs.folder, outputPath, options.log), options);
+	const folder = options.inputs.folder;
+	if (!folder) throw new Error("You must specify a valid construct project folder");
+	if (!await fileExists(folder)) throw new Error("You must specify a valid construct project folder");
+	await exportc3p(await zipFolder(folder, join(options.cwd, "c3_tmp_proj.c3p"), options.log, options.abortSignal), options);
 });
 //#endregion
 //#region src/index.ts