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

package/dist/cli.js

@@ -8,7 +8,7 @@ import { existsSync, readFileSync, readdirSync, watch } from "node:fs";
 import { cp, mkdir, readFile, readdir, writeFile } from "node:fs/promises";
 import { DmlParseError } from "@monimesl/dot-dml-parser";
 import { ScriptParseError, parseDotModule } from "@monimesl/dot-script-parser";
-import { isPageId } from "@monimesl/dot-core";
+import { DEFAULT_DASH_API_VERSION, isPageId } from "@monimesl/dot-core";
 import { renderUnicodeCompact } from "uqr";
 import { createHash, createHmac, createPrivateKey, createPublicKey, randomBytes, sign, timingSafeEqual } from "node:crypto";
 import { homedir, networkInterfaces } from "node:os";
@@ -61,6 +61,9 @@ function findDotRoot(dir) {
 function resolveOutDir(root, outDir) {
 	return resolve(root, outDir ?? "dist");
 }
+function isOneOf(values, name) {
+	return values.includes(name);
+}
 //#endregion
 //#region src/create/template.ts
 const TEMPLATES = ["starter", "showcase"];
@@ -69,7 +72,7 @@ const TEMPLATE_HINTS = {
 	showcase: "a page for each feature, to learn from"
 };
 function isTemplate(name) {
-	return TEMPLATES.includes(name);
+	return isOneOf(TEMPLATES, name);
 }
 const PAGE_FILES = {
 	"view.dml": "<View>\n	<Text>My new page</Text>\n</View>\n",
@@ -150,6 +153,7 @@ function dotJson({ name, dotPackage, template }) {
 	};
 	if (template === "showcase") {
 		dot.permissions = {
+			account: "Show your name on your concert ticket",
 			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",
@@ -161,6 +165,7 @@ function dotJson({ name, dotPackage, template }) {
 			"httpbin.org"
 		] };
 	}
+	dot.dash = { minApiVersion: DEFAULT_DASH_API_VERSION };
 	return formatJson(dot);
 }
 const TEMPLATE_READMES = {
@@ -206,10 +211,11 @@ other host fail. Your editor can complete the other fields from the schema the f
 
 ## Which Dash opens it
 
-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 \`DashError\` whose \`code\` is \`unsupported\`, so catch it and carry
-on without the feature.
+\`dash.minApiVersion\` in \`dot.json\` is the Dash API version the dot needs, such as \`1.0\`. Dash
+opens the dot when it offers that version, or a newer minor of the same major. Each Dash call's docs
+say which version it came in, after \`@since\`. To use a newer call and still open on older Dash,
+keep \`minApiVersion\` and check \`this.dash.supports('contacts.pickPhone')\` before the call.
+\`dotctl dev\` warns when the dot makes a newer call without checking.
 
 ## .env
 
@@ -268,7 +274,8 @@ function isInDotWorkspace(dir) {
 }
 function templateDir(template) {
 	const example = join(cliRoot(), "../../examples", template);
-	return existsSync(example) ? example : join(cliRoot(), "dist/templates", template);
+	if (existsSync(example)) return example;
+	return join(cliRoot(), "dist/templates", template);
 }
 function cliVersion() {
 	return readPackageJson(join(cliRoot(), "package.json")).version;
@@ -346,7 +353,7 @@ const PACKAGE_MANAGERS = [
 	"bun"
 ];
 function isPackageManager(name) {
-	return PACKAGE_MANAGERS.includes(name);
+	return isOneOf(PACKAGE_MANAGERS, name);
 }
 function launchedBy(userAgent = process.env.npm_config_user_agent ?? "") {
 	return PACKAGE_MANAGERS.find((name) => userAgent.startsWith(`${name}/`)) ?? "npm";
@@ -476,7 +483,7 @@ var LocalDeviceServer = class {
 		this.#announce();
 	}
 	close() {
-		for (const wake of this.#waiting) wake();
+		this.#wakeWaitingDevices();
 		return new Promise((resolve) => {
 			this.#server.close(() => resolve());
 			this.#server.closeAllConnections();
@@ -484,6 +491,9 @@ var LocalDeviceServer = class {
 	}
 	#announce() {
 		this.#generation += 1;
+		this.#wakeWaitingDevices();
+	}
+	#wakeWaitingDevices() {
 		for (const wake of this.#waiting) wake();
 	}
 	#handle(request, response) {
@@ -548,20 +558,20 @@ var LocalDeviceServer = class {
 			sendJson(response, { generation: this.#generation });
 			return;
 		}
-		const wake = () => {
+		const stopWaiting = () => {
 			clearTimeout(timer);
 			this.#waiting.delete(wake);
+		};
+		const wake = () => {
+			stopWaiting();
 			sendJson(response, { generation: this.#generation });
 		};
 		const timer = setTimeout(() => {
-			this.#waiting.delete(wake);
+			stopWaiting();
 			response.writeHead(204).end();
 		}, WAIT_MS);
 		this.#waiting.add(wake);
-		response.on("close", () => {
-			clearTimeout(timer);
-			this.#waiting.delete(wake);
-		});
+		response.on("close", stopWaiting);
 	}
 	#receiveLog(request, response, from) {
 		readLogText(request).then((text) => {
@@ -607,7 +617,8 @@ function buildFileName(path) {
 function isAuthorized(request, token) {
 	const given = Buffer.from(request.headers.authorization ?? "");
 	const expected = Buffer.from(`Bearer ${token}`);
-	return given.length === expected.length && timingSafeEqual(given, expected);
+	if (given.length !== expected.length) return false;
+	return timingSafeEqual(given, expected);
 }
 function sendJson(response, body) {
 	response.writeHead(200, { "content-type": "application/json" }).end(JSON.stringify(body));
@@ -616,9 +627,10 @@ async function readLogText(request) {
 	const chunks = [];
 	let size = 0;
 	for await (const chunk of request) {
-		size += chunk.length;
+		const bytes = chunk;
+		size += bytes.length;
 		if (size > MAX_LOG_BYTES) throw new Error(`A device sent more than ${MAX_LOG_BYTES} bytes of log at once`);
-		chunks.push(chunk);
+		chunks.push(bytes);
 	}
 	return Buffer.concat(chunks).toString("utf8");
 }
@@ -774,7 +786,8 @@ const HIDE_CURSOR = "\x1B[?25l";
 const SHOW_CURSOR = "\x1B[?25h";
 async function select(question, choices, fallback, { input, output } = TERMINAL) {
 	if (!input.isTTY) return fallback;
-	let selectedIndex = Math.max(0, choices.findIndex((choice) => choice.value === fallback));
+	let selectedIndex = choices.findIndex((choice) => choice.value === fallback);
+	if (selectedIndex < 0) selectedIndex = 0;
 	let valueWidth = 0;
 	if (choices.some((choice) => choice.hint)) valueWidth = Math.max(...choices.map((choice) => choice.value.length));
 	const formatChoice = (choice, index) => {
@@ -786,7 +799,8 @@ async function select(question, choices, fallback, { input, output } = TERMINAL)
 	};
 	let drawnLines = 0;
 	const draw = (lines) => {
-		const moveUp = drawnLines > 0 ? cursorUp(drawnLines) : "";
+		let moveUp = "";
+		if (drawnLines > 0) moveUp = cursorUp(drawnLines);
 		output.write(`${moveUp}${ERASE_BELOW}${lines.join("\n")}\n`);
 		drawnLines = lines.length;
 	};
@@ -837,7 +851,9 @@ async function ask(question, fallback, hint, { input, output } = TERMINAL) {
 		output
 	});
 	try {
-		return (await readline.question(`${styleText("bold", question)}${hintText}${defaultMark}: `)).trim() || fallback;
+		const trimmedAnswer = (await readline.question(`${styleText("bold", question)}${hintText}${defaultMark}: `)).trim();
+		if (trimmedAnswer === "") return fallback;
+		return trimmedAnswer;
 	} catch (error) {
 		if (error.name === "AbortError") return;
 		throw error;
@@ -938,7 +954,7 @@ async function main(argv) {
 	return runBuild(options);
 }
 async function serveLanguageServer() {
-	const { serveStdio } = await import("./server-B9-F93mS.js");
+	const { serveStdio } = await import("./server-DMnWDdJ6.js");
 	serveStdio();
 	return new Promise(() => {});
 }
@@ -1043,7 +1059,8 @@ async function createDot(dir, flags) {
 		dotPackage,
 		template
 	});
-	const path = relative(process.cwd(), root) || ".";
+	let path = relative(process.cwd(), root);
+	if (path === "") path = ".";
 	console.log(`\nCreated ${name} in ${path}`);
 	if (workspace) console.log("It is inside the Dot repository, so it uses the workspace packages.");
 	let packageManager;
@@ -1059,14 +1076,14 @@ async function createDot(dir, flags) {
 	return 0;
 }
 function runCommand(command, args, cwd) {
-	return new Promise((resolvePromise, reject) => {
+	return new Promise((resolve, reject) => {
 		const child = spawn(command, args, {
 			cwd,
 			stdio: "inherit",
 			shell: process.platform === "win32"
 		});
 		child.on("error", reject);
-		child.on("exit", (code) => resolvePromise(code ?? 1));
+		child.on("exit", (exitCode) => resolve(exitCode ?? 1));
 	});
 }
 async function askDotPackage(suggested) {