padrone 1.7.0 → 1.8.0

package/dist/index.mjs

@@ -1,7 +1,7 @@
-import { _ as resolveStdin, c as getCommandRuntime, d as repathCommandTree, f as resolveAllCommands, g as createTerminalReplSession, h as suggestSimilar, i as commandSymbol, l as lazyResolver, n as buildReplCompleter, o as findCommandByName, p as resolveCommand, u as mergeCommands, v as resolveStdinAlways, y as REPL_SIGINT } from "./commands-B_gufyR9.mjs";
-import { a as getJsonSchema, c as parsePositionalConfig, i as extractSchemaMetadata, l as preprocessArgs, n as coerceArgs, o as isArrayField, r as detectUnknownArgs, s as isAsyncStreamField, t as applyValues } from "./args-Cnq0nwSM.mjs";
+import { _ as resolveStdin, c as getCommandRuntime, d as repathCommandTree, f as resolveAllCommands, g as createTerminalReplSession, h as suggestSimilar, i as commandSymbol, l as lazyResolver, n as buildReplCompleter, o as findCommandByName, p as resolveCommand, u as mergeCommands, v as resolveStdinAlways, y as REPL_SIGINT } from "./commands-DLR0rFgq.mjs";
+import { a as getJsonSchema, c as parsePositionalConfig, i as extractSchemaMetadata, l as preprocessArgs, n as coerceArgs, o as isArrayField, r as detectUnknownArgs, s as isAsyncStreamField, t as applyValues } from "./args-DrCXxXeP.mjs";
 import { i as createStdinStream, r as concatBytes, t as asyncStream } from "./stream-DC4H8YTx.mjs";
