feat(flags)!: remove -r flag and use only -f flag

This commit is contained in:
Todd Bluhm 2025-07-02 22:27:08 -08:00
parent 2a76925bc6
commit 592ad064fb
No known key found for this signature in database
GPG Key ID: 9CF312607477B8AB
5 changed files with 7 additions and 11 deletions

7
dist/parse-args.js vendored
View File

@ -43,9 +43,9 @@ export function parseArgs(args) {
rc = {
environments: parsedCmdOptions.environments,
// if we get a boolean value assume not defined
filePath: parsedCmdOptions.rcFile === true ?
filePath: parsedCmdOptions.file === true ?
undefined :
parsedCmdOptions.rcFile,
parsedCmdOptions.file,
};
}
let envFile;
@ -82,8 +82,7 @@ export function parseArgsUsingCommander(args) {
.version(packageJson.version, '-v, --version')
.usage('[options] -- <command> [...args]')
.option('-e, --environments [envs...]', 'The rc file environment(s) to use', parseArgList)
.option('-f, --file [path]', 'Custom env file path (default path: ./.env)')
.option('-r, --rc-file [path]', 'Custom rc file path (default path: ./.env-cmdrc.(js|cjs|mjs|json)')
.option('-f, --file [path]', 'Custom env file path or .rc file path if \'-e\' used (default path: ./.env or ./.env-cmdrc.(js|cjs|mjs|json))')
.option('-x, --expand-envs', 'Replace $var in args and command with environment variables')
.option('--fallback', 'Fallback to default env file path, if custom env file path not found')
.option('--no-override', 'Do not override existing environment variables')

1
dist/types.d.ts vendored
View File

@ -7,7 +7,6 @@ export type CommanderOptions = Command<[], {
fallback?: boolean;
file?: true | string;
override?: boolean;
rcFile?: true | string;
silent?: boolean;
useShell?: boolean;
verbose?: boolean;

View File

@ -51,9 +51,9 @@ export function parseArgs(args: string[]): EnvCmdOptions {
rc = {
environments: parsedCmdOptions.environments,
// if we get a boolean value assume not defined
filePath: parsedCmdOptions.rcFile === true ?
filePath: parsedCmdOptions.file === true ?
undefined :
parsedCmdOptions.rcFile,
parsedCmdOptions.file,
}
}
@ -93,8 +93,7 @@ export function parseArgsUsingCommander(args: string[]): CommanderOptions {
.version(packageJson.version, '-v, --version')
.usage('[options] -- <command> [...args]')
.option('-e, --environments [envs...]', 'The rc file environment(s) to use', parseArgList)
.option('-f, --file [path]', 'Custom env file path (default path: ./.env)')
.option('-r, --rc-file [path]', 'Custom rc file path (default path: ./.env-cmdrc.(js|cjs|mjs|json)')
.option('-f, --file [path]', 'Custom env file path or .rc file path if \'-e\' used (default path: ./.env or ./.env-cmdrc.(js|cjs|mjs|json))')
.option('-x, --expand-envs', 'Replace $var in args and command with environment variables')
.option('--fallback', 'Fallback to default env file path, if custom env file path not found')
.option('--no-override', 'Do not override existing environment variables')

View File

@ -11,7 +11,6 @@ export type CommanderOptions = Command<[], {
fallback?: boolean // Default false
file?: true | string
override?: boolean // Default: false
rcFile?: true | string
silent?: boolean // Default: false
useShell?: boolean // Default: false
verbose?: boolean // Default: false

View File

@ -69,7 +69,7 @@ describe('parseArgs', (): void => {
})
it('should parse rc file path', (): void => {
const res = parseArgs(['-e', environments[0], '-r', rcFilePath, '--', command, ...commandArgs])
const res = parseArgs(['-e', environments[0], '-f', rcFilePath, '--', command, ...commandArgs])
assert.exists(res.rc)
assert.equal(res.rc.filePath, rcFilePath)
})