chore: package refactoring

jherr · jherr · commit d7eac47070c8 · 2025-04-12T09:13:37.000-07:00
diff --git a/cli/create-start-app/package.json b/cli/create-start-app/package.json
@@ -28,7 +28,7 @@
   "license": "MIT",
   "packageManager": "pnpm@9.15.5",
   "dependencies": {
-    "@tanstack/cta-engine": "workspace:*"
+    "@tanstack/cta-cli": "workspace:*"
   },
   "devDependencies": {
     "@types/node": "^22.13.4",
diff --git a/cli/create-start-app/src/index.ts b/cli/create-start-app/src/index.ts
@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { cli } from '@tanstack/cta-engine'
+import { cli } from '@tanstack/cta-cli'
 
 cli({
   name: 'create-start-app',
diff --git a/cli/create-tanstack/package.json b/cli/create-tanstack/package.json
@@ -28,7 +28,7 @@
   "license": "MIT",
   "packageManager": "pnpm@9.15.5",
   "dependencies": {
-    "@tanstack/cta-engine": "workspace:*"
+    "@tanstack/cta-cli": "workspace:*"
   },
   "devDependencies": {
     "@types/node": "^22.13.4",
diff --git a/cli/create-tanstack/src/index.ts b/cli/create-tanstack/src/index.ts
@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { cli } from '@tanstack/cta-engine'
+import { cli } from '@tanstack/cta-cli'
 
 cli({
   name: 'create-tanstack',
diff --git a/cli/create-tsrouter-app/package.json b/cli/create-tsrouter-app/package.json
@@ -28,7 +28,7 @@
   "license": "MIT",
   "packageManager": "pnpm@9.15.5",
   "dependencies": {
-    "@tanstack/cta-engine": "workspace:*"
+    "@tanstack/cta-cli": "workspace:*"
   },
   "devDependencies": {
     "@types/node": "^22.13.4",
diff --git a/cli/create-tsrouter-app/src/index.ts b/cli/create-tsrouter-app/src/index.ts
@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { cli } from '@tanstack/cta-engine'
+import { cli } from '@tanstack/cta-cli'
 
 cli({
   name: 'create-tsrouter-app',
diff --git a/package.json b/package.json
@@ -25,8 +25,11 @@
   "pnpm": {
     "overrides": {
       "create-start-app": "workspace:*",
+      "create-tanstack": "workspace:*",
       "create-tsrouter-app": "workspace:*",
-      "@tanstack/cta-engine": "workspace:*"
+      "@tanstack/cta-cli": "workspace:*",
+      "@tanstack/cta-engine": "workspace:*",
+      "@tanstack/cta-mcp": "workspace:*"
     }
   },
   "workspaces": [
diff --git a/packages/cta-cli/package.json b/packages/cta-cli/package.json
@@ -0,0 +1,46 @@
+{
+  "name": "@tanstack/cta-cli",
+  "version": "0.10.0-alpha.15",
+  "description": "Tanstack Application Builder CLI",
+  "type": "module",
+  "main": "./dist/index.js",
+  "types": "./dist/types/index.d.ts",
+  "scripts": {
+    "build": "tsc",
+    "dev": "tsc --watch",
+    "cipublish": "node scripts/publish.js",
+    "test:lint": "eslint ./src"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/TanStack/create-tsrouter-app.git"
+  },
+  "homepage": "https://tanstack.com/router",
+  "funding": {
+    "type": "github",
+    "url": "https://github.com/sponsors/tannerlinsley"
+  },
+  "keywords": [
+    "react",
+    "tanstack",
+    "router",
+    "create-react-app"
+  ],
+  "author": "Jack Herrington <jherr@pobox.com>",
+  "license": "MIT",
+  "packageManager": "pnpm@9.15.5",
+  "dependencies": {
+    "@tanstack/cta-engine": "workspace:*",
+    "@tanstack/cta-mcp": "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",
+    "eslint": "^9.20.0",
+    "typescript": "^5.6.3",
+    "vitest": "^3.0.8"
+  }
+}
diff --git a/packages/cta-cli/src/cli.ts b/packages/cta-cli/src/cli.ts
@@ -1,22 +1,51 @@
 import { Command, InvalidArgumentError } from 'commander'
 import { intro, log } from '@clack/prompts'
+import chalk from 'chalk'
+
+import {
+  DEFAULT_FRAMEWORK,
+  SUPPORTED_FRAMEWORKS,
+  SUPPORTED_PACKAGE_MANAGERS,
+  SUPPORTED_TOOLCHAINS,
+  addToApp,
+  createApp,
+  createDefaultEnvironment,
+  getAllAddOns,
+  initAddOn,
+} from '@tanstack/cta-engine'
+
+import { runMCPServer } from '@tanstack/cta-mcp'
 
-import { createApp } from './create-app.js'
 import { normalizeOptions, promptForOptions } from './options.js'
-import { SUPPORTED_PACKAGE_MANAGERS } from './package-manager.js'
-import { SUPPORTED_TOOLCHAINS } from './toolchain.js'
 
-import runServer from './mcp.js'
-import { listAddOns } from './add-ons.js'
-import { DEFAULT_FRAMEWORK, SUPPORTED_FRAMEWORKS } from './constants.js'
-import { initAddOn } from './custom-add-on.js'
+import type {
+  Framework,
+  Mode,
+  PackageManager,
+  TemplateOptions,
+  ToolChain,
+} from '@tanstack/cta-engine'
 
-import { createDefaultEnvironment } from './environment.js'
-import { add } from './add.js'
+import type { CliOptions } from './types.js'
 
-import type { PackageManager } from './package-manager.js'
-import type { ToolChain } from './toolchain.js'
-import type { CliOptions, Framework, Mode, TemplateOptions } from './types.js'
+async function listAddOns(
+  options: CliOptions,
+  {
+    forcedMode,
+    forcedAddOns = [],
+  }: {
+    forcedMode?: TemplateOptions
+    forcedAddOns?: Array<string>
+  },
+) {
+  const addOns = await getAllAddOns(
+    options.framework || DEFAULT_FRAMEWORK,
+    forcedMode || options.template || 'typescript',
+  )
+  for (const addOn of addOns.filter((a) => !forcedAddOns.includes(a.id))) {
+    console.log(`${chalk.bold(addOn.id)}: ${addOn.description}`)
+  }
+}
 
 export function cli({
   name,
@@ -37,7 +66,7 @@ export function cli({
     .command('add')
     .argument('add-on', 'Name of the add-on (or add-ons separated by commas)')
     .action(async (addOn: string) => {
-      await add(addOn.split(',').map((addon) => addon.trim()))
+      await addToApp(addOn.split(',').map((addon) => addon.trim()))
     })
 
   program
@@ -151,7 +180,7 @@ export function cli({
         forcedAddOns,
       })
     } else if (options.mcp || options.mcpSse) {
-      await runServer(!!options.mcpSse, {
+      await runMCPServer(!!options.mcpSse, {
         forcedMode: forcedMode as TemplateOptions,
         forcedAddOns,
         appName,
diff --git a/packages/cta-cli/src/index.ts b/packages/cta-cli/src/index.ts
@@ -0,0 +1 @@
+export { cli } from './cli.js'
diff --git a/packages/cta-cli/src/options.ts b/packages/cta-cli/src/options.ts
@@ -8,27 +8,29 @@ import {
 } from '@clack/prompts'
 
 import {
+  CODE_ROUTER,
+  DEFAULT_FRAMEWORK,
   DEFAULT_PACKAGE_MANAGER,
+  DEFAULT_TOOLCHAIN,
+  FILE_ROUTER,
   SUPPORTED_PACKAGE_MANAGERS,
+  SUPPORTED_TOOLCHAINS,
+  finalizeAddOns,
+  getAllAddOns,
   getPackageManager,
-} from './package-manager.js'
-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'
+  loadRemoteAddOn,
+} from '@tanstack/cta-engine'
 
-<<<<<<< HEAD
-import type { AddOn, CliOptions, Options, Starter, Variable } from './types.js'
-=======
 import type {
   AddOn,
-  CliOptions,
   Mode,
   Options,
-  Overlay,
+  Starter,
   TemplateOptions,
   Variable,
-} from './types.js'
->>>>>>> main
+} from '@tanstack/cta-engine'
+
+import type { CliOptions } from './types.js'
 
 // If all CLI options are provided, use them directly
 export async function normalizeOptions(
diff --git a/packages/cta-cli/src/types.ts b/packages/cta-cli/src/types.ts
@@ -0,0 +1,22 @@
+import type {
+  Framework,
+  PackageManager,
+  TemplateOptions,
+  ToolChain,
+} from '@tanstack/cta-engine'
+
+export interface CliOptions {
+  template?: TemplateOptions
+  framework?: Framework
+  tailwind?: boolean
+  packageManager?: PackageManager
+  toolchain?: ToolChain
+  projectName?: string
+  git?: boolean
+  addOns?: Array<string> | boolean
+  listAddOns?: boolean
+  mcp?: boolean
+  mcpSse?: boolean
+  starter?: string
+  targetDir?: string
+}
diff --git a/packages/cta-cli/tsconfig.json b/packages/cta-cli/tsconfig.json
@@ -0,0 +1,17 @@
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "module": "ES2020",
+    "outDir": "./dist",
+    "rootDir": "./src",
+    "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "moduleResolution": "node",
+    "declaration": true,
+    "declarationDir": "./dist/types"
+  },
+  "include": ["./src/**/*.ts"],
+  "exclude": ["node_modules", "dist"]
+}
diff --git a/packages/cta-engine/package.json b/packages/cta-engine/package.json
@@ -11,8 +11,7 @@
     "test": "npm run test:lint && vitest --run",
     "test:watch": "vitest",
     "cipublish": "node scripts/publish.js",
-    "test:lint": "eslint ./src",
-    "mcp": "tsc && npx @modelcontextprotocol/inspector dist/index.js --mcp"
+    "test:lint": "eslint ./src"
   },
   "repository": {
     "type": "git",
@@ -34,24 +33,17 @@
   "packageManager": "pnpm@9.15.5",
   "dependencies": {
     "@clack/prompts": "^0.10.0",
-    "@modelcontextprotocol/sdk": "^1.6.0",
     "chalk": "^5.4.1",
-    "commander": "^13.1.0",
     "ejs": "^3.1.10",
     "execa": "^9.5.2",
-    "express": "^4.21.2",
     "memfs": "^4.17.0",
-    "prettier": "^3.5.0",
-    "zod": "^3.24.2"
+    "prettier": "^3.5.0"
   },
   "devDependencies": {
     "@tanstack/config": "^0.16.2",
     "@types/ejs": "^3.1.5",
-    "@types/express": "^5.0.0",
     "@types/node": "^22.13.4",
     "eslint": "^9.20.0",
-    "eslint-plugin-react-hooks": "^5.1.0",
-    "eslint-plugin-unused-imports": "^4.1.4",
     "typescript": "^5.6.3",
     "vitest": "^3.0.8"
   }
diff --git a/packages/cta-engine/src/add-ons.ts b/packages/cta-engine/src/add-ons.ts
@@ -1,13 +1,11 @@
 import { readFile } from 'node:fs/promises'
 import { existsSync, readdirSync, statSync } from 'node:fs'
 import { resolve } from 'node:path'
-import chalk from 'chalk'
 
 import { getTemplatesRoot } from './templates.js'
-import { DEFAULT_FRAMEWORK } from './constants.js'
 import { readFileHelper } from './file-helper.js'
 
-import type { AddOn, CliOptions, Framework, TemplateOptions } from './types.js'
+import type { AddOn, Framework } from './types.js'
 
 function isDirectory(path: string): boolean {
   return statSync(path).isDirectory()
@@ -123,25 +121,6 @@ export async function finalizeAddOns(
   return finalAddOns
 }
 
-export async function listAddOns(
-  options: CliOptions,
-  {
-    forcedMode,
-    forcedAddOns = [],
-  }: {
-    forcedMode?: TemplateOptions
-    forcedAddOns?: Array<string>
-  },
-) {
-  const addOns = await getAllAddOns(
-    options.framework || DEFAULT_FRAMEWORK,
-    forcedMode || options.template || 'typescript',
-  )
-  for (const addOn of addOns.filter((a) => !forcedAddOns.includes(a.id))) {
-    console.log(`${chalk.bold(addOn.id)}: ${addOn.description}`)
-  }
-}
-
 function loadAddOn(addOn: AddOn): AddOn {
   return addOn
 }
diff --git a/packages/cta-engine/src/add.ts b/packages/cta-engine/src/add.ts
@@ -62,7 +62,7 @@ async function runCreateApp(options: Required<Options>) {
   return output
 }
 
-export async function add(
+export async function addToApp(
   addOns: Array<string>,
   {
     silent = false,
diff --git a/packages/cta-engine/src/index.ts b/packages/cta-engine/src/index.ts
@@ -1,11 +1,33 @@
-export { cli } from './cli.js'
-export { getAllAddOns } from './add-ons.js'
+export { finalizeAddOns, getAllAddOns, loadRemoteAddOn } from './add-ons.js'
 export { createApp } from './create-app.js'
-export { createAppOptionsFromPersisted } from './custom-add-on.js'
+export { createAppOptionsFromPersisted, initAddOn } from './custom-add-on.js'
 export {
   createMemoryEnvironment,
   createDefaultEnvironment,
 } from './environment.js'
+export { addToApp } from './add.js'
+export {
+  CODE_ROUTER,
+  DEFAULT_FRAMEWORK,
+  FILE_ROUTER,
+  SUPPORTED_FRAMEWORKS,
+} from './constants.js'
+export {
+  DEFAULT_PACKAGE_MANAGER,
+  SUPPORTED_PACKAGE_MANAGERS,
+  getPackageManager,
+} from './package-manager.js'
+export { SUPPORTED_TOOLCHAINS, DEFAULT_TOOLCHAIN } from './toolchain.js'
 
-export type { AddOn, Framework, Mode } from './types.js'
+export type {
+  AddOn,
+  Framework,
+  Mode,
+  Options,
+  Starter,
+  TemplateOptions,
+  Variable,
+} from './types.js'
 export type { PersistedOptions } from './config-file.js'
+export type { PackageManager } from './package-manager.js'
+export type { ToolChain } from './toolchain.js'
diff --git a/packages/cta-engine/src/types.ts b/packages/cta-engine/src/types.ts
diff --git a/packages/cta-mcp/package.json b/packages/cta-mcp/package.json
diff --git a/packages/cta-mcp/src/index.ts b/packages/cta-mcp/src/index.ts
diff --git a/packages/cta-mcp/src/mcp.ts b/packages/cta-mcp/src/mcp.ts
diff --git a/packages/cta-mcp/tsconfig.json b/packages/cta-mcp/tsconfig.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/scripts/publish.js b/scripts/publish.js
