fix: correct add-ons handling for create-start-app

Author: jherr

packages/cta-engine/src/cli.ts

@@ -16,7 +16,7 @@ import { createDefaultEnvironment } from './environment.js'
 
 import type { PackageManager } from './package-manager.js'
 import type { ToolChain } from './toolchain.js'
-import type { CliOptions, Framework } from './types.js'
+import type { CliOptions, Framework, Mode, TemplateOptions } from './types.js'
 
 export function cli({
   name,
@@ -26,7 +26,7 @@ export function cli({
 }: {
   name: string
   appName: string
-  forcedMode?: 'typescript' | 'javascript' | 'file-router'
+  forcedMode?: Mode
   forcedAddOns?: Array<string>
 }) {
   const program = new Command()
@@ -143,12 +143,12 @@ export function cli({
   program.action(async (projectName: string, options: CliOptions) => {
     if (options.listAddOns) {
       await listAddOns(options, {
-        forcedMode,
+        forcedMode: forcedMode as TemplateOptions,
         forcedAddOns,
       })
     } else if (options.mcp || options.mcpSse) {
       await runServer(!!options.mcpSse, {
-        forcedMode,
+        forcedMode: forcedMode as TemplateOptions,
         forcedAddOns,
         appName,
       })
@@ -160,16 +160,20 @@ export function cli({
         } as CliOptions
 
         if (forcedMode) {
-          cliOptions.template = forcedMode
+          cliOptions.template = forcedMode as TemplateOptions
         }
 
-        let finalOptions = await normalizeOptions(cliOptions, forcedAddOns)
+        let finalOptions = await normalizeOptions(
+          cliOptions,
+          forcedMode,
+          forcedAddOns,
+        )
         if (finalOptions) {
           intro(`Creating a new ${appName} app in ${projectName}...`)
         } else {
           intro(`Let's configure your ${appName} application`)
           finalOptions = await promptForOptions(cliOptions, {
-            forcedMode,
+            forcedMode: forcedMode as TemplateOptions,
             forcedAddOns,
           })
         }

packages/cta-engine/src/options.ts

@@ -16,11 +16,20 @@ import { DEFAULT_TOOLCHAIN, SUPPORTED_TOOLCHAINS } from './toolchain.js'
 import { CODE_ROUTER, DEFAULT_FRAMEWORK, FILE_ROUTER } from './constants.js'
 import { finalizeAddOns, getAllAddOns, loadRemoteAddOn } from './add-ons.js'
 
-import type { AddOn, CliOptions, Options, Overlay, Variable } from './types.js'
+import type {
+  AddOn,
+  CliOptions,
+  Mode,
+  Options,
+  Overlay,
+  TemplateOptions,
+  Variable,
+} from './types.js'
 
 // If all CLI options are provided, use them directly
 export async function normalizeOptions(
   cliOptions: CliOptions,
+  forcedMode?: Mode,
   forcedAddOns?: Array<string>,
 ): Promise<Options | undefined> {
   // in some cases, if you use windows/powershell, the argument for addons
@@ -80,7 +89,9 @@ export async function normalizeOptions(
       }
       chosenAddOns = await finalizeAddOns(
         cliOptions.framework || DEFAULT_FRAMEWORK,
-        cliOptions.template === 'file-router' ? FILE_ROUTER : CODE_ROUTER,
+        forcedMode || cliOptions.template === 'file-router'
+          ? FILE_ROUTER
+          : CODE_ROUTER,
         finalAddOns,
       )
       tailwind = true
@@ -154,7 +165,7 @@ export async function promptForOptions(
     forcedMode,
   }: {
     forcedAddOns?: Array<string>
-    forcedMode?: 'typescript' | 'javascript' | 'file-router'
+    forcedMode?: TemplateOptions
   },
 ): Promise<Required<Options>> {
   const options = {} as Required<Options>

packages/cta-engine/src/types.ts

@@ -6,14 +6,16 @@ export type Framework = 'solid' | 'react'
 
 export type TemplateOptions = 'typescript' | 'javascript' | 'file-router'
 
+export type Mode = typeof CODE_ROUTER | typeof FILE_ROUTER
+
 export interface Options {
   framework: Framework
   projectName: string
   typescript: boolean
   tailwind: boolean
   packageManager: PackageManager
   toolchain: ToolChain
-  mode: typeof CODE_ROUTER | typeof FILE_ROUTER
+  mode: Mode
   addOns: boolean
   chosenAddOns: Array<AddOn>
   git: boolean
@@ -114,7 +116,7 @@ export type Overlay = AddOn & {
   author: string
   link: string
   license: string
-  mode: typeof CODE_ROUTER | typeof FILE_ROUTER
+  mode: Mode
   framework: Framework
   typescript: boolean
   tailwind: boolean