@timmo001/groundwork-report 0.9.39 → 0.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@timmo001/groundwork-report",
-  "version": "0.9.39",
+  "version": "0.10.0",
   "description": "Groundwork's report page: one self-contained HTML file built from blocks, with every theme and the desktop's Omarchy theme",
   "license": "Apache-2.0",
   "type": "module",
@@ -35,8 +35,8 @@
     "format:check": "prettier --check ."
   },
   "dependencies": {
-    "@timmo001/groundwork-tokens": "0.9.39",
-    "@timmo001/groundwork-ui": "0.9.39",
+    "@timmo001/groundwork-tokens": "0.10.0",
+    "@timmo001/groundwork-ui": "0.10.0",
     "effect": "4.1.2"
   },
   "devDependencies": {

package/src/assets.ts

@@ -17,17 +17,21 @@ import type { ReportAssets } from "./page.ts";
 
 /** Bundles the page script and reads the themes' CSS. */
 export const reportAssets = async (): Promise<ReportAssets> => {
-  const build = await Bun.build({
-    entrypoints: [fileURLToPath(import.meta.resolve("./client.ts"))],
-    target: "browser",
-    format: "esm",
-    minify: true,
-  });
+  // The CLI rather than `Bun.build`, which can't run inside a macro while
+  // the bundler waits on it
+  const build = Bun.spawnSync([
+    process.execPath,
+    "build",
+    fileURLToPath(import.meta.resolve("./client.ts")),
+    "--target=browser",
+    "--format=esm",
+    "--minify",
+  ]);
 
-  const [output] = build.outputs;
-
-  if (!build.success || output === undefined) {
-    throw new AggregateError(build.logs, "The report script didn't build");
+  if (!build.success) {
+    throw new Error(
+      `The report script didn't build:\n${build.stderr.toString()}`,
+    );
   }
 
   const css = await Bun.file(
@@ -36,5 +40,5 @@ export const reportAssets = async (): Promise<ReportAssets> => {
     ),
   ).text();
 
-  return { css, script: await output.text() };
+  return { css, script: build.stdout.toString() };
 };

package/src/client.ts

@@ -12,6 +12,7 @@ import {
   coreThemeChoices,
   optionalThemeChoices,
   pageTheme,
+  themeOptions,
   type ThemeChoice,
   type ThemeMode,
 } from "@timmo001/groundwork-tokens/page";
@@ -44,7 +45,6 @@ const page = pageTheme({
   key: config.key,
   themes: [...coreThemeChoices, ...optionalThemeChoices, ...desktopChoices],
   defaultTheme: config.defaultTheme,
-  followOmarchy: false,
 });
 
 // A desktop theme is solved the first time it's picked, then cached so the
@@ -97,23 +97,22 @@ page.subscribe((state) => applyDesktop(state.theme));
 const picker = document.querySelector("gw-theme-picker");
 
 if (picker !== null) {
+  // The report's own theme first, then the other core themes, then the
+  // optional ones grouped by the palette they come from, such as Catppuccin
+  const builtIn = themeOptions([
+    ...coreThemeChoices.filter(({ id }) => id === config.defaultTheme),
+    ...coreThemeChoices.filter(({ id }) => id !== config.defaultTheme),
+    ...optionalThemeChoices,
+  ]);
+
   const render = () => {
-    const { mode, theme, omarchy } = page.state();
+    const { mode, theme, only, omarchy } = page.state();
 
     picker.mode = mode;
     picker.theme = theme;
+    picker.scheme = only ?? "";
     picker.themes = [
-      ...coreThemeChoices.map(({ id, name }) => ({
-        value: id,
-        label: name,
-        group: "Core",
-      })),
-      // Grouped by the palette they come from, such as Catppuccin
-      ...optionalThemeChoices.map(({ id, name, family }) => ({
-        value: id,
-        label: name,
-        group: family ?? "More themes",
-      })),
+      ...builtIn,
       // Themes translated from the machine the page was made on: the Omarchy
       // theme in use, which reads `Omarchy (Tokyo Night)`, then the rest,
       // such as `Nord (Omarchy)` or `Ghostty (Ghostty)`

package/src/desktop.ts

@@ -14,7 +14,7 @@ import { Result, Schema } from "effect";
 
 import { readDesktopThemes } from "@timmo001/groundwork-tokens/desktop-themes";
 import { readOmarchyTheme } from "@timmo001/groundwork-tokens/omarchy-current";
-import { optionalThemeDocuments } from "@timmo001/groundwork-tokens/page";
+import { optionalThemeDocuments } from "@timmo001/groundwork-tokens/choices";
 import {
   omarchyTheme,
   type OmarchyCurrentTheme,

package/src/page.ts

@@ -7,7 +7,8 @@
  */
 import type { MappedTheme } from "@timmo001/groundwork-tokens";
 import type { OmarchyCurrentTheme } from "@timmo001/groundwork-tokens/runtime";
-import { themeBootScript } from "@timmo001/groundwork-tokens/page";
+// From `choices`, not `page`, so a CLI without the DOM lib type-checks it
+import { themeBootScript } from "@timmo001/groundwork-tokens/choices";
 
 import { html, raw, type Content } from "./html.ts";
 import { reportCss } from "./styles.ts";
@@ -103,7 +104,7 @@ export const reportPage = (options: ReportPageOptions) => {
         />
         <title>${options.title}</title>
         <script>
-          ${raw(inline(themeBootScript({ key, defaultTheme, followOmarchy: false }) + desktopBootScript(key), "script"))};
+          ${raw(inline(themeBootScript({ key, defaultTheme }) + desktopBootScript(key), "script"))};
         </script>
         <style>
           ${raw(inline(options.assets.css, "style"))}