@monimesl/dot-compiler 0.1.0-alpha.9 → 1.0.0-beta.1

package/dist/index.js

@@ -2,8 +2,8 @@ import { createRequire } from "node:module";
 import { existsSync, readFileSync, realpathSync } from "node:fs";
 import { dirname, extname, join, relative, resolve, sep } from "node:path";
 import { copyFile, mkdir, readFile, readdir, rm, stat, writeFile } from "node:fs/promises";
-import { ScriptParseError, parseDotModule, parseExpression, parseLogicModule, parseStateModule, unboundReferences } from "@monimesl/dot-script-parser";
-import { PERMISSIONS, REACT_HOST_MODULES, SourceError, builtinComponents, builtinRegistry, componentRegistry, eventName, isNetworkHost, isPermission, isSemanticVersion, reactHostUrl } from "@monimesl/dot-core";
+import { ScriptParseError, globalMemberUses, parseDotModule, parseExpression, parseLogicModule, parseStateModule, unboundReferences } from "@monimesl/dot-script-parser";
+import { DEFAULT_DASH_API_VERSION, DOT_JSON_PERMISSIONS, REACT_HOST_MODULES, SourceError, builtinComponents, builtinRegistry, componentRegistry, eventName, isDashApiVersion, isDotJsonPermission, isLocalNetworkHost, isNetworkHost, isSemanticVersion, isWordsOr, otherThanWords, reactHostUrl } from "@monimesl/dot-core";
 import { zipSync } from "fflate";
 import { rolldown } from "rolldown";
 import { esmExternalRequirePlugin } from "rolldown/plugins";
@@ -18,73 +18,43 @@ var CompileWarning = class extends SourceError {
 	name = "CompileWarning";
 };
 //#endregion
