chore: more config file fixes

Author: jherr

packages/cta-cli/src/cli.ts

@@ -22,7 +22,7 @@ import { launchUI } from '@tanstack/cta-ui'
 
 import { runMCPServer } from './mcp.js'
 
-import { promptForOptions } from './options.js'
+import { promptForCreateOptions, promptForAddOns } from './options.js'
 import { normalizeOptions } from './command-line.js'
 
 import { createUIEnvironment } from './ui-environment.js'
@@ -113,6 +113,13 @@ export function cli({
           forcedRouterMode: forcedMode,
           forcedAddOns,
         })
+      } else if (parsedAddOns.length < 1) {
+        const addOns = await promptForAddOns()
+        if (addOns.length) {
+          await addToApp(environment, addOns, process.cwd(), {
+            forced: program.opts().forced,
+          })
+        }
       } else {
         await addToApp(environment, parsedAddOns, process.cwd(), {
           forced: program.opts().forced,
@@ -303,7 +310,7 @@ export function cli({
           intro(`Creating a new ${appName} app in ${projectName}...`)
         } else {
           intro(`Let's configure your ${appName} application`)
-          finalOptions = await promptForOptions(cliOptions, {
+          finalOptions = await promptForCreateOptions(cliOptions, {
             forcedMode,
             forcedAddOns,
           })

packages/cta-cli/src/options.ts

@@ -4,6 +4,7 @@ import {
   finalizeAddOns,
   getFrameworkById,
   getPackageManager,
+  readConfigFile,
 } from '@tanstack/cta-engine'
 
 import {
@@ -20,8 +21,9 @@ import {
 import type { Mode, Options } from '@tanstack/cta-engine'
 
 import type { CliOptions } from './types.js'
+import { intro } from '@clack/prompts'
 
-export async function promptForOptions(
+export async function promptForCreateOptions(
   cliOptions: CliOptions,
   {
     forcedAddOns = [],
@@ -126,3 +128,45 @@ export async function promptForOptions(
 
   return options
 }
+
+export async function promptForAddOns(): Promise<Array<string>> {
+  const config = await readConfigFile(process.cwd())
+
+  if (!config) {
+    console.error('No config file found')
+    process.exit(1)
+  }
+
+  const framework = getFrameworkById(config.framework)
+
+  if (!framework) {
+    console.error(`Unknown framework: ${config.framework}`)
+    process.exit(1)
+  }
+
+  intro(`Adding new add-ons to '${config.projectName}'`)
+
+  const addOns: Set<string> = new Set()
+
+  for (const addOn of await selectAddOns(
+    framework,
+    config.mode!,
+    'add-on',
+    'What add-ons would you like for your project?',
+    config.chosenAddOns,
+  )) {
+    addOns.add(addOn)
+  }
+
+  for (const addOn of await selectAddOns(
+    framework,
+    config.mode!,
+    'example',
+    'Would you like any examples?',
+    config.chosenAddOns,
+  )) {
+    addOns.add(addOn)
+  }
+
+  return Array.from(addOns)
+}

packages/cta-engine/src/add-to-app.ts

@@ -17,6 +17,7 @@ import {
 } from './file-helpers.js'
 import { mergePackageJSON } from './package-json.js'
 import { runSpecialSteps } from './special-steps/index.js'
+import { loadStarter } from './custom-add-ons/starter.js'
 
 import type { Environment, Mode, Options } from './types.js'
 import type { PersistedOptions } from './config-file.js'
@@ -40,7 +41,7 @@ async function createOptions(
 ): Promise<Options> {
   const framework = getFrameworkById(json.framework)
 
-  // TODO: Load the starter
+  const starter = json.starter ? await loadStarter(json.starter) : undefined
 
   return {
     ...json,
@@ -52,6 +53,7 @@ async function createOptions(
       ...addOns,
     ]),
     targetDir,
+    starter,
   } as Options
 }
 

packages/cta-engine/src/config-file.ts

@@ -46,9 +46,24 @@ export async function readConfigFileFromEnvironment(
     const configFile = resolve(targetDir, CONFIG_FILE)
     const config = await environment.readFile(configFile)
 
-    // TODO: Look for old config files and convert them to the new format
+    const originalJSON = JSON.parse(config)
 
-    return JSON.parse(config)
+    // Look for markers out outdated config files and upgrade the format on the fly (it will be written in the updated version after we add add-ons)
+    if (originalJSON.existingAddOns) {
+      if (originalJSON.framework === 'react') {
+        originalJSON.framework = 'react-cra'
+      }
+      originalJSON.chosenAddOns = originalJSON.existingAddOns
+      delete originalJSON.existingAddOns
+      delete originalJSON.addOns
+      if (originalJSON.toolchain && originalJSON.toolchain !== 'none') {
+        originalJSON.chosenAddOns.push(originalJSON.toolchain)
+      }
+      delete originalJSON.toolchain
+      delete originalJSON.variableValues
+    }
+
+    return originalJSON
   } catch {
     return null
   }

packages/cta-engine/tests/config-file.test.ts

@@ -65,4 +65,41 @@ describe('readConfigFileFromEnvironment', () => {
     const config = await readConfigFileFromEnvironment(environment, targetDir)
     expect(config).toEqual(persistedOptions)
   })
+
+  it('should upgrade old config files', async () => {
+    const targetDir = 'test-dir'
+    const persistedOptions = {
+      framework: 'react',
+      projectName: 'foo',
+      typescript: false,
+      tailwind: false,
+      packageManager: 'pnpm',
+      toolchain: 'none',
+      mode: 'code-router',
+      git: true,
+      variableValues: {},
+      version: 1,
+      existingAddOns: [],
+    }
+    const { output, environment } = createMemoryEnvironment()
+    environment.writeFile(
+      resolve(targetDir, CONFIG_FILE),
+      JSON.stringify(persistedOptions, null, 2),
+    )
+    const config = await readConfigFileFromEnvironment(environment, targetDir)
+
+    environment.finishRun()
+
+    expect(config).toEqual({
+      framework: 'react-cra',
+      projectName: 'foo',
+      typescript: false,
+      tailwind: false,
+      packageManager: 'pnpm',
+      chosenAddOns: [],
+      git: true,
+      mode: 'code-router',
+      version: 1,
+    })
+  })
 })