@tanstack/cta-cli 0.10.0-alpha.23 → 0.10.0-alpha.27

package/dist/cli.js

@@ -5,7 +5,7 @@ import chalk from 'chalk';
 import { SUPPORTED_PACKAGE_MANAGERS, addToApp, compileAddOn, compileStarter, createApp, createSerializedOptions, getAllAddOns, getFrameworkById, getFrameworkByName, getFrameworks, initAddOn, initStarter, } from '@tanstack/cta-engine';
 import { launchUI } from '@tanstack/cta-ui';
 import { runMCPServer } from './mcp.js';
-import { promptForOptions } from './options.js';
+import { promptForAddOns, promptForCreateOptions } from './options.js';
 import { normalizeOptions } from './command-line.js';
 import { createUIEnvironment } from './ui-environment.js';
 import { convertTemplateToMode } from './utils.js';
@@ -48,10 +48,20 @@ export function cli({ name, appName, forcedMode, forcedAddOns = [], defaultTempl
             launchUI({
                 mode: 'add',
                 addOns: parsedAddOns,
-                forcedMode,
+                projectPath: process.cwd(),
+                forcedRouterMode: forcedMode,
                 forcedAddOns,
+                environmentFactory: () => createUIEnvironment(appName, false),
             });
         }
+        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,
@@ -163,22 +173,17 @@ export function cli({ name, appName, forcedMode, forcedAddOns = [], defaultTempl
                     finalOptions = await normalizeOptions(cliOptions, forcedMode, forcedAddOns);
                 }
                 if (options.ui) {
-                    const defaultOptions = {
-                        framework: getFrameworkById(cliOptions.framework || 'react-cra'),
-                        mode: 'file-router',
-                        chosenAddOns: [],
-                        packageManager: 'pnpm',
-                        projectName: projectName || 'my-app',
-                        targetDir: resolve(process.cwd(), projectName || 'my-app'),
-                        typescript: true,
-                        tailwind: true,
-                        git: true,
-                    };
+                    const optionsFromCLI = await normalizeOptions(cliOptions, forcedMode, forcedAddOns, { disableNameCheck: true });
                     launchUI({
                         mode: 'setup',
-                        options: createSerializedOptions(finalOptions || defaultOptions),
-                        forcedMode,
+                        options: {
+                            ...createSerializedOptions(optionsFromCLI),
+                            projectName: 'my-app',
+                            targetDir: resolve(process.cwd(), 'my-app'),
+                        },
+                        forcedRouterMode: forcedMode,
                         forcedAddOns,
+                        environmentFactory: () => createUIEnvironment(appName, false),
                     });
                     return;
                 }
@@ -187,7 +192,7 @@ export function cli({ name, appName, forcedMode, forcedAddOns = [], defaultTempl
                 }
                 else {
                     intro(`Let's configure your ${appName} application`);
-                    finalOptions = await promptForOptions(cliOptions, {
+                    finalOptions = await promptForCreateOptions(cliOptions, {
                         forcedMode,
                         forcedAddOns,
                     });

package/dist/command-line.js

@@ -1,8 +1,8 @@
 import { resolve } from 'node:path';
 import { CODE_ROUTER, DEFAULT_PACKAGE_MANAGER, FILE_ROUTER, finalizeAddOns, getFrameworkById, getPackageManager, loadStarter, } from '@tanstack/cta-engine';
-export async function normalizeOptions(cliOptions, forcedMode, forcedAddOns) {
+export async function normalizeOptions(cliOptions, forcedMode, forcedAddOns, opts) {
     const projectName = (cliOptions.projectName ?? '').trim();
-    if (!projectName) {
+    if (!projectName && !opts?.disableNameCheck) {
         return undefined;
     }
     let typescript = cliOptions.template === 'typescript' ||

package/dist/options.js

@@ -1,6 +1,7 @@
-import { CODE_ROUTER, FILE_ROUTER, finalizeAddOns, getFrameworkById, getPackageManager, } from '@tanstack/cta-engine';
+import { CODE_ROUTER, FILE_ROUTER, finalizeAddOns, getFrameworkById, getPackageManager, readConfigFile, } from '@tanstack/cta-engine';
 import { getProjectName, selectAddOns, selectGit, selectPackageManager, selectRouterType, selectTailwind, selectToolchain, selectTypescript, } from './ui-prompts.js';
-export async function promptForOptions(cliOptions, { forcedAddOns = [], forcedMode, }) {
+import { intro } from '@clack/prompts';
+export async function promptForCreateOptions(cliOptions, { forcedAddOns = [], forcedMode, }) {
     const options = {};
     options.framework = getFrameworkById(cliOptions.framework || 'react-cra');
     options.projectName = cliOptions.projectName || (await getProjectName());
@@ -68,3 +69,24 @@ export async function promptForOptions(cliOptions, { forcedAddOns = [], forcedMo
     options.git = cliOptions.git || (await selectGit());
     return options;
 }
+export async function promptForAddOns() {
+    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 = 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);
+}

package/dist/types/command-line.d.ts

@@ -1,3 +1,5 @@
 import type { Mode, Options } from '@tanstack/cta-engine';
 import type { CliOptions } from './types.js';
-export declare function normalizeOptions(cliOptions: CliOptions, forcedMode?: Mode, forcedAddOns?: Array<string>): Promise<Options | undefined>;
+export declare function normalizeOptions(cliOptions: CliOptions, forcedMode?: Mode, forcedAddOns?: Array<string>, opts?: {
+    disableNameCheck?: boolean;
+}): Promise<Options | undefined>;

package/dist/types/options.d.ts

@@ -1,6 +1,7 @@
 import type { Mode, Options } from '@tanstack/cta-engine';
 import type { CliOptions } from './types.js';
-export declare function promptForOptions(cliOptions: CliOptions, { forcedAddOns, forcedMode, }: {
+export declare function promptForCreateOptions(cliOptions: CliOptions, { forcedAddOns, forcedMode, }: {
     forcedAddOns?: Array<string>;
     forcedMode?: Mode;
 }): Promise<Required<Options> | undefined>;
+export declare function promptForAddOns(): Promise<Array<string>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/cta-cli",
-  "version": "0.10.0-alpha.23",
+  "version": "0.10.0-alpha.27",
   "description": "Tanstack Application Builder CLI",
   "type": "module",
   "main": "./dist/index.js",
@@ -29,8 +29,8 @@
     "commander": "^13.1.0",
     "express": "^4.21.2",
     "zod": "^3.24.2",
-    "@tanstack/cta-ui": "0.10.0-alpha.23",
-    "@tanstack/cta-engine": "0.10.0-alpha.21"
+    "@tanstack/cta-engine": "0.10.0-alpha.27",
+    "@tanstack/cta-ui": "0.10.0-alpha.27"
   },
   "devDependencies": {
     "@tanstack/config": "^0.16.2",

package/src/cli.ts

@@ -22,7 +22,7 @@ import { launchUI } from '@tanstack/cta-ui'
 
 import { runMCPServer } from './mcp.js'
 
-import { promptForOptions } from './options.js'
+import { promptForAddOns, promptForCreateOptions } from './options.js'
 import { normalizeOptions } from './command-line.js'
 
 import { createUIEnvironment } from './ui-environment.js'
@@ -109,9 +109,18 @@ export function cli({
         launchUI({
           mode: 'add',
           addOns: parsedAddOns,
-          forcedMode,
+          projectPath: process.cwd(),
+          forcedRouterMode: forcedMode,
           forcedAddOns,
+          environmentFactory: () => createUIEnvironment(appName, false),
         })
+      } 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,
@@ -278,22 +287,22 @@ export function cli({
         }
 
         if (options.ui) {
-          const defaultOptions: Options = {
-            framework: getFrameworkById(cliOptions.framework || 'react-cra')!,
-            mode: 'file-router',
-            chosenAddOns: [],
-            packageManager: 'pnpm',
-            projectName: projectName || 'my-app',
-            targetDir: resolve(process.cwd(), projectName || 'my-app'),
-            typescript: true,
-            tailwind: true,
-            git: true,
-          }
+          const optionsFromCLI = await normalizeOptions(
+            cliOptions,
+            forcedMode,
+            forcedAddOns,
+            { disableNameCheck: true },
+          )
           launchUI({
             mode: 'setup',
-            options: createSerializedOptions(finalOptions || defaultOptions),
-            forcedMode,
+            options: {
+              ...createSerializedOptions(optionsFromCLI!),
+              projectName: 'my-app',
+              targetDir: resolve(process.cwd(), 'my-app'),
+            },
+            forcedRouterMode: forcedMode,
             forcedAddOns,
+            environmentFactory: () => createUIEnvironment(appName, false),
           })
           return
         }
@@ -302,7 +311,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,
           })

package/src/command-line.ts

@@ -18,9 +18,12 @@ export async function normalizeOptions(
   cliOptions: CliOptions,
   forcedMode?: Mode,
   forcedAddOns?: Array<string>,
+  opts?: {
+    disableNameCheck?: boolean
+  },
 ): Promise<Options | undefined> {
   const projectName = (cliOptions.projectName ?? '').trim()
-  if (!projectName) {
+  if (!projectName && !opts?.disableNameCheck) {
     return undefined
   }
 

package/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)
+}

package/tests/options.test.ts

@@ -1,6 +1,6 @@
 import { beforeEach, describe, it, expect, vi } from 'vitest'
 
-import { promptForOptions } from '../src/options'
+import { promptForCreateOptions } from '../src/options'
 import {
   __testClearFrameworks,
   __testRegisterFramework,
@@ -67,13 +67,13 @@ function setBasicSpies() {
   vi.spyOn(prompts, 'selectAddOns').mockImplementation(async () => [])
 }
 
-describe('promptForOptions', () => {
+describe('promptForCreateOptions', () => {
   //// Project name
 
   it('prompt for a project name', async () => {
     setBasicSpies()
 
-    const options = await promptForOptions(baseCliOptions, {})
+    const options = await promptForCreateOptions(baseCliOptions, {})
 
     expect(options?.projectName).toBe('hello')
   })
@@ -81,7 +81,7 @@ describe('promptForOptions', () => {
   it('accept incoming project name', async () => {
     setBasicSpies()
 
-    const options = await promptForOptions(
+    const options = await promptForCreateOptions(
       { ...baseCliOptions, projectName: 'override' },
       {},
     )
@@ -94,7 +94,7 @@ describe('promptForOptions', () => {
   it('forceMode should override template', async () => {
     setBasicSpies()
 
-    const options = await promptForOptions(
+    const options = await promptForCreateOptions(
       { ...baseCliOptions, template: 'javascript' },
       { forcedMode: 'file-router' },
     )
@@ -110,7 +110,7 @@ describe('promptForOptions', () => {
       async () => 'code-router',
     )
 
-    const options = await promptForOptions(
+    const options = await promptForCreateOptions(
       { ...baseCliOptions, template: 'javascript' },
       {},
     )
@@ -125,7 +125,7 @@ describe('promptForOptions', () => {
       async () => 'code-router',
     )
 
-    const options = await promptForOptions(
+    const options = await promptForCreateOptions(
       { ...baseCliOptions, template: 'file-router' },
       {},
     )
@@ -140,7 +140,7 @@ describe('promptForOptions', () => {
       async () => 'code-router',
     )
 
-    const options = await promptForOptions(
+    const options = await promptForCreateOptions(
       { ...baseCliOptions, tailwind: false, framework: undefined },
       {},
     )
@@ -153,7 +153,7 @@ describe('promptForOptions', () => {
   it('prompt for tailwind when unspecified in react-cra', async () => {
     setBasicSpies()
     vi.spyOn(prompts, 'selectTailwind').mockImplementation(async () => false)
-    const options = await promptForOptions(
+    const options = await promptForCreateOptions(
       { ...baseCliOptions, tailwind: undefined },
       {},
     )
@@ -164,7 +164,7 @@ describe('promptForOptions', () => {
   it('prompt for tailwind when unspecified in react-cra - true', async () => {
     setBasicSpies()
     vi.spyOn(prompts, 'selectTailwind').mockImplementation(async () => true)
-    const options = await promptForOptions(
+    const options = await promptForCreateOptions(
       { ...baseCliOptions, tailwind: undefined },
       {},
     )
@@ -174,7 +174,7 @@ describe('promptForOptions', () => {
 
   it('set tailwind when solid', async () => {
     setBasicSpies()
-    const options = await promptForOptions(
+    const options = await promptForCreateOptions(
       { ...baseCliOptions, tailwind: undefined, framework: 'solid' },
       {},
     )
@@ -187,7 +187,7 @@ describe('promptForOptions', () => {
   it('uses the package manager from the cli options', async () => {
     setBasicSpies()
 
-    const options = await promptForOptions(
+    const options = await promptForCreateOptions(
       { ...baseCliOptions, packageManager: 'bun' },
       {},
     )
@@ -200,7 +200,7 @@ describe('promptForOptions', () => {
 
     process.env.npm_config_userconfig = 'blarg'
 
-    const options = await promptForOptions(
+    const options = await promptForCreateOptions(
       { ...baseCliOptions, packageManager: undefined },
       {},
     )
@@ -212,7 +212,7 @@ describe('promptForOptions', () => {
   it('should be clean when no add-ons are selected', async () => {
     setBasicSpies()
 
-    const options = await promptForOptions({ ...baseCliOptions }, {})
+    const options = await promptForCreateOptions({ ...baseCliOptions }, {})
 
     expect(options?.chosenAddOns).toEqual([])
   })
@@ -222,7 +222,7 @@ describe('promptForOptions', () => {
 
     vi.spyOn(prompts, 'selectToolchain').mockImplementation(async () => 'biome')
 
-    const options = await promptForOptions(
+    const options = await promptForCreateOptions(
       { ...baseCliOptions, toolchain: 'biome' },
       {},
     )
@@ -237,7 +237,7 @@ describe('promptForOptions', () => {
       async () => undefined,
     )
 
-    const options = await promptForOptions(
+    const options = await promptForCreateOptions(
       { ...baseCliOptions },
       { forcedAddOns: ['react-query'] },
     )
@@ -252,7 +252,7 @@ describe('promptForOptions', () => {
   it('should handle add-ons from the CLI', async () => {
     setBasicSpies()
 
-    const options = await promptForOptions(
+    const options = await promptForCreateOptions(
       { ...baseCliOptions, addOns: ['biome', 'react-query'] },
       {},
     )
@@ -272,7 +272,7 @@ describe('promptForOptions', () => {
       Promise.resolve(['biome', 'react-query']),
     )
 
-    const options = await promptForOptions(
+    const options = await promptForCreateOptions(
       { ...baseCliOptions, addOns: undefined },
       {},
     )