@fluid-app/fluid-cli-mist 0.1.48 → 0.1.49

package/dist/index.mjs

@@ -1005,6 +1005,64 @@ function readMistFileFrom(dir = process.cwd()) {
 	return readMistFile(dir);
 }
 //#endregion
+//#region src/lib/staging-revision.ts
+/**
+* Pick the commit `fluid mist staging request` stages when no `--revision`
+* is given: the local checkout's HEAD, but only when nothing local would be
+* left out or lost.
+*
+* Staging can only serve a commit the mist's repository already has, and
+* this never pushes or switches branches to get one there; publishing to
+* main would ship the work to production. So the checkout must be clean
+* and its HEAD must already be on the remote's main branch.
+*/
+/** The local checkout can't be staged as it is. Nothing was changed. */
+var StagingPreflightError = class extends Error {
+	constructor(message) {
+		super(`${message} Nothing was requested.`);
+		this.name = "StagingPreflightError";
+	}
+};
+/**
+* The full SHA of the checkout's HEAD once it's clean and on the remote's
+* main branch. `remoteUrl` may carry a short-lived token; it only reaches
+* git through `gitFetch`, never argv or config.
+*
+* Raises StagingPreflightError when the directory is not a git checkout,
+* git can't report its status, it has uncommitted or untracked files, or
+* HEAD is not on the remote's main.
+*/
+async function resolveLocalStagingRevision(cwd, remoteUrl) {
+	if (await git(cwd, ["rev-parse", "--is-inside-work-tree"]) !== "true") throw new StagingPreflightError("This directory isn't a git checkout of the mist. Run it from the mist's folder or pass --revision.");
+	const status = await git(cwd, [
+		"status",
+		"--porcelain",
+		"--untracked-files=all"
+	]);
+	if (status === null) throw new StagingPreflightError("Git couldn't report whether this checkout has uncommitted changes. Pass --revision to stage a specific commit.");
+	if (status.length > 0) throw new StagingPreflightError("This checkout has uncommitted or untracked changes, and staging only serves commits already on the mist's repository. Commit and publish them, or pass --revision.");
+	const head = await git(cwd, ["rev-parse", "HEAD"]);
+	if (!head || !/^[0-9a-f]{40}$/.test(head)) throw new StagingPreflightError("This checkout has no commits yet.");
+	await gitFetch(cwd, remoteUrl, "main");
+	if ((await execa("git", [
+		"merge-base",
+		"--is-ancestor",
+		head,
+		"FETCH_HEAD"
+	], {
+		cwd,
+		reject: false
+	})).exitCode !== 0) throw new StagingPreflightError(`Commit ${head.slice(0, 7)} isn't on the mist's main branch yet, and staging only serves commits the repository already has.`);
+	return head;
+}
+async function git(cwd, args) {
+	const run = await execa("git", args, {
+		cwd,
+		reject: false
+	});
+	return run.exitCode === 0 ? run.stdout.trim() : null;
+}
+//#endregion
 //#region src/lib/staging.ts
 /** A staging step the user can act on, as opposed to a server fault. */
 var StagingUnavailableError = class extends Error {
@@ -1158,7 +1216,7 @@ function handle(err) {
 		console.error(chalk.red(err.message));
 		process.exit(1);
 	}
-	if (err instanceof StagingUnavailableError || err instanceof StagingWaitTimeoutError) {
+	if (err instanceof StagingPreflightError || err instanceof StagingUnavailableError || err instanceof StagingWaitTimeoutError) {
 		console.error(chalk.yellow(err.message));
 		process.exit(1);
 	}
@@ -4193,13 +4251,15 @@ const stagingWaitCommand = new Command("wait").description("Follow a staging ope
 //#endregion
 //#region src/commands/staging/request.ts
 /** `fluid mist staging request` — request staging at a revision. */
-const stagingRequestCommand = new Command("request").description("Request the staging environment at a pushed commit").argument("[slug]", "The mist slug (defaults to .mist file in CWD)").requiredOption("--revision <sha>", "Full 40-character SHA of a commit already on the mist's repository").option("--operation-key <key>", "Resume an interrupted request with the key it printed").option("--wait", "Follow the operation until staging is ready").option("--timeout <minutes>", "How long --wait follows it (default 30)").option("--json", "Emit the operation as JSON").action((slug, opts) => runAction(async () => {
+const stagingRequestCommand = new Command("request").description("Request the staging environment at a pushed commit").argument("[slug]", "The mist slug (defaults to .mist file in CWD)").option("--revision <sha>", "Full commit SHA to stage (defaults to this checkout's HEAD when it is clean and on main)").option("--operation-key <key>", "Resume an interrupted request with the key and --revision it printed").option("--wait", "Follow the operation until staging is ready").option("--timeout <minutes>", "How long --wait follows it (default 30)").option("--json", "Emit the operation as JSON").action((slug, opts) => runAction(async () => {
+	if (opts.operationKey && !opts.revision) throw new Error("--operation-key needs the --revision it was first sent with. The interrupted request printed both.");
 	const resolved = resolveSlug(slug);
 	const client = createMistClient();
+	const sourceRevision = opts.revision ?? await localRevision(client, resolved);
 	let operation = await admitStaging(client, resolved, {
-		sourceRevision: opts.revision,
+		sourceRevision,
 		operationKey: opts.operationKey,
-		onOperationKey: (key) => process.stderr.write(chalk.dim(`Operation key ${key}. If this is interrupted, rerun with --operation-key ${key}.\n`))
+		onOperationKey: (key) => process.stderr.write(chalk.dim(`Operation key ${key}. If this is interrupted, rerun with --operation-key ${key} --revision ${sourceRevision}.\n`))
 	});
 	process.stderr.write(`Staging operation ${operation.id}: ${describeProgress(operation)}\n`);
 	if (opts.wait) operation = await waitForOperation(client, resolved, operation.id, waitOptions(opts.timeout));
@@ -4207,6 +4267,13 @@ const stagingRequestCommand = new Command("request").description("Request the st
 	if (operation.state === "succeeded") console.log(`✔ Staging is ready. Run \`fluid mist staging status\` for its URL.`);
 	else console.log(`Requested. Follow it with \`fluid mist staging wait --operation ${operation.id}\`.`);
 }));
+/** This checkout's HEAD, once it is clean and already on the remote's main. */
+async function localRevision(client, slug) {
+	const { git_credential: credential } = await createGitCredential(client, slug);
+	const revision = await resolveLocalStagingRevision(process.cwd(), credential.remote_url);
+	process.stderr.write(chalk.dim(`Staging this checkout's HEAD, ${revision.slice(0, 7)}.\n`));
+	return revision;
+}
 //#endregion
 //#region src/commands/staging/index.ts
 /** `fluid mist staging` — sub-command aggregator. */