create-newt-app 0.35.2 → 0.35.3

package/dist/index.js

@@ -7,11 +7,11 @@ import { fileURLToPath } from "node:url";
 import { randomBytes } from "node:crypto";
 import { execa } from "execa";
 import ejs from "ejs";
-import { existsSync, promises } from "fs";
+import { existsSync, promises, readdirSync } from "fs";
 import path from "path";
 import https from "node:https";
 //#region package.json
-var version = "0.35.2";
+var version = "0.35.3";
 var engines = { "node": ">=24.0.0" };
 //#endregion
 //#region src/templates/root/index.ts
@@ -13899,27 +13899,41 @@ function validateNodeVersion(current, requirement) {
 function normalizeProjectName(projectName) {
 	return projectName.trim().normalize("NFKD").replace(/[\u0300-\u036f]/g, "").toLowerCase().replace(/\s+/g, "-").replace(/[^a-z0-9\-._~]/g, "-").replace(/-+/g, "-").replace(/^[-._]+/, "").replace(/-+$/, "").slice(0, 214);
 }
+function projectTarget(projectName) {
+	if ([".", "./"].includes(projectName.trim())) return {
+		name: normalizeProjectName(path.basename(process.cwd())),
+		dir: "."
+	};
+	const name = normalizeProjectName(projectName);
+	return {
+		name,
+		dir: name
+	};
+}
 function validateProjectName(projectName) {
 	if (!projectName) return {
 		valid: false,
 		error: "Project name is required"
 	};
-	const normalized = normalizeProjectName(projectName);
-	if (!normalized) return {
+	const { name, dir } = projectTarget(projectName);
+	if (!name) return {
 		valid: false,
 		error: `"${projectName}" has nothing left after normalizing. Include a letter or a digit.`
 	};
-	const targetPath = path.resolve(process.cwd(), normalized);
-	if (existsSync(targetPath)) return {
+	if (dir === ".") return readdirSync(process.cwd()).length === 0 ? { valid: true } : {
+		valid: false,
+		error: "The current directory is not empty"
+	};
+	if (existsSync(path.resolve(process.cwd(), dir))) return {
 		valid: false,
-		error: `Directory "${normalized}" already exists`
+		error: `Directory "${dir}" already exists`
 	};
 	return { valid: true };
 }
 //#endregion
 //#region src/tasks.ts
 async function scaffold(modules, options) {
-	const validation = validateProjectName(options.name);
+	const validation = validateProjectName(options.dir);
 	if (!validation.valid) {
 		console.error(`Error: ${validation.error}`);
 		process.exit(1);
@@ -13936,12 +13950,12 @@ async function scaffold(modules, options) {
 		authSecret: randomBytes(32).toString("base64url"),
 		versions
 	};
-	await renderTemplatesToDisk(modules, options.name, templateData, options.selection);
+	await renderTemplatesToDisk(modules, options.dir, templateData, options.selection);
 	const packages = modules.map((mod) => mod.packages).filter((ele) => ele !== void 0).flat();
-	if (packages.length > 0) await updatePackageJson(options.name, packages, templateData);
+	if (packages.length > 0) await updatePackageJson(options.dir, packages, templateData);
 	const scripts = modules.map((mod) => mod.scripts).filter((ele) => ele !== void 0).flat();
-	if (scripts.length > 0) await updateScripts(options.name, scripts, templateData);
-	await sortPackageJsons(options.name);
+	if (scripts.length > 0) await updateScripts(options.dir, scripts, templateData);
+	await sortPackageJsons(options.dir);
 }
 async function hasCommand(command) {
 	try {
@@ -14229,13 +14243,14 @@ async function doInit(options) {
 		const rawName = answers.name ?? options.name ?? "";
 		const nameCheck = validateProjectName(rawName);
 		if (!nameCheck.valid) throw new Error(nameCheck.error);
-		const name = normalizeProjectName(rawName);
+		const { name, dir } = projectTarget(rawName);
 		const taskBuilder = new TaskBuilder();
 		taskBuilder.add({
 			title: "Scaffolding project",
 			task: async () => {
 				await scaffold(allModules, {
 					name,
+					dir,
 					testing,
 					database,
 					deployment,
@@ -14250,14 +14265,14 @@ async function doInit(options) {
 			taskBuilder.add({
 				title: "Installing with pnpm",
 				task: async () => {
-					await pnpmInstall(name);
+					await pnpmInstall(dir);
 					return "Installed.";
 				}
 			});
 			taskBuilder.add({
 				title: "Formatting",
 				task: async () => {
-					await pnpmFormat(name);
+					await pnpmFormat(dir);
 					return "Formatted.";
 				}
 			});
@@ -14266,19 +14281,19 @@ async function doInit(options) {
 		if (options.git) taskBuilder.add({
 			title: "Initializing git",
 			task: async () => {
-				committed = await initGit(name);
+				committed = await initGit(dir);
 				return committed ? "Initialized git." : "Initialized git, but could not commit.";
 			}
 		});
 		await p.tasks(taskBuilder.tasks);
 		p.outro(`Done!`);
-		if (name !== rawName) {
-			console.log(`Note: the project directory is "${name}", not "${rawName}".`);
+		if (dir !== "." && dir !== rawName) {
+			console.log(`Note: the project directory is "${dir}", not "${rawName}".`);
 			console.log();
 		}
 		console.log("Next steps:");
 		console.log();
-		console.log(chalk.blue(`  cd ${name}`));
+		if (dir !== ".") console.log(chalk.blue(`  cd ${dir}`));
 		if (!options.install) {
 			console.log(chalk.blue(`  pnpm install`));
 			console.log(chalk.blue(`  pnpm format:fix`));