chore: CLI tests

Author: jherr

packages/cta-cli/package.json

@@ -8,7 +8,10 @@
   "scripts": {
     "build": "tsc",
     "dev": "tsc --watch",
-    "test:lint": "eslint ./src"
+    "test:lint": "eslint ./src",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "test:coverage": "vitest run --coverage"
   },
   "repository": {
     "type": "git",
@@ -29,19 +32,21 @@
   "license": "MIT",
   "packageManager": "pnpm@9.15.5",
   "dependencies": {
-    "@tanstack/cta-engine": "workspace:*",
+    "@clack/prompts": "^0.10.0",
     "@tanstack/cta-custom-add-on": "workspace:*",
+    "@tanstack/cta-engine": "workspace:*",
     "@tanstack/cta-mcp": "workspace:*",
     "@tanstack/cta-ui": "workspace:*",
-    "@clack/prompts": "^0.10.0",
     "chalk": "^5.4.1",
     "commander": "^13.1.0"
   },
   "devDependencies": {
     "@tanstack/config": "^0.16.2",
     "@types/node": "^22.13.4",
+    "@vitest/coverage-v8": "3.1.1",
     "eslint": "^9.20.0",
     "typescript": "^5.6.3",
-    "vitest": "^3.0.8"
+    "vitest": "^3.1.1",
+    "vitest-fetch-mock": "^0.4.5"
   }
 }

packages/cta-cli/src/cli.ts

@@ -18,7 +18,8 @@ import { runMCPServer } from '@tanstack/cta-mcp'
 
 import { launchUI } from '@tanstack/cta-ui'
 
-import { normalizeOptions, promptForOptions } from './options.js'
+import { promptForOptions } from './options.js'
+import { normalizeOptions } from './command-line.js'
 
 import { createUIEnvironment } from './ui-environment.js'
 
@@ -246,7 +247,7 @@ export function cli({
         } else {
           intro(`Let's configure your ${appName} application`)
           finalOptions = await promptForOptions(cliOptions, {
-            forcedMode: forcedMode as TemplateOptions,
+            forcedMode: forcedMode as Mode,
             forcedAddOns,
           })
         }
@@ -256,9 +257,9 @@ export function cli({
         }
 
         finalOptions.targetDir =
-          options.targetDir || resolve(process.cwd(), finalOptions!.projectName)
+          options.targetDir || resolve(process.cwd(), finalOptions.projectName)
 
-        await createApp(environment, finalOptions!)
+        await createApp(environment, finalOptions)
       } catch (error) {
         log.error(
           error instanceof Error ? error.message : 'An unknown error occurred',

packages/cta-cli/src/command-line.ts

@@ -0,0 +1,116 @@
+import { resolve } from 'node:path'
+
+import {
+  CODE_ROUTER,
+  DEFAULT_PACKAGE_MANAGER,
+  FILE_ROUTER,
+  finalizeAddOns,
+  getFrameworkById,
+  getPackageManager,
+  loadRemoteAddOn,
+} from '@tanstack/cta-engine'
+
+import type { Mode, Options, Starter } from '@tanstack/cta-engine'
+
+import type { CliOptions } from './types.js'
+
+export async function normalizeOptions(
+  cliOptions: CliOptions,
+  forcedMode?: Mode,
+  forcedAddOns?: Array<string>,
+): Promise<Options | undefined> {
+  const projectName = (cliOptions.projectName ?? '').trim()
+  if (!projectName) {
+    return undefined
+  }
+
+  let typescript =
+    cliOptions.template === 'typescript' ||
+    cliOptions.template === 'file-router' ||
+    cliOptions.framework === 'solid'
+
+  let tailwind = !!cliOptions.tailwind
+  if (cliOptions.framework === 'solid') {
+    tailwind = true
+  }
+
+  let mode: typeof FILE_ROUTER | typeof CODE_ROUTER =
+    cliOptions.template === 'file-router' ? FILE_ROUTER : CODE_ROUTER
+
+  const starter = cliOptions.starter
+    ? ((await loadRemoteAddOn(cliOptions.starter)) as Starter)
+    : undefined
+
+  if (starter) {
+    tailwind = starter.tailwind
+    typescript = starter.typescript
+    cliOptions.framework = starter.framework
+    mode = starter.mode
+  }
+
+  const framework = getFrameworkById(cliOptions.framework || 'react-cra')!
+
+  async function selectAddOns() {
+    // Edge case for Windows Powershell
+    if (Array.isArray(cliOptions.addOns) && cliOptions.addOns.length === 1) {
+      const parseSeparatedArgs = cliOptions.addOns[0].split(' ')
+      if (parseSeparatedArgs.length > 1) {
+        cliOptions.addOns = parseSeparatedArgs
+      }
+    }
+
+    if (
+      Array.isArray(cliOptions.addOns) ||
+      starter?.dependsOn ||
+      forcedAddOns ||
+      cliOptions.toolchain
+    ) {
+      const selectedAddOns = new Set<string>([
+        ...(starter?.dependsOn || []),
+        ...(forcedAddOns || []),
+      ])
+      if (cliOptions.addOns && Array.isArray(cliOptions.addOns)) {
+        for (const a of cliOptions.addOns) {
+          selectedAddOns.add(a)
+        }
+      }
+      if (cliOptions.toolchain) {
+        selectedAddOns.add(cliOptions.toolchain)
+      }
+
+      return await finalizeAddOns(
+        framework,
+        forcedMode || cliOptions.template === 'file-router'
+          ? FILE_ROUTER
+          : CODE_ROUTER,
+        Array.from(selectedAddOns),
+      )
+    }
+
+    return []
+  }
+
+  const chosenAddOns = await selectAddOns()
+
+  if (chosenAddOns.length) {
+    tailwind = true
+    typescript = true
+  }
+
+  return {
+    projectName: projectName,
+    targetDir: resolve(process.cwd(), projectName),
+    framework,
+    mode,
+    typescript,
+    tailwind,
+    packageManager:
+      cliOptions.packageManager ||
+      getPackageManager() ||
+      DEFAULT_PACKAGE_MANAGER,
+    git: !!cliOptions.git,
+    chosenAddOns,
+    starter,
+    variableValues: {},
+  }
+}