@bedrock-rbx/core 0.1.0-beta.12 → 0.1.0-beta.14

package/dist/cli/run.mjs

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
-import { B as renderDeployError, E as serializeStateFile, G as renderStateWriteError, H as renderMigrateParseError, R as createClackProgressAdapter, U as renderMigrationSummary, V as renderMigrateError, W as renderParseError, a as buildStatePort, d as resolveStateConfig, f as flattenConfig, h as diff, i as loadConfig, l as validatePlan, n as serializeConfig, o as buildDesired, r as deploy, t as migrateMantleState, u as selectEnvironment, y as createClackPort, z as renderBuildStatePortError } from "../migrate-mantle-state-Dkk5zGHw.mjs";
+import { A as createClackProgressAdapter, E as serializeStateFile, G as renderMigrateParseError, H as renderBuildStatePortError, J as renderStateWriteError, K as renderMigrationSummary, U as renderDeployError, V as resolveStateConfig, W as renderMigrateError, _ as diff, a as buildStatePort, d as selectEnvironment, f as selectMergedEnvironment, i as loadConfig, l as validatePlan, m as flattenConfig, n as serializeConfig, o as buildDesired, p as collectRedactionAnnotations, q as renderParseError, r as deploy, t as migrateMantleState, u as extractResourceRedaction, y as createClackPort } from "../migrate-mantle-state-qejWFAR0.mjs";
 import { isCancel, path, select, text } from "@clack/prompts";
 import process from "node:process";
 import { mkdir, readFile, writeFile } from "node:fs/promises";
 import { dirname, join } from "node:path";
 import sade from "sade";
 //#region package.json
