fix: resolve the right config file and args from cli (#20)

Author: Bernankez

package.json

@@ -51,6 +51,7 @@
     "build": "tsup src/index.ts src/cli/index.ts --format esm,cjs --dts --clean",
     "watch": "npm run build -- --watch src",
     "start": "esno src/cli/run.ts",
+    "test": "vitest",
     "upgrade": "npm-check -u && npm audit fix",
     "bumpp": "esno src/cli/run.ts",
     "prepublishOnly": "npm run clean && npm run build",
@@ -80,6 +81,7 @@
     "picocolors": "^1.0.0",
     "rimraf": "^5.0.5",
     "tsup": "^8.0.2",
-    "typescript": "^5.3.3"
+    "typescript": "^5.3.3",
+    "vitest": "^1.3.1"
   }
 }

pnpm-lock.yaml

@@ -26,43 +26,21 @@ export interface ParsedArgs {
  */
 export async function parseArgs(): Promise<ParsedArgs> {
   try {
-    const cli = cac('bumpp')
-
-    cli
-      .version(version)
-      .usage('[...files]')
-      .option('--preid <preid>', 'ID for prerelease')
-      .option('--all', `Include all files (default: ${bumpConfigDefaults.all})`)
-      .option('-c, --commit [msg]', `Commit message (default: ${bumpConfigDefaults.commit})`)
-      .option('--no-commit', 'Skip commit')
-      .option('-t, --tag [tag]', `Tag name (default: ${bumpConfigDefaults.tag})`)
-      .option('--no-tag', 'Skip tag')
-      .option('-p, --push', `Push to remote (default: ${bumpConfigDefaults.push})`)
-      .option('-y, --yes', `Skip confirmation (default: ${!bumpConfigDefaults.confirm})`)
-      .option('-r, --recursive', `Bump package.json files recursively (default: ${bumpConfigDefaults.recursive})`)
-      .option('--no-verify', 'Skip git verification')
-      .option('--ignore-scripts', `Ignore scripts (default: ${bumpConfigDefaults.ignoreScripts})`)
-      .option('-q, --quiet', 'Quiet mode')
-      .option('-v, --version <version>', 'Target version')
-      .option('-x, --execute <command>', 'Commands to execute after version bumps')
-      .help()
-
-    const result = cli.parse()
-    const args = result.options
+    const { args, resultArgs } = loadCliArgs()
 
     const parsedArgs: ParsedArgs = {
       help: args.help as boolean,
       version: args.version as boolean,
       quiet: args.quiet as boolean,
       options: await loadBumpConfig({
         preid: args.preid,
-        commit: !args.noCommit && args.commit,
-        tag: !args.noTag && args.tag,
+        commit: args.commit,
+        tag: args.tag,
         push: args.push,
         all: args.all,
         confirm: !args.yes,
         noVerify: !args.verify,
-        files: [...(args['--'] || []), ...result.args],
+        files: [...(args['--'] || []), ...resultArgs],
         ignoreScripts: args.ignoreScripts,
         execute: args.execute,
         recursive: !!args.recursive,
@@ -116,6 +94,47 @@ export async function parseArgs(): Promise<ParsedArgs> {
   }
 }
 
+export function loadCliArgs(argv = process.argv) {
+  const cli = cac('bumpp')
+
+  cli
+    .version(version)
+    .usage('[...files]')
+    .option('--preid <preid>', 'ID for prerelease')
+    .option('--all', `Include all files (default: ${bumpConfigDefaults.all})`)
+    .option('-c, --commit [msg]', 'Commit message', { default: true })
+    .option('--no-commit', 'Skip commit', { default: false })
+    .option('-t, --tag [tag]', 'Tag name', { default: true })
+    .option('--no-tag', 'Skip tag', { default: false })
+    .option('-p, --push', `Push to remote (default: ${bumpConfigDefaults.push})`)
+    .option('-y, --yes', `Skip confirmation (default: ${!bumpConfigDefaults.confirm})`)
+    .option('-r, --recursive', `Bump package.json files recursively (default: ${bumpConfigDefaults.recursive})`)
+    .option('--no-verify', 'Skip git verification')
+    .option('--ignore-scripts', `Ignore scripts (default: ${bumpConfigDefaults.ignoreScripts})`)
+    .option('-q, --quiet', 'Quiet mode')
+    .option('-v, --version <version>', 'Target version')
+    .option('-x, --execute <command>', 'Commands to execute after version bumps')
+    .help()
+
+  const result = cli.parse(argv)
+  const rawArgs = cli.rawArgs
+  const args = result.options
+
+  const hasCommitFlag = rawArgs.some(arg => ['-c', '--commit', '--no-commit'].includes(arg))
+  const hasTagFlag = rawArgs.some(arg => ['-t', '--tag', '--no-tag'].includes(arg))
+
+  const { tag, commit, ...rest } = args
+
+  return {
+    args: {
+      ...rest,
+      commit: hasCommitFlag ? commit : undefined,
+      tag: hasTagFlag ? tag : undefined,
+    } as { [k: string]: any },
+    resultArgs: result.args,
+  }
+}
+
 function errorHandler(error: Error): never {
   console.error(error.message)
   return process.exit(ExitCode.InvalidArgument)

src/cli/parse-args.ts

@@ -18,11 +18,18 @@ export async function loadBumpConfig(
   overrides?: Partial<VersionBumpOptions>,
   cwd = process.cwd(),
 ) {
+  const { config: bumppConfig } = await loadConfig<VersionBumpOptions>({
+    name: 'bumpp',
+    overrides: {
+      ...(overrides as VersionBumpOptions),
+    },
+    cwd,
+  })
   const { config } = await loadConfig<VersionBumpOptions>({
     name: 'bump',
     defaults: bumpConfigDefaults,
     overrides: {
-      ...(overrides as VersionBumpOptions),
+      ...(bumppConfig!),
     },
     cwd,
   })

src/config.ts

@@ -0,0 +1,38 @@
+import { describe, expect, it } from 'vitest'
+import { loadCliArgs } from '../src/cli/parse-args'
+
+const defaultArgs = ['node', 'bumpp']
+
+describe('loadCliArgs', async () => {
+  it('returns an object with the correct properties', () => {
+    const result = loadCliArgs()
+
+    expect(typeof result).toBe('object')
+    expect(typeof result.args).toBe('object')
+    expect(typeof result.resultArgs).toBe('object')
+  })
+
+  it('sets the commit property to undefined if no commit flag is present', () => {
+    const result = loadCliArgs([...defaultArgs])
+
+    expect(result.args.commit).toBe(undefined)
+  })
+
+  it('sets the commit property to true if `--commit` is present', () => {
+    const result = loadCliArgs([...defaultArgs, '--commit'])
+
+    expect(result.args.commit).toBe(true)
+  })
+
+  it('sets the commit property to true if `-c` is present', () => {
+    const result = loadCliArgs([...defaultArgs, '-c'])
+
+    expect(result.args.commit).toBe(true)
+  })
+
+  it('sets the commit property to false if `--no-commit` is present', () => {
+    const result = loadCliArgs([...defaultArgs, '--no-commit'])
+
+    expect(result.args.commit).toBe(false)
+  })
+})

test/parse-args.test.ts

@@ -19,7 +19,8 @@
     "skipLibCheck": true
   },
   "include": [
-    "src/**/*.ts"
+    "src/**/*.ts",
+    "test/**/*.ts"
   ],
   "exclude": [
     "node_modules"