@nativedesktop/cli 0.4.1 → 0.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativedesktop/cli",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "The nd CLI: dev-runs, builds, and packages NativeDesktop apps",
   "type": "module",
   "license": "MIT",
@@ -25,6 +25,6 @@
     "./config": "./src/config.ts"
   },
   "dependencies": {
-    "@nativedesktop/host": "0.4.1"
+    "@nativedesktop/host": "0.4.2"
   }
 }

package/src/config.test.ts

@@ -1,8 +1,14 @@
-// Webview engine and scheme resolution: the decisions `nd dev`, `nd package`
-// and `nd doctor` all make from the same config, and the values `nd dev` hands
-// the host as ND_WEBVIEW_ENGINE and ND_CEF_SCHEMES.
+// Webview engine, scheme and style resolution: the decisions `nd dev`,
+// `nd package` and `nd doctor` all make from the same config, and the values
+// `nd dev` hands the host as ND_WEBVIEW_ENGINE, ND_CEF_SCHEMES and ND_CEF_STYLE.
 import { describe, expect, test } from "bun:test";
-import { engineTargetFor, type NativeDesktopConfig, resolveCefSchemes, resolveWebViewEngine } from "./config.ts";
+import {
+  engineTargetFor,
+  type NativeDesktopConfig,
+  resolveCefSchemes,
+  resolveCefStyle,
+  resolveWebViewEngine,
+} from "./config.ts";
 
 const chromiumOnMac: NativeDesktopConfig = { webview: { engine: { mac: "chromium" } } };
 
@@ -52,3 +58,23 @@ describe("resolveCefSchemes", () => {
     expect(() => resolveCefSchemes(bad, {})).toThrow("webview.cef.schemes");
   });
 });
+
+describe("resolveCefStyle", () => {
+  const chrome: NativeDesktopConfig = { webview: { cef: { style: "chrome" } } };
+
+  test("defaults to alloy", () => {
+    expect(resolveCefStyle({}, {})).toBe("alloy");
+    expect(resolveCefStyle(chrome, {})).toBe("chrome");
+  });
+
+  test("ND_CEF_STYLE overrides the config in both directions", () => {
+    expect(resolveCefStyle({}, { ND_CEF_STYLE: "chrome" })).toBe("chrome");
+    expect(resolveCefStyle(chrome, { ND_CEF_STYLE: "alloy" })).toBe("alloy");
+  });
+
+  test("an unknown style names where it came from", () => {
+    expect(() => resolveCefStyle({}, { ND_CEF_STYLE: "views" })).toThrow("ND_CEF_STYLE");
+    const bad = { webview: { cef: { style: "blink" } } } as unknown as NativeDesktopConfig;
+    expect(() => resolveCefStyle(bad, {})).toThrow("webview.cef.style");
+  });
+});

package/src/config.ts

