@mirinjs/cli 0.1.0-alpha.22 → 0.1.0-alpha.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mirinjs/cli",
-  "version": "0.1.0-alpha.22",
+  "version": "0.1.0-alpha.24",
   "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.22",
-    "mirinjs": "0.1.0-alpha.22"
+    "create-mirinjs": "0.1.0-alpha.24",
+    "mirinjs": "0.1.0-alpha.24"
   },
   "optionalDependencies": {
-    "@mirinjs/darwin-arm64": "0.1.0-alpha.22",
-    "@mirinjs/win32-x64": "0.1.0-alpha.22",
-    "@mirinjs/win32-arm64": "0.1.0-alpha.22",
-    "@mirinjs/linux-arm64": "0.1.0-alpha.22",
-    "@mirinjs/linux-x64": "0.1.0-alpha.22"
+    "@mirinjs/darwin-arm64": "0.1.0-alpha.24",
+    "@mirinjs/win32-x64": "0.1.0-alpha.24",
+    "@mirinjs/win32-arm64": "0.1.0-alpha.24",
+    "@mirinjs/linux-arm64": "0.1.0-alpha.24",
+    "@mirinjs/linux-x64": "0.1.0-alpha.24"
   },
   "publishConfig": {
     "access": "public"

package/src/build.ts

@@ -22,7 +22,7 @@ import { buildAppBundle } from "./bundle/macos/index.ts";
 import { normalizeCefLocales } from "./bundle/shared/cef-locales.ts";
 import { buildWindowsBundle } from "./bundle/windows/index.ts";
 import { compileWorkers, normalizeSidecars } from "./extras.ts";
-import { resolveIconSource } from "./icons/sources.ts";
+import { resolveIconFallback, resolveIconSource } from "./icons/sources.ts";
 import { makeWindowsIcon } from "./icons/windows/index.ts";
 import { buildLinuxPackages, resolveLinuxFormats } from "./package/linux/index.ts";
 import { sweepBuildTemps } from "./temps.ts";
@@ -297,6 +297,7 @@ export async function build(
           cefLocales,
           version,
           icon: appIconPath,
+          iconFallback: resolveIconFallback(config.icon, projectDir),
           signIdentity,
           urlSchemes: config.urlSchemes,
           resources: { ...resources, sidecars },

package/src/bundle/macos/app.ts

@@ -52,6 +52,8 @@ export interface BundleOptions {
    * .icon document (the only form carrying appearance variants). Optional.
    */
   icon?: string;
+  /** `.icns`-capable source used when an `.icon` document can't be compiled. */
+  iconFallback?: string;
   /** Codesign identity; "-" (default) is ad-hoc. Set to a Developer ID to ship. */
   signIdentity?: string;
   /** Custom URL schemes -> Info.plist CFBundleURLTypes (deep links). */
@@ -144,7 +146,12 @@ interface IconKeys {
  * `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> {
+async function writeIcon(
+  iconSrc: string,
+  resources: string,
+  work: string,
+  fallback?: string,
+): Promise<IconKeys> {
   if (!existsSync(iconSrc)) {
     console.warn(`[mirin] icon not found, skipping: ${iconSrc}`);
     return {};
@@ -152,10 +159,16 @@ async function writeIcon(iconSrc: string, resources: string, work: string): Prom
 
   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.
+    // An Icon Composer document can't go through iconutil, so the .icns comes
+    // from actool — or, when no installed Xcode can compile the document, from
+    // the fallback source. A bundle must never ship iconless.
     const catalog = await writeAppearanceCatalog(iconSrc, resources, work);
-    if (catalog?.icns) cpSync(catalog.icns, icns);
+    if (catalog?.icns) {
+      cpSync(catalog.icns, icns);
+    } else if (fallback && existsSync(fallback)) {
+      console.warn(`[mirin] falling back to ${fallback} for the macOS icon.`);
+      await writeIcns(fallback, icns, resources);
+    }
     return { iconFile: existsSync(icns) ? "icon" : undefined, iconName: catalog?.name };
   }
 
@@ -215,7 +228,7 @@ export async function buildAppBundle(opts: BundleOptions): Promise<{ app: string
   // 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)
+    ? await writeIcon(opts.icon, join(contents, "Resources"), iconWork, opts.iconFallback)
     : ({} as IconKeys);
   rmSync(iconWork, { recursive: true, force: true });
   const version = opts.version ?? "0.0.1";

package/src/dev.ts

@@ -30,7 +30,7 @@ const IS_WINDOWS = process.platform === "win32";
 const IS_LINUX = process.platform === "linux";
 
 import { compileWorkers, normalizeSidecars } from "./extras.ts";
-import { resolveIconSource } from "./icons/sources.ts";
+import { resolveIconFallback, resolveIconSource } from "./icons/sources.ts";
 import { createReporter } from "./shared/report.ts";
 import { DevSession } from "./shared/session.ts";
 import { sweepBuildTemps } from "./temps.ts";
@@ -155,6 +155,7 @@ export async function dev(projectDir = process.cwd(), options?: DevOptions): Pro
           helperBin: artifacts.helperBin,
           cefPath: artifacts.cefPath,
           icon: iconSrc,
+          iconFallback: resolveIconFallback(config.icon, projectDir),
           urlSchemes: config.urlSchemes,
         });
   bundlePhase?.ok();

package/src/icons/macos/appearance.ts

@@ -21,21 +21,27 @@ export const isIconComposerDoc = (path: string): boolean => path.endsWith(".icon
 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.
+ * Every actool on this machine, newest Xcode first. `xcrun` alone is not
+ * enough: it honours the selected developer dir, which is often Command Line
+ * Tools (no actool) or an Xcode too old for Icon Composer documents.
  */
-async function findActool(): Promise<string | undefined> {
+async function findActools(): Promise<string[]> {
+  const found: string[] = [];
+  const push = (path: string) => {
+    if (existsSync(path) && !found.includes(path)) found.push(path);
+  };
+  // CI images install versioned Xcodes (Xcode_26.1.app, …); newest first, since
+  // only recent actools can compile an Icon Composer document.
+  const apps = (await $`ls -d /Applications/Xcode*.app`.nothrow().quiet()).stdout
+    .toString()
+    .split("\n")
+    .filter(Boolean)
+    .sort()
+    .reverse();
+  for (const app of apps) push(join(app.trim(), "Contents/Developer/usr/bin/actool"));
   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;
+  if (xcrun.exitCode === 0) push(xcrun.stdout.toString().trim());
+  return found;
 }
 
 export interface AppearanceCatalog {
@@ -59,11 +65,11 @@ export async function writeAppearanceCatalog(
   // what the caller passed and of the subprocess working directory.
   const resources = resolve(resourcesDir);
   const work = resolve(workDir);
-  const actool = await findActool();
-  if (!actool) {
+  const actools = await findActools();
+  if (actools.length === 0) {
     console.warn(
       "[mirin] actool not found — appearance variants need a full Xcode " +
-        "(Command Line Tools alone is not enough); shipping the default icon only.",
+        "(Command Line Tools alone is not enough).",
     );
     return undefined;
   }
@@ -74,23 +80,30 @@ export async function writeAppearanceCatalog(
   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;
+  // Old actools exit 0 for an .icon document while emitting no catalog (they
+  // warn that the platform can't target macOS 26), so success is judged by the
+  // artifact, not the exit code — and every installed Xcode gets a turn.
+  const car = join(work, "compiled", "Assets.car");
+  let lastOutput = "";
+  for (const actool of actools) {
+    const compiled = join(work, "compiled");
+    rmSync(compiled, { recursive: true, force: true });
+    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();
+    lastOutput = res.stdout.toString().trim();
+    if (existsSync(car)) {
+      cpSync(car, join(resources, "Assets.car"));
+      const icns = join(compiled, `${ICON_NAME}.icns`);
+      return { name: ICON_NAME, icns: existsSync(icns) ? icns : undefined };
+    }
   }
 
-  cpSync(car, join(resources, "Assets.car"));
-  const icns = join(compiled, `${ICON_NAME}.icns`);
-  return { name: ICON_NAME, icns: existsSync(icns) ? icns : undefined };
+  console.warn(
+    `[mirin] no installed Xcode could compile the .icon document (tried ${actools.length}).\n` +
+      lastOutput,
+  );
+  return undefined;
 }

package/src/icons/sources.ts

@@ -23,3 +23,16 @@ export function resolveIconSource(
   const picked = typeof icon === "string" ? icon : (icon[platform] ?? icon.default);
   return picked ? join(projectDir, picked) : undefined;
 }
+
+/**
+ * The `.icns`-capable fallback behind a macOS `.icon` document: the `default`
+ * entry when per-platform sources are configured. A failed catalog compile
+ * must degrade to a plain icon, never to an iconless bundle.
+ */
+export function resolveIconFallback(
+  icon: string | IconSources | undefined,
+  projectDir: string,
+): string | undefined {
+  if (!icon || typeof icon === "string") return undefined;
+  return icon.default ? join(projectDir, icon.default) : undefined;
+}