create-questpie 2.0.3 → 2.0.4

package/dist/index.mjs

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
+import { existsSync, readFileSync } from "node:fs";
+import { join, resolve } from "node:path";
 import { Command } from "commander";
 import * as p from "@clack/prompts";
 import pc from "picocolors";
 import { execFileSync, execSync } from "node:child_process";
-import { existsSync } from "node:fs";
 import { cp, mkdir, readFile, readdir, rename, rm, writeFile } from "node:fs/promises";
-import { join, resolve } from "node:path";
 
 //#region src/templates.ts
 const templates = [{
@@ -86,19 +86,62 @@ const label = {
 
 //#endregion
 //#region src/prompts.ts
+const queueAdapters = [
+	"pg-boss",
+	"bullmq",
+	"none"
+];
+const emailAdapters = [
+	"console",
+	"smtp",
+	"resend",
+	"plunk"
+];
+const realtimeAdapters = [
+	"none",
+	"pg-notify",
+	"redis-streams"
+];
+const kvAdapters = ["memory", "redis"];
+function assertChoice(name, value, choices) {
+	if (value === void 0) return void 0;
+	if (choices.includes(value)) return value;
+	throw new Error(`Invalid ${name}: ${value}. Expected one of: ${choices.join(", ")}.`);
+}
+function withOptionDefaults(options) {
+	return {
+		...options,
+		queueAdapter: options.queueAdapter ?? "pg-boss",
+		emailAdapter: options.emailAdapter ?? "console",
+		realtimeAdapter: options.realtimeAdapter ?? "none",
+		kvAdapter: options.kvAdapter ?? "memory",
+		includeWorkflows: options.includeWorkflows ?? false
+	};
+}
 async function runPrompts(args) {
-	if (!Boolean(process.stdin.isTTY && process.stdout.isTTY)) {
+	const isInteractive = Boolean(process.stdin.isTTY && process.stdout.isTTY);
+	const queueAdapter = assertChoice("queue adapter", args.queueAdapter, queueAdapters);
+	const emailAdapter = assertChoice("email adapter", args.emailAdapter, emailAdapters);
+	const realtimeAdapter = assertChoice("realtime adapter", args.realtimeAdapter, realtimeAdapters);
+	const kvAdapter = assertChoice("KV adapter", args.kvAdapter, kvAdapters);
+	if (!isInteractive) {
 		if (!args.projectName) throw new Error("Project name is required in non-interactive mode.");
 		if (!isValidPackageName(args.projectName)) throw new Error("Invalid package name (use lowercase, hyphens, no spaces).");
-		return {
+		return withOptionDefaults({
 			projectName: args.projectName,
 			templateId: args.templateId ?? templates[0].id,
 			databaseName: args.databaseName ?? toDbName(args.projectName),
 			installDeps: args.installDeps ?? true,
 			initGit: args.initGit ?? true,
 			installSkills: args.installSkills ?? true,
-			runCodegen: args.runCodegen ?? true
-		};
+			runCodegen: args.runCodegen ?? true,
+			continueOnError: args.continueOnError ?? false,
+			queueAdapter,
+			emailAdapter,
+			realtimeAdapter,
+			kvAdapter,
+			includeWorkflows: args.includeWorkflows ?? false
+		});
 	}
 	p.intro(pc.bgCyan(pc.black(" QUESTPIE — Create a new project ")));
 	const questions = await p.group({
@@ -170,15 +213,21 @@ async function runPrompts(args) {
 		p.cancel("Operation cancelled.");
 		process.exit(0);
 	} });
-	return {
+	return withOptionDefaults({
 		projectName: questions.projectName,
 		templateId: questions.templateId,
 		databaseName: questions.databaseName,
 		installDeps: questions.installDeps,
 		initGit: questions.initGit,
 		installSkills: questions.installSkills,
-		runCodegen: questions.runCodegen
-	};
+		runCodegen: questions.runCodegen,
+		continueOnError: args.continueOnError ?? false,
+		queueAdapter,
+		emailAdapter,
+		realtimeAdapter,
+		kvAdapter,
+		includeWorkflows: args.includeWorkflows ?? false
+	});
 }
 
 //#endregion
@@ -286,24 +335,168 @@ async function installProjectSkills(targetDir) {
 	}
 	return installed;
 }
+function handleFatalStepFailure(message, error, continueOnError) {
+	if (continueOnError) return;
+	const cause = error instanceof Error ? error.message : typeof error === "string" ? error : String(error);
+	throw new Error(`${message}: ${cause}`);
+}
+async function applyProjectOptions(targetDir, options) {
+	await updatePackageJson(targetDir, options);
+	await writeFile(join(targetDir, "src", "lib", "env.ts"), buildEnvFile(options), "utf-8");
+	await writeFile(join(targetDir, "src", "questpie", "server", "questpie.config.ts"), buildRuntimeConfig(options), "utf-8");
+	await writeFile(join(targetDir, "src", "questpie", "server", "modules.ts"), buildServerModules(options), "utf-8");
+	await writeFile(join(targetDir, "src", "questpie", "admin", "modules.ts"), buildAdminModules(options), "utf-8");
+}
+async function updatePackageJson(targetDir, options) {
+	const packageJsonPath = join(targetDir, "package.json");
+	const packageJson = JSON.parse(await readFile(packageJsonPath, "utf-8"));
+	if (options.queueAdapter === "bullmq") packageJson.dependencies.bullmq = "^5.0.0";
+	if (options.queueAdapter === "bullmq" || options.realtimeAdapter === "redis-streams" || options.kvAdapter === "redis") packageJson.dependencies.redis = "^5.0.0";
+	if (options.includeWorkflows) packageJson.dependencies["@questpie/workflows"] = "latest";
+	await writeFile(packageJsonPath, `${JSON.stringify(packageJson, null, "	")}\n`);
+}
+function buildEnvFile(options) {
+	const mailAdapters = Array.from(new Set(["console", options.emailAdapter ?? "console"]));
+	const lines = [
+		`import { createEnv } from "@t3-oss/env-core";`,
+		`import { z } from "zod";`,
+		``,
+		`export const env = createEnv({`,
+		`\tserver: {`,
+		`\t\tDATABASE_URL: z.string().url(),`,
+		`\t\tAPP_URL: z.string().url().default("http://localhost:3000"),`,
+		`\t\tPORT: z`,
+		`\t\t\t.string()`,
+		`\t\t\t.transform(Number)`,
+		`\t\t\t.pipe(z.number().int().positive())`,
+		`\t\t\t.default(3000),`,
+		`\t\tBETTER_AUTH_SECRET: z.string().min(1).default("change-me-in-production"),`,
+		`\t\tMAIL_ADAPTER: z.enum(${JSON.stringify(mailAdapters)}).default("console"),`
+	];
+	if (options.emailAdapter === "smtp") lines.push(`\t\tSMTP_HOST: z.string().optional(),`, `\t\tSMTP_PORT: z`, `\t\t\t.string()`, `\t\t\t.transform(Number)`, `\t\t\t.pipe(z.number().int().positive())`, `\t\t\t.optional(),`);
+	if (options.emailAdapter === "resend") lines.push(`\t\tRESEND_API_KEY: z.string().optional(),`);
+	if (options.emailAdapter === "plunk") lines.push(`\t\tPLUNK_SECRET_KEY: z.string().optional(),`);
+	if (options.queueAdapter === "bullmq" || options.realtimeAdapter === "redis-streams" || options.kvAdapter === "redis") lines.push(`\t\tREDIS_URL: z.string().url().default("redis://localhost:6379"),`);
+	lines.push(`\t},`, `\truntimeEnv: process.env,`, `\temptyStringAsUndefined: true,`, `});`, ``);
+	return lines.join("\n");
+}
+function buildRuntimeConfig(options) {
+	const imports = [`import { runtimeConfig } from "questpie/app";`, `import { ConsoleAdapter } from "questpie/adapters/console";`];
+	if (options.queueAdapter === "pg-boss") imports.push(`import { pgBossAdapter } from "questpie/adapters/pg-boss";`);
+	if (options.queueAdapter === "bullmq") imports.push(`import { bullMQAdapter } from "questpie/adapters/bullmq";`);
+	if (options.emailAdapter === "smtp") imports.push(`import { SmtpAdapter } from "questpie/adapters/smtp";`);
+	if (options.emailAdapter === "resend") imports.push(`import { ResendAdapter } from "questpie/adapters/resend";`);
+	if (options.emailAdapter === "plunk") imports.push(`import { PlunkAdapter } from "questpie/adapters/plunk";`);
+	if (options.realtimeAdapter === "pg-notify") imports.push(`import { pgNotifyAdapter } from "questpie/adapters/pg-notify";`);
+	if (options.realtimeAdapter === "redis-streams") imports.push(`import { redisStreamsAdapter } from "questpie/adapters/redis-streams";`);
+	if (options.kvAdapter === "redis") {
+		imports.push(`import { redisKVAdapter } from "questpie/adapters/redis-kv";`);
+		imports.push(`import { createClient } from "redis";`);
+	}
+	imports.push(``, `import { env } from "@/lib/env.js";`, ``);
+	const helpers = [];
+	if (options.emailAdapter === "resend" || options.emailAdapter === "plunk") helpers.push(`function requiredEnv(value: string | undefined, name: string): string {`, `\tif (!value) throw new Error(\`Missing required environment variable: \${name}\`);`, `\treturn value;`, `}`, ``);
+	if (options.kvAdapter === "redis") helpers.push(`async function getRedis() {`, `\tconst redis = createClient({ url: env.REDIS_URL });`, `\tawait redis.connect();`, `\treturn redis;`, `}`, ``);
+	const configEntries = [
+		`\tapp: { url: env.APP_URL },`,
+		`\tdb: { url: env.DATABASE_URL },`,
+		`\tstorage: { basePath: "/api" },`,
+		`\temail: {`,
+		`\t\tadapter: ${buildEmailAdapterExpression(options)},`,
+		`\t},`
+	];
+	if (options.queueAdapter === "pg-boss") configEntries.push(`\tqueue: {`, `\t\tadapter: pgBossAdapter({ connectionString: env.DATABASE_URL }),`, `\t},`);
+	if (options.queueAdapter === "bullmq") configEntries.push(`\tqueue: {`, `\t\tadapter: bullMQAdapter({ connection: { url: env.REDIS_URL } }),`, `\t},`);
+	if (options.realtimeAdapter === "pg-notify") configEntries.push(`\trealtime: {`, `\t\tadapter: pgNotifyAdapter({ connectionString: env.DATABASE_URL }),`, `\t},`);
+	if (options.realtimeAdapter === "redis-streams") configEntries.push(`\trealtime: {`, `\t\tadapter: redisStreamsAdapter({ url: env.REDIS_URL }),`, `\t},`);
+	if (options.kvAdapter === "redis") configEntries.push(`\tkv: {`, `\t\tadapter: redisKVAdapter({ client: getRedis, keyPrefix: "${options.projectName}:" }),`, `\t},`);
+	return [
+		`/**`,
+		` * QUESTPIE Runtime Configuration`,
+		` *`,
+		` * Runtime-only configuration: database, adapters, secrets.`,
+		` * Entity definitions are codegen-generated.`,
+		` */`,
+		``,
+		...imports,
+		...helpers,
+		`export default runtimeConfig({`,
+		...configEntries,
+		`});`,
+		``
+	].join("\n");
+}
+function buildEmailAdapterExpression(options) {
+	if (options.emailAdapter === "smtp") return `env.MAIL_ADAPTER === "smtp"\n\t\t\t? new SmtpAdapter({\n\t\t\t\t\ttransport: {\n\t\t\t\t\t\thost: env.SMTP_HOST || "localhost",\n\t\t\t\t\t\tport: env.SMTP_PORT || 1025,\n\t\t\t\t\t\tsecure: false,\n\t\t\t\t\t},\n\t\t\t\t})\n\t\t\t: new ConsoleAdapter({ logHtml: false })`;
+	if (options.emailAdapter === "resend") return `env.MAIL_ADAPTER === "resend"\n\t\t\t? new ResendAdapter({ apiKey: requiredEnv(env.RESEND_API_KEY, "RESEND_API_KEY") })\n\t\t\t: new ConsoleAdapter({ logHtml: false })`;
+	if (options.emailAdapter === "plunk") return `env.MAIL_ADAPTER === "plunk"\n\t\t\t? new PlunkAdapter({ apiKey: requiredEnv(env.PLUNK_SECRET_KEY, "PLUNK_SECRET_KEY") })\n\t\t\t: new ConsoleAdapter({ logHtml: false })`;
+	return `new ConsoleAdapter({ logHtml: false })`;
+}
+function buildServerModules(options) {
+	const imports = [
+		`/**`,
+		` * Modules — static module dependencies for this project.`,
+		` */`,
+		`import { adminModule } from "@questpie/admin/modules/admin";`,
+		`import { openApiModule } from "@questpie/openapi";`
+	];
+	const modules = ["adminModule", "openApiModule"];
+	if (options.includeWorkflows) {
+		imports.push(`import { workflowsModule } from "@questpie/workflows/modules/workflows";`);
+		modules.push("workflowsModule");
+	}
+	return [
+		...imports,
+		``,
+		`const modules = [`,
+		...modules.map((mod) => `\t${mod},`),
+		`] as const;`,
+		``,
+		`export default modules;`,
+		``
+	].join("\n");
+}
+function buildAdminModules(options) {
+	const imports = [`import { adminClientModule } from "@questpie/admin/client/modules/admin";`];
+	const modules = ["adminClientModule"];
+	if (options.includeWorkflows) {
+		imports.push(`import { workflowsClientModule } from "@questpie/workflows/client/modules/workflows";`);
+		modules.push("workflowsClientModule");
+	}
+	return [
+		...imports,
+		``,
+		`export default [${modules.join(", ")}] as const;`,
+		``
+	].join("\n");
+}
 async function scaffold(options) {
+	const resolvedOptions = {
+		...options,
+		queueAdapter: options.queueAdapter ?? "pg-boss",
+		emailAdapter: options.emailAdapter ?? "console",
+		realtimeAdapter: options.realtimeAdapter ?? "none",
+		kvAdapter: options.kvAdapter ?? "memory",
+		includeWorkflows: options.includeWorkflows ?? false
+	};
 	const spinner = p.spinner();
-	const targetDir = resolve(process.cwd(), options.projectName);
+	const targetDir = resolve(process.cwd(), resolvedOptions.projectName);
+	const continueOnError = resolvedOptions.continueOnError === true;
 	if (existsSync(targetDir)) {
-		p.log.error(`Directory ${options.projectName} already exists.`);
+		p.log.error(`Directory ${resolvedOptions.projectName} already exists.`);
 		process.exit(1);
 	}
 	const vars = {
-		projectName: options.projectName,
-		databaseName: options.databaseName,
-		databaseUser: options.databaseName,
+		projectName: resolvedOptions.projectName,
+		databaseName: resolvedOptions.databaseName,
+		databaseUser: resolvedOptions.databaseName,
 		databasePassword: generatePassword(),
 		authSecret: generatePassword(48)
 	};
 	spinner.start("Copying template files");
-	const templateDir = join(getTemplatesDir(), options.templateId);
+	const templateDir = join(getTemplatesDir(), resolvedOptions.templateId);
 	if (!existsSync(templateDir)) {
-		spinner.stop(label.error(`Template "${options.templateId}" not found`));
+		spinner.stop(label.error(`Template "${resolvedOptions.templateId}" not found`));
 		process.exit(1);
 	}
 	await cp(templateDir, targetDir, { recursive: true });
@@ -313,18 +506,20 @@ async function scaffold(options) {
 	await renameEnvExample(targetDir);
 	await processDirectory(targetDir, vars);
 	await createLocalEnv(targetDir);
+	await applyProjectOptions(targetDir, resolvedOptions);
 	spinner.stop(label.success("Processed template variables"));
 	const pm = detectPackageManager();
-	if (options.installDeps) {
+	if (resolvedOptions.installDeps) {
 		spinner.start(`Installing dependencies with ${pm}`);
 		try {
 			installDependencies(targetDir, pm);
 			spinner.stop(label.success("Installed dependencies"));
-		} catch {
-			spinner.stop(label.warn("Failed to install dependencies — run manually"));
+		} catch (error) {
+			spinner.stop(label.warn("Failed to install dependencies"));
+			handleFatalStepFailure("Dependency installation failed", error, continueOnError);
 		}
 	}
-	if (options.installSkills) {
+	if (resolvedOptions.installSkills) {
 		spinner.start("Installing QUESTPIE agent skills");
 		try {
 			const installedSkills = await installProjectSkills(targetDir);
@@ -334,16 +529,17 @@ async function scaffold(options) {
 			spinner.stop(label.warn("Failed to install skills — continuing"));
 		}
 	}
-	if (options.installDeps && options.runCodegen) {
+	if (resolvedOptions.installDeps && resolvedOptions.runCodegen) {
 		spinner.start("Generating QUESTPIE app");
 		try {
 			runPackageScript(targetDir, pm, "scaffold:generate");
 			spinner.stop(label.success("Generated QUESTPIE app"));
-		} catch {
-			spinner.stop(label.warn("Failed to run codegen — run manually"));
+		} catch (error) {
+			spinner.stop(label.warn("Failed to run codegen"));
+			handleFatalStepFailure("QUESTPIE codegen failed", error, continueOnError);
 		}
 	}
-	if (options.initGit && isGitInstalled()) {
+	if (resolvedOptions.initGit && isGitInstalled()) {
 		spinner.start("Initializing git repository");
 		try {
 			gitInit(targetDir);
@@ -355,7 +551,7 @@ async function scaffold(options) {
 	const runScript = (script) => pm === "npm" ? `npm run ${script}` : `${pm} run ${script}`;
 	const questpieBin = pm === "npm" ? "npx questpie" : "bunx questpie";
 	p.note([
-		`cd ${options.projectName}`,
+		`cd ${resolvedOptions.projectName}`,
 		"",
 		"# Review the generated environment",
 		"# .env has already been created from .env.example",
@@ -366,8 +562,8 @@ async function scaffold(options) {
 		"# Regenerate and type-check the scaffold",
 		runScript("scaffold:verify"),
 		"",
-		"# Run migrations",
-		runScript("migrate"),
+		"# Create local database tables",
+		runScript("db:push"),
 		"",
 		"# Start dev server",
 		runScript("dev"),
@@ -377,14 +573,26 @@ async function scaffold(options) {
 		`${questpieBin} add global marketing`,
 		"",
 		"# If you create files manually",
-		runScript("questpie:generate")
+		runScript("questpie:generate"),
+		"",
+		"# For production migrations",
+		runScript("migrate:create"),
+		runScript("migrate")
 	].join("\n"), "Next steps");
 	p.outro(`${label.success("Done!")} Happy building with QUESTPIE!`);
 }
 
 //#endregion
 //#region src/index.ts
-new Command().name("create-questpie").description("Create a new QUESTPIE project").version("2.0.1").argument("[project-name]", "Name of the project").option("-t, --template <name>", "Template to use (default: tanstack-start)").option("--database <name>", "Database name (default: derived from project name)").option("--no-install", "Skip dependency installation").option("--no-git", "Skip git initialization").option("--no-skills", "Skip installing project-local QUESTPIE agent skills").option("--no-generate", "Skip running QUESTPIE codegen after install").action(async (projectName, opts) => {
+function readPackageVersion() {
+	for (const candidate of [resolve(import.meta.dirname, "..", "package.json"), resolve(import.meta.dirname, "..", "..", "package.json")]) {
+		if (!existsSync(candidate)) continue;
+		const packageJson = JSON.parse(readFileSync(candidate, "utf-8"));
+		if (packageJson.version) return packageJson.version;
+	}
+	return "0.0.0";
+}
+new Command().name("create-questpie").description("Create a new QUESTPIE project").version(readPackageVersion()).argument("[project-name]", "Name of the project").option("-t, --template <name>", "Template to use (default: tanstack-start)").option("--database <name>", "Database name (default: derived from project name)").option("--no-install", "Skip dependency installation").option("--no-git", "Skip git initialization").option("--no-skills", "Skip installing project-local QUESTPIE agent skills").option("--no-generate", "Skip running QUESTPIE codegen after install").option("--queue <adapter>", "Queue adapter: pg-boss, bullmq, none (default: pg-boss)").option("--email <adapter>", "Email adapters to scaffold: console, smtp, resend, plunk (default: console)").option("--realtime <adapter>", "Realtime adapter: none, pg-notify, redis-streams (default: none)").option("--kv <adapter>", "KV adapter: memory, redis (default: memory)").option("--workflows", "Install and register @questpie/workflows").option("--continue-on-error", "Keep scaffold files when dependency install or codegen fails").action(async (projectName, opts) => {
 	try {
 		if (opts.template && !getTemplate(opts.template)) throw new Error(`Unknown template: ${opts.template}`);
 		await scaffold(await runPrompts({
@@ -394,7 +602,13 @@ new Command().name("create-questpie").description("Create a new QUESTPIE project
 			installDeps: opts.install === false ? false : void 0,
 			initGit: opts.git === false ? false : void 0,
 			installSkills: opts.skills === false ? false : void 0,
-			runCodegen: opts.generate === false ? false : void 0
+			runCodegen: opts.generate === false ? false : void 0,
+			continueOnError: opts.continueOnError === true,
+			queueAdapter: opts.queue,
+			emailAdapter: opts.email,
+			realtimeAdapter: opts.realtime,
+			kvAdapter: opts.kv,
+			includeWorkflows: opts.workflows === true
 		}));
 	} catch (error) {
 		console.error(error instanceof Error ? error.message : String(error));

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "create-questpie",
-	"version": "2.0.3",
+	"version": "2.0.4",
 	"description": "Create a new QUESTPIE project",
 	"keywords": [
 		"create",