@aedis/cli 0.2.2 → 0.3.0

package/README.md

@@ -6,9 +6,9 @@ before any file is written, npm dependencies are pinned to exact versions at lea
 script runs.
 
 ```bash
-npx @aedis/cli@0.2.2 init
-npx @aedis/cli@0.2.2 add button approval-card
-npx @aedis/cli@0.2.2 diff
+npx @aedis/cli@0.3.0 init
+npx @aedis/cli@0.3.0 add button approval-card
+npx @aedis/cli@0.3.0 diff
 ```
 
 Always pin the version, as above. Never run `npx aedis`: the unscoped `aedis` package on npm is not this one.

package/dist/aedis.js

@@ -307,7 +307,9 @@ const shadows = {
 };
 const fonts = {
 	sans: "-apple-system, BlinkMacSystemFont, \"Segoe UI Variable Display\", \"Segoe UI\", system-ui, sans-serif",
-	mono: "ui-monospace, \"SF Mono\", \"Cascadia Code\", Menlo, Consolas, monospace"
+	mono: "ui-monospace, \"SF Mono\", \"Cascadia Code\", Menlo, Consolas, monospace",
+	/** Headings; the sans unless a theme gives the display its own family. */
+	display: "var(--font-sans)"
 };
 /** Tracking tightens and leading drops as size grows. Tailwind: `text-<name>`. */
 const typeScale = {
@@ -522,8 +524,21 @@ const MIN_TEXT_PX = 12;
 const themeFonts = {
 	system: fonts.sans,
 	rounded: `ui-rounded, "SF Pro Rounded", ${fonts.sans}`,
-	serif: "ui-serif, \"New York\", Georgia, \"Times New Roman\", serif"
+	serif: "ui-serif, \"New York\", Georgia, \"Times New Roman\", serif",
+	mono: fonts.mono
 };
+const fontSlots = [
+	"sans",
+	"display",
+	"mono"
+];
+/** A family name a theme may name: letters, digits, spaces and hyphens, so it can never close the quotes or the rule. */
+const FAMILY = /^[A-Za-z][A-Za-z0-9 -]{0,47}$/;
+/** The CSS stack for a font choice: a preset, or a self-hosted family quoted ahead of the system fallback. */
+function fontStack(slot, choice) {
+	if (has(themeFonts, choice)) return themeFonts[choice];
+	return `"${choice}", ${slot === "mono" ? fonts.mono : fonts.sans}`;
+}
 /** A stored or shared theme larger than this is refused before parsing. */
 const MAX_THEME_BYTES = 16384;
 const modes = ["light", "dark"];
@@ -569,6 +584,7 @@ function validateTheme(input) {
 		"shadow",
 		"motion",
 		"font",
+		"fonts",
 		"type"
 	], "");
 	if (input.version !== 1) errors.push("version must be 1");
@@ -634,6 +650,19 @@ function validateTheme(input) {
 		if (typeof input.font === "string" && has(themeFonts, input.font)) theme.font = input.font;
 		else errors.push(`font must be one of ${Object.keys(themeFonts).join(", ")}`);
 	}
+	if (input.fonts !== void 0) {
+		if (!isRecord(input.fonts)) errors.push("fonts must be an object with sans, display or mono");
+		else {
+			errors.push(...unknownKeys(input.fonts, fontSlots, "fonts."));
+			theme.fonts = {};
+			for (const slot of fontSlots) {
+				const v = input.fonts[slot];
+				if (v === void 0) continue;
+				if (typeof v === "string" && (has(themeFonts, v.trim()) || FAMILY.test(v.trim()))) theme.fonts[slot] = v.trim();
+				else errors.push(`fonts.${slot} must be one of ${Object.keys(themeFonts).join(", ")} or a family name of letters, digits, spaces and hyphens`);
+			}
+		}
+	}
 	if (input.type !== void 0) {
 		if (!isRecord(input.type)) errors.push("type must be an object");
 		else {
@@ -697,6 +726,7 @@ function themeVariables(theme, mode) {
 	for (const [k, v] of Object.entries(theme.blur ?? {})) vars[`--blur-${k}`] = `${v}px`;
 	if (theme.motion !== void 0) for (const [k, v] of Object.entries(durations)) vars[`--duration-${k}`] = `${num(parseFloat(v) * theme.motion)}ms`;
 	if (theme.font) vars["--font-sans"] = themeFonts[theme.font];
+	for (const [slot, choice] of Object.entries(theme.fonts ?? {})) vars[`--font-${slot}`] = fontStack(slot, choice);
 	if (theme.type) Object.assign(vars, typeVariables(theme.type));
 	return vars;
 }
@@ -1588,7 +1618,7 @@ function planFiles(items, config, root) {
 }
 //#endregion
 //#region src/cli.ts
-const VERSION = "0.2.2";
+const VERSION = "0.3.0";
 /** What `aedis init` installs: config, theme tokens, cn and the security primitives. */
 const INIT_ITEMS = [
 	"theme",
@@ -1752,7 +1782,7 @@ async function run(argv, io) {
 		}
 		if (!existsSync(path.join(root, "package.json"))) throw new Error(`${root} has no package.json; run inside your app`);
 		if (command === "init") {
-			const config = readConfig(root) ?? defaultConfig(root, flags.release ?? `v0.2.2`);
+			const config = readConfig(root) ?? defaultConfig(root, flags.release ?? `v0.3.0`);
 			if (!isRelease(config.release)) throw new Error(`invalid release ${config.release}`);
 			const decoded = flags.preset === void 0 ? null : decodePreset(flags.preset);
 			if (decoded && !decoded.ok) throw new Error(`preset refused: ${decoded.error}`);
@@ -1788,7 +1818,7 @@ ${themeToCss(theme)}
 		}
 		if (command === "theme" && args[0] === "import") {
 			if (!args[1]) throw new Error("theme import: give the theme's JSON file");
-			const config = readConfig(root) ?? defaultConfig(root, `v0.2.2`);
+			const config = readConfig(root) ?? defaultConfig(root, `v0.3.0`);
 			const input = insideProject(root, path.relative(root, path.resolve(io.cwd, args[1])));
 			const result = themeImport(readFileSync(input, "utf8"), path.basename(input));
 			if (!result.ok) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aedis/cli",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "description": "Add Aedis UI components to your app with verified provenance: signed releases, exact and aged dependencies, no install scripts.",
   "keywords": [
     "aedis",