@timmo001/groundwork-report 0.9.38 → 0.9.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@timmo001/groundwork-report",
-  "version": "0.9.38",
+  "version": "0.9.40",
   "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.38",
-    "@timmo001/groundwork-ui": "0.9.38",
+    "@timmo001/groundwork-tokens": "0.9.40",
+    "@timmo001/groundwork-ui": "0.9.40",
     "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/desktop.ts

@@ -10,17 +10,16 @@
  *
  * @module
  */
-import { Result } from "effect";
+import { Result, Schema } from "effect";
 
 import { readDesktopThemes } from "@timmo001/groundwork-tokens/desktop-themes";
 import { readOmarchyTheme } from "@timmo001/groundwork-tokens/omarchy-current";
-import { optionalThemeChoices } from "@timmo001/groundwork-tokens/page";
+import { optionalThemeDocuments } from "@timmo001/groundwork-tokens/choices";
 import {
   omarchyTheme,
-  parseTheme,
   type OmarchyCurrentTheme,
 } from "@timmo001/groundwork-tokens/runtime";
-import type { MappedTheme } from "@timmo001/groundwork-tokens";
+import { MappedTheme } from "@timmo001/groundwork-tokens";
 
 /** What `readReportThemes` found, to spread into `reportPage`'s options. */
 export interface ReportThemes {
@@ -28,26 +27,18 @@ export interface ReportThemes {
   readonly desktop: readonly MappedTheme[];
 }
 
-/** The optional themes' documents, to drop desktop themes that match them. */
-const optionalThemes = async () => {
-  const documents: MappedTheme[] = [];
+const decodeMapped = Schema.decodeUnknownResult(MappedTheme);
 
-  for (const { id } of optionalThemeChoices) {
-    const file = await Bun.file(
-      Bun.fileURLToPath(
-        import.meta.resolve(`@timmo001/groundwork-tokens/themes/${id}.json`),
-      ),
-    ).text();
-
-    const parsed = parseTheme(file);
-
-    if (Result.isSuccess(parsed) && parsed.success.kind === "mapped") {
-      documents.push(parsed.success);
-    }
-  }
+/**
+ * The optional themes' documents, to drop desktop themes that match them.
+ * They come bundled rather than read from disk, so this works in an app
+ * compiled to one binary.
+ */
+const optionalThemes = optionalThemeDocuments.flatMap((document) => {
+  const decoded = decodeMapped(document);
 
-  return documents;
-};
+  return Result.isSuccess(decoded) ? [decoded.success] : [];
+});
 
 /**
  * Reads the Omarchy theme in use and every other theme on the machine, the
@@ -55,18 +46,15 @@ const optionalThemes = async () => {
  * terminal following Omarchy doesn't show twice.
  */
 export const readReportThemes = async (): Promise<ReportThemes> => {
-  const [omarchy, optional] = await Promise.all([
-    readOmarchyTheme(),
-    optionalThemes(),
-  ]);
+  const omarchy = await readOmarchyTheme();
 
   const current =
     omarchy === null ? undefined : omarchyTheme(omarchy.colors, omarchy.name);
 
   const existing =
     current !== undefined && Result.isSuccess(current)
-      ? [...optional, current.success]
-      : optional;
+      ? [...optionalThemes, current.success]
+      : optionalThemes;
 
   return {
     omarchy,

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";