Fix create-tldraw directory naming edge cases

cursoragent · cursoragent · commit b903f05838ee · 2026-03-10T17:11:29.000Z
diff --git a/packages/create-tldraw/src/main.ts b/packages/create-tldraw/src/main.ts
@@ -43,11 +43,20 @@ async function main() {
 	const template = await templatePicker(args.template, args['no-telemetry'])
 	const name = await namePicker(maybeTargetDir)
 
-	const targetDir = findAvailableDir(maybeTargetDir ?? resolve(process.cwd(), name))
+	const requestedTargetDir = maybeTargetDir ?? resolve(process.cwd(), name)
+	const targetDir = findAvailableDir(requestedTargetDir)
+	if (targetDir !== requestedTargetDir) {
+		nicelog(
+			`${relative(process.cwd(), requestedTargetDir)} already exists, using ${relative(
+				process.cwd(),
+				targetDir
+			)} instead.`
+		)
+	}
 	mkdirSync(targetDir, { recursive: true })
 
 	await downloadTemplate(template, targetDir)
-	await renameTemplate(pathToName(targetDir), targetDir)
+	await renameTemplate(name, targetDir)
 
 	const manager = getPackageManager()
 	const doneMessage = ['Done! Now run:', '']
@@ -142,10 +151,15 @@ async function namePicker(argOption?: string) {
 function findAvailableDir(targetDir: string): string {
 	if (isDirEmpty(targetDir)) return targetDir
 
-	for (let i = 1; ; i++) {
+	const maxAttempts = 1000
+	for (let i = 1; i <= maxAttempts; i++) {
 		const candidate = `${targetDir}-${i}`
 		if (isDirEmpty(candidate)) return candidate
 	}
+
+	throw new Error(
+		`Could not find an available directory for ${targetDir} after ${maxAttempts} attempts.`
+	)
 }
 
 async function downloadTemplate(template: Template, targetDir: string) {
