@tanstack/cli 0.68.0 → 0.69.0

package/dist/cli.js

@@ -353,8 +353,7 @@ export function cli({ name, appName, forcedAddOns = [], forcedDeployment, defaul
             throw new Error('Failed to normalize options');
         }
         currentTelemetry?.mergeProperties(getResolvedCreateTelemetryProperties(normalizedOpts, options));
-        normalizedOpts.targetDir =
-            options.targetDir || resolve(process.cwd(), projectName);
+        normalizedOpts.targetDir = resolve(normalizedOpts.targetDir);
         // Create the initial app with minimal output for dev watch mode
         console.log(chalk.bold('\ndev-watch'));
         console.log(chalk.gray('├─') + ' ' + `creating initial ${appName} app...`);
@@ -629,7 +628,10 @@ export function cli({ name, appName, forcedAddOns = [], forcedDeployment, defaul
                 }
                 let cameFromPrompts = false;
                 if (finalOptions) {
-                    intro(`Creating a new ${appName} app in ${projectName}...`);
+                    const createLocation = resolve(finalOptions.targetDir) === resolve(process.cwd())
+                        ? 'the current directory'
+                        : finalOptions.projectName;
+                    intro(`Creating a new ${appName} app in ${createLocation}...`);
                 }
                 else {
                     if (!wantsInteractiveMode) {
@@ -652,14 +654,11 @@ export function cli({ name, appName, forcedAddOns = [], forcedDeployment, defaul
                 telemetry.mergeProperties(getResolvedCreateTelemetryProperties(finalOptions, cliOptions));
                 finalOptions.routerOnly =
                     !!cliOptions.routerOnly;
-                if (options.targetDir) {
-                    finalOptions.targetDir = options.targetDir;
-                }
-                else if (finalOptions.targetDir) {
+                if (finalOptions.targetDir) {
                     // Keep the normalized target dir.
                 }
-                else if (projectName === '.') {
-                    finalOptions.targetDir = resolve(process.cwd());
+                else if (options.targetDir) {
+                    finalOptions.targetDir = resolve(options.targetDir);
                 }
                 else {
                     finalOptions.targetDir = resolve(process.cwd(), finalOptions.projectName);

package/dist/command-line.js

@@ -1,7 +1,7 @@
 import { resolve } from 'node:path';
 import fs from 'node:fs';
 import { DEFAULT_PACKAGE_MANAGER, finalizeAddOns, getFrameworkById, getPackageManager, getRawRegistry, loadStarter, populateAddOnOptionsDefaults, } from '@tanstack/create';
-import { getCurrentDirectoryName, sanitizePackageName, validateProjectName, } from './utils.js';
+import { resolveProjectLocation, validateProjectName, } from './utils.js';
 const SUPPORTED_LEGACY_TEMPLATES = new Set([
     'file-router',
     'typescript',
@@ -264,19 +264,15 @@ export function validateLegacyCreateFlags(cliOptions) {
     return { warnings };
 }
 export async function normalizeOptions(cliOptions, forcedAddOns, opts) {
-    let projectName = (cliOptions.projectName ?? '').trim();
-    let targetDir;
-    // Handle "." as project name - use current directory
-    if (projectName === '.') {
-        projectName = sanitizePackageName(getCurrentDirectoryName());
-        targetDir = resolve(process.cwd());
-    }
-    else {
-        targetDir = resolve(process.cwd(), projectName);
-    }
-    if (!projectName && !opts?.disableNameCheck) {
+    const projectLocation = resolveProjectLocation({
+        projectName: cliOptions.projectName,
+        targetDir: cliOptions.targetDir,
+    });
+    if (!projectLocation && !opts?.disableNameCheck) {
         return undefined;
     }
+    const projectName = projectLocation?.projectName ?? '';
+    const targetDir = projectLocation?.targetDir ?? resolve(process.cwd());
     if (projectName) {
         const { valid, error } = validateProjectName(projectName);
         if (!valid) {

package/dist/options.js

@@ -2,7 +2,7 @@ import { intro } from '@clack/prompts';
 import { finalizeAddOns, getFrameworkById, getFrameworks, getPackageManager, loadStarter, populateAddOnOptionsDefaults, readConfigFile, } from '@tanstack/create';
 import { getProjectName, promptForAddOnOptions, promptForEnvVars, selectAddOns, selectDeployment, selectExamples, selectFramework, selectGit, selectInstall, selectPackageManager, selectTemplate, selectToolchain, } from './ui-prompts.js';
 import { listTemplateChoices, resolveStarterSpecifier, } from './command-line.js';
-import { getCurrentDirectoryName, sanitizePackageName, validateProjectName, } from './utils.js';
+import { resolveProjectLocation, validateProjectName, } from './utils.js';
 export async function promptForCreateOptions(cliOptions, { forcedAddOns = [], forcedDeployment, showDeploymentOptions = true, defaultFrameworkId, }) {
     const options = {};
     if (cliOptions.framework) {
@@ -17,23 +17,20 @@ export async function promptForCreateOptions(cliOptions, { forcedAddOns = [], fo
             options.framework = await selectFramework(availableFrameworks, defaultFrameworkId);
         }
     }
-    // Validate project name
-    if (cliOptions.projectName) {
-        // Handle "." as project name - use sanitized current directory name
-        if (cliOptions.projectName === '.') {
-            options.projectName = sanitizePackageName(getCurrentDirectoryName());
-        }
-        else {
-            options.projectName = cliOptions.projectName;
-        }
-        const { valid, error } = validateProjectName(options.projectName);
-        if (!valid) {
-            console.error(error);
-            process.exit(1);
-        }
-    }
-    else {
-        options.projectName = await getProjectName();
+    const projectLocation = resolveProjectLocation({
+        projectName: cliOptions.projectName ?? (await getProjectName()),
+        targetDir: cliOptions.targetDir,
+        emptyProjectNameIsCurrentDirectory: true,
+    });
+    if (!projectLocation) {
+        throw new Error('Project name or target directory is required');
+    }
+    options.projectName = projectLocation.projectName;
+    options.targetDir = projectLocation.targetDir;
+    const { valid, error } = validateProjectName(options.projectName);
+    if (!valid) {
+        console.error(error);
+        process.exit(1);
     }
     // Mode is always file-router (TanStack Start)
     options.mode = 'file-router';

package/dist/telemetry.js

@@ -1,5 +1,5 @@
 import { version as nodeVersion } from 'node:process';
-import { getTelemetryStatus, markTelemetryNoticeSeen, TELEMETRY_NOTICE_VERSION, } from './telemetry-config.js';
+import { TELEMETRY_NOTICE_VERSION, getTelemetryStatus, markTelemetryNoticeSeen, } from './telemetry-config.js';
 const TELEMETRY_TRANSPORT_ENDPOINT = 'https://www.google-analytics.com/g/collect';
 const TELEMETRY_PROPERTY_ID = 'G-JMT1Z50SPS';
 const TELEMETRY_NOTICE = 'TanStack CLI sends anonymous usage telemetry by default. It never sends project names, paths, raw search text, template URLs, add-on config values, or raw error messages. Disable it with `tanstack telemetry disable` or `TANSTACK_CLI_TELEMETRY_DISABLED=1`.';

package/dist/types/utils.d.ts

@@ -1,5 +1,16 @@
 export declare function sanitizePackageName(name: string): string;
 export declare function getCurrentDirectoryName(): string;
+export declare function getDirectoryPackageName(directory: string): string;
+export declare function getCurrentDirectoryPackageName(): string;
+export declare function isCurrentDirectoryProjectNameInput(name: string): boolean;
+export declare function resolveProjectLocation({ projectName, targetDir, emptyProjectNameIsCurrentDirectory, }: {
+    projectName?: string;
+    targetDir?: string;
+    emptyProjectNameIsCurrentDirectory?: boolean;
+}): {
+    projectName: string;
+    targetDir: string;
+} | undefined;
 export declare function validateProjectName(name: string): {
     valid: boolean;
     error: string;

package/dist/ui-prompts.js

@@ -1,6 +1,6 @@
 import { cancel, confirm, isCancel, multiselect, note, password, select, text, } from '@clack/prompts';
 import { DEFAULT_PACKAGE_MANAGER, SUPPORTED_PACKAGE_MANAGERS, getAllAddOns, } from '@tanstack/create';
-import { validateProjectName } from './utils.js';
+import { isCurrentDirectoryProjectNameInput, validateProjectName, } from './utils.js';
 export async function selectFramework(frameworks, defaultFrameworkId) {
     const initialValue = (defaultFrameworkId &&
         frameworks.find((f) => f.id.toLowerCase() === defaultFrameworkId.toLowerCase())?.id) ||
@@ -34,10 +34,10 @@ export async function selectInstall() {
 export async function getProjectName() {
     const value = await text({
         message: 'What would you like to name your project?',
-        defaultValue: 'my-app',
+        placeholder: 'Leave empty to initialize in the current directory',
         validate(value) {
-            if (!value) {
-                return 'Please enter a name';
+            if (isCurrentDirectoryProjectNameInput(value)) {
+                return;
             }
             const { valid, error } = validateProjectName(value);
             if (!valid) {
@@ -49,7 +49,7 @@ export async function getProjectName() {
         cancel('Operation cancelled.');
         process.exit(0);
     }
-    return value;
+    return value.trim();
 }
 export async function selectPackageManager() {
     const packageManager = await select({
@@ -208,25 +208,19 @@ export async function promptForAddOnOptions(addOnIds, framework) {
             continue;
         addOnOptions[addOnId] = {};
         for (const [optionName, option] of Object.entries(addOn.options)) {
-            if (option && typeof option === 'object' && 'type' in option) {
-                if (option.type === 'select') {
-                    const selectOption = option;
-                    const value = await select({
-                        message: `${addOn.name}: ${selectOption.label}`,
-                        options: selectOption.options.map((opt) => ({
-                            value: opt.value,
-                            label: opt.label,
-                        })),
-                        initialValue: selectOption.default,
-                    });
-                    if (isCancel(value)) {
-                        cancel('Operation cancelled.');
-                        process.exit(0);
-                    }
-                    addOnOptions[addOnId][optionName] = value;
-                }
-                // Future option types can be added here
+            const value = await select({
+                message: `${addOn.name}: ${option.label}`,
+                options: option.options.map((opt) => ({
+                    value: opt.value,
+                    label: opt.label,
+                })),
+                initialValue: option.default,
+            });
+            if (isCancel(value)) {
+                cancel('Operation cancelled.');
+                process.exit(0);
             }
+            addOnOptions[addOnId][optionName] = value;
         }
     }
     return addOnOptions;

package/dist/utils.js

@@ -1,5 +1,6 @@
-import { basename } from 'node:path';
+import { basename, resolve } from 'node:path';
 import validatePackageName from 'validate-npm-package-name';
+const FALLBACK_PACKAGE_NAME = 'tanstack-app';
 export function sanitizePackageName(name) {
     return name
         .toLowerCase()
@@ -13,6 +14,47 @@ export function sanitizePackageName(name) {
 export function getCurrentDirectoryName() {
     return basename(process.cwd());
 }
+export function getDirectoryPackageName(directory) {
+    return sanitizePackageName(basename(resolve(directory))) || FALLBACK_PACKAGE_NAME;
+}
+export function getCurrentDirectoryPackageName() {
+    return getDirectoryPackageName(process.cwd());
+}
+export function isCurrentDirectoryProjectNameInput(name) {
+    const normalized = name.trim();
+    return normalized === '' || normalized === '.';
+}
+export function resolveProjectLocation({ projectName, targetDir, emptyProjectNameIsCurrentDirectory = false, }) {
+    const normalizedProjectName = projectName?.trim() ?? '';
+    if (normalizedProjectName === '.') {
+        return {
+            projectName: getCurrentDirectoryPackageName(),
+            targetDir: resolve(process.cwd()),
+        };
+    }
+    if (normalizedProjectName) {
+        return {
+            projectName: normalizedProjectName,
+            targetDir: targetDir
+                ? resolve(targetDir)
+                : resolve(process.cwd(), normalizedProjectName),
+        };
+    }
+    if (targetDir) {
+        const resolvedTargetDir = resolve(targetDir);
+        return {
+            projectName: getDirectoryPackageName(resolvedTargetDir),
+            targetDir: resolvedTargetDir,
+        };
+    }
+    if (emptyProjectNameIsCurrentDirectory) {
+        return {
+            projectName: getCurrentDirectoryPackageName(),
+            targetDir: resolve(process.cwd()),
+        };
+    }
+    return undefined;
+}
 export function validateProjectName(name) {
     const { validForNewPackages, validForOldPackages, errors, warnings } = validatePackageName(name);
     const error = errors?.[0] || warnings?.[0];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/cli",
-  "version": "0.68.0",
+  "version": "0.69.0",
   "description": "TanStack CLI",
   "type": "module",
   "main": "./dist/index.js",
@@ -44,7 +44,7 @@
     "tempy": "^3.1.0",
     "validate-npm-package-name": "^7.0.0",
     "zod": "^3.24.2",
-    "@tanstack/create": "0.68.0"
+    "@tanstack/create": "0.68.1"
   },
   "devDependencies": {
     "@playwright/test": "^1.58.2",