@tanstack/cta-engine 0.10.0-alpha.6 → 0.10.0-alpha.9

package/dist/add.js

@@ -21,10 +21,7 @@ async function createOptions(json, addOns) {
     return {
         ...json,
         tailwind: true,
-        chosenAddOns: await finalizeAddOns(json.framework, json.mode, [
-            ...json.existingAddOns,
-            ...addOns,
-        ]),
+        chosenAddOns: await finalizeAddOns(json.framework, json.mode, [...json.existingAddOns, ...addOns]),
     };
 }
 async function runCreateApp(options) {
@@ -33,6 +30,7 @@ async function runCreateApp(options) {
         silent: true,
         environment,
         cwd: process.cwd(),
+        name: 'create-tsrouter-app',
     });
     return output;
 }

package/dist/cli.js

@@ -9,7 +9,7 @@ import { listAddOns } from './add-ons.js';
 import { DEFAULT_FRAMEWORK, SUPPORTED_FRAMEWORKS } from './constants.js';
 // import { initAddOn } from './custom-add-on.js'
 import { createDefaultEnvironment } from './environment.js';
-export function cli() {
+export function cli({ name, forcedMode, forcedAddOns, }) {
     const program = new Command();
     program
         .name('create-tsrouter-app')
@@ -32,7 +32,7 @@ export function cli() {
     //   .action(async () => {
     //     await initAddOn('overlay')
     //   })
-    program // 104 22
+    program
         .argument('[project-name]', 'name of the project')
         .option('--no-git', 'do not create a git repository')
         .option('--target-dir <path>', 'the directory to create the project in')
@@ -42,14 +42,6 @@ export function cli() {
         }
         return value;
     }, DEFAULT_FRAMEWORK)
-        .option('--template <type>', 'project template (typescript, javascript, file-router)', (value) => {
-        if (value !== 'typescript' &&
-            value !== 'javascript' &&
-            value !== 'file-router') {
-            throw new InvalidArgumentError(`Invalid template: ${value}. Only the following are allowed: typescript, javascript, file-router`);
-        }
-        return value;
-    })
         .option(`--package-manager <${SUPPORTED_PACKAGE_MANAGERS.join('|')}>`, `Explicitly tell the CLI to use this package manager`, (value) => {
         if (!SUPPORTED_PACKAGE_MANAGERS.includes(value)) {
             throw new InvalidArgumentError(`Invalid package manager: ${value}. The following are allowed: ${SUPPORTED_PACKAGE_MANAGERS.join(', ')}`);
@@ -71,10 +63,20 @@ export function cli() {
         return addOns;
     })
         .option('--list-add-ons', 'list all available add-ons', false)
-        .option('--overlay [url]', 'add an overlay from a URL', false)
+        // .option('--overlay [url]', 'add an overlay from a URL', false)
         .option('--mcp', 'run the MCP server', false)
-        .option('--mcp-sse', 'run the MCP server in SSE mode', false)
-        .action(async (projectName, options) => {
+        .option('--mcp-sse', 'run the MCP server in SSE mode', false);
+    if (!forcedMode) {
+        program.option('--template <type>', 'project template (typescript, javascript, file-router)', (value) => {
+            if (value !== 'typescript' &&
+                value !== 'javascript' &&
+                value !== 'file-router') {
+                throw new InvalidArgumentError(`Invalid template: ${value}. Only the following are allowed: typescript, javascript, file-router`);
+            }
+            return value;
+        });
+    }
+    program.action(async (projectName, options) => {
         if (options.listAddOns) {
             await listAddOns(options);
         }
@@ -87,23 +89,28 @@ export function cli() {
                     projectName,
                     ...options,
                 };
-                let finalOptions = await normalizeOptions(cliOptions);
+                if (forcedMode) {
+                    cliOptions.template = forcedMode;
+                }
+                let finalOptions = await normalizeOptions(cliOptions, forcedAddOns);
                 if (finalOptions) {
                     intro(`Creating a new TanStack app in ${projectName}...`);
                 }
                 else {
                     intro("Let's configure your TanStack application");
-                    finalOptions = await promptForOptions(cliOptions);
+                    finalOptions = await promptForOptions(cliOptions, {
+                        forcedMode,
+                        forcedAddOns,
+                    });
                 }
                 await createApp(finalOptions, {
                     environment: createDefaultEnvironment(),
                     cwd: options.targetDir || undefined,
+                    name,
                 });
             }
             catch (error) {
-                log.error(error instanceof Error
-                    ? error.message
-                    : 'An unknown error occurred');
+                log.error(error instanceof Error ? error.message : 'An unknown error occurred');
                 process.exit(1);
             }
         }

package/dist/create-app.js

@@ -209,7 +209,7 @@ async function copyAddOnFile(environment, content, target, targetPath, templateF
         }
     }
 }
-export async function createApp(options, { silent = false, environment, cwd, }) {
+export async function createApp(options, { silent = false, environment, cwd, name = 'create-tsrouter-app', }) {
     environment.startRun();
     const templateDirBase = resolve(getTemplatesRoot(), options.framework, 'base');
     const templateDirRouter = resolve(getTemplatesRoot(), options.framework, options.mode);

package/dist/custom-add-on.js

@@ -78,9 +78,7 @@ export default (parentRoute: RootRoute) => createRoute({
 async function createOptions(json) {
     return {
         ...json,
-        chosenAddOns: await finalizeAddOns(json.framework, json.mode, [
-            ...json.existingAddOns,
-        ]),
+        chosenAddOns: await finalizeAddOns(json.framework, json.mode, [...json.existingAddOns]),
     };
 }
 async function runCreateApp(options) {
@@ -89,6 +87,7 @@ async function runCreateApp(options) {
         silent: true,
         environment,
         cwd: process.cwd(),
+        name: 'create-tsrouter-app',
     });
     return output;
 }

package/dist/mcp.js

@@ -95,6 +95,7 @@ server.tool('createTanStackReactApplication', {
         }, {
             silent: true,
             environment: createDefaultEnvironment(),
+            name: 'create-tsrouter-app',
         });
         return {
             content: [{ type: 'text', text: 'Application created successfully' }],
@@ -173,6 +174,7 @@ server.tool('createTanStackSolidApplication', {
         }, {
             silent: true,
             environment: createDefaultEnvironment(),
+            name: 'create-tsrouter-app',
         });
         return {
             content: [{ type: 'text', text: 'Application created successfully' }],

package/dist/options.js

@@ -4,7 +4,7 @@ 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';
 // If all CLI options are provided, use them directly
-export async function normalizeOptions(cliOptions) {
+export async function normalizeOptions(cliOptions, forcedAddOns) {
     // in some cases, if you use windows/powershell, the argument for addons
     // if sepparated by comma is not really passed as an array, but as a string
     // with spaces, We need to normalize this edge case.
@@ -13,6 +13,9 @@ export async function normalizeOptions(cliOptions) {
         if (parseSeparatedArgs.length > 1) {
             cliOptions.addOns = parseSeparatedArgs;
         }
+        if (forcedAddOns) {
+            cliOptions.addOns = [...cliOptions.addOns, ...forcedAddOns];
+        }
     }
     if (cliOptions.projectName) {
         let typescript = cliOptions.template === 'typescript' ||
@@ -101,7 +104,7 @@ async function collectVariables(variables) {
     }
     return responses;
 }
-export async function promptForOptions(cliOptions) {
+export async function promptForOptions(cliOptions, { forcedAddOns = [], forcedMode, }) {
     const options = {};
     options.framework = cliOptions.framework || DEFAULT_FRAMEWORK;
     if (options.framework === 'solid') {
@@ -128,7 +131,7 @@ export async function promptForOptions(cliOptions) {
         options.projectName = value;
     }
     // Router type selection
-    if (!cliOptions.template) {
+    if (!cliOptions.template && !forcedMode) {
         const routerType = await select({
             message: 'Select the router type:',
             options: [
@@ -149,6 +152,10 @@ export async function promptForOptions(cliOptions) {
         }
         options.mode = routerType;
     }
+    else if (forcedMode) {
+        options.mode = forcedMode === 'file-router' ? FILE_ROUTER : CODE_ROUTER;
+        options.typescript = options.mode === FILE_ROUTER;
+    }
     else {
         options.mode =
             cliOptions.template === 'file-router' ? FILE_ROUTER : CODE_ROUTER;
@@ -234,7 +241,7 @@ export async function promptForOptions(cliOptions) {
     }
     options.chosenAddOns = [];
     if (Array.isArray(cliOptions.addOns)) {
-        options.chosenAddOns = await finalizeAddOns(options.framework, options.mode, cliOptions.addOns);
+        options.chosenAddOns = await finalizeAddOns(options.framework, options.mode, Array.from(new Set([...cliOptions.addOns, ...forcedAddOns])));
         options.tailwind = true;
     }
     else if (cliOptions.addOns) {
@@ -245,7 +252,9 @@ export async function promptForOptions(cliOptions) {
         if (options.typescript && addOns.length > 0) {
             const value = await multiselect({
                 message: 'What add-ons would you like for your project:',
-                options: addOns.map((addOn) => ({
+                options: addOns
+                    .filter((addOn) => !forcedAddOns.includes(addOn.id))
+                    .map((addOn) => ({
                     value: addOn.id,
                     label: addOn.name,
                     hint: addOn.description,
@@ -264,7 +273,9 @@ export async function promptForOptions(cliOptions) {
         if (options.typescript && examples.length > 0) {
             const value = await multiselect({
                 message: 'Would you like any examples?',
-                options: examples.map((addOn) => ({
+                options: examples
+                    .filter((addOn) => !forcedAddOns.includes(addOn.id))
+                    .map((addOn) => ({
                     value: addOn.id,
                     label: addOn.name,
                     hint: addOn.description,
@@ -277,11 +288,16 @@ export async function promptForOptions(cliOptions) {
             }
             selectedExamples = value;
         }
-        if (selectedAddOns.length > 0 || selectedExamples.length > 0) {
-            options.chosenAddOns = await finalizeAddOns(options.framework, options.mode, [...selectedAddOns, ...selectedExamples]);
+        if (selectedAddOns.length > 0 ||
+            selectedExamples.length > 0 ||
+            forcedAddOns.length > 0) {
+            options.chosenAddOns = await finalizeAddOns(options.framework, options.mode, Array.from(new Set([...selectedAddOns, ...selectedExamples, ...forcedAddOns])));
             options.tailwind = true;
         }
     }
+    else if (forcedAddOns.length > 0) {
+        options.chosenAddOns = await finalizeAddOns(options.framework, options.mode, forcedAddOns);
+    }
     // Collect variables
     const variables = [];
     for (const addOn of options.chosenAddOns) {

package/dist/types/cli.d.ts

@@ -1 +1,5 @@
-export declare function cli(): void;
+export declare function cli({ name, forcedMode, forcedAddOns, }: {
+    name: string;
+    forcedMode?: 'typescript' | 'javascript' | 'file-router';
+    forcedAddOns?: Array<string>;
+}): void;

package/dist/types/create-app.d.ts

@@ -1,6 +1,7 @@
 import type { Environment, Options } from './types.js';
-export declare function createApp(options: Options, { silent, environment, cwd, }: {
+export declare function createApp(options: Options, { silent, environment, cwd, name, }: {
     silent?: boolean;
     environment: Environment;
     cwd?: string;
+    name: string;
 }): Promise<void>;

package/dist/types/options.d.ts

@@ -1,3 +1,6 @@
 import type { CliOptions, Options } from './types.js';
-export declare function normalizeOptions(cliOptions: CliOptions): Promise<Options | undefined>;
-export declare function promptForOptions(cliOptions: CliOptions): Promise<Required<Options>>;
+export declare function normalizeOptions(cliOptions: CliOptions, forcedAddOns?: Array<string>): Promise<Options | undefined>;
+export declare function promptForOptions(cliOptions: CliOptions, { forcedAddOns, forcedMode, }: {
+    forcedAddOns?: Array<string>;
+    forcedMode?: 'typescript' | 'javascript' | 'file-router';
+}): Promise<Required<Options>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/cta-engine",
-  "version": "0.10.0-alpha.6",
+  "version": "0.10.0-alpha.9",
   "description": "Tanstack Application Builder Engine",
   "type": "module",
   "main": "./dist/index.js",

package/src/add.ts

@@ -25,7 +25,7 @@ import { readConfigFile, writeConfigFile } from './config-file.js'
 
 import type { PersistedOptions } from './config-file.js'
 
-import type { Options } from './types.js'
+import type { Framework, Options } from './types.js'
 
 function isDirectory(path: string) {
   return statSync(path).isDirectory()
@@ -43,10 +43,11 @@ async function createOptions(
   return {
     ...json,
     tailwind: true,
-    chosenAddOns: await finalizeAddOns(json.framework!, json.mode!, [
-      ...json.existingAddOns,
-      ...addOns,
-    ]),
+    chosenAddOns: await finalizeAddOns(
+      json.framework as Framework,
+      json.mode as string,
+      [...json.existingAddOns, ...addOns],
+    ),
   } as Required<Options>
 }
 
@@ -56,6 +57,7 @@ async function runCreateApp(options: Required<Options>) {
     silent: true,
     environment,
     cwd: process.cwd(),
+    name: 'create-tsrouter-app',
   })
   return output
 }

package/src/cli.ts

@@ -18,7 +18,15 @@ import type { PackageManager } from './package-manager.js'
 import type { ToolChain } from './toolchain.js'
 import type { CliOptions, Framework } from './types.js'
 
-export function cli() {
+export function cli({
+  name,
+  forcedMode,
+  forcedAddOns,
+}: {
+  name: string
+  forcedMode?: 'typescript' | 'javascript' | 'file-router'
+  forcedAddOns?: Array<string>
+}) {
   const program = new Command()
 
   program
@@ -46,7 +54,7 @@ export function cli() {
   //     await initAddOn('overlay')
   //   })
 
-  program // 104 22
+  program
     .argument('[project-name]', 'name of the project')
     .option('--no-git', 'do not create a git repository')
     .option('--target-dir <path>', 'the directory to create the project in')
@@ -65,22 +73,6 @@ export function cli() {
       },
       DEFAULT_FRAMEWORK,
     )
-    .option<'typescript' | 'javascript' | 'file-router'>(
-      '--template <type>',
-      'project template (typescript, javascript, file-router)',
-      (value) => {
-        if (
-          value !== 'typescript' &&
-          value !== 'javascript' &&
-          value !== 'file-router'
-        ) {
-          throw new InvalidArgumentError(
-            `Invalid template: ${value}. Only the following are allowed: typescript, javascript, file-router`,
-          )
-        }
-        return value
-      },
-    )
     .option<PackageManager>(
       `--package-manager <${SUPPORTED_PACKAGE_MANAGERS.join('|')}>`,
       `Explicitly tell the CLI to use this package manager`,
@@ -122,42 +114,68 @@ export function cli() {
       },
     )
     .option('--list-add-ons', 'list all available add-ons', false)
-    .option('--overlay [url]', 'add an overlay from a URL', false)
+    // .option('--overlay [url]', 'add an overlay from a URL', false)
     .option('--mcp', 'run the MCP server', false)
     .option('--mcp-sse', 'run the MCP server in SSE mode', false)
-    .action(async (projectName: string, options: CliOptions) => {
-      if (options.listAddOns) {
-        await listAddOns(options)
-      } else if (options.mcp || options.mcpSse) {
-        await runServer(!!options.mcpSse)
-      } else {
-        try {
-          const cliOptions = {
-            projectName,
-            ...options,
-          } as CliOptions
 
-          let finalOptions = await normalizeOptions(cliOptions)
-          if (finalOptions) {
-            intro(`Creating a new TanStack app in ${projectName}...`)
-          } else {
-            intro("Let's configure your TanStack application")
-            finalOptions = await promptForOptions(cliOptions)
-          }
-          await createApp(finalOptions, {
-            environment: createDefaultEnvironment(),
-            cwd: options.targetDir || undefined,
-          })
-        } catch (error) {
-          log.error(
-            error instanceof Error
-              ? error.message
-              : 'An unknown error occurred',
+  if (!forcedMode) {
+    program.option<'typescript' | 'javascript' | 'file-router'>(
+      '--template <type>',
+      'project template (typescript, javascript, file-router)',
+      (value) => {
+        if (
+          value !== 'typescript' &&
+          value !== 'javascript' &&
+          value !== 'file-router'
+        ) {
+          throw new InvalidArgumentError(
+            `Invalid template: ${value}. Only the following are allowed: typescript, javascript, file-router`,
           )
-          process.exit(1)
         }
+        return value
+      },
+    )
+  }
+
+  program.action(async (projectName: string, options: CliOptions) => {
+    if (options.listAddOns) {
+      await listAddOns(options)
+    } else if (options.mcp || options.mcpSse) {
+      await runServer(!!options.mcpSse)
+    } else {
+      try {
+        const cliOptions = {
+          projectName,
+          ...options,
+        } as CliOptions
+
+        if (forcedMode) {
+          cliOptions.template = forcedMode
+        }
+
+        let finalOptions = await normalizeOptions(cliOptions, forcedAddOns)
+        if (finalOptions) {
+          intro(`Creating a new TanStack app in ${projectName}...`)
+        } else {
+          intro("Let's configure your TanStack application")
+          finalOptions = await promptForOptions(cliOptions, {
+            forcedMode,
+            forcedAddOns,
+          })
+        }
+        await createApp(finalOptions, {
+          environment: createDefaultEnvironment(),
+          cwd: options.targetDir || undefined,
+          name,
+        })
+      } catch (error) {
+        log.error(
+          error instanceof Error ? error.message : 'An unknown error occurred',
+        )
+        process.exit(1)
       }
-    })
+    }
+  })
 
   program.parse()
 }

package/src/create-app.ts

@@ -304,10 +304,12 @@ export async function createApp(
     silent = false,
     environment,
     cwd,
+    name = 'create-tsrouter-app',
   }: {
     silent?: boolean
     environment: Environment
     cwd?: string
+    name: string
   },
 ) {
   environment.startRun()

package/src/custom-add-on.ts

@@ -8,7 +8,7 @@ import { createApp } from './create-app.js'
 import { readConfigFile } from './config-file.js'
 import { finalizeAddOns } from './add-ons.js'
 
-import type { Options } from './types.js'
+import type { Framework, Options } from './types.js'
 import type { PersistedOptions } from './config-file.js'
 
 type AddOnMode = 'add-on' | 'overlay'
@@ -106,9 +106,11 @@ async function createOptions(
 ): Promise<Required<Options>> {
   return {
     ...json,
-    chosenAddOns: await finalizeAddOns(json.framework!, json.mode!, [
-      ...json.existingAddOns,
-    ]),
+    chosenAddOns: await finalizeAddOns(
+      json.framework as Framework,
+      json.mode as string,
+      [...json.existingAddOns],
+    ),
   } as Required<Options>
 }
 
@@ -118,6 +120,7 @@ async function runCreateApp(options: Required<Options>) {
     silent: true,
     environment,
     cwd: process.cwd(),
+    name: 'create-tsrouter-app',
   })
   return output
 }

package/src/mcp.ts

@@ -114,6 +114,7 @@ server.tool(
         {
           silent: true,
           environment: createDefaultEnvironment(),
+          name: 'create-tsrouter-app',
         },
       )
       return {
@@ -209,6 +210,7 @@ server.tool(
         {
           silent: true,
           environment: createDefaultEnvironment(),
+          name: 'create-tsrouter-app',
         },
       )
       return {

package/src/options.ts

@@ -21,6 +21,7 @@ import type { AddOn, CliOptions, Options, Overlay, Variable } from './types.js'
 // If all CLI options are provided, use them directly
 export async function normalizeOptions(
   cliOptions: CliOptions,
+  forcedAddOns?: Array<string>,
 ): Promise<Options | undefined> {
   // in some cases, if you use windows/powershell, the argument for addons
   // if sepparated by comma is not really passed as an array, but as a string
@@ -30,6 +31,9 @@ export async function normalizeOptions(
     if (parseSeparatedArgs.length > 1) {
       cliOptions.addOns = parseSeparatedArgs
     }
+    if (forcedAddOns) {
+      cliOptions.addOns = [...cliOptions.addOns, ...forcedAddOns]
+    }
   }
   if (cliOptions.projectName) {
     let typescript =
@@ -135,6 +139,13 @@ async function collectVariables(
 
 export async function promptForOptions(
   cliOptions: CliOptions,
+  {
+    forcedAddOns = [],
+    forcedMode,
+  }: {
+    forcedAddOns?: Array<string>
+    forcedMode?: 'typescript' | 'javascript' | 'file-router'
+  },
 ): Promise<Required<Options>> {
   const options = {} as Required<Options>
 
@@ -166,7 +177,7 @@ export async function promptForOptions(
   }
 
   // Router type selection
-  if (!cliOptions.template) {
+  if (!cliOptions.template && !forcedMode) {
     const routerType = await select({
       message: 'Select the router type:',
       options: [
@@ -186,6 +197,9 @@ export async function promptForOptions(
       process.exit(0)
     }
     options.mode = routerType as typeof CODE_ROUTER | typeof FILE_ROUTER
+  } else if (forcedMode) {
+    options.mode = forcedMode === 'file-router' ? FILE_ROUTER : CODE_ROUTER
+    options.typescript = options.mode === FILE_ROUTER
   } else {
     options.mode =
       cliOptions.template === 'file-router' ? FILE_ROUTER : CODE_ROUTER
@@ -274,7 +288,7 @@ export async function promptForOptions(
     options.chosenAddOns = await finalizeAddOns(
       options.framework,
       options.mode,
-      cliOptions.addOns,
+      Array.from(new Set([...cliOptions.addOns, ...forcedAddOns])),
     )
     options.tailwind = true
   } else if (cliOptions.addOns) {
@@ -285,11 +299,13 @@ export async function promptForOptions(
     if (options.typescript && addOns.length > 0) {
       const value = await multiselect({
         message: 'What add-ons would you like for your project:',
-        options: addOns.map((addOn) => ({
-          value: addOn.id,
-          label: addOn.name,
-          hint: addOn.description,
-        })),
+        options: addOns
+          .filter((addOn) => !forcedAddOns.includes(addOn.id))
+          .map((addOn) => ({
+            value: addOn.id,
+            label: addOn.name,
+            hint: addOn.description,
+          })),
         required: false,
       })
 
@@ -306,11 +322,13 @@ export async function promptForOptions(
     if (options.typescript && examples.length > 0) {
       const value = await multiselect({
         message: 'Would you like any examples?',
-        options: examples.map((addOn) => ({
-          value: addOn.id,
-          label: addOn.name,
-          hint: addOn.description,
-        })),
+        options: examples
+          .filter((addOn) => !forcedAddOns.includes(addOn.id))
+          .map((addOn) => ({
+            value: addOn.id,
+            label: addOn.name,
+            hint: addOn.description,
+          })),
         required: false,
       })
 
@@ -321,14 +339,26 @@ export async function promptForOptions(
       selectedExamples = value
     }
 
-    if (selectedAddOns.length > 0 || selectedExamples.length > 0) {
+    if (
+      selectedAddOns.length > 0 ||
+      selectedExamples.length > 0 ||
+      forcedAddOns.length > 0
+    ) {
       options.chosenAddOns = await finalizeAddOns(
         options.framework,
         options.mode,
-        [...selectedAddOns, ...selectedExamples],
+        Array.from(
+          new Set([...selectedAddOns, ...selectedExamples, ...forcedAddOns]),
+        ),
       )
       options.tailwind = true
     }
+  } else if (forcedAddOns.length > 0) {
+    options.chosenAddOns = await finalizeAddOns(
+      options.framework,
+      options.mode,
+      forcedAddOns,
+    )
   }
 
   // Collect variables

package/tsconfig.json

@@ -1,8 +1,14 @@
 {
-  "extends": "../../tsconfig.json",
   "compilerOptions": {
+    "target": "ES2020",
+    "module": "ES2020",
     "outDir": "./dist",
     "rootDir": "./src",
+    "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "moduleResolution": "node",
     "declaration": true,
     "declarationDir": "./dist/types"
   },