@mirinjs/cli 0.0.1-alpha.0 → 0.0.1-alpha.10

package/package.json

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

package/src/artifacts.ts

@@ -118,13 +118,17 @@ async function ensureCef(): Promise<string> {
   const url = `https://github.com/${REPO_SLUG}/releases/download/v${version}/${asset}`;
   console.log(`[mirin] downloading CEF for ${platformTag()} (one-time, ~hundreds of MB)…`);
 
-  const res = await fetch(url);
-  if (!res.ok) {
-    throw new Error(`mirin: failed to download CEF from ${url} (HTTP ${res.status}).`);
-  }
+  // Download with curl, not `Bun.write(file, await fetch(url))`: the latter
+  // pins a core at 100% CPU and never completes on large gzip responses
+  // (the streaming write path). curl is fast and ubiquitous.
   const archive = join(tmpdir(), asset);
-  await Bun.write(archive, res);
-  await $`tar -xzf ${archive} -C ${cacheDir}`;
+  try {
+    await $`curl -fSL --retry 3 -o ${archive} ${url}`;
+    await $`tar -xzf ${archive} -C ${cacheDir}`;
+  } catch (err) {
+    rmSync(archive, { force: true });
+    throw new Error(`mirin: failed to download CEF from ${url} (${err}).`);
+  }
   rmSync(archive, { force: true });
   return cacheDir;
 }

package/src/build.ts

@@ -20,12 +20,14 @@ import { mkdirSync, rmSync } from "node:fs";
 import { join } from "node:path";
 import { buildAppBundle } from "./bundle.ts";
 import { resolveArtifacts } from "./artifacts.ts";