@@ -145,6 +145,9 @@ export interface PackageConfig {
 /** `<webview>` engine: the platform's own WebKit, or Chromium via CEF. */
 export type WebViewEngine = "system" | "chromium";
 
+/** CEF browser style, per `cef_runtime_style_t`. */
+export type CefStyle = "alloy" | "chrome";
+
 export interface CefConfig {
   /** Pinned CEF release, matched against cef-builds.spotifycdn.com/index.json.
    * Default: DEFAULT_CEF_VERSION from @nativedesktop/host/cef. */
@@ -156,6 +159,11 @@ export interface CefConfig {
    * cef_initialize, which is long before app code runs, so the list has to come
    * from config rather than a runtime call. */
   schemes?: string[];
+  /** Browser style. Default "alloy". "chrome" gives the embedded browser
+   * Chromium's own browser runtime, which is the only way to run Chrome
+   * extensions; it costs Chromium's own handling of some UI that Alloy leaves
+   * to the embedder. See docs/webview.md. */
+  style?: CefStyle;
 }
 
 export interface WebViewConfig {
@@ -235,6 +243,29 @@ export function resolveCefSchemes(
   return [...new Set(declared)];
 }
 
+const CEF_STYLES: readonly CefStyle[] = ["alloy", "chrome"];
+
+function expectStyle(value: string, source: string): CefStyle {
+  if (!CEF_STYLES.includes(value as CefStyle)) {
+    throw new Error(`nd: ${source} must be "alloy" or "chrome" (got "${value}")`);
+  }
+  return value as CefStyle;
+}
+
+/**
+ * The browser style a launch declares. ND_CEF_STYLE wins outright, the same way
+ * ND_WEBVIEW_ENGINE and ND_CEF_SCHEMES do, and takes the name the host reads.
+ */
+export function resolveCefStyle(
+  config: NativeDesktopConfig,
+  env: Record<string, string | undefined> = process.env,
+): CefStyle {
+  const override = env.ND_CEF_STYLE;
+  if (override) return expectStyle(override, "ND_CEF_STYLE");
+  const declared = config.webview?.cef?.style;
+  return declared ? expectStyle(declared, "webview.cef.style") : "alloy";
+}
+
 export function defineConfig(config: NativeDesktopConfig): NativeDesktopConfig { return config; }
 
 export async function loadConfig(cwd = process.cwd()): Promise<NativeDesktopConfig> {

package/src/index.ts

@@ -13,6 +13,7 @@ import {
   loadConfig,
   type NativeDesktopConfig,
   resolveCefSchemes,
+  resolveCefStyle,
   resolveWebViewEngine,
 } from "./config.ts";
 import { packageApp, type PackageOptions } from "./package/index.ts";
@@ -24,15 +25,16 @@ async function nativeEnv(config: NativeDesktopConfig): Promise<Record<string, st
   return paths.length ? { ND_PLUGINS: "1", ND_PLUGIN_PATHS: paths.join(":") } : {};
 }
 
-/** The host reads the engine and its launch-declared schemes off its
- * environment, so both config decisions have to be made here and handed down.
- * Windows has no engine target yet. */
+/** The host reads the engine, its launch-declared schemes and the browser style
+ * off its environment, so those config decisions have to be made here and
+ * handed down. Windows has no engine target yet. */
 function engineEnv(config: NativeDesktopConfig): Record<string, string> {
   const target = engineTargetFor();
   if (!target) return {};
   const schemes = resolveCefSchemes(config);
   return {
     ND_WEBVIEW_ENGINE: resolveWebViewEngine(config, target),
+    ND_CEF_STYLE: resolveCefStyle(config),
     ...(schemes.length ? { ND_CEF_SCHEMES: schemes.join(",") } : {}),
   };
 }

package/src/package/doctor.ts

@@ -10,6 +10,7 @@ import {
   loadConfig,
   type NativeDesktopConfig,
   resolveCefSchemes,
+  resolveCefStyle,
   resolveWebViewEngine,
   type WebViewEngine,
 } from "../config.ts";
@@ -78,9 +79,11 @@ export function webviewChecks(config: NativeDesktopConfig, cwd: string): Check[]
   if (!target) return [];
   let engine: WebViewEngine;
   let schemes: string[];
+  let style: string;
   try {
     engine = resolveWebViewEngine(config, target);
     schemes = resolveCefSchemes(config);
+    style = resolveCefStyle(config);
   } catch (err) {
     return [{ name: "webview", status: "error", detail: String(err) }];
   }
@@ -88,7 +91,8 @@ export function webviewChecks(config: NativeDesktopConfig, cwd: string): Check[]
     name: "webview",
     status: "ok",
     detail: `engine=${engine} (${target})${process.env.ND_WEBVIEW_ENGINE ? " from ND_WEBVIEW_ENGINE" : ""}` +
-      (schemes.length ? ` schemes=${schemes.join(",")}` : ""),
+      (schemes.length ? ` schemes=${schemes.join(",")}` : "") +
+      (engine === "chromium" ? ` style=${style}` : ""),
   }];
 
   const version = cefVersionFor(config.webview?.cef);

package/src/package/identity.test.ts

@@ -208,7 +208,7 @@ describe("buildDesktopEntry / appRunTemplate", () => {
     expect(script).not.toContain("ND_WEBVIEW_ENGINE");
   });
 
-  test("AppRun exports the engine and its schemes, behind an override", () => {
+  test("AppRun exports the engine, its schemes and the style, behind an override", () => {
     const script = appRunTemplate({
       entry: "src/main.tsx",
       cwd: ".",
@@ -216,8 +216,10 @@ describe("buildDesktopEntry / appRunTemplate", () => {
       pluginPaths: [],
       engine: "chromium",
       schemes: ["nbext", "nbint"],
+      style: "chrome",
     });
     expect(script).toContain('export ND_WEBVIEW_ENGINE="${ND_WEBVIEW_ENGINE:-chromium}"');
     expect(script).toContain('export ND_CEF_SCHEMES="${ND_CEF_SCHEMES:-nbext,nbint}"');
+    expect(script).toContain('export ND_CEF_STYLE="${ND_CEF_STYLE:-chrome}"');
   });
 });

package/src/package/linux.ts

@@ -7,7 +7,7 @@ import { chmodSync, cpSync, mkdirSync, writeFileSync } from "node:fs";
 import { join, resolve } from "node:path";
 import { resolveHostBinary } from "@nativedesktop/host";
 import { cefPlatformKey } from "@nativedesktop/host/cef";
-import { type NativeDesktopConfig, resolveCefSchemes, resolveWebViewEngine } from "../config.ts";
+import { type NativeDesktopConfig, resolveCefSchemes, resolveCefStyle, resolveWebViewEngine } from "../config.ts";
 import { applyCefLinuxPlan, cefVersionFor, ensureCefDist, planCefLinux } from "./cef.ts";
 import { installLinuxIcon } from "./icons.ts";
 import { buildAppRun, buildDesktopEntry, buildMimeInfoXml, type ResolvedIdentity } from "./identity.ts";
@@ -32,6 +32,7 @@ export async function packageLinuxApp(
 
   const engine = resolveWebViewEngine(config, "linux");
   const schemes = resolveCefSchemes(config);
+  const style = resolveCefStyle(config);
   const payload = await assemblePayload({
     appDir,
     config,
@@ -39,6 +40,7 @@ export async function packageLinuxApp(
     appRoot: join(appdir, "app"),
     engine,
     schemes,
+    style,
     entry: options.entry,
     compile: options.compile,
   });
@@ -51,6 +53,7 @@ export async function packageLinuxApp(
     pluginPaths: payload.pluginPaths,
     engine,
     schemes,
+    style,
   }));
   chmodSync(join(appdir, "AppRun"), 0o755);
   writeFileSync(join(appdir, `${identity.slug}.desktop`), buildDesktopEntry(identity, linux));

package/src/package/mac.ts

@@ -7,7 +7,7 @@ import { chmodSync, cpSync, existsSync, mkdirSync, readFileSync, writeFileSync }
 import { join, resolve } from "node:path";
 import { resolveHostBinary } from "@nativedesktop/host";
 import { cefPlatformKey } from "@nativedesktop/host/cef";
-import { type NativeDesktopConfig, resolveCefSchemes, resolveWebViewEngine } from "../config.ts";
+import { type NativeDesktopConfig, resolveCefSchemes, resolveCefStyle, resolveWebViewEngine } from "../config.ts";
 import {
   applyCefMacPlan,
   type CefMacPlan,
@@ -80,6 +80,7 @@ export async function packageMacApp(
     appRoot: join(c, "Resources", "app"),
     engine,
     schemes: resolveCefSchemes(config),
+    style: resolveCefStyle(config),
     entry: options.entry,
     compile: options.compile,
   });

package/src/package/payload.ts

@@ -4,7 +4,7 @@
 // workspace-relative path and relative imports keep resolving packaged.
 import { cpSync, existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync } from "node:fs";
 import { basename, join, relative, resolve, sep } from "node:path";
-import { buildNativePlugins, type NativeDesktopConfig, type PackageConfig, type WebViewEngine } from "../config.ts";
+import { buildNativePlugins, type CefStyle, type NativeDesktopConfig, type PackageConfig, type WebViewEngine } from "../config.ts";
 import type { ResolvedIdentity } from "./identity.ts";
 import { assertResolvableEntries, flattenRuntimeModules } from "./modules.ts";
 
@@ -46,6 +46,8 @@ export interface PayloadOptions {
   engine: WebViewEngine;
   /** Launch-declared CEF schemes, recorded for the same reason. */
   schemes: string[];
+  /** CEF browser style, recorded for the same reason. */
+  style: CefStyle;
   /** CLI --entry override (app-relative source entry). */
   entry?: string;
   /** false forces raw source (--no-compile). */
@@ -170,6 +172,7 @@ export async function assemblePayload(o: PayloadOptions): Promise<PayloadResult>
     pluginPaths,
     engine: o.engine,
     schemes: o.schemes,
+    style: o.style,
   }, null, 2)}\n`);
 
   return { entry: appEntry, cwd, pluginPaths };

package/src/package/templates.ts

@@ -99,6 +99,8 @@ export interface AppRunSpec {
   engine?: string;
   /** Launch-declared CEF schemes. */
   schemes?: string[];
+  /** CEF browser style the AppDir was staged for. */
+  style?: string;
 }
 
 export function appRunTemplate(s: AppRunSpec): string {
@@ -108,11 +110,12 @@ export function appRunTemplate(s: AppRunSpec): string {
     `export ND_SCRIPT="$HERE/app/${s.entry}"\n` +
     'export PATH="$HERE/usr/bin:$PATH"\n';
   if (s.appId) script += `export ND_APP_ID="${s.appId}"\n`;
-  // Every CEF process reads both of these, and both have to be settled before
+  // Every CEF process reads these, and each has to be settled before
   // cef_initialize. The :- form keeps an explicit override ahead of the bundle,
   // matching how the mac bootstrap defers to an already-set variable.
   if (s.engine) script += `export ND_WEBVIEW_ENGINE="\${ND_WEBVIEW_ENGINE:-${s.engine}}"\n`;
   if (s.schemes?.length) script += `export ND_CEF_SCHEMES="\${ND_CEF_SCHEMES:-${s.schemes.join(",")}}"\n`;
+  if (s.style) script += `export ND_CEF_STYLE="\${ND_CEF_STYLE:-${s.style}}"\n`;
   if (s.pluginPaths.length) {
     script += 'export ND_PLUGINS="1"\n';
     script += `export ND_PLUGIN_PATHS="${s.pluginPaths.map((p) => `$HERE/app/${p}`).join(":")}"\n`;