-var version = "0.1.0-beta.12";
+var version = "0.1.0-beta.14";
 //#endregion
 //#region src/cli/credential-environment-overrides.ts
 /**
@@ -136,34 +136,37 @@ function deployCommand(deps) {
 	};
 }
 function resolveDeploy(deps) {
-	const clack = deps.clack ?? createClackPort();
 	return {
-		clack,
+		clack: deps.clack ?? createClackPort(),
 		deploy: deps.deploy ?? deploy,
 		exit: deps.exit ?? ((code) => process.exit(code)),
 		loadConfig: deps.loadConfig ?? loadConfig,
-		progress: deps.progress ?? createClackProgressAdapter({ clack })
+		progressOverride: deps.progress
 	};
 }
 function loadOptionsFor$1(parsed) {
 	return parsed.configFile === void 0 ? void 0 : { configFile: parsed.configFile };
 }
+function cancelAsFailed$1(clack) {
+	clack.cancel("deploy failed");
+}
 async function dispatchEnvironments$1(inputs) {
-	const { config, environments, getEnv, resolved } = inputs;
+	const { config, environments, getEnv, progress, resolved } = inputs;
 	const failed = [];
 	for (const environment of environments) {
 		const result = await resolved.deploy({
 			config,
 			environment,
-			getEnv
+			getEnv,
+			progress
 		});
-		if (result.success) resolved.progress.emit({
+		if (result.success) progress.emit({
 			environment,
 			kind: "deploySuccess",
 			resourceCount: result.data.resources.length
 		});
 		else {
-			resolved.progress.emit({
+			progress.emit({
 				environment,
 				error: result.err,
 				kind: "deployFailure"
@@ -177,8 +180,24 @@ function buildGetEnvironment$1(parsed) {
 	const overrides = buildCredentialOverrides(parsed);
 	return (name) => overrides[name] ?? process.env[name];
 }
-function cancelAsFailed$1(clack) {
-	clack.cancel("deploy failed");
+async function dispatchAndReport(input) {
+	const { loaded, parsed, resolved } = input;
+	const progress = resolved.progressOverride ?? createClackProgressAdapter({
+		clack: resolved.clack,
+		config: loaded
+	});
+	if ((await dispatchEnvironments$1({
+		config: loaded,
+		environments: parsed.environments,
+		getEnv: buildGetEnvironment$1(parsed),
+		progress,
+		resolved
+	})).length > 0) {
+		cancelAsFailed$1(resolved.clack);
+		return 1;
+	}
+	resolved.clack.outro("deploy succeeded");
+	return 0;
 }
 async function runDeploy(rawOptions, resolved) {
 	resolved.clack.intro("bedrock deploy");
@@ -197,17 +216,11 @@ async function runDeploy(rawOptions, resolved) {
 		cancelAsFailed$1(resolved.clack);
 		return 1;
 	}
-	if ((await dispatchEnvironments$1({
-		config: loaded.data,
-		environments: parsed.data.environments,
-		getEnv: buildGetEnvironment$1(parsed.data),
+	return dispatchAndReport({
+		loaded: loaded.data,
+		parsed: parsed.data,
 		resolved
-	})).length > 0) {
-		cancelAsFailed$1(resolved.clack);
-		return 1;
-	}
-	resolved.clack.outro("deploy succeeded");
-	return 0;
+	});
 }
 //#endregion
 //#region src/shell/preview-diff.ts
@@ -266,15 +279,32 @@ function pickStatePort(options, config) {
 		stateConfig: stateConfig.data
 	});
 }
-async function resolveDeps(options) {
-	const config = await pickConfig(options);
-	if (!config.success) return config;
-	const selected = selectEnvironment(config.data, options.environment);
+function resolveEnvironmentView(config, environment) {
+	const merged = selectMergedEnvironment(config, environment);
+	if (!merged.success) return {
+		err: merged.err,
+		success: false
+	};
+	const selected = selectEnvironment(config, environment);
 	if (!selected.success) return {
 		err: selected.err,
 		success: false
 	};
-	const effective = selected.data;
+	const environmentResource = extractResourceRedaction(merged.data.entry);
+	return {
+		data: {
+			effective: selected.data,
+			redactions: collectRedactionAnnotations(merged.data.merged, environmentResource)
+		},
+		success: true
+	};
+}
+async function resolveDeps(options) {
+	const config = await pickConfig(options);
+	if (!config.success) return config;
+	const view = resolveEnvironmentView(config.data, options.environment);
+	if (!view.success) return view;
+	const { effective, redactions } = view.data;
 	const readFile$1 = options.readFile ?? readFile;
 	const statePort = pickStatePort(options, effective);
 	if (!statePort.success) return statePort;
@@ -282,6 +312,7 @@ async function resolveDeps(options) {
 		data: {
 			config: effective,
 			readFile: readFile$1,
+			redactions,
 			statePort: statePort.data
 		},
 		success: true
@@ -316,7 +347,8 @@ async function runPreview(environment, deps) {
 	return {
 		data: {
 			environment,
-			ops: diff(desired.data, priorResources)
+			ops: diff(desired.data, priorResources),
+			redactions: deps.redactions
 		},
 		success: true
 	};
@@ -363,20 +395,33 @@ function cancelAsFailed(clack) {
 function describeOp(op) {
 	switch (op.type) {
 		case "create": return `+ ${op.desired.kind}:${op.key}`;
-		case "update": return `~ ${op.desired.kind}:${op.key}`;
+		case "update": return `~ ${op.desired.kind}:${op.key} ${op.changedFields.join(" + ")} updated`;
 	}
 }
 function isDriftOp(op) {
 	return op.type !== "noop";
 }
+function describeRedaction(redaction) {
+	const suffix = redaction.hasRealValueEdits ? "redacted, real values not pushed" : "redacted";
+	return `- ${redaction.kind}:${redaction.key} (${suffix})`;
+}
+function renderRedactions(preview, clack) {
+	const driftPairs = new Set(preview.ops.filter(isDriftOp).map((op) => `${op.desired.kind}:${op.key}`));
+	const redactedNoops = preview.redactions.filter((redaction) => !driftPairs.has(`${redaction.kind}:${redaction.key}`));
+	if (redactedNoops.length === 0) return;
+	clack.logMessage(`Redacted in "${preview.environment}":`);
+	for (const redaction of redactedNoops) clack.logMessage(describeRedaction(redaction));
+}
 function renderPreview(preview, clack) {
 	const drift = preview.ops.filter(isDriftOp);
 	if (drift.length === 0) {
 		clack.logSuccess(`No drift for "${preview.environment}"`);
+		renderRedactions(preview, clack);
 		return false;
 	}
 	clack.logMessage(`Pending changes for "${preview.environment}":`);
 	for (const op of drift) clack.logMessage(describeOp(op));
+	renderRedactions(preview, clack);
 	return true;
 }
 async function dispatchEnvironments(inputs) {