create-newt-app 0.35.1 → 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.1";
+var version = "0.35.3";
 var engines = { "node": ">=24.0.0" };
 //#endregion
 //#region src/templates/root/index.ts
@@ -177,6 +177,21 @@ pnpm dev
 \`\`\`
 
 Open [http://localhost:3000](http://localhost:3000).
+<% if (deployment === 'spa') { -%>
+
+## Production build
+
+NestJS serves the static export and the API from one origin, so point \`BETTER_AUTH_URL\` at it:
+
+\`\`\`sh
+pnpm db:migrate
+pnpm build
+cd apps/api
+BETTER_AUTH_URL=http://localhost:3001 pnpm start:prod
+\`\`\`
+
+Open [http://localhost:3001](http://localhost:3001). In a real deployment, set \`BETTER_AUTH_URL\` to the public URL.
+<% } -%>
 
 ## Apps
 
@@ -921,6 +936,7 @@ const auth = { templates: [
   "name": "@<%= projectName %>/auth",
   "version": "0.0.0",
   "private": true,
+  "type": "module",
   "exports": {
     ".": "./src/index.ts"
   },
@@ -1022,7 +1038,6 @@ export interface SessionTable {
 
 export interface AccountTable {
   id: string;
-  issuer: string;
   accountId: string;
   providerId: string;
   userId: string;
@@ -1239,7 +1254,9 @@ export const db = new Kysely<DB>({
   dialect: new SqliteDialect({ database: driver }),
 });
 
-export type Database = Kysely<DB>;`
+export type Database = Kysely<DB>;
+
+export type * from "./schema.js";`
 };
 //#endregion
 //#region src/templates/db/templates/src-index-postgres.ts
@@ -1255,7 +1272,9 @@ export const db = new Kysely<DB>({
   dialect: new PostgresDialect({ pool: driver }),
 });
 
-export type Database = Kysely<DB>;`
+export type Database = Kysely<DB>;
+
+export type * from "./schema.js";`
 };
 //#endregion
 //#region src/templates/db/index.ts
@@ -12322,14 +12341,7 @@ var todos_service_default = {
 	filename: "apps/api/src/todos/todos.service.ts",
 	template: `import { Injectable, NotFoundException } from '@nestjs/common';
 import { randomUUID } from 'node:crypto';
-import { db } from '@<%= projectName %>/db';
-
-export interface Todo {
-  id: string;
-  title: string;
-  done: boolean;
-  createdAt: string;
-}
+import { db, type Todo } from '@<%= projectName %>/db';
 
 const columns = ['id', 'title', 'done', 'createdAt'] as const;
 
@@ -12428,6 +12440,15 @@ export interface TodoTable {
   createdAt: Generated<string>;
 }
 