-import { a as escapeHtml, i as getVersion, o as resolveOutputFormat, r as getRootCommand, s as colorThemes, t as generateHelp } from "./help-BtxLgrF_.mjs";
+import { a as escapeHtml, i as getVersion, o as resolveOutputFormat, r as getRootCommand, s as colorThemes, t as generateHelp } from "./help-B-ZMYyn-.mjs";
 import { a as SignalError, i as RoutingError, n as ConfigError, o as ValidationError, r as PadroneError, s as signalExitCode, t as ActionError } from "./errors-DA4KzK1M.mjs";
 //#region src/core/results.ts
 /**
@@ -239,7 +239,14 @@ function runInterceptorChain(phase, interceptors, ctx, core) {
 	for (let i = phaseInterceptors.length - 1; i >= 0; i--) {
 		const handler = phaseInterceptors[i][phase];
 		const prevNext = next;
-		next = (currentCtx) => handler(currentCtx, (overrides) => prevNext(overrides ? Object.assign({}, currentCtx, overrides) : currentCtx));
+		next = (currentCtx) => handler(currentCtx, (overrides) => {
+			if (!overrides) return prevNext(currentCtx);
+			if (overrides.context != null && typeof overrides.context === "object") overrides = {
+				...overrides,
+				context: Object.assign({}, currentCtx.context, overrides.context)
+			};
+			return prevNext(Object.assign({}, currentCtx, overrides));
+		});
 	}
 	return next(ctx);
 }
@@ -640,10 +647,7 @@ function createAutoOutputInterceptor(outputConfig) {
 			if (collected instanceof Promise) return collected.then((v) => ({ result: v }));
 			return { result: collected };
 		};
-		const executedOrPromise = next({ context: {
-			...ctx.context,
-			output: indicator
-		} });
+		const executedOrPromise = next({ context: { output: indicator } });
 		if (executedOrPromise instanceof Promise) return executedOrPromise.then(handleResult);
 		return handleResult(executedOrPromise);
 	} }));
@@ -934,9 +938,11 @@ function parseCommand(input, rootCommand, findCommandByName) {
 		unmatchedTerms
 	};
 	const argsMeta = curCommand.meta?.fields;
-	const { flags, aliases } = curCommand.argsSchema ? extractSchemaMetadata(curCommand.argsSchema, argsMeta, curCommand.meta?.autoAlias) : {
+	const { flags, aliases, negatives, customNegation } = curCommand.argsSchema ? extractSchemaMetadata(curCommand.argsSchema, argsMeta, curCommand.meta?.autoAlias) : {
 		flags: {},
-		aliases: {}
+		aliases: {},
+		negatives: {},
+		customNegation: /* @__PURE__ */ new Set()
 	};
 	const arrayArguments = /* @__PURE__ */ new Set();
 	if (curCommand.argsSchema) try {
@@ -951,9 +957,16 @@ function parseCommand(input, rootCommand, findCommandByName) {
 		let key;
 		if (arg.type === "alias" && arg.key.length === 1 && flags[arg.key[0]]) key = [flags[arg.key[0]]];
 		else if (arg.type === "named" && arg.key.length === 1 && aliases[arg.key[0]]) key = [aliases[arg.key[0]]];
-		else key = arg.key;
+		else if (arg.type === "named" && arg.key.length === 1 && negatives[arg.key[0]]) {
+			setNestedValue(rawArgs, [negatives[arg.key[0]]], false);
+			continue;
+		} else key = arg.key;
 		const rootKey = key[0];
 		if (arg.type === "named" && arg.negated) {
+			if (customNegation.has(rootKey)) {
+				setNestedValue(rawArgs, [`no-${key.join(".")}`], false);
+				continue;
+			}
 			setNestedValue(rawArgs, key, false);
 			continue;
 		}
@@ -990,12 +1003,21 @@ function buildCommandArgs(command, rawArgs, positionalArgs) {
 		flags: {},
 		aliases: {}
 	});
+	let issues;
 	const positionalConfig = command.meta?.positional ? parsePositionalConfig(command.meta.positional) : [];
 	if (positionalConfig.length > 0) {
 		let argIndex = 0;
 		for (let i = 0; i < positionalConfig.length; i++) {
 			const { name, variadic } = positionalConfig[i];
 			if (argIndex >= positionalArgs.length) break;
+			if (name in preprocessedArgs) {
+				issues ??= [];
+				issues.push({
+					path: [name],
+					message: `Ambiguous argument "${name}": provided both positionally and as a named option`
+				});
+				continue;
+			}
 			if (variadic) {
 				const nonVariadicAfter = positionalConfig.slice(i + 1).filter((p) => !p.variadic).length;
 				const variadicEnd = positionalArgs.length - nonVariadicAfter;
@@ -1011,7 +1033,10 @@ function buildCommandArgs(command, rawArgs, positionalArgs) {
 		}
 	}
 	if (command.argsSchema) preprocessedArgs = coerceArgs(preprocessedArgs, command.argsSchema);
-	return preprocessedArgs;
+	return {
+		args: preprocessedArgs,
+		issues
+	};
 }
 /**
 * Detects unknown options in args that aren't defined in the schema.
@@ -1024,8 +1049,8 @@ function checkUnknownArgs(command, preprocessedArgs) {
 		return unknowns;
 	}
 	const argsMeta = command.meta?.fields;
-	const { flags, aliases } = extractSchemaMetadata(command.argsSchema, argsMeta, command.meta?.autoAlias);
-	return detectUnknownArgs(preprocessedArgs, command.argsSchema, flags, aliases);
+	const { flags, aliases, negatives } = extractSchemaMetadata(command.argsSchema, argsMeta, command.meta?.autoAlias);
+	return detectUnknownArgs(preprocessedArgs, command.argsSchema, flags, aliases, negatives);
 }
 /**
 * Validates preprocessed arguments against the command's schema.
@@ -1071,7 +1096,12 @@ function formatIssueMessages(issues) {
 * External data sources (stdin, env, config) are not resolved here — use eval() for that.
 */
 function coreValidateForParse(command, rawArgs, positionalArgs) {
-	return thenMaybe(validateCommandArgs(command, buildCommandArgs(command, rawArgs, positionalArgs)), (v) => v);
+	const { args: preprocessedArgs, issues } = buildCommandArgs(command, rawArgs, positionalArgs);
+	if (issues) return {
+		args: void 0,
+		argsResult: { issues }
+	};
+	return thenMaybe(validateCommandArgs(command, preprocessedArgs), (v) => v);
 }
 //#endregion
 //#region src/extension/utils.ts
@@ -1429,7 +1459,11 @@ const interactiveInterceptor = defineInterceptor({
 	const interactivitySuppressed = runtime.interactive === "unsupported" || effectiveInteractive === false || stdinIsPiped && effectiveInteractive !== true;
 	const forceInteractive = !interactivitySuppressed && effectiveInteractive === true;
 	if (!(!interactivitySuppressed && runtime.prompt && hasInteractiveConfig(command.meta))) return next();
-	const preprocessedArgs = buildCommandArgs(command, ctx.rawArgs, ctx.positionalArgs);
+	const { args: preprocessedArgs, issues: positionalIssues } = buildCommandArgs(command, ctx.rawArgs, ctx.positionalArgs);
+	if (positionalIssues) return {
+		args: void 0,
+		argsResult: { issues: positionalIssues }
+	};
 	const unknowns = checkUnknownArgs(command, preprocessedArgs);
 	if (unknowns.length > 0) return {
 		args: void 0,
@@ -1993,7 +2027,11 @@ function execCommand(resolvedInput, ctx, evalOptions, errorMode = "soft", caller
 				evalInteractive: evalOptions?.interactive
 			};
 			const coreValidate = (validateCtx) => {
-				const preprocessedArgs = buildCommandArgs(validateCtx.command, validateCtx.rawArgs, validateCtx.positionalArgs);
+				const { args: preprocessedArgs, issues } = buildCommandArgs(validateCtx.command, validateCtx.rawArgs, validateCtx.positionalArgs);
+				if (issues) return {
+					args: void 0,
+					argsResult: { issues }
+				};
 				return thenMaybe(validateCommandArgs(validateCtx.command, preprocessedArgs), (v) => v);
 			};
 			const validatedOrPromise = runInterceptorChain("validate", commandInterceptors, validateCtx, coreValidate);
@@ -2260,6 +2298,11 @@ function createProgramMethods(ctx, evalCommand) {
 		if (commandObj.path) parts.push(commandObj.path);
 		const positionalConfig = commandObj.meta?.positional ? parsePositionalConfig(commandObj.meta.positional) : [];
 		const positionalNames = new Set(positionalConfig.map((p) => p.name));
+		const negativeKeyword = {};
+		if (commandObj.argsSchema) {
+			const { negatives } = extractSchemaMetadata(commandObj.argsSchema, commandObj.meta?.fields, commandObj.meta?.autoAlias);
+			for (const [keyword, argName] of Object.entries(negatives)) if (!(argName in negativeKeyword)) negativeKeyword[argName] = keyword;
+		}
 		if (args && typeof args === "object") {
 			for (const { name, variadic } of positionalConfig) {
 				const value = args[name];
@@ -2278,6 +2321,7 @@ function createProgramMethods(ctx, evalCommand) {
 			const stringifyValue = (key, value) => {
 				if (value === void 0) return;
 				if (typeof value === "boolean") if (value) parts.push(`--${key}`);
+				else if (negativeKeyword[key]) parts.push(`--${negativeKeyword[key]}`);
 				else parts.push(`--no-${key}`);
 				else if (Array.isArray(value)) for (const v of value) {
 					const vStr = String(v);
@@ -2457,17 +2501,17 @@ function createProgramMethods(ctx, evalCommand) {
 	};
 	const completion = async (shell) => {
 		resolveAllCommands(rootCommand);
-		const { generateCompletionOutput } = await import("./completion-BEuflbDO.mjs");
+		const { generateCompletionOutput } = await import("./completion-UnBKfGuk.mjs");
 		return generateCompletionOutput(rootCommand, shell);
 	};
 	const mcp = async (prefs) => {
 		resolveAllCommands(rootCommand);
-		const { startMcpServer } = await import("./mcp-6-Jw4Bpq.mjs");
+		const { startMcpServer } = await import("./mcp-D6PdtjIs.mjs");
 		return startMcpServer(ctx.builder, rootCommand, evalCommand, prefs);
 	};
 	const serve = async (prefs) => {
 		resolveAllCommands(rootCommand);
-		const { startServeServer } = await import("./serve-YVTPzBCl.mjs");
+		const { startServeServer } = await import("./serve-PaCLsNoD.mjs");
 		return startServeServer(ctx.builder, rootCommand, evalCommand, prefs);
 	};
 	return {
@@ -2688,33 +2732,13 @@ function createPadroneBuilder(inputCommand) {
 	execCtx.builder = builder;
 	return builder;
 }
-/**
-* Identity helper that contextually types a command builder callback while preserving its full return type.
-* Use this when defining commands in separate files — the parent program retains exact type information
-* about the subcommand's args, result, and nested commands.
-*
-* @example
-* ```ts
-* // my-command.ts
-* export const myCommand = defineCommand((c) =>
-*   c.arguments(z.object({ name: z.string() }))
-*    .action((args) => console.log(args.name))
-* );
-*
-* // cli.ts
-* createPadrone('test').command('my-command', myCommand)
-* ```
-*
-* @example With context
-* ```ts
-* export const myCommand = defineCommand<{ db: Database }>((c) =>
-*   c.arguments(z.object({ id: z.string() }))
-*    .action((args, ctx) => ctx.context.db.find(args.id))
-* );
-* ```
-*/
 function defineCommand(fn) {
-	return fn;
+	if (fn) return fn;
+	const builder = {
+		requires: () => builder,
+		define: (f) => f
+	};
+	return builder;
 }
 //#endregion
 //#region src/extension/completion.ts
@@ -2736,7 +2760,7 @@ function padroneCompletion() {
 	}), { positional: ["shell"] }).async().action(async (args, ctx) => {
 		const rootCommand = getRootCommand(ctx.command);
 		resolveAllCommands(rootCommand);
-		const { detectShell, generateCompletionOutput, setupCompletions } = await import("./completion-BEuflbDO.mjs");
+		const { detectShell, generateCompletionOutput, setupCompletions } = await import("./completion-UnBKfGuk.mjs");
 		const shell = args.shell;
 		if (args.setup) {
 			const resolvedShell = shell ?? await detectShell();
@@ -3310,11 +3334,7 @@ function loggerInterceptor(rawConfig) {
 					prefix: rawConfig?.prefix ?? "",
 					timestamps: rawConfig?.timestamps ?? ctxCfg?.timestamps ?? false
 				};
-				const logger = createLogger(ctx.runtime, resolved.level, resolved, ctx.context?.tracing);
-				return next({ context: {
-					...ctx.context,
-					logger
-				} });
+				return next({ context: { logger: createLogger(ctx.runtime, resolved.level, resolved, ctx.context?.tracing) } });
 			}
 		};
 	});
@@ -3414,7 +3434,7 @@ function padroneMcp(defaults) {
 	}), { positional: ["transport"] }).async().action(async (args, ctx) => {
 		const rootCommand = getRootCommand(ctx.command);
 		resolveAllCommands(rootCommand);
-		const { startMcpServer } = await import("./mcp-6-Jw4Bpq.mjs");
+		const { startMcpServer } = await import("./mcp-D6PdtjIs.mjs");
 		const transport = args.transport === "stdio" || args.transport === "http" ? args.transport : void 0;
 		const port = args.port ? parseInt(args.port, 10) : void 0;
 		const prefs = {
@@ -3860,7 +3880,7 @@ function progressInterceptor(config) {
 				};
 				return next();
 			},
-			execute(ctx, next) {
+			execute(_ctx, next) {
 				if (indicator && msgs.validation) indicator.update(msgs.progress);
 				const effectiveIndicator = indicator ?? noopIndicator;
 				const onSuccess = (value) => {
@@ -3876,10 +3896,7 @@ function progressInterceptor(config) {
 				};
 				let result;
 				try {
-					result = next({ context: {
-						...ctx.context,
-						progress: effectiveIndicator
-					} });
+					result = next({ context: { progress: effectiveIndicator } });
 				} catch (err) {
 					onError(err);
 				}
@@ -3951,7 +3968,7 @@ function padroneServe(defaults) {
 	})).async().action(async (args, ctx) => {
 		const rootCommand = getRootCommand(ctx.command);
 		resolveAllCommands(rootCommand);
-		const { startServeServer } = await import("./serve-YVTPzBCl.mjs");
+		const { startServeServer } = await import("./serve-PaCLsNoD.mjs");
 		const port = args.port ? parseInt(args.port, 10) : void 0;
 		const prefs = {
 			...defaults,
@@ -4046,7 +4063,7 @@ function tracingInterceptor(config) {
 			},
 			execute(ctx, next) {
 				rootSpan = tracer.startSpan(`cli ${ctx.command.name}`);
-				const padroneTracer = {
+				return next({ context: { tracing: {
 					tracer,
 					rootSpan,
 					span(name, fn) {
@@ -4071,11 +4088,7 @@ function tracingInterceptor(config) {
 							throw err;
 						}
 					}
-				};
-				return next({ context: {
-					...ctx.context,
-					tracing: padroneTracer
-				} });
+				} } });
 			},
 			error(ctx, next) {
 				rootSpan?.recordException(ctx.error);