-//#region src/project/categories.ts
-const CATEGORIES = [
-	"agriculture",
-	"asset_finance",
-	"donations",
-	"education",
-	"electricity",
-	"entertainment",
-	"events",
-	"finance",
-	"food_and_drink",
-	"gambling",
-	"games",
-	"government",
-	"health",
-	"insurance",
-	"internet_service_provider",
-	"investments",
-	"jobs",
-	"lifestyle",
-	"loans",
-	"micro_credit",
-	"microfinance",
-	"news",
-	"other",
-	"productivity",
-	"real_estate",
-	"religion",
-	"remittances",
-	"savings",
-	"shopping",
-	"social",
-	"sports",
-	"telecom",
-	"television",
-	"transport",
-	"travel",
-	"utilities",
-	"water"
-];
-function isCategory(value) {
-	return CATEGORIES.includes(value);
+//#region src/utils.ts
+function quotedList(values) {
+	return values.map((value) => `"${value}"`).join(", ");
+}
+function relativeSlashPath(from, to) {
+	return relative(from, to).split(sep).join("/");
 }
 //#endregion
 //#region src/project/dot-json.ts
 const DOT_JSON_FILE = "dot.json";
 const DOT_JSON_FIELDS = [
-	"$schema",
 	"id",
+	"$schema",
+	"package",
 	"name",
 	"version",
-	"description",
-	"categories",
-	"icon",
 	"permissions",
 	"network",
 	"dash"
 ];
 const REQUIRED_DOT_JSON_FIELDS = [
-	"id",
+	"package",
 	"name",
 	"version"
 ];
-const DASH_FIELDS = ["minVersion"];
 const NETWORK_FIELDS = ["hosts"];
-const ID_WORD = "[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?";
-const DOT_ID_PATTERN = new RegExp(`^(?=[a-z])${ID_WORD}(?:\\.${ID_WORD})+$`);
+const DASH_FIELDS = ["minApiVersion"];
+const LISTING_FIELDS = [
+	"description",
+	"categories",
+	"icon"
+];
+const PACKAGE_WORD = "[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?";
+const DOT_PACKAGE_PATTERN = new RegExp(`^(?=[a-z])${PACKAGE_WORD}(?:\\.${PACKAGE_WORD})+$`);
+function isDotPackage(name) {
+	return name.length <= 128 && DOT_PACKAGE_PATTERN.test(name);
+}
 async function readDotJson(file) {
 	let dotJson;
 	try {
@@ -92,46 +62,42 @@ async function readDotJson(file) {
 	} catch (error) {
 		throw new CompileError(`This isn't valid JSON: ${error.message}`, file);
 	}
-	if (!isObject(dotJson)) throw new CompileError("dot.json must be an object, such as { \"id\": \"com.example.shop\", \"name\": \"Shop\", \"version\": \"1.0.0\" }", file);
+	if (!isObject(dotJson)) throw new CompileError("dot.json must be an object, such as { \"package\": \"com.mysalone.thing\", \"name\": \"My Salone Thing\", \"version\": \"1.0.0\" }", file);
 	if ("pages" in dotJson) throw new CompileError("List pages in dot.ts, not here: defineDot({ pages: [...] })", file);
+	for (const field of LISTING_FIELDS) if (field in dotJson) throw new CompileError(`Remove "${field}". A dot's description, categories and icon are set where it's published.`, file);
 	rejectUnknownFields(dotJson, DOT_JSON_FIELDS, file);
+	if (dotJson.package === void 0 && typeof dotJson.id === "string" && DOT_PACKAGE_PATTERN.test(dotJson.id)) throw new CompileError(`"${dotJson.id}" is a package name. Rename "id" to "package".`, file);
 	for (const field of REQUIRED_DOT_JSON_FIELDS) if (dotJson[field] === void 0) throw new CompileError(`"${field}" is required`, file);
-	const { $schema, id, name, version, description, categories, icon, permissions, network, dash } = dotJson;
+	const { $schema, package: packageName, id, name, version, permissions, network, dash } = dotJson;
 	if ($schema !== void 0 && typeof $schema !== "string") throw new CompileError("\"$schema\" must be a string", file);
-	if (typeof id !== "string" || !DOT_ID_PATTERN.test(id)) throw new CompileError("\"id\" must be a reverse domain name, such as \"com.example.counter\". Use lowercase letters, digits and hyphens, with dots between words. A word can't start or end with a hyphen, or be longer than 63 characters.", file);
-	if (id.length > 128) throw new CompileError(`"id" must be at most 128 characters`, file);
+	if (typeof packageName !== "string" || !DOT_PACKAGE_PATTERN.test(packageName)) throw new CompileError("\"package\" must be a reverse domain name. Use lowercase words joined by dots, such as \"com.mysalone.thing\".", file);
+	if (packageName.length > 128) throw new CompileError(`"package" must be at most 128 characters`, file);
+	if (id !== void 0 && !isNonEmptyString(id)) throw new CompileError("\"id\" must be the ID Monime gave the dot, as text", file);
 	if (!isNonEmptyString(name)) throw new CompileError("\"name\" must be text, and not empty", file);
 	if (!isSemanticVersion(version)) throw new CompileError("\"version\" must be a semantic version, such as \"1.0.0\"", file);
-	if (description !== void 0 && !isNonEmptyString(description)) throw new CompileError("\"description\" must be text, and not empty", file);
-	if (icon !== void 0 && !(isNonEmptyString(icon) && icon.endsWith(".png"))) throw new CompileError("\"icon\" must be the path to a PNG file, such as \"icon.png\"", file);
 	return {
 		id,
+		package: packageName,
 		name,
 		version,
-		description,
-		categories: readCategories(categories, file),
-		icon,
 		permissions: readPermissions(permissions, file),
 		network: readNetworkAccess(network, file),
-		dash: readDashRequirements(dash, file)
+		dash: readDashNeeds(dash, file)
 	};
 }
-function readCategories(categories, file) {
-	if (categories === void 0) return;
-	if (!Array.isArray(categories) || categories.length === 0) throw new CompileError("\"categories\" must list one or more categories, such as [\"finance\", \"savings\"]", file);
-	const listed = [];
-	for (const category of categories) {
-		if (!isCategory(category)) throw new CompileError(`"${String(category)}" is not a category. The categories are ${quotedList(CATEGORIES)}`, file);
-		if (listed.includes(category)) throw new CompileError(`"categories" lists "${category}" more than once`, file);
-		listed.push(category);
-	}
-	return listed;
+function readDashNeeds(dash, file) {
+	if (dash === void 0) return;
+	if (!isObject(dash)) throw new CompileError("\"dash\" must be an object, such as { \"minApiVersion\": \"1.0\" }", file);
+	rejectUnknownFields(dash, DASH_FIELDS, file, "dash");
+	const { minApiVersion = DEFAULT_DASH_API_VERSION } = dash;
+	if (!isDashApiVersion(minApiVersion)) throw new CompileError("\"dash.minApiVersion\" must be a Dash API version: a major and a minor, such as \"1.0\"", file);
+	return { minApiVersion };
 }
 function readPermissions(permissions, file) {
 	if (permissions === void 0) return;
-	if (!isObject(permissions)) throw new CompileError("\"permissions\" must be an object, such as { \"account\": \"Show your name on receipts\" }", file);
+	if (!isObject(permissions)) throw new CompileError("\"permissions\" must be an object, such as { \"camera\": \"Scan tickets at the door\" }", file);
 	for (const [permission, reason] of Object.entries(permissions)) {
-		if (!isPermission(permission)) throw new CompileError(`Unknown permission "${permission}". The permissions are ${quotedList(PERMISSIONS)}`, file);
+		if (!isDotJsonPermission(permission)) throw new CompileError(`Unknown permission "${permission}". The permissions are ${quotedList(DOT_JSON_PERMISSIONS)}`, file);
 		if (!isNonEmptyString(reason)) throw new CompileError(`"permissions.${permission}" must say why the dot needs it, such as "Show your name on receipts"`, file);
 	}
 	return permissions;
@@ -150,14 +116,6 @@ function readNetworkAccess(network, file) {
 	}
 	return { hosts: listed };
 }
-function readDashRequirements(dash, file) {
-	if (dash === void 0) return;
-	if (!isObject(dash)) throw new CompileError("\"dash\" must be an object, such as { \"minVersion\": \"2.4.0\" }", file);
-	rejectUnknownFields(dash, DASH_FIELDS, file, "dash");
-	const { minVersion } = dash;
-	if (minVersion !== void 0 && !isSemanticVersion(minVersion)) throw new CompileError("\"dash.minVersion\" must be a semantic version, such as \"2.4.0\"", file);
-	return { minVersion };
-}
 function rejectUnknownFields(object, allowed, file, parent) {
 	for (const field of Object.keys(object)) {
 		if (allowed.includes(field)) continue;
@@ -165,9 +123,6 @@ function rejectUnknownFields(object, allowed, file, parent) {
 		throw new CompileError(`Unknown field "${parent}.${field}". The fields allowed in "${parent}" are ${quotedList(allowed)}`, file);
 	}
 }
-function quotedList(values) {
-	return values.map((value) => `"${value}"`).join(", ");
-}
 function isObject(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -207,7 +162,7 @@ async function listStatics(root) {
 		if (!entry.isFile() || entry.name.startsWith(".")) continue;
 		const file = join(entry.parentPath, entry.name);
 		await checkImage(file, extname(entry.name).toLowerCase());
-		statics.push(`${STATICS_DIR}/${relative(staticsDir, file).split(sep).join("/")}`);
+		statics.push(`${STATICS_DIR}/${relativeSlashPath(staticsDir, file)}`);
 	}
 	return statics.sort();
 }
@@ -235,50 +190,51 @@ async function loadProject(root) {
 	const dotJsonFile = join(root, DOT_JSON_FILE);
 	if (!existsSync(dotJsonFile)) throw new CompileError(`There is no ${DOT_JSON_FILE} in this folder`, root);
 	const dotJson = await readDotJson(dotJsonFile);
-	if (dotJson.icon !== void 0 && !existsSync(join(root, dotJson.icon))) throw new CompileError(`The icon "${dotJson.icon}" is missing`, dotJsonFile);
 	const dotFile = join(root, DOT_FILE);
 	if (!existsSync(dotFile)) throw new CompileError(`There is no ${DOT_FILE}. Add one: export default defineDot({ pages: [...] })`, root);
 	const { pages } = parseDotModule(await readFile(dotFile, "utf8"), dotFile);
-	const sources = await Promise.all(pages.map((path) => loadPage(root, path, dotFile)));
-	const seen = /* @__PURE__ */ new Map();
-	for (const page of sources) {
-		const other = seen.get(page.id.toLowerCase());
-		if (other) {
+	const pageSources = await Promise.all(pages.map((path) => loadPage(root, path, dotFile)));
+	const pagesByLowercaseId = /* @__PURE__ */ new Map();
+	for (const page of pageSources) {
+		const earlierPage = pagesByLowercaseId.get(page.id.toLowerCase());
+		if (earlierPage) {
 			let file = dotFile;
 			if (page.id !== page.path) file = page.controller;
-			else if (other.id !== other.path) file = other.controller;
-			throw new CompileError(`Page id "${page.id}" (${page.path}) is already used by ${other.path}`, file);
+			else if (earlierPage.id !== earlierPage.path) file = earlierPage.controller;
+			throw new CompileError(`Page id "${page.id}" (${page.path}) is already used by ${earlierPage.path}`, file);
 		}
-		seen.set(page.id.toLowerCase(), page);
+		pagesByLowercaseId.set(page.id.toLowerCase(), page);
 	}
 	return {
 		root,
 		dotJson,
 		dot: dotFile,
-		pages: sources,
+		pages: pageSources,
 		statics: await listStatics(root)
 	};
 }
 async function loadPage(root, path, dotFile) {
-	const dir = join(root, PAGES_DIR, path);
+	const pageDir = join(root, PAGES_DIR, path);
 	const files = {
-		view: join(dir, PAGE_FILES.view),
-		state: join(dir, PAGE_FILES.state),
-		controller: join(dir, PAGE_FILES.controller)
+		view: join(pageDir, PAGE_FILES.view),
+		state: join(pageDir, PAGE_FILES.state),
+		controller: join(pageDir, PAGE_FILES.controller)
 	};
 	const missing = Object.values(files).filter((file) => !existsSync(file));
 	if (missing.length > 0) throw new CompileError(`Page "${path}" is missing ${missing.join(", ")}`, dotFile);
-	const { id } = parseLogicModule(await readFile(files.controller, "utf8"), files.controller);
+	const controller = await readFile(files.controller, "utf8");
+	const { id, share } = parseLogicModule(controller, files.controller);
 	return {
 		path,
 		id: id ?? path,
+		share,
 		...files
 	};
 }
 //#endregion
 //#region src/entries.ts
 const RUNTIME_PACKAGE = "@monimesl/dot-runtime";
-const RUNTIME = {
+const RUNTIME_MODULES = {
 	ui: `${RUNTIME_PACKAGE}/ui`,
 	logic: `${RUNTIME_PACKAGE}/logic`,
 	renderer: `${RUNTIME_PACKAGE}/react`
@@ -292,13 +248,18 @@ const viewModuleId = (id) => `dot:view/${id}`;
 function literal(value) {
 	return JSON.stringify(value);
 }
-function pageTable(project, binding) {
-	return `{${project.pages.map((page, index) => `\n    ${literal(page.id)}: ${binding}${index},`).join("")}\n  }`;
+function pageTable(project, importName) {
+	return `{${project.pages.map((page, index) => `\n    ${literal(page.id)}: ${importName}${index},`).join("")}\n  }`;
 }
 function uiEntry(project, components) {
-	const renderer = components ? [`import { createReactRenderer, ${components.join(", ")} } from ${literal(RUNTIME.renderer)};`, `const createRenderer = () => createReactRenderer({ components: { ${components.join(", ")} } });`] : [`import createRenderer from ${literal(RUNTIME.renderer)};`];
+	const rendererModule = literal(RUNTIME_MODULES.renderer);
+	let renderer;
+	if (components) {
+		const componentList = components.join(", ");
+		renderer = [`import { createReactRenderer, ${componentList} } from ${rendererModule};`, `const createRenderer = () => createReactRenderer({ components: { ${componentList} } });`];
+	} else renderer = [`import createRenderer from ${rendererModule};`];
 	return [
-		`import { runWebview } from ${literal(RUNTIME.ui)};`,
+		`import { runWebview } from ${literal(RUNTIME_MODULES.ui)};`,
 		...renderer,
 		...project.pages.map((page, index) => `import view${index} from ${literal(viewModuleId(page.id))};`),
 		"",
@@ -309,11 +270,14 @@ function uiEntry(project, components) {
 		""
 	].join("\n");
 }
-function logicEntry(project, { strict }) {
+function logicEntry(project, { strict, dashMinApiVersion }) {
 	const options = ["  dot,", `  pages: ${pageTable(project, "page")},`];
-	if (strict) options.push("  strict: true,");
+	if (strict) {
+		options.push("  strict: true,");
+		options.push(`  dashMinApiVersion: ${literal(dashMinApiVersion)},`);
+	}
 	return [
-		`import { runService } from ${literal(RUNTIME.logic)};`,
+		`import { runService } from ${literal(RUNTIME_MODULES.logic)};`,
 		`import dot from ${literal(project.dot)};`,
 		...project.pages.map((page, index) => `import page${index} from ${literal(page.controller)};`),
 		"",
@@ -329,7 +293,7 @@ function envModule(env) {
 //#endregion
 //#region src/globals.ts
 const DOT_GLOBALS = {
-	"@monimesl/dot-runtime": [
+	[RUNTIME_PACKAGE]: [
 		"definePage",
 		"defineDot",
 		"createEvent",
@@ -337,17 +301,18 @@ const DOT_GLOBALS = {
 	],
 	[ENV_MODULE]: ["env"]
 };
-const SCRIPT = /\.[cm]?[jt]sx?$/;
+const SCRIPT_FILE = /\.[cm]?[jt]sx?$/;
+const ANSWERS_AT_ONCE = /* @__PURE__ */ new Set(["utils", "supports"]);
 function dotGlobals(root) {
 	const realRoot = realpathSync(root);
-	const isDotModule = (id) => id.startsWith(realRoot + sep) && !id.includes(`${sep}node_modules${sep}`) && SCRIPT.test(id);
+	const isDotModule = (id) => id.startsWith(realRoot + sep) && !id.includes(`${sep}node_modules${sep}`) && SCRIPT_FILE.test(id);
 	const isPageModule = (id) => id.startsWith(join(realRoot, PAGES_DIR) + sep);
 	return {
 		name: "dot:globals",
 		transform(code, id) {
 			if (!isDotModule(id)) return null;
 			const used = new Set(unboundReferences(code, Object.values(DOT_GLOBALS).flat(), id));
-			if (isPageModule(id) && used.has("dash")) this.error(`${relative(realRoot, id)} uses the global \`dash\`. In a page, use \`this.dash\` in actions and hooks, so its calls stop when the page closes.`);
+			if (isPageModule(id) && used.has("dash") && makesDashCalls(code, id)) this.error(`${relative(realRoot, id)} uses the global \`dash\`. In a page, use \`this.dash\` in actions and hooks, so its calls stop when the page closes. Only dash.utils and dash.supports, which answer at once, work anywhere.`);
 			const imports = [];
 			for (const [source, names] of Object.entries(DOT_GLOBALS)) {
 				const imported = names.filter((name) => used.has(name));
@@ -361,9 +326,12 @@ function dotGlobals(root) {
 		}
 	};
 }
+function makesDashCalls(code, id) {
+	for (const member of globalMemberUses(code, "dash", id)) if (!ANSWERS_AT_ONCE.has(member)) return true;
+	return false;
+}
 //#endregion
 //#region src/build/bundle.ts
-/** Bundles one entry with rolldown, replacing `outDir`. Returns the written files. */
 async function bundle(options) {
 	await rm(options.outDir, {
 		recursive: true,
@@ -396,14 +364,13 @@ async function bundle(options) {
 			entryFileNames: options.fileName,
 			sourcemap: options.mode === "development",
 			sourcemapExcludeSources: options.mode === "production",
-			minify: options.minify
+			minify: options.mode === "production"
 		});
 		return output.map((chunk) => join(options.outDir, chunk.fileName));
 	} finally {
 		await bundler.close();
 	}
 }
-/** Serves generated modules and resolves their imports as if they lived in the project root. */
 function generatedModules(root, modules) {
 	const importer = join(root, DOT_JSON_FILE);
 	return {
@@ -443,7 +410,7 @@ function requirePackage(fromDir, name, installedIn) {
 	try {
 		packageFile = require.resolve(`${name}/package.json`);
 	} catch {
-		throw new CompileError(`${name} is not installed in ${installedIn}`, fromDir);
+		throw new CompileError(`${name} isn't installed in ${installedIn}. Install the project's dependencies, then try again`, fromDir);
 	}
 	const { version } = JSON.parse(readFileSync(packageFile, "utf8"));
 	return {
@@ -463,8 +430,12 @@ function printExpr(expr, scope) {
 	switch (expr.type) {
 		case "Literal": return JSON.stringify(expr.value);
 		case "Identifier": return scope.get(expr.name) ?? `d.${expr.name}`;
-		case "Member": return expr.property.type === "Literal" && typeof expr.property.value === "string" ? `${print(expr.object)}?.${expr.property.value}` : `${print(expr.object)}?.[${print(expr.property)}]`;
-		case "Unary": return `(${expr.operator}${expr.operator === "typeof" ? " " : ""}${print(expr.argument)})`;
+		case "Member":
+			if (expr.property.type === "Literal" && typeof expr.property.value === "string" && isIdentifier(expr.property.value)) return `${print(expr.object)}?.${expr.property.value}`;
+			return `${print(expr.object)}?.[${print(expr.property)}]`;
+		case "Unary":
+			if (expr.operator === "typeof") return `(typeof ${print(expr.argument)})`;
+			return `(${expr.operator}${print(expr.argument)})`;
 		case "Binary": return `(${print(expr.left)} ${expr.operator} ${print(expr.right)})`;
 		case "Conditional": return `(${print(expr.test)} ? ${print(expr.consequent)} : ${print(expr.alternate)})`;
 	}
@@ -529,15 +500,17 @@ function compileLoop(compiler, node, parent, scope) {
 	checkVariableName("item", item);
 	checkVariableName("index", index);
 	if (item === index) compiler.fail("<For> `item` and `index` need different names", node.loc);
-	const itemVar = "$" + item;
-	const indexVar = "$" + index;
-	const inner = new Map(scope).set(item, itemVar).set(index, indexVar);
-	const args = [list, `(${itemVar}, ${indexVar}) => [${compiler.compile(node.children, parent, inner).join(", ")}]`];
-	if (key === void 0) compiler.warn("<For> has no `key`, so items are matched by position. Add key=\"<property>\" (or \"*this\") so rows stay right when items move, or key=\"*index\" to keep matching by position.", node.loc);
-	else if (key === "*index") {} else if (key === "*this") args.push(`(${itemVar}) => ${itemVar}`);
-	else if (isIdentifier(key)) args.push(`(${itemVar}) => ${itemVar}?.${key}`);
+	const itemVariable = "$" + item;
+	const indexVariable = "$" + index;
+	const loopScope = new Map(scope);
+	loopScope.set(item, itemVariable);
+	loopScope.set(index, indexVariable);
+	const eachArguments = [list, `(${itemVariable}, ${indexVariable}) => [${compiler.compile(node.children, parent, loopScope).join(", ")}]`];
+	if (key === void 0) compiler.warn("<For> has no `key`, so items are matched by position. If items can move, add key=\"<property>\" or key=\"*this\". To keep matching by position, add key=\"*index\".", node.loc);
+	else if (key === "*index") {} else if (key === "*this") eachArguments.push(`(${itemVariable}) => ${itemVariable}`);
+	else if (isIdentifier(key)) eachArguments.push(`(${itemVariable}) => ${itemVariable}?.${key}`);
 	else compiler.fail(`<For> \`key\` must be a property name, *this or *index, got "${key}"`, node.loc);
-	return `each(${args.join(", ")})`;
+	return `each(${eachArguments.join(", ")})`;
 }
 //#endregion
 //#region src/view/compiler.ts
@@ -550,6 +523,7 @@ const ROOT_DEFAULTS = {
 const SEGMENT_BINDING_REGEXP = /{{([\s\S]*?)}}/g;
 const DATA_PREFIX = "data-";
 const DATA_ATTRIBUTE = /^data-[a-z][a-z0-9]*(-[a-z0-9]+)*$/;
+const THEME_COLOR_NAME = /^[a-z][a-zA-Z0-9]*$/;
 var ViewCompiler = class {
 	#context;
 	#components;
@@ -559,63 +533,72 @@ var ViewCompiler = class {
 		for (const name of Object.keys(CONTROL_FLOW_TAGS)) if (name in this.#components) this.fail(`<${name}> is reserved for control flow`);
 	}
 	compile(nodes, parent, scope) {
-		const out = [];
-		for (let i = 0; i < nodes.length; i++) {
-			const node = nodes[i];
+		const compiled = [];
+		for (let index = 0; index < nodes.length; index++) {
+			const node = nodes[index];
 			if (node.type === "Text") {
-				out.push(...this.#compileText(node.content, parent, scope, node.loc));
+				compiled.push(...this.#compileText(node.content, parent, scope, node.loc));
 				continue;
 			}
 			switch (node.tag) {
 				case "If": {
-					const branches = ifChain(node, nodes.slice(i + 1));
-					out.push(compileConditional(this, branches, parent, scope));
-					i += branches.length - 1;
+					const branches = ifChain(node, nodes.slice(index + 1));
+					compiled.push(compileConditional(this, branches, parent, scope));
+					index += branches.length - 1;
 					break;
 				}
 				case "ElseIf":
 				case "Else": return this.fail(`<${node.tag}> must come right after <If> or <ElseIf>`, node.loc);
 				case "For":
-					out.push(compileLoop(this, node, parent, scope));
+					compiled.push(compileLoop(this, node, parent, scope));
 					break;
-				default: out.push(`h(${this.#compileElementArgs(node, parent, scope).join(", ")})`);
+				default: compiled.push(`h(${this.#compileElementArgs(node, parent, scope).join(", ")})`);
 			}
 		}
-		return out;
+		return compiled;
 	}
 	#compileText(content, parent, scope, loc) {
 		if (parent?.children !== "text") {
-			const wrappers = Object.values(this.#components).filter((component) => component.inline && component.children === "text").sort((a, b) => Number(b.name === "Text") - Number(a.name === "Text")).map((component) => `<${component.name}>`).join(" or ");
-			this.fail(`'${content}' must be inside ${wrappers || "an inline component"}`, loc);
+			if (content.trim() === "") return [];
+			this.fail(`'${content}' must be inside ${this.#textWrapperNames()}`, loc);
 		}
 		return this.#compileAsSegments(content, scope, loc).map(printSegment);
 	}
+	#textWrapperNames() {
+		const textWrappers = Object.values(this.#components).filter((component) => {
+			return component.inline === true && component.children === "text";
+		});
+		const textFirst = [...textWrappers.filter((component) => component.name === "Text"), ...textWrappers.filter((component) => component.name !== "Text")];
+		if (textFirst.length === 0) return "an inline component";
+		return textFirst.map((component) => `<${component.name}>`).join(" or ");
+	}
 	compileRoot(nodes) {
 		if (!this.#components["View"]) this.fail(`The components must include <${ROOT_TAG}>, which is the root of every page`);
 		const [root, outside] = nodes;
 		if (root?.type !== "Element" || root.tag !== "View") return this.fail(`A page must have one <${ROOT_TAG}> around everything else`, root?.loc);
-		if (outside) {
-			const name = outside.type === "Text" ? `'${outside.content}'` : `<${outside.tag}>`;
-			this.fail(`${name} must be inside the page's <${ROOT_TAG}>`, outside.loc);
-		}
+		if (outside) this.fail(`${describeNode(outside)} must be inside the page's <${ROOT_TAG}>`, outside.loc);
 		return this.#compileElementArgs(root, null, EMPTY_SCOPE, ROOT_DEFAULTS);
 	}
 	#compileElementArgs(node, parent, scope, defaults = {}) {
 		const component = this.#components[node.tag];
-		if (!component) return this.fail(`Unknown component <${node.tag}>.`, node.loc);
+		if (!component) return this.fail(`Unknown component <${node.tag}>`, node.loc);
 		this.#context.onComponent?.(component.name);
 		if (parent && !canHaveChildren(parent, component)) this.fail(`<${node.tag}> can't go inside <${parent.name}>`, node.loc);
-		const attributes = Object.entries(node.attributes);
 		for (const { prop, ignores, because } of component.overrides ?? []) if (prop in node.attributes && ignores in node.attributes) this.warn(`<${component.name}> ignores \`${ignores}\` with \`${prop}\`: ${because}`, node.loc);
-		const data = this.#compileData(attributes.filter(([name]) => name.startsWith(DATA_PREFIX)), scope, node.loc);
-		const props = [
-			...attributes.filter(([name]) => !name.startsWith(DATA_PREFIX)).map(([name, value]) => this.#compileProp(component, name, value, scope, node.loc)),
-			...Object.entries(node.events).map(([name, handler]) => this.#compileEvent(component, name, handler, data, node.loc)),
-			...Object.entries(defaults).filter(([name]) => !(name in node.attributes)).map(([name, value]) => `${name}: ${JSON.stringify(value)}`)
-		];
+		const dataAttributes = [];
+		const propAttributes = [];
+		for (const [name, value] of Object.entries(node.attributes)) if (name.startsWith("data-")) dataAttributes.push([name, value]);
+		else propAttributes.push([name, value]);
+		const data = this.#compileData(dataAttributes, scope, node.loc);
+		const props = [];
+		for (const [name, value] of propAttributes) props.push(this.#compileProp(component, name, value, scope, node.loc));
+		for (const [name, handler] of Object.entries(node.events)) props.push(this.#compileEvent(component, name, handler, data, node.loc));
+		for (const [name, value] of Object.entries(defaults)) if (!(name in node.attributes)) props.push(`${name}: ${JSON.stringify(value)}`);
+		let propsCode = "null";
+		if (props.length > 0) propsCode = `{ ${props.join(", ")} }`;
 		return [
 			JSON.stringify(component.name),
-			props.length ? `{ ${props.join(", ")} }` : "null",
+			propsCode,
 			...this.compile(node.children, component, scope)
 		];
 	}
@@ -633,12 +616,12 @@ var ViewCompiler = class {
 			const kind = typeof type === "string" ? `a ${type}` : "an enum";
 			this.fail(`\`${name}\` is ${kind}, so set it with one {{ }} binding`, loc);
 		}
-		return `${name}: ${segments.map(printSegment).join(" + ")}`;
+		return `${name}: ${concatenateSegments(segments)}`;
 	}
 	#compileData(attributes, scope, loc) {
 		if (attributes.length === 0) return null;
 		return `{ ${attributes.map(([name, value]) => {
-			if (!DATA_ATTRIBUTE.test(name)) this.fail(`\`${name}\` must start with data- and use lowercase words joined by -, such as data-account-id`, loc);
+			if (!DATA_ATTRIBUTE.test(name)) this.fail(`\`${name}\` must be lowercase words joined by -, such as data-account-id`, loc);
 			return `${dataKey(name)}: ${this.#compileDataValue(value, scope, loc)}`;
 		}).join(", ")} }`;
 	}
@@ -647,19 +630,21 @@ var ViewCompiler = class {
 		const bindingCode = singleBindingCode(segments);
 		if (bindingCode !== null) return bindingCode;
 		if (segments.length === 0) return "\"\"";
-		return segments.map(printSegment).join(" + ");
+		return concatenateSegments(segments);
 	}
 	#checkStaticsReference(value, loc) {
 		const { statics } = this.#context;
-		if (statics && value.startsWith(`statics/`) && !statics.includes(value)) this.fail(`"${value}" is not in ${STATICS_DIR}/`, loc);
+		if (statics && value.startsWith(`statics/`) && !statics.includes(value)) this.fail(`"${value}" isn't in ${STATICS_DIR}/`, loc);
 	}
 	#compileEvent(component, attribute, handler, data, loc) {
 		const event = eventName(attribute);
 		if (!component.events.includes(event)) this.fail(`<${component.name}> has no \`${attribute}\` event`, loc);
 		if (!isIdentifier(handler)) this.fail(`\`${attribute}\` must name a mutation or action in controller.ts, got "${handler}"`, loc);
 		const { handlers } = this.#context;
-		if (handlers && !handlers.includes(handler)) this.fail(`\`${handler}\` is not a mutation or action in controller.ts`, loc);
-		return `${attribute}: on(${data ? `${JSON.stringify(handler)}, ${data}` : JSON.stringify(handler)})`;
+		if (handlers && !handlers.includes(handler)) this.fail(`\`${handler}\` isn't a mutation or action in controller.ts`, loc);
+		let onArguments = JSON.stringify(handler);
+		if (data) onArguments += `, ${data}`;
+		return `${attribute}: on(${onArguments})`;
 	}
 	checkControlFlowElementAttributes(node) {
 		const { attributes: allowed, required } = CONTROL_FLOW_TAGS[node.tag];
@@ -674,9 +659,10 @@ var ViewCompiler = class {
 		return bindingCode;
 	}
 	#compileLiteral(type, value, loc) {
+		if (isWordsOr(type)) return this.#compileWordOr(type, value, loc);
 		if (typeof type !== "string") {
 			if (type.includes(value)) return JSON.stringify(value);
-			return this.fail(`Expected one of ${type.map((option) => `"${option}"`).join(", ")}, got "${value}"`, loc);
+			return this.fail(`Expected one of ${quotedList(type)}, got "${value}"`, loc);
 		}
 		switch (type) {
 			case "boolean":
@@ -684,28 +670,34 @@ var ViewCompiler = class {
 				if (value === "false") return "false";
 				return this.fail(`Expected true or false, got "${value}"`, loc);
 			case "number":
-				if (value.trim() !== "" && Number.isFinite(Number(value))) return String(Number(value));
+				if (isNumberText(value)) return printNumber(value);
 				return this.fail(`Expected a number, got "${value}"`, loc);
 			case "string":
 			case "any": return JSON.stringify(value);
 		}
 	}
+	#compileWordOr(type, value, loc) {
+		if (type.words.includes(value)) return JSON.stringify(value);
+		if (type.or === "number" && isNumberText(value)) return printNumber(value);
+		if (type.or === "themeColor" && THEME_COLOR_NAME.test(value)) return JSON.stringify(value);
+		return this.fail(`Expected one of ${quotedList(type.words)}, or ${otherThanWords(type)}, got "${value}"`, loc);
+	}
 	#compileAsSegments(input, scope, loc) {
 		const segments = [];
-		let last = 0;
+		let staticStart = 0;
 		for (const match of input.matchAll(SEGMENT_BINDING_REGEXP)) {
-			if (match.index > last) segments.push({
+			if (match.index > staticStart) segments.push({
 				kind: "static",
-				value: input.slice(last, match.index)
+				value: input.slice(staticStart, match.index)
 			});
-			const expr = this.#parseBindingExpression(match[1], scope, loc);
+			const expression = this.#parseBindingExpression(match[1], scope, loc);
 			segments.push({
 				kind: "binding",
-				code: printExpr(expr, scope)
+				code: printExpr(expression, scope)
 			});
-			last = match.index + match[0].length;
+			staticStart = match.index + match[0].length;
 		}
-		const rest = input.slice(last);
+		const rest = input.slice(staticStart);
 		if (rest.includes("{{")) this.fail("A binding is missing its closing `}}`", loc);
 		if (rest) segments.push({
 			kind: "static",
@@ -714,22 +706,22 @@ var ViewCompiler = class {
 		return segments;
 	}
 	#parseBindingExpression(source, scope, loc) {
-		let expr;
+		let expression;
 		try {
-			expr = parseExpression(source);
+			expression = parseExpression(source);
 		} catch (error) {
 			if (!(error instanceof ScriptParseError)) throw error;
 			return this.fail(`Invalid binding \`{{${source}}}\`: ${error.reason}`, loc);
 		}
 		const { stateKeys } = this.#context;
 		if (stateKeys) {
-			const undeclared = stateReads(expr, scope).find((name) => !stateKeys.includes(name));
+			const undeclared = stateReads(expression, scope).find((name) => !stateKeys.includes(name));
 			if (undeclared) {
 				const declared = stateKeys.join(", ") || "none";
 				this.fail(`\`${undeclared}\` isn't in state.ts. It has: ${declared}`, loc);
 			}
 		}
-		return expr;
+		return expression;
 	}
 	warn(message, loc) {
 		this.#context.onWarning?.(new CompileWarning(message, this.#context.file, loc));
@@ -741,8 +733,9 @@ var ViewCompiler = class {
 function ifChain(ifNode, nextSiblings) {
 	const branches = [ifNode];
 	for (const sibling of nextSiblings) {
-		if (branches.at(-1).tag === "Else" || !continuesIf(sibling)) break;
+		if (!continuesIf(sibling)) break;
 		branches.push(sibling);
+		if (sibling.tag === "Else") break;
 	}
 	return branches;
 }
@@ -755,11 +748,21 @@ function singleBindingCode(segments) {
 	return null;
 }
 function dataKey(attribute) {
-	const [first = "", ...rest] = attribute.slice(5).split("-");
-	return first + rest.map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join("");
+	const words = attribute.slice(5).split("-");
+	let key = words[0] ?? "";
+	for (const word of words.slice(1)) key += word.charAt(0).toUpperCase() + word.slice(1);
+	return key;
+}
+function describeNode(node) {
+	if (node.type === "Text") return `'${node.content}'`;
+	return `<${node.tag}>`;
 }
 function printSegment(segment) {
-	return segment.kind === "static" ? JSON.stringify(segment.value) : `text(${segment.code})`;
+	if (segment.kind === "static") return JSON.stringify(segment.value);
+	return `text(${segment.code})`;
+}
+function concatenateSegments(segments) {
+	return segments.map(printSegment).join(" + ");
 }
 function canHaveChildren(parent, child) {
 	switch (parent.children) {
@@ -768,17 +771,23 @@ function canHaveChildren(parent, child) {
 		case "elements": return true;
 	}
 }
+function isNumberText(value) {
+	return value.trim() !== "" && Number.isFinite(Number(value));
+}
+function printNumber(value) {
+	return String(Number(value));
+}
 //#endregion
 //#region src/view/compile.ts
 function compileView(source, context) {
 	const nodes = parseDmlToIR(source, {
 		locations: true,
 		file: context.file,
-		whitespace: "collapse"
+		whitespace: "inline"
 	});
 	return [
 		"export default function render(d, { h, on, text, each }) {",
-		`  return h(${new ViewCompiler(context).compileRoot(nodes).map((arg) => `\n    ${arg},`).join("")}\n  );`,
+		`  return h(${new ViewCompiler(context).compileRoot(nodes).map((argument) => `\n    ${argument},`).join("")}\n  );`,
 		"}",
 		""
 	].join("\n");
@@ -838,13 +847,13 @@ function addVariables(env, variables, file) {
 //#endregion
 //#region src/build/build.ts
 const MANIFEST_FILE = "manifest.json";
-const ICON_FILE = "icon.png";
 const STYLES_FILE = "dot.css";
 const ARCHIVE_DATE = new Date(1980, 0, 1);
 /** Compiles and bundles the dot into `outDir` for hosts, and refreshes the types in `.dot/`. */
 async function build(options) {
 	const project = await loadProject(options.root);
 	const mode = options.mode ?? "production";
+	if (mode === "production") refuseLocalNetworkHosts(project);
 	const env = await loadPublicEnv(project.root, mode);
 	const runtime = installedRuntime(project.root);
 	await writePageTypes(project);
@@ -861,20 +870,16 @@ async function build(options) {
 		fileName: "dot.js",
 		format,
 		mode,
-		minify: mode === "production",
 		conditions: options.conditions ?? [],
 		external
 	});
-	const files = [
-		...await bundleLayer(ENTRY.ui, uiDir, "esm", Object.keys(REACT_HOST_MODULES)),
-		...await bundleLayer(ENTRY.logic, join(outDir, "logic"), "iife", []),
-		await copyRendererStyles(runtime, uiDir),
-		await writeIndexHtml(project, uiDir, runtime.react.version),
-		...await copyStatics(project, uiDir),
-		await writeManifest(project, outDir, runtime)
-	];
-	const icon = await copyIcon(project, outDir);
-	if (icon) files.push(icon);
+	const files = [];
+	files.push(...await bundleLayer(ENTRY.ui, uiDir, "esm", Object.keys(REACT_HOST_MODULES)));
+	files.push(...await bundleLayer(ENTRY.logic, join(outDir, "logic"), "iife", []));
+	files.push(await copyRendererStyles(runtime, uiDir));
+	files.push(await writeIndexHtml(project, uiDir, runtime.react.version));
+	files.push(...await copyStatics(project, uiDir));
+	files.push(await writeManifest(project, outDir, runtime));
 	if (mode === "production") files.push(await writeArchive(project, outDir, files));
 	return {
 		outDir,
@@ -882,6 +887,9 @@ async function build(options) {
 		warnings
 	};
 }
+function refuseLocalNetworkHosts(project) {
+	for (const host of project.dotJson.network?.hosts ?? []) if (isLocalNetworkHost(host)) throw new CompileError(`"${host}" in network.hosts only works while developing, as Dash refuses it for published dots. Use your server's public name in dot.json`, join(project.root, DOT_JSON_FILE));
+}
 async function copyRendererStyles(runtime, uiDir) {
 	const file = join(uiDir, STYLES_FILE);
 	await mkdir(uiDir, { recursive: true });
@@ -891,25 +899,30 @@ async function copyRendererStyles(runtime, uiDir) {
 async function writeArchive(project, outDir, files) {
 	const entries = {};
 	for (const file of files) if (!file.endsWith(".map")) {
-		const name = relative(outDir, file).split(sep).join("/");
+		const name = relativeSlashPath(outDir, file);
 		entries[name] = [await readFile(file), { mtime: ARCHIVE_DATE }];
 	}
-	const { id, version } = project.dotJson;
-	for (const name of await readdir(outDir)) if (name.startsWith(`${id}-`) && name.endsWith(".zip")) await rm(join(outDir, name));
-	const file = join(outDir, `${id}-${version}.zip`);
+	const { package: packageName, version } = project.dotJson;
+	for (const name of await readdir(outDir)) if (name.startsWith(`${packageName}-`) && name.endsWith(".zip")) await rm(join(outDir, name));
+	const file = join(outDir, `${packageName}-${version}.zip`);
 	await writeFile(file, zipSync(entries, { level: 9 }));
 	return file;
 }
 async function compileModules(project, env, components, mode, warnings) {
 	const modules = /* @__PURE__ */ new Map();
-	const used = /* @__PURE__ */ new Set();
+	const usedComponents = /* @__PURE__ */ new Set();
 	for (const page of project.pages) {
-		const view = await compilePage(page, components, project.statics, warnings, used);
+		const view = await compilePage(page, components, project.statics, warnings, usedComponents);
 		modules.set(viewModuleId(page.id), view);
 	}
-	const builtins = [...used].filter((name) => name in builtinComponents).sort();
-	modules.set(ENTRY.ui, uiEntry(project, mode === "production" ? builtins : void 0));
-	modules.set(ENTRY.logic, logicEntry(project, { strict: mode === "development" }));
+	let rendererComponents;
+	if (mode === "production") rendererComponents = [...usedComponents].filter((name) => name in builtinComponents).sort();
+	modules.set(ENTRY.ui, uiEntry(project, rendererComponents));
+	const logicOptions = {
+		strict: mode === "development",
+		dashMinApiVersion: dashMinApiVersion(project)
+	};
+	modules.set(ENTRY.logic, logicEntry(project, logicOptions));
 	modules.set(ENV_MODULE, envModule(env));
 	return modules;
 }
@@ -935,32 +948,30 @@ async function writeManifest(project, outDir, runtime) {
 	await writeFile(file, `${JSON.stringify(manifest, null, 2)}\n`);
 	return file;
 }
-async function copyIcon(project, outDir) {
-	if (project.dotJson.icon === void 0) return null;
-	const file = join(outDir, ICON_FILE);
-	await copyFile(join(project.root, project.dotJson.icon), file);
-	return file;
-}
 function dotManifest(project, runtime) {
-	const { id, name, version, description, categories, permissions, network, dash } = project.dotJson;
+	const { id, package: packageName, name, version, permissions, network } = project.dotJson;
 	const pages = project.pages.map((page) => page.id);
+	const share = {};
+	for (const page of project.pages) if (page.share) share[page.id] = page.share;
 	return {
 		id,
+		package: packageName,
 		name,
 		version,
 		runtime: runtime.version,
 		react: runtime.react.version,
-		description,
-		categories,
-		icon: project.dotJson.icon === void 0 ? void 0 : ICON_FILE,
 		permissions,
 		network,
-		dash,
+		dash: { minApiVersion: dashMinApiVersion(project) },
 		entry: pages[0],
-		pages
+		pages,
+		share
 	};
 }
-async function compilePage(page, components, statics, warnings, used) {
+function dashMinApiVersion(project) {
+	return project.dotJson.dash?.minApiVersion ?? DEFAULT_DASH_API_VERSION;
+}
+async function compilePage(page, components, statics, warnings, usedComponents) {
 	const [view, state, controller] = await Promise.all([
 		readFile(page.view, "utf8"),
 		readFile(page.state, "utf8"),
@@ -971,7 +982,7 @@ async function compilePage(page, components, statics, warnings, used) {
 		components,
 		statics,
 		onWarning: (warning) => warnings.push(warning),
-		onComponent: (name) => used.add(name)
+		onComponent: (name) => usedComponents.add(name)
 	};
 	const { keys } = parseStateModule(state, page.state);
 	if (keys) context.stateKeys = keys;
@@ -989,7 +1000,7 @@ function indexHtml(title, reactVersion) {
     <meta charset="UTF-8" />
     <meta
       name="viewport"
-      content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"
+      content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover"
     />
     <title>${escaped}</title>
     <link rel="stylesheet" href="./${STYLES_FILE}" />
@@ -1008,6 +1019,6 @@ function indexHtml(title, reactVersion) {
 `;
 }
 //#endregion
-export { CONTROL_FLOW_TAGS, CompileError, CompileWarning, DATA_PREFIX, PAGES_DIR, ROOT_TAG, STATICS_DIR, build, canHaveChildren, compileView, dataKey, installedRuntime, listStatics, loadProject };
+export { CONTROL_FLOW_TAGS, CompileError, CompileWarning, DATA_PREFIX, DOT_FILE, DOT_JSON_FILE, PAGES_DIR, ROOT_TAG, STATICS_DIR, build, canHaveChildren, compileView, dataKey, installedRuntime, isDotPackage, listStatics, loadProject };
 
 //# sourceMappingURL=index.js.map