+import { sweepBuildTemps } from "./temps.ts";
 
 export async function build(projectDir = process.cwd()): Promise<number> {
   const outDir = join(projectDir, "build");
   const work = join(projectDir, ".mirin");
   mkdirSync(outDir, { recursive: true });
   mkdirSync(work, { recursive: true });
+  sweepBuildTemps(projectDir);
 
   const config = (await import(join(projectDir, "mirin.config.ts"))).default;
   const appName: string = config.name ?? "Mirin App";
@@ -59,6 +61,7 @@ export async function build(projectDir = process.cwd()): Promise<number> {
     coreDylib: artifacts.coreDylib,
     helperBin: artifacts.helperBin,
     cefPath: artifacts.cefPath,
+    icon: config.icon ? join(projectDir, config.icon) : undefined,
     signIdentity: process.env.MIRIN_SIGN_IDENTITY,
     resources: {
       uiDir: join(projectDir, "dist"),

package/src/bundle.ts

@@ -33,6 +33,8 @@ export interface BundleOptions {
   coreDylib: string; // libmirin_core.dylib
   helperBin: string; // compiled mirin-helper binary
   cefPath: string; // dir containing the CEF framework (vendor/cef)
+  /** App icon source: a .icns, a .iconset dir, or a square .png. Optional. */
+  icon?: string;
   /** Codesign identity; "-" (default) is ad-hoc. Set to a Developer ID to ship. */
   signIdentity?: string;
   /** Production-only resources placed under Contents/Resources. */
@@ -43,6 +45,50 @@ export interface BundleOptions {
   };
 }
 
+/** The 10 standard iconset renditions (point size + @1x/@2x pixel size). */
+const ICONSET_RENDITIONS = [
+  { name: "icon_16x16.png", px: 16 },
+  { name: "icon_16x16@2x.png", px: 32 },
+  { name: "icon_32x32.png", px: 32 },
+  { name: "icon_32x32@2x.png", px: 64 },
+  { name: "icon_128x128.png", px: 128 },
+  { name: "icon_128x128@2x.png", px: 256 },
+  { name: "icon_256x256.png", px: 256 },
+  { name: "icon_256x256@2x.png", px: 512 },
+  { name: "icon_512x512.png", px: 512 },
+  { 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");
+
+  if (iconSrc.endsWith(".icns")) {
+    cpSync(iconSrc, icns);
+  } else if (iconSrc.endsWith(".iconset")) {
+    await $`iconutil -c icns ${iconSrc} -o ${icns}`.quiet();
+  } else {
+    const iconset = join(resources, "icon.iconset");
+    rmSync(iconset, { recursive: true, force: true });
+    mkdirSync(iconset, { recursive: true });
+    for (const { name, px } of ICONSET_RENDITIONS) {
+      await $`sips -z ${px} ${px} ${iconSrc} --out ${join(iconset, name)}`.quiet();
+    }
+    await $`iconutil -c icns ${iconset} -o ${icns}`.quiet();
+    rmSync(iconset, { recursive: true, force: true });
+  }
+  return "icon";
+}
+
 type PlistValue = string | boolean | Record<string, string>;
 
 function plist(entries: Record<string, PlistValue>): string {
@@ -87,25 +133,29 @@ export async function buildAppBundle(opts: BundleOptions): Promise<{ app: string
   cpSync(opts.hostExe, join(macos, appName));
   cpSync(opts.coreDylib, join(macos, "libmirin_core.dylib"));
 
-  writeFileSync(
-    join(contents, "Info.plist"),
-    plist({
-      CFBundleDevelopmentRegion: "en",
-      CFBundleDisplayName: appName,
-      CFBundleExecutable: appName,
-      CFBundleIdentifier: bundleId,
-      CFBundleInfoDictionaryVersion: "6.0",
-      CFBundleName: appName,
-      CFBundlePackageType: "APPL",
-      CFBundleShortVersionString: "0.0.1",
-      CFBundleVersion: "0.0.1",
-      LSMinimumSystemVersion: "13.0",
-      NSHighResolutionCapable: true,
-      NSSupportsAutomaticGraphicsSwitching: true,
-      LSFileQuarantineEnabled: true,
-      LSEnvironment: { MallocNanoZone: "0" },
-    }),
-  );
+  // 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;
+
+  const info: Record<string, PlistValue> = {
+    CFBundleDevelopmentRegion: "en",
+    CFBundleDisplayName: appName,
+    CFBundleExecutable: appName,
+    CFBundleIdentifier: bundleId,
+    CFBundleInfoDictionaryVersion: "6.0",
+    CFBundleName: appName,
+    CFBundlePackageType: "APPL",
+    CFBundleShortVersionString: "0.0.1",
+    CFBundleVersion: "0.0.1",
+    LSMinimumSystemVersion: "13.0",
+    NSHighResolutionCapable: true,
+    NSSupportsAutomaticGraphicsSwitching: true,
+    LSFileQuarantineEnabled: true,
+    LSEnvironment: { MallocNanoZone: "0" },
+  };
+  if (iconFile) info.CFBundleIconFile = iconFile;
+
+  writeFileSync(join(contents, "Info.plist"), plist(info));
 
   cpSync(join(cefPath, FRAMEWORK), join(frameworks, FRAMEWORK), {
     recursive: true,

package/src/dev.ts

@@ -13,12 +13,16 @@ import { mkdirSync } from "node:fs";
 import { join } from "node:path";
 import { buildAppBundle } from "./bundle.ts";
 import { resolveArtifacts } from "./artifacts.ts";
+import { sweepBuildTemps } from "./temps.ts";
 
 const DEV_URL = "http://localhost:5173";
 
 export async function dev(projectDir = process.cwd()): Promise<number> {
   const work = join(projectDir, ".mirin");
   mkdirSync(work, { recursive: true });
+  // `bun build --compile` drops temp *.bun-build files in the cwd; clear any left
+  // behind by a previously interrupted run so they don't pile up in the project.
+  sweepBuildTemps(projectDir);
 
   // --- load the manifest ---
   const config = (await import(join(projectDir, "mirin.config.ts"))).default;
@@ -46,6 +50,7 @@ export async function dev(projectDir = process.cwd()): Promise<number> {
     coreDylib: artifacts.coreDylib,
     helperBin: artifacts.helperBin,
     cefPath: artifacts.cefPath,
+    icon: config.icon ? join(projectDir, config.icon) : undefined,
   });
 
   // --- start Vite ---

package/src/temps.ts

@@ -0,0 +1,24 @@
+/**
+ * Remove `bun build --compile` scratch files (`.*.bun-build`) from a directory.
+ *
+ * `bun build --compile` writes these temp files into the working directory and
+ * normally cleans them up — but a hard-killed build leaves them behind, where
+ * they accumulate in the project root. The dev/build commands sweep them first.
+ */
+
+import { readdirSync, rmSync } from "node:fs";
+import { join } from "node:path";
+
+export function sweepBuildTemps(dir: string): void {
+  let entries: string[];
+  try {
+    entries = readdirSync(dir);
+  } catch {
+    return;
+  }
+  for (const name of entries) {
+    if (name.endsWith(".bun-build")) {
+      rmSync(join(dir, name), { force: true });
+    }
+  }
+}