@mirinjs/cli 0.1.0-alpha.19 → 0.1.0-alpha.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mirinjs/cli",
-  "version": "0.1.0-alpha.19",
+  "version": "0.1.0-alpha.20",
   "description": "CLI for mirin apps: dev, build, init.",
   "type": "module",
   "license": "MIT",
@@ -27,15 +27,15 @@
     "bun": ">=1.2.0"
   },
   "dependencies": {
-    "create-mirinjs": "0.1.0-alpha.19",
-    "mirinjs": "0.1.0-alpha.19"
+    "create-mirinjs": "0.1.0-alpha.20",
+    "mirinjs": "0.1.0-alpha.20"
   },
   "optionalDependencies": {
-    "@mirinjs/darwin-arm64": "0.1.0-alpha.19",
-    "@mirinjs/win32-x64": "0.1.0-alpha.19",
-    "@mirinjs/win32-arm64": "0.1.0-alpha.19",
-    "@mirinjs/linux-arm64": "0.1.0-alpha.19",
-    "@mirinjs/linux-x64": "0.1.0-alpha.19"
+    "@mirinjs/darwin-arm64": "0.1.0-alpha.20",
+    "@mirinjs/win32-x64": "0.1.0-alpha.20",
+    "@mirinjs/win32-arm64": "0.1.0-alpha.20",
+    "@mirinjs/linux-arm64": "0.1.0-alpha.20",
+    "@mirinjs/linux-x64": "0.1.0-alpha.20"
   },
   "publishConfig": {
     "access": "public"

package/src/build.ts

@@ -66,10 +66,10 @@ function patchPeToGuiSubsystem(exePath: string): void {
 async function brandWindowsExe(
   exe: string,
   opts: {
-    projectDir: string;
     work: string;
     appName: string;
     version: string;
+    /** Absolute path to the icon source. */
     icon?: string;
     publisher: string;
   },
@@ -83,7 +83,7 @@ async function brandWindowsExe(
   }
   const args: string[] = [];
   if (opts.icon) {
-    const ico = makeWindowsIcon(join(opts.projectDir, opts.icon), join(opts.work, "exe-icon.ico"), {
+    const ico = makeWindowsIcon(opts.icon, join(opts.work, "exe-icon.ico"), {
       onlyLargest: true,
     });
     if (ico) args.push("--set-icon", ico);
@@ -194,6 +194,7 @@ export async function build(
   const linux: boolean | import("mirinjs").LinuxConfig = config.linux ?? true;
   const publisher: string = config.publisher ?? appName;
   const cefLocales = normalizeCefLocales(config.cef?.locales);
+  const appIconPath: string | undefined = config.icon ? join(projectDir, config.icon) : undefined;
 
   console.log(`[mirin build] ${appName} ${version}`);
 
@@ -221,11 +222,10 @@ export async function build(
     if (IS_WINDOWS) {
       patchPeToGuiSubsystem(hostExe);
       await brandWindowsExe(hostExe, {
-        projectDir,
         work,
         appName,
         version,
-        icon: config.icon,
+        icon: appIconPath,
         publisher,
       });
     }
@@ -266,7 +266,7 @@ export async function build(
         helperExe: artifacts.helperBin,
         cefPath: artifacts.cefPath,
         cefLocales,
-        icon: config.icon ? join(projectDir, config.icon) : undefined,
+        icon: appIconPath,
         resources: { ...resources, sidecars: sidecars.map((s) => ({ name: s.name, src: s.src })) },
       })
     : IS_LINUX
@@ -278,7 +278,7 @@ export async function build(
           helperExe: artifacts.helperBin,
           cefPath: artifacts.cefPath,
           cefLocales,
-          icon: config.icon ? join(projectDir, config.icon) : undefined,
+          icon: appIconPath,
           resources: {
             ...resources,
             sidecars: sidecars.map((s) => ({ name: s.name, src: s.src })),
@@ -294,7 +294,7 @@ export async function build(
           cefPath: artifacts.cefPath,
           cefLocales,
           version,
-          icon: config.icon ? join(projectDir, config.icon) : undefined,
+          icon: appIconPath,
           signIdentity,
           urlSchemes: config.urlSchemes,
           resources: { ...resources, sidecars },
@@ -316,7 +316,7 @@ export async function build(
       publisher,
       outDir,
       projectDir,
-      icon: config.icon ? join(projectDir, config.icon) : undefined,
+      icon: appIconPath,
       options: typeof linux === "object" ? linux : {},
       formats,
     });
@@ -340,7 +340,7 @@ export async function build(
     inno,
     linux,
     publisher,
-    icon: config.icon ? join(projectDir, config.icon) : undefined,
+    icon: appIconPath,
     signIdentity,
   };
 }

package/src/bundle/macos/app.ts

@@ -22,6 +22,7 @@ import {
 } from "node:fs";
 import { join } from "node:path";
 import { $ } from "bun";
+import { isIconComposerDoc, writeAppearanceCatalog } from "../../icons/macos/index.ts";
 import { pruneMacCefLocales } from "../shared/cef-locales.ts";
 
 const FRAMEWORK = "Chromium Embedded Framework.framework";
@@ -46,7 +47,10 @@ export interface BundleOptions {
   cefLocales?: string[];
   /** App version → Info.plist CFBundleShortVersionString/CFBundleVersion. */
   version?: string;
-  /** App icon source: a .icns, a .iconset dir, or a square .png. Optional. */
+  /**
+   * App icon source: a .icns, a .iconset dir, a square .png, or an Icon Composer
+   * .icon document (the only form carrying appearance variants). Optional.
+   */
   icon?: string;
   /** Codesign identity; "-" (default) is ad-hoc. Set to a Developer ID to ship. */
   signIdentity?: string;
@@ -109,19 +113,8 @@ const ICONSET_RENDITIONS = [
   { name: "icon_512x512@2x.png", px: 1024 },
 ];
 
-/**
- * Render the app icon to `Resources/icon.icns` and return the CFBundleIconFile
- * stem ("icon"), or undefined if there's no usable source. Accepts a `.icns`
- * (copied), a `.iconset` directory (iconutil), or a square `.png` (rendered to
- * a full iconset via sips, then iconutil).
- */
-async function writeIcon(iconSrc: string, resources: string): Promise<string | undefined> {
-  if (!existsSync(iconSrc)) {
-    console.warn(`[mirin] icon not found, skipping: ${iconSrc}`);
-    return undefined;
-  }
-  const icns = join(resources, "icon.icns");
-
+/** Render one icon source to `Resources/icon.icns`. */
+async function writeIcns(iconSrc: string, icns: string, resources: string): Promise<void> {
   if (iconSrc.endsWith(".icns")) {
     cpSync(iconSrc, icns);
   } else if (iconSrc.endsWith(".iconset")) {
@@ -136,7 +129,38 @@ async function writeIcon(iconSrc: string, resources: string): Promise<string | u
     await $`iconutil -c icns ${iconset} -o ${icns}`.quiet();
     rmSync(iconset, { recursive: true, force: true });
   }
-  return "icon";
+}
+
+/** The Info.plist keys an icon contributes, empty when there's no usable source. */
+interface IconKeys {
+  /** CFBundleIconFile — `Resources/icon.icns`, read by macOS 25 and earlier. */
+  iconFile?: string;
+  /** CFBundleIconName — `Resources/Assets.car`, preferred on macOS 26+. */
+  iconName?: string;
+}
+
+/**
+ * Render the app icon into Resources. An `.icon` document compiles to an
+ * `Assets.car` (macOS 26+ light/dark/tinted) and contributes the `.icns` actool
+ * derives from it; every other source takes the plain iconutil path.
+ */
+async function writeIcon(iconSrc: string, resources: string, work: string): Promise<IconKeys> {
+  if (!existsSync(iconSrc)) {
+    console.warn(`[mirin] icon not found, skipping: ${iconSrc}`);
+    return {};
+  }
+
+  const icns = join(resources, "icon.icns");
+  if (isIconComposerDoc(iconSrc)) {
+    // An Icon Composer document can't go through iconutil, so the only .icns
+    // available for it is the one actool derives.
+    const catalog = await writeAppearanceCatalog(iconSrc, resources, work);
+    if (catalog?.icns) cpSync(catalog.icns, icns);
+    return { iconFile: existsSync(icns) ? "icon" : undefined, iconName: catalog?.name };
+  }
+
+  await writeIcns(iconSrc, icns, resources);
+  return { iconFile: "icon" };
 }
 
 type PlistValue = string | boolean | PlistValue[] | { [k: string]: PlistValue };
@@ -188,8 +212,12 @@ export async function buildAppBundle(opts: BundleOptions): Promise<{ app: string
   cpSync(opts.coreDylib, join(macos, "libmirin_core.dylib"));
 
   // Render the icon (if any) into Resources before writing the plist, so we
-  // only set CFBundleIconFile when an icon was actually produced.
-  const iconFile = opts.icon ? await writeIcon(opts.icon, join(contents, "Resources")) : undefined;
+  // only set the icon keys when an icon was actually produced.
+  const iconWork = join(opts.outDir, ".mirin-icon");
+  const { iconFile, iconName } = opts.icon
+    ? await writeIcon(opts.icon, join(contents, "Resources"), iconWork)
+    : ({} as IconKeys);
+  rmSync(iconWork, { recursive: true, force: true });
   const version = opts.version ?? "0.0.1";
 
   const info: Record<string, PlistValue> = {
@@ -209,6 +237,9 @@ export async function buildAppBundle(opts: BundleOptions): Promise<{ app: string
     LSEnvironment: { MallocNanoZone: "0" },
   };
   if (iconFile) info.CFBundleIconFile = iconFile;
+  // macOS 26+ resolves the appearance-aware icon out of Assets.car via this key
+  // and falls back to CFBundleIconFile when the catalog has no match.
+  if (iconName) info.CFBundleIconName = iconName;
   // Deep-link schemes: register this app as the macOS handler for app://-style
   // URLs (e.g. anko://…). Delivered at runtime via app.on("open-url").
   if (opts.urlSchemes?.length) {

package/src/icons/macos/appearance.ts

@@ -0,0 +1,96 @@
+/**
+ * Compile macOS appearance-variant app icons (light / dark / tinted, macOS 26+).
+ *
+ * `.icns` has no notion of appearance — the Dock picks a variant out of a
+ * compiled asset catalog keyed by `CFBundleIconName`, and the only input that
+ * produces one is an Icon Composer `.icon` document. `actool` compiles it to
+ * the same `Assets.car` shape Apple's own bundled apps ship.
+ *
+ * Best-effort throughout: `actool` only ships with a full Xcode, so a machine
+ * with just Command Line Tools warns and keeps the plain `.icns`.
+ */
+
+import { cpSync, existsSync, mkdirSync, rmSync } from "node:fs";
+import { join, resolve } from "node:path";
+import { $ } from "bun";
+
+/** True when the source is an Icon Composer document, which actool reads directly. */
+export const isIconComposerDoc = (path: string): boolean => path.endsWith(".icon");
+
+/** Asset-catalog icon name; also the `CFBundleIconName` written to Info.plist. */
+const ICON_NAME = "AppIcon";
+
+/**
+ * Locate `actool`. `xcrun` honours the selected developer dir, which is often
+ * Command Line Tools (no actool), so fall back to a full Xcode if one is
+ * installed but not selected.
+ */
+async function findActool(): Promise<string | undefined> {
+  const xcrun = await $`xcrun --find actool`.nothrow().quiet();
+  if (xcrun.exitCode === 0) {
+    const path = xcrun.stdout.toString().trim();
+    if (path && existsSync(path)) return path;
+  }
+  for (const app of ["/Applications/Xcode.app", "/Applications/Xcode-beta.app"]) {
+    const path = join(app, "Contents/Developer/usr/bin/actool");
+    if (existsSync(path)) return path;
+  }
+  return undefined;
+}
+
+export interface AppearanceCatalog {
+  /** Goes in Info.plist as `CFBundleIconName`. */
+  name: string;
+  /** The legacy `.icns` actool derives alongside the catalog, if it emitted one. */
+  icns?: string;
+}
+
+/**
+ * Compile `icon` into `<Resources>/Assets.car`, or return undefined if the
+ * catalog could not be built (no actool, unreadable art) — callers then keep
+ * the plain `.icns` path.
+ */
+export async function writeAppearanceCatalog(
+  iconDoc: string,
+  resourcesDir: string,
+  workDir: string,
+): Promise<AppearanceCatalog | undefined> {
+  // actool resolves its own arguments, so hand it absolute paths regardless of
+  // what the caller passed and of the subprocess working directory.
+  const resources = resolve(resourcesDir);
+  const work = resolve(workDir);
+  const actool = await findActool();
+  if (!actool) {
+    console.warn(
+      "[mirin] actool not found — appearance variants need a full Xcode " +
+        "(Command Line Tools alone is not enough); shipping the default icon only.",
+    );
+    return undefined;
+  }
+
+  rmSync(work, { recursive: true, force: true });
+  mkdirSync(work, { recursive: true });
+
+  const doc = join(work, `${ICON_NAME}.icon`);
+  cpSync(iconDoc, doc, { recursive: true });
+
+  const compiled = join(work, "compiled");
+  mkdirSync(compiled, { recursive: true });
+  const res =
+    await $`${actool} --output-format human-readable-text --notices --warnings --app-icon ${ICON_NAME} --output-partial-info-plist ${join(work, "partial.plist")} --enable-on-demand-resources NO --target-device mac --minimum-deployment-target 26.0 --platform macosx --compile ${compiled} ${doc}`
+      .nothrow()
+      .quiet();
+
+  const car = join(compiled, "Assets.car");
+  if (res.exitCode !== 0 || !existsSync(car)) {
+    console.warn(
+      `[mirin] actool failed (exit ${res.exitCode}) — shipping the default icon only.\n` +
+        res.stdout.toString().trim(),
+    );
+    return undefined;
+  }
+
+  cpSync(car, join(resources, "Assets.car"));
+  const icns = join(compiled, `${ICON_NAME}.icns`);
+  return { name: ICON_NAME, icns: existsSync(icns) ? icns : undefined };
+}

package/src/icons/macos/index.ts

@@ -0,0 +1 @@
+export { isIconComposerDoc, writeAppearanceCatalog } from "./appearance.ts";