@monimesl/dot-cli 0.1.0-alpha.19 → 0.1.0-alpha.21

package/dist/cli.js

@@ -2,7 +2,7 @@ import { createRequire } from "node:module";
 import { spawn, spawnSync } from "node:child_process";
 import { basename, dirname, join, relative, resolve, sep } from "node:path";
 import { parseArgs, styleText } from "node:util";
-import { CompileError, PAGES_DIR, build, installedRuntime, isDotPackage, loadProject } from "@monimesl/dot-compiler";
+import { CompileError, DOT_FILE, DOT_JSON_FILE, PAGES_DIR, build, installedRuntime, isDotPackage, loadProject } from "@monimesl/dot-compiler";
 import { DEFAULT_PORT, startSimulator } from "@monimesl/dot-simulator";
 import { existsSync, readFileSync, readdirSync, watch } from "node:fs";
 import { cp, mkdir, readFile, readdir, writeFile } from "node:fs/promises";
@@ -21,11 +21,19 @@ var CommandError = class extends Error {
 };
 function describeError(error) {
 	if (error instanceof CommandError || error instanceof CompileError || error instanceof DmlParseError || error instanceof ScriptParseError) return error.message;
-	if (error.code?.startsWith("ERR_PARSE_ARGS")) {
+	if (isArgumentError(error)) {
 		const [firstSentence] = error.message.split(". ");
 		return `${firstSentence}. See dotctl --help.`;
 	}
-	return error instanceof Error ? error.stack ?? error.message : String(error);
+	if (error instanceof Error) return error.stack ?? error.message;
+	return String(error);
+}
+function isArgumentError(error) {
+	if (!(error instanceof Error) || !("code" in error)) return false;
+	return typeof error.code === "string" && error.code.startsWith("ERR_PARSE_ARGS");
+}
+function printFiles(files) {
+	for (const file of files) console.log(`  ${relative(process.cwd(), file)}`);
 }
 function printWarnings({ warnings }) {
 	for (const warning of warnings) console.warn(`warning: ${warning.message}`);
@@ -33,6 +41,26 @@ function printWarnings({ warnings }) {
 function printBuildTime(startedAt) {
 	console.log(`Built in ${Math.round(performance.now() - startedAt)}ms`);
 }
+function printSimulatorUrl(url) {
+	console.log(`\n  Simulator running at: ${url}\n`);
+}
+//#endregion
+//#region src/utils.ts
+function findFolderWith(fileName, dir) {
+	let current = dir;
+	while (true) {
+		if (existsSync(join(current, fileName))) return current;
+		const parent = dirname(current);
+		if (parent === current) return;
+		current = parent;
+	}
+}
+function findDotRoot(dir) {
+	return findFolderWith(DOT_JSON_FILE, dir);
+}
+function resolveOutDir(root, outDir) {
+	return resolve(root, outDir ?? "dist");
+}
 //#endregion
 //#region src/create/template.ts
 const TEMPLATES = ["starter", "showcase"];
@@ -60,8 +88,8 @@ const TEMPLATE_FILES = [
 	".env"
 ];
 const DOT_JSON_SCHEMA = "https://unpkg.com/@monimesl/dot-runtime/dot.schema.json";
-const json = (value) => `${JSON.stringify(value, null, 2)}\n`;
-function projectFiles(options) {
+const UNREGISTERED_DOT_ID = "<monime-Internal-Id>";
+function generatedFiles(options) {
 	return {
 		"package.json": packageJson(options),
 		"tsconfig.json": tsconfig(options),
@@ -72,7 +100,7 @@ function projectFiles(options) {
 }
 function packageJson({ packageName, dotVersion, workspace }) {
 	const conditions = workspace ? " --conditions @monimesl/dot-source" : "";
-	return json({
+	return formatJson({
 		name: packageName,
 		private: true,
 		type: "module",
@@ -102,7 +130,7 @@ function tsconfig({ workspace }) {
 		verbatimModuleSyntax: true
 	};
 	if (workspace) compilerOptions.customConditions = ["@monimesl/dot-source"];
-	return json({
+	return formatJson({
 		compilerOptions,
 		include: [
 			"dot.ts",
@@ -112,7 +140,6 @@ function tsconfig({ workspace }) {
 		]
 	});
 }
-const UNREGISTERED_DOT_ID = "<monime-Internal-Id>";
 function dotJson({ name, dotPackage, template }) {
 	const dot = {
 		id: UNREGISTERED_DOT_ID,
@@ -125,7 +152,8 @@ function dotJson({ name, dotPackage, template }) {
 		dot.permissions = {
 			camera: "Take a photo for your concert ticket, or scan a ticket's QR code",
 			photoLibrary: "Choose a photo for your concert ticket",
-			files: "Attach your concert ticket"
+			files: "Attach your concert ticket",
+			contacts: "Choose a friend to send a ticket to"
 		};
 		dot.network = { hosts: [
 			"itunes.apple.com",
@@ -133,7 +161,7 @@ function dotJson({ name, dotPackage, template }) {
 			"httpbin.org"
 		] };
 	}
-	return json(dot);
+	return formatJson(dot);
 }
 const TEMPLATE_READMES = {
 	starter: `It starts with one page, \`index\`. It shows a greeting from \`.env\` and a counter you
@@ -172,7 +200,7 @@ also lists the page in \`dot.ts\`. The dot opens on the first page in that list.
 
 \`dot.json\` describes the dot to Dash. Its \`package\` is a reverse domain name you own, such as
 \`com.mysalone.thing\`. You can't change it after publishing. To publish, register the dot with
-Monime first, and replace its \`id\`, \`<monime-Internal-Id>\`, with the ID Monime gives you.
+Monime first, and replace its \`id\`, \`${UNREGISTERED_DOT_ID}\`, with the ID Monime gives you.
 \`network.hosts\` lists every host the dot sends requests to with \`dash.network\`. Requests to any
 other host fail. Your editor can complete the other fields from the schema the file points to.
 
@@ -180,7 +208,7 @@ other host fail. Your editor can complete the other fields from the schema the f
 
 Dash opens the dot unless it was built with a newer major version of \`@monimesl/dot-runtime\` than
 the one Dash has. A newer minor version can add Dash calls that an older Dash doesn't have yet.
-There, such a call fails with a \`HostError\` whose \`code\` is \`unsupported\`, so catch it and carry
+There, such a call fails with a \`DashError\` whose \`code\` is \`unsupported\`, so catch it and carry
 on without the feature.
 
 ## .env
@@ -194,6 +222,9 @@ Never put a secret there. \`.env.development\` and \`.env.production\` override
 function suggestedDotPackage(packageName) {
 	return `com.example.${packageName.slice(0, 63).replace(/-+$/, "")}`;
 }
+function formatJson(value) {
+	return `${JSON.stringify(value, null, 2)}\n`;
+}
 //#endregion
 //#region src/create/create.ts
 const DOT_PACKAGE_RULE = "Use lowercase words joined by dots, such as com.mysalone.thing.";
@@ -208,7 +239,7 @@ async function create({ name, dir, dotPackage, template = "starter" }) {
 	const source = templateDir(template);
 	await mkdir(root, { recursive: true });
 	for (const path of TEMPLATE_FILES) await cp(join(source, path), join(root, path), { recursive: true });
-	const generated = projectFiles({
+	const generated = generatedFiles({
 		name,
 		packageName,
 		dotPackage,
@@ -229,17 +260,11 @@ function toDisplayName(dir) {
 	return basename(resolve(dir)).split(/[-_\s]+/).filter(Boolean).map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join(" ");
 }
 function isInDotWorkspace(dir) {
-	let current = dirname(dir);
-	while (true) {
-		if (existsSync(join(current, "pnpm-workspace.yaml"))) {
-			const runtimeManifest = join(current, "packages/runtime/package.json");
-			if (!existsSync(runtimeManifest)) return false;
-			return readPackageJson(runtimeManifest).name === "@monimesl/dot-runtime";
-		}
-		const parent = dirname(current);
-		if (parent === current) return false;
-		current = parent;
-	}
+	const workspaceRoot = findFolderWith("pnpm-workspace.yaml", dirname(dir));
+	if (workspaceRoot === void 0) return false;
+	const runtimeManifest = join(workspaceRoot, "packages/runtime/package.json");
+	if (!existsSync(runtimeManifest)) return false;
+	return readPackageJson(runtimeManifest).name === "@monimesl/dot-runtime";
 }
 function templateDir(template) {
 	const example = join(cliRoot(), "../../examples", template);
@@ -255,22 +280,12 @@ function cliRoot() {
 	return dirname(createRequire(import.meta.url).resolve("@monimesl/dot-cli/package.json"));
 }
 //#endregion
-//#region src/dot-root.ts
-function findDotRoot(dir) {
-	while (true) {
-		if (existsSync(join(dir, "dot.json"))) return dir;
-		const parent = dirname(dir);
-		if (parent === dir) return;
-		dir = parent;
-	}
-}
-//#endregion
 //#region src/create/page.ts
 async function createPage(path, cwd) {
 	if (!isPageId(path)) throw new CommandError(`"${path}" is not a page path. Use letters, digits, "-" and "_", with "/" between folders, such as "cart/checkout"`);
 	const root = findDotRoot(resolve(cwd));
 	if (root === void 0) throw new CommandError("There is no dot.json in this folder or any folder above it. Run this command inside a dot");
-	const dir = join(root, "pages", path);
+	const dir = join(root, PAGES_DIR, path);
 	if (existsSync(dir)) throw new CommandError(`pages/${path} already exists. Choose another path`);
 	await mkdir(dir, { recursive: true });
 	const files = [];
@@ -282,10 +297,10 @@ async function createPage(path, cwd) {
 	return {
 		dir,
 		files,
-		listing: await listPage(join(root, "dot.ts"), path)
+		listing: await addToDotPages(join(root, DOT_FILE), path)
 	};
 }
-async function listPage(dotFile, path) {
+async function addToDotPages(dotFile, path) {
 	if (!existsSync(dotFile)) return "manual";
 	const source = await readFile(dotFile, "utf8");
 	let dot;
@@ -295,23 +310,25 @@ async function listPage(dotFile, path) {
 		return "manual";
 	}
 	if (dot.pages.includes(path)) return "already";
-	const updated = withPage(source, dot.lastPage, path);
+	const updated = insertPage(source, dot.lastPage, path);
 	if (!listsPage(updated, dotFile, path)) return "manual";
 	await writeFile(dotFile, updated);
 	return "added";
 }
-function withPage(source, lastPage, path) {
+function insertPage(source, lastPage, path) {
 	const quote = source[lastPage.start] === "\"" ? "\"" : "'";
 	const page = `${quote}${path}${quote}`;
+	const before = source.slice(0, lastPage.end);
+	const after = source.slice(lastPage.end);
 	const lineStart = source.lastIndexOf("\n", lastPage.start - 1) + 1;
 	const indent = source.slice(lineStart, lastPage.start);
-	if (!/^\s*$/.test(indent)) return `${source.slice(0, lastPage.end)}, ${page}${source.slice(lastPage.end)}`;
-	const trailingComma = /^\s*,/.exec(source.slice(lastPage.end));
+	if (!/^\s*$/.test(indent)) return `${before}, ${page}${after}`;
+	const trailingComma = /^\s*,/.exec(after);
 	if (trailingComma) {
 		const end = lastPage.end + trailingComma[0].length;
 		return `${source.slice(0, end)}\n${indent}${page},${source.slice(end)}`;
 	}
-	return `${source.slice(0, lastPage.end)},\n${indent}${page}${source.slice(lastPage.end)}`;
+	return `${before},\n${indent}${page}${after}`;
 }
 function listsPage(source, dotFile, path) {
 	try {
@@ -334,10 +351,10 @@ function isPackageManager(name) {
 function launchedBy(userAgent = process.env.npm_config_user_agent ?? "") {
 	return PACKAGE_MANAGERS.find((name) => userAgent.startsWith(`${name}/`)) ?? "npm";
 }
-function installedManagers(isInstalled = onPath) {
+function installedManagers(isInstalled = isOnPath) {
 	return PACKAGE_MANAGERS.filter(isInstalled);
 }
-function onPath(name) {
+function isOnPath(name) {
 	return spawnSync(name, ["--version"], {
 		stdio: "ignore",
 		shell: process.platform === "win32"
@@ -366,16 +383,18 @@ async function loadDeveloperKey(path = defaultDeveloperKeyPath()) {
 	return toDeveloperKey(privateKey);
 }
 function toDeveloperKey(privateKey) {
-	const raw = Buffer.from(createPublicKey(privateKey).export({ format: "jwk" }).x, "base64url");
+	const publicKeyJwk = createPublicKey(privateKey).export({ format: "jwk" });
+	const rawPublicKey = Buffer.from(publicKeyJwk.x, "base64url");
 	return {
-		publicKey: raw.toString("base64"),
-		keyId: raw.subarray(0, 8).toString("hex"),
+		publicKey: rawPublicKey.toString("base64"),
+		keyId: rawPublicKey.subarray(0, 8).toString("hex"),
 		sign: (bytes) => sign(null, bytes, privateKey).toString("base64")
 	};
 }
 //#endregion
 //#region src/device/server.ts
 const DEVICE_SCHEME = "dotdev";
+const FILES_PATH = "/dev/files/";
 const WAIT_MS = 25e3;
 const MAX_LOG_BYTES = 1048576;
 const LINK_LIFETIME_SECONDS = 43200;
@@ -390,130 +409,170 @@ function signedLinkMessage(server, secret, expires, keyId) {
 	].join("\n");
 }
 function deviceToken(secret) {
-	return createHmac("sha256", Buffer.from(secret, "base64url")).update("dotdev-token", "utf8").digest("base64url");
+	return hmacWithSecret(secret, "dotdev-token");
 }
 function buildMac(secret, body) {
-	return createHmac("sha256", Buffer.from(secret, "base64url")).update(`dotdev-build\n${body}`, "utf8").digest("base64url");
+	return hmacWithSecret(secret, `dotdev-build\n${body}`);
 }
 async function startDeviceServer({ address = localNetworkAddress(), port = 0, onLog = () => {}, onConnect = () => {}, developerKey } = {}) {
 	if (address === void 0) throw new Error("This computer has no local network address, so devices can't reach it. Connect to a network and try again");
-	const secret = randomBytes(16).toString("base64url");
-	const token = deviceToken(secret);
-	let signature = null;
-	let build = { files: /* @__PURE__ */ new Map() };
-	let generation = 0;
-	let hotSince = 0;
-	let error = null;
-	const waiting = /* @__PURE__ */ new Set();
-	const connected = /* @__PURE__ */ new Set();
-	const announce = () => {
-		generation += 1;
-		for (const wake of waiting) wake();
-	};
-	const server = createServer((request, response) => {
+	const deviceServer = new LocalDeviceServer(onLog, onConnect);
+	await deviceServer.listen(port, address, developerKey);
+	return deviceServer;
+}
+var LocalDeviceServer = class {
+	#onLog;
+	#onConnect;
+	#secret = randomBytes(16).toString("base64url");
+	#token = deviceToken(this.#secret);
+	#server;
+	#waiting = /* @__PURE__ */ new Set();
+	#connected = /* @__PURE__ */ new Set();
+	#link = "";
+	#signature = null;
+	#files = /* @__PURE__ */ new Map();
+	#generation = 0;
+	#hotSince = 0;
+	#error = null;
+	constructor(onLog, onConnect) {
+		this.#onLog = onLog;
+		this.#onConnect = onConnect;
+		this.#server = createServer((request, response) => {
+			this.#handle(request, response);
+		});
+	}
+	get link() {
+		return this.#link;
+	}
+	async listen(port, address, developerKey) {
+		await new Promise((resolve, reject) => {
+			this.#server.once("error", reject);
+			this.#server.listen(port, address, () => resolve());
+		});
+		const { port: listeningPort } = this.#server.address();
+		const origin = `http://${address}:${listeningPort}`;
+		if (developerKey) {
+			const expires = Math.floor(Date.now() / 1e3) + LINK_LIFETIME_SECONDS;
+			const keyId = developerKey.keyId;
+			const message = signedLinkMessage(origin, this.#secret, expires, keyId);
+			const sig = developerKey.sign(Buffer.from(message, "utf8"));
+			this.#signature = {
+				expires,
+				keyId,
+				sig
+			};
+		}
+		const server = encodeURIComponent(origin);
+		this.#link = `${DEVICE_SCHEME}://connect?server=${server}&secret=${this.#secret}`;
+	}
+	async publish(dir, { hot = false } = {}) {
+		this.#files = await readBuild(dir);
+		this.#error = null;
+		this.#announce();
+		if (!hot) this.#hotSince = this.#generation;
+	}
+	fail(message) {
+		this.#error = message;
+		this.#announce();
+	}
+	close() {
+		for (const wake of this.#waiting) wake();
+		return new Promise((resolve) => {
+			this.#server.close(() => resolve());
+			this.#server.closeAllConnections();
+		});
+	}
+	#announce() {
+		this.#generation += 1;
+		for (const wake of this.#waiting) wake();
+	}
+	#handle(request, response) {
 		const from = request.socket.remoteAddress ?? "a device";
 		if (request.method === "GET" && request.url === "/dev/link") {
-			if (signature) sendJson(response, signature);
-			else response.writeHead(404).end();
+			this.#sendSignature(response);
 			return;
 		}
-		if (!isAuthorized(request, token)) {
+		if (!isAuthorized(request, this.#token)) {
 			response.writeHead(401).end();
 			return;
 		}
 		const url = new URL(request.url ?? "/", "http://device");
 		const path = url.pathname;
-		if (request.method === "GET" && path === "/dev/build") {
-			if (!connected.has(from)) {
-				connected.add(from);
-				onConnect(from);
-			}
-			const files = Object.fromEntries([...build.files].map(([name, file]) => [name, file.hash]));
-			const body = JSON.stringify({
-				generation,
-				hotSince,
-				files,
-				error
-			});
-			response.writeHead(200, {
-				"content-type": "application/json",
-				[BUILD_MAC_HEADER]: buildMac(secret, body)
-			}).end(body);
-		} else if (request.method === "GET" && path.startsWith("/dev/files/")) {
-			if (url.searchParams.get("generation") !== String(generation)) {
-				response.writeHead(409).end();
-				return;
-			}
-			const name = path.slice(11).split("/").map(decodeURIComponent).join("/");
-			const file = build.files.get(name);
-			if (!file) {
-				response.writeHead(404).end();
-				return;
-			}
-			response.writeHead(200, { "content-type": "application/octet-stream" }).end(file.bytes);
-		} else if (request.method === "GET" && path === "/dev/changes") waitForChange(response, Number(url.searchParams.get("after")));
-		else if (request.method === "POST" && path === "/dev/log") readText(request).then((text) => {
-			for (const line of text.split("\n")) onLog(line, from);
-			response.writeHead(204).end();
-		}).catch(() => response.writeHead(413).end());
+		if (request.method === "GET" && path === "/dev/build") this.#sendBuild(response, from);
+		else if (request.method === "GET" && path.startsWith(FILES_PATH)) this.#sendFile(response, path, url.searchParams.get("generation"));
+		else if (request.method === "GET" && path === "/dev/changes") this.#waitForChange(response, Number(url.searchParams.get("after")));
+		else if (request.method === "POST" && path === "/dev/log") this.#receiveLog(request, response, from);
 		else response.writeHead(404).end();
-	});
-	const waitForChange = (response, after) => {
-		if (generation > after) {
-			sendJson(response, { generation });
+	}
+	#sendSignature(response) {
+		if (this.#signature) sendJson(response, this.#signature);
+		else response.writeHead(404).end();
+	}
+	#sendBuild(response, from) {
+		if (!this.#connected.has(from)) {
+			this.#connected.add(from);
+			this.#onConnect(from);
+		}
+		const hashes = {};
+		for (const [name, file] of this.#files) hashes[name] = file.hash;
+		const body = JSON.stringify({
+			generation: this.#generation,
+			hotSince: this.#hotSince,
+			files: hashes,
+			error: this.#error
+		});
+		response.writeHead(200, {
+			"content-type": "application/json",
+			[BUILD_MAC_HEADER]: buildMac(this.#secret, body)
+		}).end(body);
+	}
+	#sendFile(response, path, generation) {
+		if (generation !== String(this.#generation)) {
+			response.writeHead(409).end();
+			return;
+		}
+		const fileName = buildFileName(path);
+		if (fileName === void 0) {
+			response.writeHead(400).end();
+			return;
+		}
+		const file = this.#files.get(fileName);
+		if (!file) {
+			response.writeHead(404).end();
+			return;
+		}
+		response.writeHead(200, { "content-type": "application/octet-stream" }).end(file.bytes);
+	}
+	#waitForChange(response, after) {
+		if (this.#generation > after) {
+			sendJson(response, { generation: this.#generation });
 			return;
 		}
 		const wake = () => {
 			clearTimeout(timer);
-			waiting.delete(wake);
-			sendJson(response, { generation });
+			this.#waiting.delete(wake);
+			sendJson(response, { generation: this.#generation });
 		};
 		const timer = setTimeout(() => {
-			waiting.delete(wake);
+			this.#waiting.delete(wake);
 			response.writeHead(204).end();
 		}, WAIT_MS);
-		waiting.add(wake);
+		this.#waiting.add(wake);
 		response.on("close", () => {
 			clearTimeout(timer);
-			waiting.delete(wake);
+			this.#waiting.delete(wake);
 		});
-	};
-	await new Promise((resolve, reject) => {
-		server.once("error", reject);
-		server.listen(port, address, () => resolve());
-	});
-	const { port: listening } = server.address();
-	const origin = `http://${address}:${listening}`;
-	if (developerKey) {
-		const expires = Math.floor(Date.now() / 1e3) + LINK_LIFETIME_SECONDS;
-		const keyId = developerKey.keyId;
-		const message = signedLinkMessage(origin, secret, expires, keyId);
-		signature = {
-			expires,
-			keyId,
-			sig: developerKey.sign(Buffer.from(message, "utf8"))
-		};
 	}
-	return {
-		link: `${DEVICE_SCHEME}://connect?server=${encodeURIComponent(origin)}&secret=${secret}`,
-		async publish(dir, { hot = false } = {}) {
-			build = await readBuild(dir);
-			error = null;
-			announce();
-			if (!hot) hotSince = generation;
-		},
-		fail(message) {
-			error = message;
-			announce();
-		},
-		close() {
-			for (const wake of waiting) wake();
-			return new Promise((resolve) => {
-				server.close(() => resolve());
-				server.closeAllConnections();
-			});
-		}
-	};
+	#receiveLog(request, response, from) {
+		readLogText(request).then((text) => {
+			for (const line of text.split("\n")) this.#onLog(line, from);
+			response.writeHead(204).end();
+		}).catch(() => response.writeHead(413).end());
+	}
+};
+function hmacWithSecret(secret, text) {
+	const key = Buffer.from(secret, "base64url");
+	return createHmac("sha256", key).update(text, "utf8").digest("base64url");
 }
 function localNetworkAddress() {
 	for (const addresses of Object.values(networkInterfaces())) for (const candidate of addresses ?? []) if (candidate.family === "IPv4" && !candidate.internal) return candidate.address;
@@ -529,12 +588,21 @@ async function readBuild(dir) {
 		const path = join(entry.parentPath, entry.name);
 		const bytes = await readFile(path);
 		const hash = createHash("sha256").update(bytes).digest("base64url");
-		files.set(relative(dir, path).split(sep).join("/"), {
+		const name = relative(dir, path).split(sep).join("/");
+		files.set(name, {
 			bytes,
 			hash
 		});
 	}
-	return { files };
+	return files;
+}
+function buildFileName(path) {
+	const encodedParts = path.slice(11).split("/");
+	try {
+		return encodedParts.map((part) => decodeURIComponent(part)).join("/");
+	} catch {
+		return;
+	}
 }
 function isAuthorized(request, token) {
 	const given = Buffer.from(request.headers.authorization ?? "");
@@ -544,7 +612,7 @@ function isAuthorized(request, token) {
 function sendJson(response, body) {
 	response.writeHead(200, { "content-type": "application/json" }).end(JSON.stringify(body));
 }
-async function readText(request) {
+async function readLogText(request) {
 	const chunks = [];
 	let size = 0;
 	for await (const chunk of request) {
@@ -570,64 +638,40 @@ function startDotSimulator(project, outDir, port) {
 const CHANGE_DEBOUNCE_MS = 50;
 async function dev({ port, device, ...options }) {
 	const project = await loadProject(options.root);
-	const outDir = resolve(project.root, options.outDir ?? "dist");
+	const outDir = resolveOutDir(project.root, options.outDir);
 	const buildOptions = {
 		mode: "development",
 		...options,
 		outDir
 	};
-	const buildApp = async () => {
-		const started = performance.now();
-		try {
-			printWarnings(await build(buildOptions));
-			printBuildTime(started);
-			return null;
-		} catch (error) {
-			const message = describeError(error).replaceAll(project.root + sep, "");
-			console.error(`error: ${message}`);
-			return message;
-		}
-	};
-	const firstError = await buildApp();
+	const firstError = await buildDot(buildOptions, project.root);
 	const simulator = await startDotSimulator(project, outDir, port);
 	if (firstError) simulator.error(firstError);
-	console.log(`\n  Simulator running at: ${simulator.url}\n`);
-	let devices;
-	if (device) {
-		const developerKey = await loadDeveloperKey();
-		devices = await startDeviceServer({
-			developerKey,
-			onConnect: (from) => console.log(`A device connected from ${from}`),
-			onLog: (line) => console.log(`device ${line}`)
-		});
-		if (firstError) devices.fail(firstError);
-		else await devices.publish(outDir);
-		printDeviceLink(devices.link);
-		if (developerKey) console.log(`  Signed with developer key ${developerKey.keyId}\n`);
-		else console.log(`${missingDeveloperKeyHint()}\n`);
-	}
-	const changed = /* @__PURE__ */ new Set();
+	printSimulatorUrl(simulator.url);
+	let deviceServer;
+	if (device) deviceServer = await startDevices(outDir, firstError);
+	const changedFiles = /* @__PURE__ */ new Set();
 	const pagesDir = join(project.root, PAGES_DIR) + sep;
 	const rebuilds = new RebuildQueue(async () => {
-		const building = [...changed];
-		const error = await buildApp();
+		const filesInThisBuild = [...changedFiles];
+		const error = await buildDot(buildOptions, project.root);
 		if (error) {
 			simulator.error(error);
-			devices?.fail(error);
+			deviceServer?.fail(error);
 			return;
 		}
-		for (const path of building) changed.delete(path);
-		const hot = building.every((path) => path.startsWith(pagesDir));
+		for (const path of filesInThisBuild) changedFiles.delete(path);
+		const hot = filesInThisBuild.every((path) => path.startsWith(pagesDir));
 		if (hot) simulator.hotReload();
 		else simulator.reload();
-		await devices?.publish(outDir, { hot });
+		await deviceServer?.publish(outDir, { hot });
 	});
 	let debounceTimer;
 	const watcher = watch(project.root, { recursive: true }, (_event, file) => {
 		if (!file || isIgnored(file)) return;
 		const path = resolve(project.root, file);
 		if (path === outDir || path.startsWith(outDir + sep)) return;
-		changed.add(path);
+		changedFiles.add(path);
 		clearTimeout(debounceTimer);
 		debounceTimer = setTimeout(() => {
 			console.log(`Changed ${relative(project.root, path)}`);
@@ -637,12 +681,39 @@ async function dev({ port, device, ...options }) {
 	return async () => {
 		clearTimeout(debounceTimer);
 		watcher.close();
-		await Promise.all([simulator.close(), devices?.close()]);
+		await Promise.all([simulator.close(), deviceServer?.close()]);
 	};
 }
+async function buildDot(buildOptions, root) {
+	const startedAt = performance.now();
+	try {
+		printWarnings(await build(buildOptions));
+		printBuildTime(startedAt);
+		return null;
+	} catch (error) {
+		const message = describeError(error).replaceAll(root + sep, "");
+		console.error(`error: ${message}`);
+		return message;
+	}
+}
+async function startDevices(outDir, firstError) {
+	const developerKey = await loadDeveloperKey();
+	const deviceServer = await startDeviceServer({
+		developerKey,
+		onConnect: (from) => console.log(`A device connected from ${from}`),
+		onLog: (line) => console.log(`device ${line}`)
+	});
+	if (firstError) deviceServer.fail(firstError);
+	else await deviceServer.publish(outDir);
+	printDeviceLink(deviceServer.link);
+	if (developerKey) console.log(`  Signed with developer key ${developerKey.keyId}\n`);
+	else console.log(`${missingDeveloperKeyHint()}\n`);
+	return deviceServer;
+}
 function printDeviceLink(link) {
 	console.log("  To open it in Dash, turn on Enable Dot Debugging in Developer Settings.\n  Then tap Live Test on the Dots tab and scan this code.\n");
-	console.log(renderUnicodeCompact(link, { border: 1 }).replace(/^/gm, "  "));
+	const qrCode = renderUnicodeCompact(link, { border: 1 });
+	console.log(qrCode.replace(/^/gm, "  "));
 	console.log(`\n  ${link}\n`);
 }
 var RebuildQueue = class {
@@ -680,16 +751,16 @@ function isIgnored(file) {
 //#region src/preview.ts
 async function preview({ port, ...options }) {
 	const project = await loadProject(options.root);
-	const outDir = resolve(project.root, options.outDir ?? "dist");
-	const started = performance.now();
+	const outDir = resolveOutDir(project.root, options.outDir);
+	const startedAt = performance.now();
 	printWarnings(await build({
 		...options,
 		outDir,
 		mode: "production"
 	}));
-	printBuildTime(started);
+	printBuildTime(startedAt);
 	const simulator = await startDotSimulator(project, outDir, port);
-	console.log(`\n  Simulator running at: ${simulator.url}\n`);
+	printSimulatorUrl(simulator.url);
 	return simulator;
 }
 //#endregion
@@ -701,29 +772,33 @@ const TERMINAL = {
 const ERASE_BELOW = "\x1B[0J";
 const HIDE_CURSOR = "\x1B[?25l";
 const SHOW_CURSOR = "\x1B[?25h";
-const cursorUp = (lines) => `\x1b[${lines}A`;
 async function select(question, choices, fallback, { input, output } = TERMINAL) {
 	if (!input.isTTY) return fallback;
-	let current = Math.max(0, choices.findIndex((choice) => choice.value === fallback));
-	const width = choices.some((choice) => choice.hint) ? Math.max(...choices.map((choice) => choice.value.length)) : 0;
-	const row = (choice, index) => {
-		const name = choice.value.padEnd(width);
+	let selectedIndex = Math.max(0, choices.findIndex((choice) => choice.value === fallback));
+	let valueWidth = 0;
+	if (choices.some((choice) => choice.hint)) valueWidth = Math.max(...choices.map((choice) => choice.value.length));
+	const formatChoice = (choice, index) => {
+		const value = choice.value.padEnd(valueWidth);
 		const hint = choice.hint ? styleText("dim", `  ${choice.hint}`) : "";
 		const defaultMark = choice.value === fallback ? styleText("green", " (default)") : "";
-		if (index === current) return `${styleText("cyan", "❯")} ${styleText(["cyan", "bold"], name)}${hint}${defaultMark}`;
-		return `  ${name}${hint}${defaultMark}`;
+		if (index === selectedIndex) return `${styleText("cyan", "❯")} ${styleText(["cyan", "bold"], value)}${hint}${defaultMark}`;
+		return `  ${value}${hint}${defaultMark}`;
 	};
 	let drawnLines = 0;
 	const draw = (lines) => {
-		output.write(`${drawnLines ? cursorUp(drawnLines) : ""}${ERASE_BELOW}${lines.join("\n")}\n`);
+		const moveUp = drawnLines > 0 ? cursorUp(drawnLines) : "";
+		output.write(`${moveUp}${ERASE_BELOW}${lines.join("\n")}\n`);
 		drawnLines = lines.length;
 	};
-	const drawList = () => draw([`${styleText("bold", question)} ${styleText("dim", "↑/↓ to move, Enter to choose")}`, ...choices.map(row)]);
+	const drawQuestionAndChoices = () => {
+		const keysHint = styleText("dim", "↑/↓ to move, Enter to choose");
+		draw([`${styleText("bold", question)} ${keysHint}`, ...choices.map(formatChoice)]);
+	};
 	emitKeypressEvents(input);
 	input.setRawMode(true);
 	input.resume();
 	output.write(HIDE_CURSOR);
-	drawList();
+	drawQuestionAndChoices();
 	return new Promise((resolve) => {
 		const onKeypress = (_text, key) => {
 			if (key.ctrl && key.name === "c") {
@@ -731,13 +806,13 @@ async function select(question, choices, fallback, { input, output } = TERMINAL)
 				process.exit(130);
 			}
 			if (key.name === "up" || key.name === "k") {
-				current = (current - 1 + choices.length) % choices.length;
-				drawList();
+				selectedIndex = (selectedIndex - 1 + choices.length) % choices.length;
+				drawQuestionAndChoices();
 			} else if (key.name === "down" || key.name === "j") {
-				current = (current + 1) % choices.length;
-				drawList();
+				selectedIndex = (selectedIndex + 1) % choices.length;
+				drawQuestionAndChoices();
 			} else if (key.name === "return" || key.name === "enter") {
-				const { value } = choices[current];
+				const { value } = choices[selectedIndex];
 				input.off("keypress", onKeypress);
 				input.setRawMode(false);
 				input.pause();
@@ -755,14 +830,14 @@ async function confirm(question, fallback, terminal = TERMINAL) {
 }
 async function ask(question, fallback, hint, { input, output } = TERMINAL) {
 	if (!input.isTTY) return fallback;
-	const guide = hint ? styleText("dim", `, ${hint}`) : "";
+	const hintText = hint ? styleText("dim", `, ${hint}`) : "";
 	const defaultMark = fallback ? styleText("dim", ` (default: ${fallback})`) : "";
 	const readline = createInterface({
 		input,
 		output
 	});
 	try {
-		return (await readline.question(`${styleText("bold", question)}${guide}${defaultMark}: `)).trim() || fallback;
+		return (await readline.question(`${styleText("bold", question)}${hintText}${defaultMark}: `)).trim() || fallback;
 	} catch (error) {
 		if (error.name === "AbortError") return;
 		throw error;
@@ -770,6 +845,9 @@ async function ask(question, fallback, hint, { input, output } = TERMINAL) {
 		readline.close();
 	}
 }
+function cursorUp(lines) {
+	return `\x1b[${lines}A`;
+}
 //#endregion
 //#region src/cli.ts
 const USAGE = `Usage:
@@ -822,57 +900,85 @@ async function main(argv) {
 		}
 	});
 	const [command, target, pagePath] = positionals;
-	if (command === "lsp" && !values.help) {
-		const { serveStdio } = await import("./server-uIyYmYnp.js");
-		serveStdio();
-		return new Promise(() => {});
-	}
-	if (command === "keys" && !values.help) return keys(target);
-	if (command === "create" && target === "page" && !values.help) return addPage(pagePath);
-	if (command === "create" && !values.help) return createApp(target, values.name, values.package, values.template, values.pm);
-	if (values.help || command !== "build" && command !== "dev" && command !== "preview") {
+	if (values.help) {
 		console.log(USAGE);
-		return values.help ? 0 : 1;
+		return 0;
 	}
-	const port = values.port === void 0 ? void 0 : Number(values.port);
-	if (port !== void 0 && !Number.isInteger(port)) {
-		console.error(`--port must be a whole number, not "${values.port}"`);
-		return 1;
+	switch (command) {
+		case "lsp": return serveLanguageServer();
+		case "keys": return showKeys(target);
+		case "create":
+			if (target === "page") return addPage(pagePath);
+			return createDot(target, {
+				name: values.name,
+				dotPackage: values.package,
+				template: values.template,
+				packageManager: values.pm
+			});
+		case "build":
+		case "dev":
+		case "preview": break;
+		default:
+			console.log(USAGE);
+			return 1;
+	}
+	let port;
+	if (values.port !== void 0) {
+		port = Number(values.port);
+		if (!Number.isInteger(port)) {
+			console.error(`--port must be a whole number, not "${values.port}"`);
+			return 1;
+		}
 	}
 	const options = { root: target ?? "." };
 	if (values["out-dir"] !== void 0) options.outDir = values["out-dir"];
 	if (values.conditions !== void 0) options.conditions = values.conditions.split(",");
-	if (command === "dev") {
-		const stop = await dev({
-			...options,
-			port,
-			device: values.device
-		});
-		await new Promise((resolve) => process.once("SIGINT", resolve));
-		await stop();
-		return 0;
-	}
-	if (command === "preview") {
-		if (values.device) {
-			console.error("--device only works with dotctl dev");
-			return 1;
-		}
-		const simulator = await preview({
-			...options,
-			port
-		});
-		await new Promise((resolve) => process.once("SIGINT", resolve));
-		await simulator.close();
-		return 0;
+	if (command === "dev") return runDev(options, port, values.device);
+	if (command === "preview") return runPreview(options, port, values.device);
+	return runBuild(options);
+}
+async function serveLanguageServer() {
+	const { serveStdio } = await import("./server-B9-F93mS.js");
+	serveStdio();
+	return new Promise(() => {});
+}
+async function runDev(options, port, device) {
+	const stop = await dev({
+		...options,
+		port,
+		device
+	});
+	await waitForCtrlC();
+	await stop();
+	return 0;
+}
+async function runPreview(options, port, device) {
+	if (device) {
+		console.error("--device only works with dotctl dev");
+		return 1;
 	}
-	const started = performance.now();
+	const simulator = await preview({
+		...options,
+		port
+	});
+	await waitForCtrlC();
+	await simulator.close();
+	return 0;
+}
+async function runBuild(options) {
+	const startedAt = performance.now();
 	const result = await build(options);
-	for (const file of result.files.filter((file) => !file.endsWith(".map"))) console.log(`  ${relative(process.cwd(), file)}`);
+	printFiles(result.files.filter((file) => !file.endsWith(".map")));
 	printWarnings(result);
-	printBuildTime(started);
+	printBuildTime(startedAt);
 	return 0;
 }
-async function keys(action) {
+function waitForCtrlC() {
+	return new Promise((resolve) => {
+		process.once("SIGINT", () => resolve());
+	});
+}
+async function showKeys(action) {
 	if (action !== "show") {
 		console.error("Usage: dotctl keys show");
 		return 1;
@@ -886,40 +992,51 @@ async function keys(action) {
 	console.log(`\n  Public key: ${key.publicKey}\n  Key ID:     ${key.keyId}\n`);
 	return 0;
 }
-async function addPage(path) {
-	if (path === void 0) {
+async function addPage(typedPath) {
+	if (typedPath === void 0) {
 		console.error("Give the page a path, such as: dotctl create page cart/checkout");
 		return 1;
 	}
-	if (path.startsWith("/")) path = path.substring(1);
-	if (path.endsWith("/")) path = path.substring(0, path.length - 1);
+	const path = trimSlashes(typedPath);
 	const { files, listing } = await createPage(path, process.cwd());
-	for (const file of files) console.log(`  ${relative(process.cwd(), file)}`);
+	printFiles(files);
 	if (listing === "added") console.log(`\nListed '${path}' in dot.ts.`);
 	else if (listing === "manual") console.log(`\nAdd it to the pages in dot.ts so it gets built: defineDot({ pages: [..., '${path}'] })`);
 	return 0;
 }
-async function createApp(dir, name, dotPackageFlag, templateFlag, packageManagerFlag) {
+function trimSlashes(path) {
+	let trimmed = path;
+	if (trimmed.startsWith("/")) trimmed = trimmed.substring(1);
+	if (trimmed.endsWith("/")) trimmed = trimmed.substring(0, trimmed.length - 1);
+	return trimmed;
+}
+async function createDot(dir, flags) {
+	const templateFlag = flags.template;
 	if (templateFlag !== void 0 && !isTemplate(templateFlag)) {
 		console.error(`--template must be one of ${TEMPLATES.join(", ")}`);
 		return 1;
 	}
+	const packageManagerFlag = flags.packageManager;
 	if (packageManagerFlag !== void 0 && !isPackageManager(packageManagerFlag)) {
 		console.error(`--pm must be one of ${PACKAGE_MANAGERS.join(", ")}`);
 		return 1;
 	}
-	name ??= await ask("Dot name", dir ? toDisplayName(dir) : "Dot");
+	let name = flags.name;
+	if (name === void 0) name = await ask("Dot name", dir ? toDisplayName(dir) : "Dot");
 	if (!name) {
 		console.error("The dot needs a name. Pass one with: dotctl create [dir] --name \"My Dot\"");
 		return 1;
 	}
+	const dotPackageFlag = flags.dotPackage;
 	if (dotPackageFlag !== void 0 && !isDotPackage(dotPackageFlag)) {
 		console.error(`--package "${dotPackageFlag}" isn't a package name. ${DOT_PACKAGE_RULE}`);
 		return 1;
 	}
-	const dotPackage = dotPackageFlag ?? await askDotPackage(suggestedDotPackage(toPackageName(name)));
+	let dotPackage = dotPackageFlag;
+	if (dotPackage === void 0) dotPackage = await askDotPackage(suggestedDotPackage(toPackageName(name)));
 	if (!dotPackage) return 1;
-	const template = templateFlag ?? await chooseTemplate();
+	let template = templateFlag;
+	if (template === void 0) template = await chooseTemplate();
 	const { root, workspace } = await create({
 		name,
 		dir: dir ?? toPackageName(name),
@@ -929,17 +1046,19 @@ async function createApp(dir, name, dotPackageFlag, templateFlag, packageManager
 	const path = relative(process.cwd(), root) || ".";
 	console.log(`\nCreated ${name} in ${path}`);
 	if (workspace) console.log("It is inside the Dot repository, so it uses the workspace packages.");
-	let packageManager = workspace ? "pnpm" : packageManagerFlag ?? launchedBy();
+	let packageManager;
+	if (workspace) packageManager = "pnpm";
+	else packageManager = packageManagerFlag ?? launchedBy();
 	console.log();
 	if (await confirm("Install and start it now?", true)) {
 		if (!workspace && !packageManagerFlag) packageManager = await choosePackageManager(packageManager);
-		if (await run(packageManager, ["install"], root) === 0) return run(packageManager, ["run", "dev"], root);
+		if (await runCommand(packageManager, ["install"], root) === 0) return runCommand(packageManager, ["run", "dev"], root);
 		console.error(`\n${packageManager} install failed. Fix the problem above, then run the steps below.`);
 	}
 	console.log(`\nNext:\n\n  cd ${path}\n  ${packageManager} install\n  ${packageManager} run dev\n`);
 	return 0;
 }
-function run(command, args, cwd) {
+function runCommand(command, args, cwd) {
 	return new Promise((resolvePromise, reject) => {
 		const child = spawn(command, args, {
 			cwd,
@@ -967,10 +1086,11 @@ function chooseTemplate() {
 async function choosePackageManager(suggested) {
 	const installed = installedManagers();
 	if (installed.length < 2) return installed[0] ?? suggested;
-	const fallback = installed.includes(suggested) ? suggested : installed[0];
+	let fallback = installed[0];
+	if (installed.includes(suggested)) fallback = suggested;
 	return select("Package manager?", installed.map((manager) => ({ value: manager })), fallback);
 }
-main(process.argv.slice(2)).then((code) => process.exit(code), (error) => {
+main(process.argv.slice(2)).then((exitCode) => process.exit(exitCode), (error) => {
 	console.error(`error: ${describeError(error)}`);
 	process.exit(1);
 });