+// Wire shape of a todo: what the api serves and the web app consumes.
+// The service converts table rows (raw sqlite values) into this.
+export interface Todo {
+  id: string;
+  title: string;
+  done: boolean;
+  createdAt: string;
+}
+
 export interface UserTable {
   id: string;
   name: string;
@@ -12451,7 +12472,6 @@ export interface SessionTable {
 
 export interface AccountTable {
   id: string;
-  issuer: string;
   accountId: string;
   providerId: string;
   userId: string;
@@ -12619,7 +12639,7 @@ var api_index_default = {
 	template: `export { AppModule } from './app.module';
 export { AppService } from './app.service';
 export { TodosService } from './todos/todos.service';
-export type { Todo } from './todos/todos.service';`
+export type { Todo } from '@<%= projectName %>/db';`
 };
 //#endregion
 //#region src/templates/todo-example/templates/web-todos-route.ts
@@ -12711,25 +12731,28 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import { useForm } from '@tanstack/react-form';
 import { authClient } from '@/lib/auth-client';
 import { Button } from '@<%= projectName %>/ui/button';
+import type { Todo } from '@<%= projectName %>/db';
 
-interface Todo {
-  id: string;
-  title: string;
-  done: boolean;
+async function request<T>(url: string, init?: RequestInit): Promise<T> {
+  const res = await fetch(url, init);
+  if (!res.ok) throw new Error('Request failed with status ' + res.status);
+  const text = await res.text();
+  // SAFETY: T is the response shape the api wrapper promises for each
+  // endpoint, and every success path returns a JSON body.
+  return (text ? JSON.parse(text) : undefined) as T;
 }
 
 const api = {
-  getTodos: (): Promise<Todo[]> => fetch('/api/todos').then((r) => r.json()),
-  createTodo: (title: string): Promise<Todo> =>
-    fetch('/api/todos', {
+  getTodos: () => request<Todo[]>('/api/todos'),
+  createTodo: (title: string) =>
+    request<Todo>('/api/todos', {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({ title }),
-    }).then((r) => r.json()),
-  toggleTodo: (id: string): Promise<Todo> =>
-    fetch(\`/api/todos/\${id}/toggle\`, { method: 'PATCH' }).then((r) => r.json()),
-  deleteTodo: (id: string): Promise<void> =>
-    fetch(\`/api/todos/\${id}\`, { method: 'DELETE' }).then(() => undefined),
+    }),
+  toggleTodo: (id: string) =>
+    request<Todo>(\`/api/todos/\${id}/toggle\`, { method: 'PATCH' }),
+  deleteTodo: (id: string) => request<void>(\`/api/todos/\${id}\`, { method: 'DELETE' }),
 };
 
 export function TodoList({
@@ -12739,7 +12762,7 @@ export function TodoList({
 }) {
   const queryClient = useQueryClient();
 
-  const { data: todos = [], isPending } = useQuery({
+  const { data: todos = [], isPending, isError } = useQuery({
     queryKey: ['todos'],
     queryFn: api.getTodos,
   });
@@ -12810,8 +12833,14 @@ export function TodoList({
         </form.Subscribe>
       </form>
 
+      {(createMutation.isError || toggleMutation.isError || deleteMutation.isError) && (
+        <p className="text-sm text-red-400 mb-4">Something went wrong. Try again.</p>
+      )}
+
       {isPending ? (
         <p className="text-sm text-muted-foreground">Loading…</p>
+      ) : isError ? (
+        <p className="text-sm text-red-400">Couldn&apos;t load todos.</p>
       ) : (
         <ul className="divide-y divide-neutral-700">
           {todos.map((todo) => (
@@ -12941,25 +12970,29 @@ import { authClient } from '@/lib/auth-client';
 import { Button } from '@<%= projectName %>/ui/button';
 import { Input } from '@<%= projectName %>/ui/input';
 import { Checkbox } from '@<%= projectName %>/ui/checkbox';
+import { toast } from 'sonner';
+import type { Todo } from '@<%= projectName %>/db';
 
-interface Todo {
-  id: string;
-  title: string;
-  done: boolean;
+async function request<T>(url: string, init?: RequestInit): Promise<T> {
+  const res = await fetch(url, init);
+  if (!res.ok) throw new Error('Request failed with status ' + res.status);
+  const text = await res.text();
+  // SAFETY: T is the response shape the api wrapper promises for each
+  // endpoint, and every success path returns a JSON body.
+  return (text ? JSON.parse(text) : undefined) as T;
 }
 
 const api = {
-  getTodos: (): Promise<Todo[]> => fetch('/api/todos').then((r) => r.json()),
-  createTodo: (title: string): Promise<Todo> =>
-    fetch('/api/todos', {
+  getTodos: () => request<Todo[]>('/api/todos'),
+  createTodo: (title: string) =>
+    request<Todo>('/api/todos', {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({ title }),
-    }).then((r) => r.json()),
-  toggleTodo: (id: string): Promise<Todo> =>
-    fetch(\`/api/todos/\${id}/toggle\`, { method: 'PATCH' }).then((r) => r.json()),
-  deleteTodo: (id: string): Promise<void> =>
-    fetch(\`/api/todos/\${id}\`, { method: 'DELETE' }).then(() => undefined),
+    }),
+  toggleTodo: (id: string) =>
+    request<Todo>(\`/api/todos/\${id}/toggle\`, { method: 'PATCH' }),
+  deleteTodo: (id: string) => request<void>(\`/api/todos/\${id}\`, { method: 'DELETE' }),
 };
 
 export function TodoList({
@@ -12969,7 +13002,7 @@ export function TodoList({
 }) {
   const queryClient = useQueryClient();
 
-  const { data: todos = [], isPending } = useQuery({
+  const { data: todos = [], isPending, isError } = useQuery({
     queryKey: ['todos'],
     queryFn: api.getTodos,
   });
@@ -12977,16 +13010,19 @@ export function TodoList({
   const createMutation = useMutation({
     mutationFn: api.createTodo,
     onSuccess: () => queryClient.invalidateQueries({ queryKey: ['todos'] }),
+    onError: () => toast.error("Couldn't add todo"),
   });
 
   const toggleMutation = useMutation({
     mutationFn: api.toggleTodo,
     onSuccess: () => queryClient.invalidateQueries({ queryKey: ['todos'] }),
+    onError: () => toast.error("Couldn't update todo"),
   });
 
   const deleteMutation = useMutation({
     mutationFn: api.deleteTodo,
     onSuccess: () => queryClient.invalidateQueries({ queryKey: ['todos'] }),
+    onError: () => toast.error("Couldn't delete todo"),
   });
 
   const form = useForm({
@@ -13043,6 +13079,8 @@ export function TodoList({
 
       {isPending ? (
         <p className="text-sm text-muted-foreground">Loading…</p>
+      ) : isError ? (
+        <p className="text-sm text-destructive">Couldn&apos;t load todos.</p>
       ) : (
         <ul className="divide-y divide-border">
           {todos.map((todo) => (
@@ -13195,25 +13233,28 @@ import * as stylex from '@stylexjs/stylex';
 import { authClient } from '@/lib/auth-client';
 import { Button } from '@<%= projectName %>/ui/button';
 import { colors, radii } from '@<%= projectName %>/ui/tokens.stylex';
+import type { Todo } from '@<%= projectName %>/db';
 
-interface Todo {
-  id: string;
-  title: string;
-  done: boolean;
+async function request<T>(url: string, init?: RequestInit): Promise<T> {
+  const res = await fetch(url, init);
+  if (!res.ok) throw new Error('Request failed with status ' + res.status);
+  const text = await res.text();
+  // SAFETY: T is the response shape the api wrapper promises for each
+  // endpoint, and every success path returns a JSON body.
+  return (text ? JSON.parse(text) : undefined) as T;
 }
 
 const api = {
-  getTodos: (): Promise<Todo[]> => fetch('/api/todos').then((r) => r.json()),
-  createTodo: (title: string): Promise<Todo> =>
-    fetch('/api/todos', {
+  getTodos: () => request<Todo[]>('/api/todos'),
+  createTodo: (title: string) =>
+    request<Todo>('/api/todos', {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({ title }),
-    }).then((r) => r.json()),
-  toggleTodo: (id: string): Promise<Todo> =>
-    fetch(\`/api/todos/\${id}/toggle\`, { method: 'PATCH' }).then((r) => r.json()),
-  deleteTodo: (id: string): Promise<void> =>
-    fetch(\`/api/todos/\${id}\`, { method: 'DELETE' }).then(() => undefined),
+    }),
+  toggleTodo: (id: string) =>
+    request<Todo>(\`/api/todos/\${id}/toggle\`, { method: 'PATCH' }),
+  deleteTodo: (id: string) => request<void>(\`/api/todos/\${id}\`, { method: 'DELETE' }),
 };
 
 export function TodoList({
@@ -13223,7 +13264,7 @@ export function TodoList({
 }) {
   const queryClient = useQueryClient();
 
-  const { data: todos = [], isPending } = useQuery({
+  const { data: todos = [], isPending, isError } = useQuery({
     queryKey: ['todos'],
     queryFn: api.getTodos,
   });
@@ -13294,8 +13335,14 @@ export function TodoList({
         </form.Subscribe>
       </form>
 
+      {(createMutation.isError || toggleMutation.isError || deleteMutation.isError) && (
+        <p {...stylex.props(styles.error)}>Something went wrong. Try again.</p>
+      )}
+
       {isPending ? (
         <p {...stylex.props(styles.muted)}>Loading…</p>
+      ) : isError ? (
+        <p {...stylex.props(styles.error)}>Couldn&apos;t load todos.</p>
       ) : (
         <ul {...stylex.props(styles.list)}>
           {todos.map((todo) => (
@@ -13420,6 +13467,11 @@ const styles = stylex.create({
     fontSize: '0.875rem',
     color: colors.mutedForeground,
   },
+  error: {
+    fontSize: '0.875rem',
+    color: colors.danger,
+    marginBottom: '1rem',
+  },
 });
 `
 };
@@ -13629,9 +13681,23 @@ const todoExampleDi = { templates: [
 	app_module_di_default,
 	api_index_default
 ] };
-const todoExampleWeb = { templates: [web_todo_list_default, web_page_default] };
-const todoExampleShadcn = { templates: [shadcn_todo_list_default, shadcn_page_default] };
-const todoExampleStylex = { templates: [stylex_todo_list_default, stylex_page_default] };
+const webDbPackage = {
+	package: "@<%= projectName %>/db",
+	module: "apps/web",
+	version: "workspace:*"
+};
+const todoExampleWeb = {
+	templates: [web_todo_list_default, web_page_default],
+	packages: [webDbPackage]
+};
+const todoExampleShadcn = {
+	templates: [shadcn_todo_list_default, shadcn_page_default],
+	packages: [webDbPackage]
+};
+const todoExampleStylex = {
+	templates: [stylex_todo_list_default, stylex_page_default],
+	packages: [webDbPackage]
+};
 //#endregion
 //#region src/templates/index.ts
 const staticDir = new URL("./static/", import.meta.url);
@@ -13831,29 +13897,43 @@ function validateNodeVersion(current, requirement) {
 	};
 }
 function normalizeProjectName(projectName) {
-	return projectName.trim().toLowerCase().replace(/\s+/g, "-").replace(/[^a-z0-9\-._~]/g, "-").replace(/-+/g, "-").replace(/^[-._]+/, "").replace(/-+$/, "").slice(0, 214);
+	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: `Directory "${normalized}" already exists`
+		error: "The current directory is not empty"
+	};
+	if (existsSync(path.resolve(process.cwd(), dir))) return {
+		valid: false,
+		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);
@@ -13870,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 {
@@ -14163,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,
@@ -14184,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.";
 				}
 			});
@@ -14200,15 +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 (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`));