refactor(commands): read signing and install options from ctx.options

The command modules read provision, teamId and the test-init install
options straight from the global options service, which their typed
options already cover or can. The signing pair is a shared schema
spread into the build, deploy, prepare, debug and run schemas, and
validatePlatformOptions takes the typed context instead of resolving
the service. Reads that write back, take the whole argv, or hand the
service object to another service stay as they are.

The redeclaration note in the docs said a redeclared CLI-wide option
inherits nothing; the adapter carries the alias, default and
sensitivity over when the command leaves them unset, and the docs now
say so.

Author: edusperoni

defining-commands.md

@@ -183,9 +183,9 @@ spelling _means_:
 stringOption({ alias: "p" })` steals `--path`'s shorthand. Restating an
   option's own shorthand (`path: stringOption({ alias: "p" })`) is fine.
 
-The merge replaces the CLI-wide entry rather than patching it, so a
-redeclaration inherits nothing: restate the `alias` and `hasSensitiveValue` the
-global declaration carries if the command still wants them.
+A redeclaration that leaves `alias`, `default` or `hasSensitiveValue` unset
+keeps what the CLI-wide declaration carries for them, so `path: stringOption()`
+still answers to `-p` and stays out of the logs; set one only to change it.
 
 ### How validation behaves
 

lib/commands/build.ts

@@ -2,7 +2,11 @@ import {
 	ANDROID_RELEASE_BUILD_ERROR_MESSAGE,
 	AndroidAppBundleMessages,
 } from "../constants";
-import { canExecuteCommandBase, validatePlatformOptions } from "./command-base";
+import {
+	canExecuteCommandBase,
+	platformSigningOptions,
+	validatePlatformOptions,
+} from "./command-base";
 import { hasValidAndroidSigning } from "../common/helpers";
 import {
 	IAndroidBundleValidatorHelper,
@@ -28,6 +32,7 @@ import { inject } from "../common/di";
 type BuildPlatform = "iOS" | "Android" | "visionOS";
 
 const buildCommandOptions = {
+	...platformSigningOptions,
 	watch: booleanOption({ default: false }),
 	hmr: booleanOption({ default: false }),
 	force: booleanOption(),

lib/commands/command-base.ts

@@ -5,12 +5,31 @@ import {
 	ICanExecuteCommandOptions,
 	INotConfiguredEnvOptions,
 } from "../common/definitions/commands";
-import { ArgumentSpec, CommandContext } from "../common/define-command";
+import {
+	ArgumentSpec,
+	CommandContext,
+	CommandOptionsSchema,
+	objectOption,
+} from "../common/define-command";
 import { Injector } from "../common/di";
 
+/**
+ * The CLI-wide signing options `validatePlatformOptions` checks. A command
+ * that validates them spreads this into its own schema.
+ */
+export const platformSigningOptions = {
+	provision: objectOption(),
+	teamId: objectOption(),
+} satisfies CommandOptionsSchema;
+
 /** The part of a command context these helpers read. */
 type PlatformCommandContext = Pick<CommandContext<any>, "injector">;
 
+type PlatformSigningContext = Pick<
+	CommandContext<typeof platformSigningOptions>,
+	"injector" | "options"
+>;
+
 /**
  * The declarative form of `$platformCommandParameter`. Initializing the
  * project data is what makes the platform check possible, so it stays part of
@@ -38,17 +57,16 @@ export const platformArgument: ArgumentSpec<any> = {
 };
 
 export function validatePlatformOptions(
-	context: PlatformCommandContext,
+	context: PlatformSigningContext,
 	platform: string,
 ): Promise<boolean> {
-	const $options = context.injector.get<IOptions>("options");
 	const $projectData = context.injector.get<IProjectData>("projectData");
 
 	return context.injector
 		.get<IPlatformValidationService>("platformValidationService")
 		.validateOptions(
-			$options.provision,
-			$options.teamId,
+			context.options.provision,
+			context.options.teamId,
 			$projectData,
 			platform,
 		);
@@ -82,9 +100,19 @@ function hasUsableEnvironment(
 	);
 }
 
-export async function canExecuteCommandBase(
+export function canExecuteCommandBase(
+	context: PlatformSigningContext,
+	platform: string,
+	options: ICanExecuteCommandOptions & { validateOptions: true },
+): Promise<boolean>;
+export function canExecuteCommandBase(
 	context: PlatformCommandContext,
 	platform: string,
+	options?: ICanExecuteCommandOptions & { validateOptions?: false },
+): Promise<boolean>;
+export async function canExecuteCommandBase(
+	context: PlatformCommandContext | PlatformSigningContext,
+	platform: string,
 	options: ICanExecuteCommandOptions = {},
 ): Promise<boolean> {
 	const validatePlatformOutput = await validatePlatformBase(
@@ -96,7 +124,10 @@ export async function canExecuteCommandBase(
 	let result = canExecute;
 
 	if (canExecute && options.validateOptions) {
-		result = await validatePlatformOptions(context, platform);
+		result = await validatePlatformOptions(
+			<PlatformSigningContext>context,
+			platform,
+		);
 	}
 
 	return result;

lib/commands/debug.ts

@@ -27,13 +27,14 @@ import {
 	restartShortcut,
 	watcherShortcut,
 } from "../services/key-shortcuts";
-import { canExecuteCommandBase } from "./command-base";
+import { canExecuteCommandBase, platformSigningOptions } from "./command-base";
 import * as _ from "lodash";
 
 /** Which `$devicePlatformsConstants` entry a command debugs. */
 type DebugPlatform = "iOS" | "Android" | "visionOS";
 
 const debugCommandOptions = {
+	...platformSigningOptions,
 	force: booleanOption(),
 	release: booleanOption(),
 	aab: booleanOption(),

lib/commands/deploy.ts

@@ -2,7 +2,11 @@ import {
 	ANDROID_RELEASE_BUILD_ERROR_MESSAGE,
 	ANDROID_APP_BUNDLE_SIGNING_ERROR_MESSAGE,
 } from "../constants";
-import { canExecuteCommandBase, platformArgument } from "./command-base";
+import {
+	canExecuteCommandBase,
+	platformArgument,
+	platformSigningOptions,
+} from "./command-base";
 import { DeployCommandHelper } from "../helpers/deploy-command-helper";
 import { hasValidAndroidSigning } from "../common/helpers";
 import { IMigrateController } from "../definitions/migrate";
@@ -16,6 +20,7 @@ import {
 import { inject } from "../common/di";
 
 const deployCommandOptions = {
+	...platformSigningOptions,
 	watch: booleanOption({ default: false }),
 	hmr: booleanOption({ default: false }),
 	force: booleanOption(),

lib/commands/prepare.ts

@@ -1,6 +1,7 @@
 import {
 	canExecuteCommandBase,
 	platformArgument,
+	platformSigningOptions,
 	validatePlatformArgument,
 	validatePlatformOptions,
 } from "./command-base";
@@ -18,6 +19,7 @@ import { IOptions } from "../declarations";
 import { IProjectData } from "../definitions/project";
 
 export const prepareCommandOptions = {
+	...platformSigningOptions,
 	watch: booleanOption({ default: false }),
 	hmr: booleanOption({ default: false }),
 	skipNative: booleanOption({ default: false }),

lib/commands/run.ts

@@ -14,7 +14,7 @@ import {
 	ANDROID_APP_BUNDLE_SIGNING_ERROR_MESSAGE,
 	ANDROID_RELEASE_BUILD_ERROR_MESSAGE,
 } from "../constants";
-import { IOptions, IPlatformValidationService } from "../declarations";
+import { IPlatformValidationService } from "../declarations";
 import { IMigrateController } from "../definitions/migrate";
 import { IProjectData, IProjectDataService } from "../definitions/project";
 import {
@@ -25,8 +25,10 @@ import {
 	restartShortcut,
 	watcherShortcut,
 } from "../services/key-shortcuts";
+import { platformSigningOptions } from "./command-base";
 
 const runCommandOptions = {
+	...platformSigningOptions,
 	force: booleanOption(),
 	release: booleanOption(),
 	aab: booleanOption(),
@@ -166,7 +168,6 @@ async function canExecuteApplePlatformRunCommand(
 	context: RunCommandContext,
 	platform: string,
 ): Promise<boolean> {
-	const $options = context.injector.get<IOptions>("options");
 	const $platformValidationService =
 		context.injector.get<IPlatformValidationService>(
 			"platformValidationService",
@@ -188,8 +189,8 @@ async function canExecuteApplePlatformRunCommand(
 	const result =
 		(await canExecuteRunCommand(context, platform)) &&
 		(await $platformValidationService.validateOptions(
-			$options.provision,
-			$options.teamId,
+			context.options.provision,
+			context.options.teamId,
 			projectData,
 			platform.toLowerCase(),
 		));
@@ -229,7 +230,6 @@ export const androidRunCommand = defineCommand({
 	options: runCommandOptions,
 	arguments: "any",
 	async canExecute(context: RunCommandContext): Promise<boolean> {
-		const $options = inject<IOptions>("options");
 		const $platformValidationService = inject<IPlatformValidationService>(
 			"platformValidationService",
 		);
@@ -265,8 +265,8 @@ export const androidRunCommand = defineCommand({
 		}
 
 		return $platformValidationService.validateOptions(
-			$options.provision,
-			$options.teamId,
+			context.options.provision,
+			context.options.teamId,
 			$projectData,
 			platform.toLowerCase(),
 		);

lib/commands/test-init.ts

@@ -6,11 +6,12 @@ import {
 	IProjectData,
 	ITestInitializationService,
 } from "../definitions/project";
-import { INodePackageManager, IOptions } from "../declarations";
+import { INodePackageManager } from "../declarations";
 import { IPluginsService } from "../definitions/plugins";
 import {
 	Command,
 	CommandOptionsSchema,
+	booleanOption,
 	stringOption,
 } from "../common/define-command";
 import { inject } from "../common/di";
@@ -28,6 +29,10 @@ const karmaConfigAdditionalFrameworks: IDictionary<string[]> = {
 
 const testInitCommandOptions = {
 	framework: stringOption(),
+	disableNpmInstall: booleanOption(),
+	frameworkPath: stringOption(),
+	ignoreScripts: booleanOption(),
+	path: stringOption(),
 } satisfies CommandOptionsSchema;
 
 export class TestInitCommand extends Command({
@@ -38,7 +43,6 @@ export class TestInitCommand extends Command({
 }) {
 	private $fs = inject<IFileSystem>("fs");
 	private $logger = inject<ILogger>("logger");
-	private $options = inject<IOptions>("options");
 	private $packageManager = inject<INodePackageManager>("packageManager");
 	private $pluginsService = inject<IPluginsService>("pluginsService");
 	private $projectData = inject<IProjectData>("projectData");
@@ -130,10 +134,10 @@ export class TestInitCommand extends Command({
 				...(mod.saveInDependencies ? { save: true } : { "save-dev": true }),
 				"save-exact": true,
 				optional: false,
-				disableNpmInstall: this.$options.disableNpmInstall,
-				frameworkPath: this.$options.frameworkPath,
-				ignoreScripts: this.$options.ignoreScripts,
-				path: this.$options.path,
+				disableNpmInstall: this.options.disableNpmInstall,
+				frameworkPath: this.options.frameworkPath,
+				ignoreScripts: this.options.ignoreScripts,
+				path: this.options.path,
 			});
 
 			const modulePath = path.join(projectDir, "node_modules", mod.name);
@@ -187,9 +191,9 @@ export class TestInitCommand extends Command({
 							"save-dev": true,
 							"save-exact": true,
 							disableNpmInstall: false,
-							frameworkPath: this.$options.frameworkPath,
-							ignoreScripts: this.$options.ignoreScripts,
-							path: this.$options.path,
+							frameworkPath: this.options.frameworkPath,
+							ignoreScripts: this.options.ignoreScripts,
+							path: this.options.path,
 						},
 					);
 				} catch (e) {