@akanjs/devkit 3.0.0-beta.29 → 3.0.0-beta.30

package/mobile/mobileTarget.ts

@@ -1,5 +1,5 @@
-import type { AkanMobileAppId } from "akanjs";
-import type { AkanAppConfig, AkanMobileTargetConfig, MobileEnv } from "../akanConfig";
+import type { AkanNativeAppId } from "akanjs";
+import type { AkanAppConfig, AkanNativeTarget, NativeEnv } from "../akanConfig";
 import type { App } from "../commandDecorators";
 
 export type MobilePlatform = "ios" | "android";
@@ -9,26 +9,26 @@ export type MobileTargetSelection = string | "all" | undefined;
 
 export interface ResolvedMobileTarget {
   name: string;
-  config: AkanMobileTargetConfig;
+  config: AkanNativeTarget;
 }
 
-export const MOBILE_ENVS = ["local", "debug", "develop", "main"] as const satisfies readonly MobileEnv[];
+export const MOBILE_ENVS = ["local", "debug", "develop", "main"] as const satisfies readonly NativeEnv[];
 
 const trimSlashes = (value: string) => value.replace(/^\/+|\/+$/g, "");
 
 export const getMobileTargets = async (app: App): Promise<ResolvedMobileTarget[]> => {
   const config = await app.getConfig();
-  return Object.entries(config.mobile.targets).map(([name, target]) => ({ name, config: target }));
+  return Object.entries(config.native.targets).map(([name, target]) => ({ name, config: target }));
 };
 
 //* An app with basePaths builds a CSR page per basePath and none at its root, so a target naming no basePath opens
 //* nothing on its own there; it is the template each basePath's target is made from.
-const isTemplateOnly = ({ basePaths, mobile }: Pick<AkanAppConfig, "basePaths" | "mobile">) =>
-  basePaths.size > 0 && Object.values(mobile.targets).every((target) => !target.basePath);
+const isTemplateOnly = ({ basePaths, native }: Pick<AkanAppConfig, "basePaths" | "native">) =>
+  basePaths.size > 0 && Object.values(native.targets).every((target) => !target.basePath);
 
 export const getMobileTargetChoices = async (app: App): Promise<string[]> => {
   const config = await app.getConfig();
-  const targetNames = Object.keys(config.mobile.targets);
+  const targetNames = Object.keys(config.native.targets);
   if (targetNames.length > 0 && !isTemplateOnly(config)) return targetNames;
   return [...config.basePaths];
 };
@@ -56,15 +56,15 @@ export const resolveMobileTargets = async (
 ): Promise<ResolvedMobileTarget[]> => {
   const config = await app.getConfig();
   const targets = await getMobileTargets(app);
-  if (targets.length === 0) throw new Error(`No mobile targets configured for ${app.name}`);
+  if (targets.length === 0) throw new Error(`No native targets configured for ${app.name}`);
   if (!selection && targets.length === 1 && !isTemplateOnly(config)) return targets;
   if (!selection) {
     const choices = await getMobileTargetChoices(app);
     if (choices.length === 1) return resolveMobileTargets(app, choices[0]);
-    throw new Error(`Multiple mobile targets found for ${app.name}. Pass --target <${choices.join("|")}|all>.`);
+    throw new Error(`Multiple native targets found for ${app.name}. Pass --target <${choices.join("|")}|all>.`);
   }
   if (selection === "all") {
-    if (Object.keys(config.mobile.targets).length > 1) return targets;
+    if (Object.keys(config.native.targets).length > 1) return targets;
     const basePaths = [...config.basePaths];
     if (basePaths.length > 1 || isTemplateOnly(config)) {
       return basePaths.flatMap((basePath) => {
@@ -79,20 +79,20 @@ export const resolveMobileTargets = async (
   const basePathTarget = resolveMobileTargetByBasePath(targets, selection);
   if (basePathTarget && config.basePaths.has(trimSlashes(selection))) return [basePathTarget];
   const choices = await getMobileTargetChoices(app);
-  throw new Error(`Mobile target '${selection}' was not found. Available: ${choices.join(", ")}`);
+  throw new Error(`Native target '${selection}' was not found. Available: ${choices.join(", ")}`);
 };
 
-export const resolveAppId = (appId: AkanMobileAppId, platform: NativePlatform): string => {
+export const resolveAppId = (appId: AkanNativeAppId, platform: NativePlatform): string => {
   if (typeof appId === "string") return appId;
   const id = appId[platform] ?? appId.default;
-  if (!id) throw new Error(`mobile.appId names no id for ${platform}; give it ${platform} or default.`);
+  if (!id) throw new Error(`native.appId names no id for ${platform}; give it ${platform} or default.`);
   return id;
 };
 
-export const appIdsOf = (appId: AkanMobileAppId): string[] =>
+export const appIdsOf = (appId: AkanNativeAppId): string[] =>
   typeof appId === "string" ? [appId] : Object.values(appId).filter((id): id is string => !!id);
 
-export const resolveMobilePath = (target: AkanMobileTargetConfig, pathname: string) => {
+export const resolveMobilePath = (target: AkanNativeTarget, pathname: string) => {
   const basePath = trimSlashes(target.basePath ?? "");
   const normalizedPath = `/${pathname.replace(/^\/+/, "")}`;
   if (!basePath) return normalizedPath;
@@ -100,7 +100,7 @@ export const resolveMobilePath = (target: AkanMobileTargetConfig, pathname: stri
   return `/${basePath}${normalizedPath === "/" ? "" : normalizedPath}`;
 };
 
-export const targetHtmlFilename = (target: AkanMobileTargetConfig) => {
+export const targetHtmlFilename = (target: AkanNativeTarget) => {
   const basePath = trimSlashes(target.basePath ?? "");
   return basePath ? `${basePath}.html` : "index.html";
 };

package/mobile/nativeApp.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, test } from "bun:test";
 import path from "node:path";
 import type { AkanPlugin } from "akanjs";
-import type { AkanMobileTargetConfig } from "../akanConfig";
+import type { AkanNativeTarget } from "../akanConfig";
 import type { App } from "../commandDecorators";
 import { tempDirs, writeText } from "../testHelpers";
 import { NativeApp } from "./nativeApp";
@@ -9,7 +9,7 @@ import { NativeConfig } from "./nativeConfig";
 
 const makeTempRoot = tempDirs("akan-native-app-");
 
-const target = (config: Partial<AkanMobileTargetConfig> = {}) => ({
+const target = (config: Partial<AkanNativeTarget> = {}) => ({
   name: config.name ?? "default",
   config: {
     name: config.name ?? "default",
@@ -39,10 +39,10 @@ describe("NativeApp", () => {
   test("keeps each target's web root and each platform's output apart", () => {
     const admin = new NativeApp(fakeApp(), target({ name: "admin", basePath: "admin" }));
 
-    expect(admin.web.dir).toBe(path.join(appDir, ".akan/mobile/admin/web"));
-    expect(admin.outDir("ios")).toBe(path.join(appDir, ".akan/mobile/admin/native/ios"));
-    expect(admin.outDir("android")).toBe(path.join(appDir, ".akan/mobile/admin/native/android"));
-    expect(admin.devOutDir("macos")).toBe(path.join(appDir, ".akan/mobile/admin/dev/macos"));
+    expect(admin.web.dir).toBe(path.join(appDir, ".akan/native/admin/web"));
+    expect(admin.outDir("ios")).toBe(path.join(appDir, ".akan/native/admin/build/ios"));
+    expect(admin.outDir("android")).toBe(path.join(appDir, ".akan/native/admin/build/android"));
+    expect(admin.devOutDir("macos")).toBe(path.join(appDir, ".akan/native/admin/dev/macos"));
   });
 
   test("a dev build bundles no page a release build left, and builds apart from the release it would empty", async () => {
@@ -106,7 +106,7 @@ describe("NativeApp", () => {
 
     expect(warnings).toEqual([]);
     expect(config.plugins).toEqual([...NativeConfig.basePlugins, "push"]);
-    expect(config.web.dir).toBe(path.join(appDir, ".akan/mobile/default/web"));
+    expect(config.web.dir).toBe(path.join(appDir, ".akan/native/default/web"));
   });
 
   test("a config nothing is built from (the update key's) stages no desktop bin", async () => {

package/mobile/nativeApp.ts

@@ -1,6 +1,6 @@
 import path from "node:path";
 import type { AkanNativeConfig } from "@akanjs/native/config";
-import type { MobileEnv } from "akanjs";
+import type { NativeEnv } from "akanjs";
 import type { App } from "../commandDecorators";
 import { Executor } from "../executors";
 import { DesktopBin } from "./desktopBin";
@@ -36,7 +36,7 @@ interface NativeDevBoot {
 
 export interface NativeBuildOptions {
   profile?: "debug" | "release";
-  /** The server a desktop app carries (the target's `native.desktop.server`), staged by DesktopServerStage. */
+  /** The server a desktop app carries (the target's `desktop.server`), staged by DesktopServerStage. */
   server?: DesktopServerBundle;
   /** Windows: an NSIS setup program beside the app folder. */
   installer?: boolean;
@@ -48,7 +48,7 @@ export interface NativeDevOptions extends NativeRunOptions {
   lang: string;
 }
 
-/** One mobile target of an app on the native runtime (a phone, or this computer as a desktop app): where it builds,
+/** One native target of an app on the native runtime (a phone, or this computer as a desktop app): where it builds,
  * what it ships, and the calls into the API. */
 export class NativeApp {
   readonly targetRoot: string;
@@ -59,14 +59,14 @@ export class NativeApp {
   constructor(
     readonly app: App,
     readonly target: ResolvedMobileTarget,
-    readonly env?: MobileEnv,
+    readonly env?: NativeEnv,
   ) {
-    this.targetRoot = path.join(app.cwdPath, ".akan", "mobile", target.name);
+    this.targetRoot = path.join(app.cwdPath, ".akan", "native", target.name);
     this.web = new NativeWebDir(path.join(this.targetRoot, "web"));
   }
 
   outDir(platform: NativePlatform) {
-    return path.join(this.targetRoot, "native", platform);
+    return path.join(this.targetRoot, "build", platform);
   }
 
   //? Apart from the builds: a desktop build empties its folder first, which would take a release and its installer.
@@ -74,7 +74,7 @@ export class NativeApp {
     return path.join(this.targetRoot, "dev", platform);
   }
 
-  /** The web root, from the production build the mobile commands run first. */
+  /** The web root, from the production build the native commands run first. */
   async assembleWeb() {
     const dist = this.app.dist.cwdPath;
     return await this.web.assemble(this.target.config, {
@@ -135,7 +135,7 @@ export class NativeApp {
     const problems = api.validateConfig(config, { appDir: this.app.cwdPath });
     if (problems.length)
       throw new Error(
-        `Mobile target '${this.target.name}' makes an invalid native config:\n- ${problems.join("\n- ")}`,
+        `Native target '${this.target.name}' makes an invalid native config:\n- ${problems.join("\n- ")}`,
       );
   }
 
@@ -298,7 +298,7 @@ export class NativeApp {
       });
     } catch (error) {
       throw new Error(
-        `Mobile target '${this.target.name}': ${error instanceof Error ? error.message : String(error)}`,
+        `Native target '${this.target.name}': ${error instanceof Error ? error.message : String(error)}`,
         {
           cause: error,
         },
@@ -309,7 +309,7 @@ export class NativeApp {
   #assertUpdates() {
     if (!this.target.config.updates)
       throw new Error(
-        `Mobile target '${this.target.name}' has no updates: { url, publicKey } in akan.config.ts; \`akan update-keygen ${this.app.name}\` prints the key.`,
+        `Native target '${this.target.name}' has no updates: add native.updates: { url, publicKey } to akan.config.ts; \`akan update-keygen ${this.app.name}\` prints the key.`,
       );
   }
 
@@ -335,7 +335,7 @@ export class NativeApp {
     const { api, config } = await this.prepare(platform);
     if (!config.updates)
       throw new Error(
-        `Mobile target '${this.target.name}' takes no updates: add mobile.updates: { url, publicKey } to akan.config.ts first.`,
+        `Native target '${this.target.name}' takes no updates: add native.updates: { url, publicKey } to akan.config.ts first.`,
       );
     const packed = await api.packUpdate({
       ...this.#task(platform, config),

package/mobile/nativeConfig.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, test } from "bun:test";
 import { mkdir, writeFile } from "node:fs/promises";
 import path from "node:path";
-import type { AkanMobileTargetConfig } from "../akanConfig";
+import type { AkanNativeTarget } from "../akanConfig";
 import { tempDirs } from "../testHelpers";
 import { NativeApi } from "./nativeApi";
 import { NativeConfig } from "./nativeConfig";
@@ -9,7 +9,7 @@ import { NativeConfig } from "./nativeConfig";
 const makeTempRoot = tempDirs("akan-native-config-");
 const repoApp = path.resolve(import.meta.dir, "../../../../apps/minimal");
 
-const minimalTarget: AkanMobileTargetConfig = {
+const minimalTarget: AkanNativeTarget = {
   name: "default",
   indexPath: "/explore",
   appName: "minimal",
@@ -17,16 +17,12 @@ const minimalTarget: AkanMobileTargetConfig = {
   version: "0.0.1",
   buildNum: 1,
   permissions: ["push"],
-  native: { android: { googleServices: "secrets/google-services.json" } },
-  deepLinks: {
-    schemes: ["minimal"],
-    domains: ["example.com"],
-    ios: { teamId: "TEAMID" },
-    android: { sha256CertFingerprints: ["00:11"] },
-  },
+  deepLinks: { schemes: ["minimal"], domains: ["example.com"] },
+  ios: { teamId: "TEAMID" },
+  android: { googleServices: "secrets/google-services.json", sha256CertFingerprints: ["00:11"] },
 };
 
-const adminTarget: AkanMobileTargetConfig = {
+const adminTarget: AkanNativeTarget = {
   name: "admin",
   basePath: "admin",
   appName: "Portal Admin",
@@ -34,14 +30,15 @@ const adminTarget: AkanMobileTargetConfig = {
   fileName: "portal-admin",
   version: "2.1.0",
   buildNum: 42,
-  assets: { icon: "assets/icon.png", splash: "assets/splash.png" },
+  icon: "assets/icon.png",
+  splash: "assets/splash.png",
   permissions: ["camera", "location", "contacts", "speech"],
   deepLinks: { domains: ["portal.example"] },
-  files: { "android/res/raw/chime.mp3": "assets/chime.mp3" },
-  native: {
-    plugins: ["iap"],
-    ios: { infoPlist: { ITSAppUsesNonExemptEncryption: false } },
-    android: { manifest: ['<queries><package android:name="com.kakao.talk" /></queries>'] },
+  plugins: ["iap"],
+  ios: { infoPlist: { ITSAppUsesNonExemptEncryption: false } },
+  android: {
+    manifest: ['<queries><package android:name="com.kakao.talk" /></queries>'],
+    files: { "res/raw/chime.mp3": "assets/chime.mp3" },
   },
 };
 
@@ -52,7 +49,7 @@ describe("NativeConfig.build", () => {
     const { config, warnings } = NativeConfig.build({
       appPath: "/repo/apps/minimal",
       target: minimalTarget,
-      webDir: "/repo/apps/minimal/.akan/mobile/default/web",
+      webDir: "/repo/apps/minimal/.akan/native/default/web",
       contributions: [{ permission: "push", plugins: ["push"] }],
       locales: ["en", "ko"],
       platform: "android",
@@ -61,7 +58,7 @@ describe("NativeConfig.build", () => {
     expect(warnings).toEqual([]);
     expect(config).toEqual({
       app: { id: "com.minimal.dev.app", name: "minimal", fileName: "minimal", version: "0.0.1", build: 1 },
-      web: { dir: "/repo/apps/minimal/.akan/mobile/default/web" },
+      web: { dir: "/repo/apps/minimal/.akan/native/default/web" },
       plugins: [...NativeConfig.basePlugins, "single-instance", "push"],
       capabilities: [
         {
@@ -83,7 +80,7 @@ describe("NativeConfig.build", () => {
     const { config, warnings } = NativeConfig.build({
       appPath: "/repo/apps/portal",
       target: adminTarget,
-      webDir: "/repo/apps/portal/.akan/mobile/admin/web",
+      webDir: "/repo/apps/portal/.akan/native/admin/web",
       contributions: [],
       locales: ["en", "ko"],
       platform: "android",
@@ -92,7 +89,7 @@ describe("NativeConfig.build", () => {
     expect(warnings).toEqual(["Permission 'speech' has no native plugin yet; the app ships without it."]);
     expect(config).toEqual({
       app: { id: "com.portal.admin", name: "Portal Admin", fileName: "portal-admin", version: "2.1.0", build: 42 },
-      web: { dir: "/repo/apps/portal/.akan/mobile/admin/web" },
+      web: { dir: "/repo/apps/portal/.akan/native/admin/web" },
       plugins: [...NativeConfig.basePlugins, "camera", "geolocation", "contacts", "iap"],
       capabilities: [
         {
@@ -129,7 +126,15 @@ describe("NativeConfig.build", () => {
   test("a plugin that claims a permission replaces the builtin one and adds its Android entries", () => {
     const { config } = NativeConfig.build({
       appPath: "/repo/apps/portal",
-      target: { ...adminTarget, permissions: ["camera"], native: undefined, files: undefined, assets: undefined },
+      target: {
+        ...adminTarget,
+        permissions: ["camera"],
+        plugins: undefined,
+        ios: undefined,
+        android: undefined,
+        icon: undefined,
+        splash: undefined,
+      },
       webDir: "/web",
       contributions: [
         {
@@ -158,7 +163,7 @@ describe("NativeConfig.build", () => {
   });
 
   test("updates bring their plugin and follow the binary's backend unless a channel is named", () => {
-    const build = (updates: AkanMobileTargetConfig["updates"], env?: "main" | "develop") =>
+    const build = (updates: AkanNativeTarget["updates"], env?: "main" | "develop") =>
       NativeConfig.build({
         appPath: "/repo/apps/portal",
         target: { ...adminTarget, updates },
@@ -190,14 +195,10 @@ describe("NativeConfig.build", () => {
       appPath: "/repo/apps/portal",
       target: {
         ...adminTarget,
-        assets: {
-          icon: { image: "assets/icon.png", backgroundColor: "#ffffff" },
-          splash: { backgroundColor: { light: "#ffffff", dark: "#000000" }, autoHide: false },
-        },
-        native: {
-          push: { android: { smallIcon: "assets/noti.png", color: "#ff5a5f", channel: { id: "chat", name: "Chat" } } },
-          privacy: { tracking: false, accessedApis: { DiskSpace: ["E174.1"] } },
-        },
+        icon: { image: "assets/icon.png", backgroundColor: "#ffffff" },
+        splash: { backgroundColor: { light: "#ffffff", dark: "#000000" }, autoHide: false },
+        android: { push: { smallIcon: "assets/noti.png", color: "#ff5a5f", channel: { id: "chat", name: "Chat" } } },
+        ios: { privacy: { tracking: false, accessedApis: { DiskSpace: ["E174.1"] } } },
       },
       webDir: "/web",
       contributions: [],
@@ -238,14 +239,11 @@ describe("NativeConfig.build", () => {
     await writeFile(path.join(root, "web/index.html"), "<html><head></head><body></body></html>");
     const api = await NativeApi.load(repoApp);
 
-    const adminWithEverything: AkanMobileTargetConfig = {
+    const adminWithEverything: AkanNativeTarget = {
       ...adminTarget,
       updates: { url: "https://updates.example.com/portal", publicKey: updatesKey },
-      native: {
-        ...adminTarget.native,
-        push: { android: { smallIcon: "assets/icon.png", color: "#ff5a5f" } },
-        privacy: { tracking: false },
-      },
+      ios: { ...adminTarget.ios, privacy: { tracking: false } },
+      android: { ...adminTarget.android, push: { smallIcon: "assets/icon.png", color: "#ff5a5f" } },
     };
     for (const target of [minimalTarget, adminWithEverything]) {
       const { config } = NativeConfig.build({
@@ -267,7 +265,13 @@ describe("NativeConfig.build", () => {
     await writeManifest(path.join(root, "vendor", "led-panel"), "led-panel");
     const { config } = NativeConfig.build({
       appPath: root,
-      target: { ...minimalTarget, permissions: [], native: { plugins: ["./vendor/led-panel"] }, deepLinks: undefined },
+      target: {
+        ...minimalTarget,
+        permissions: [],
+        plugins: ["./vendor/led-panel"],
+        deepLinks: undefined,
+        android: undefined,
+      },
       webDir: path.join(root, "web"),
       contributions: [],
       locales: ["en"],
@@ -293,8 +297,9 @@ describe("NativeConfig.build", () => {
       target: {
         ...minimalTarget,
         permissions: [],
-        native: { plugins: ["./native/kiosk/", "kiosk", "haptics"] },
+        plugins: ["./native/kiosk/", "kiosk", "haptics"],
         deepLinks: undefined,
+        android: undefined,
       },
       webDir: path.join(root, "web"),
       contributions: [],
@@ -314,10 +319,8 @@ describe("NativeConfig.build", () => {
         ...minimalTarget,
         permissions: [],
         deepLinks: undefined,
-        native: {
-          android: { autoplay: true },
-          desktop: { recovery: "reload", window: { fullscreen: true, skipTaskbar: true }, screenCapture: "auto" },
-        },
+        android: { autoplay: true },
+        desktop: { recovery: "reload", window: { fullscreen: true, skipTaskbar: true }, screenCapture: "auto" },
       },
       webDir: path.join(root, "web"),
       contributions: [],
@@ -342,7 +345,7 @@ describe("NativeConfig.build", () => {
     const updates = { url: "https://releases.example.com/board", publicKey: `${"a".repeat(43)}=`, channel: "pilot" };
     const { config } = NativeConfig.build({
       appPath: "/repo/apps/board",
-      target: { ...minimalTarget, permissions: [], deepLinks: undefined, native: undefined, updates },
+      target: { ...minimalTarget, permissions: [], deepLinks: undefined, android: undefined, updates },
       webDir: "/web",
       contributions: [],
       locales: ["en"],
@@ -362,7 +365,7 @@ describe("NativeConfig.build", () => {
           ...minimalTarget,
           permissions: [],
           deepLinks: undefined,
-          native: undefined,
+          android: undefined,
           updates: { ...updates, ...(channel ? { channel } : {}) },
         },
         webDir: "/web",

package/mobile/nativeConfig.ts

@@ -1,13 +1,7 @@
 import { readFileSync } from "node:fs";
 import path from "node:path";
 import type { AkanNativeConfig } from "@akanjs/native/config";
-import type {
-  AkanMobileTargetConfig,
-  AkanNativeValue,
-  AkanPluginNativeConfig,
-  MobileEnv,
-  MobilePermission,
-} from "akanjs";
+import type { AkanNativeTarget, AkanNativeValue, AkanPluginNativeConfig, NativeEnv, NativePermission } from "akanjs";
 import type { DesktopServerBundle } from "./desktopServerStage";
 import { type NativePlatform, resolveAppId } from "./mobileTarget";
 import type { NativePluginFolder } from "./nativePluginFolders";
@@ -16,16 +10,16 @@ import { toIosInfoPlistUsageDescriptions } from "./usageDescriptions";
 export interface NativeConfigInput {
   /** The app folder; every relative path in the target resolves against it. */
   appPath: string;
-  target: AkanMobileTargetConfig;
+  target: AkanNativeTarget;
   /** The assembled web root the app loads. */
   webDir: string;
   /** What the app's and its libs' plugins declare. */
   contributions: AkanPluginNativeConfig[];
   locales: readonly string[];
   /** The backend the binary talks to; an updates channel left unnamed follows it. */
-  env?: MobileEnv;
+  env?: NativeEnv;
   platform: NativePlatform;
-  /** A desktop build that carries its server (the target's `native.desktop.server`). */
+  /** A desktop build that carries its server (the target's `desktop.server`). */
   desktopServer?: DesktopServerBundle;
   /** The plugins in the app's and its libs' `native/` folders. */
   nativePlugins?: NativePluginFolder[];
@@ -57,7 +51,7 @@ export class NativeConfig {
     "haptics",
   ] as const;
   //* Used when no plugin of the app or its libs claims the permission; speech has no native plugin yet.
-  static readonly builtinContributions: { [permission in MobilePermission]: AkanPluginNativeConfig } = {
+  static readonly builtinContributions: { [permission in NativePermission]: AkanPluginNativeConfig } = {
     camera: {
       permission: "camera",
       plugins: ["camera"],
@@ -112,7 +106,7 @@ export class NativeConfig {
     const folders = new Set(nativePlugins.map((plugin) => path.resolve(plugin.dir)));
     const folderIds = new Set(nativePlugins.map((plugin) => plugin.id));
     //? A `native/<id>` folder ships by itself; listed again, by path or by id, it would reach the runtime twice.
-    const listed = (target.native?.plugins ?? []).filter((spec) =>
+    const listed = (target.plugins ?? []).filter((spec) =>
       NativeConfig.#isId(spec) ? !folderIds.has(spec) : !folders.has(path.resolve(appPath, spec)),
     );
     const plugins = [
@@ -142,11 +136,11 @@ export class NativeConfig {
     const ios = NativeConfig.#compact<NativeIos>({
       infoPlist: NativeConfig.#merged(
         applied.map((c) => c.infoPlist),
-        target.native?.ios?.infoPlist,
+        target.ios?.infoPlist,
       ),
       entitlements: NativeConfig.#merged(
         applied.map((c) => c.entitlements),
-        target.native?.ios?.entitlements,
+        target.ios?.entitlements,
       ),
     });
     const manifest = [
@@ -156,21 +150,24 @@ export class NativeConfig {
       ...[...new Set(applied.flatMap((c) => c.androidFeatures ?? []))].map(
         (name) => `<uses-feature android:name="${name}" android:required="false" />`,
       ),
-      ...(target.native?.android?.manifest ?? []),
+      ...(target.android?.manifest ?? []),
     ];
     const android = NativeConfig.#compact({
       manifest,
-      application: target.native?.android?.application ?? [],
-      activity: target.native?.android?.activity ?? [],
+      application: target.android?.application ?? [],
+      activity: target.android?.activity ?? [],
     });
-    const resources = Object.entries(target.files ?? {}).map(([to, from]) => ({ from: abs(from), to }));
+    const resources = [
+      ...Object.entries(target.ios?.files ?? {}).map(([to, from]) => ({ from: abs(from), to: `ios/${to}` })),
+      ...Object.entries(target.android?.files ?? {}).map(([to, from]) => ({ from: abs(from), to: `android/${to}` })),
+    ];
     const native = NativeConfig.#compact({ ios, android, resources });
-    const googleServices = target.native?.android?.googleServices;
-    const pushAndroid = target.native?.push?.android;
+    const googleServices = target.android?.googleServices;
+    const pushAndroid = target.android?.push;
     const desktop = NativeConfig.#compact<NonNullable<AkanNativeConfig["desktop"]>>({
-      recovery: target.native?.desktop?.recovery,
-      screenCapture: target.native?.desktop?.screenCapture,
-      window: NativeConfig.#compact({ ...target.native?.desktop?.window }),
+      recovery: target.desktop?.recovery,
+      screenCapture: target.desktop?.screenCapture,
+      window: NativeConfig.#compact({ ...target.desktop?.window }),
       server: desktopServer,
       bin: desktopBin,
     });
@@ -206,30 +203,30 @@ export class NativeConfig {
             },
           }
         : {}),
-      ...(target.native?.privacy ? { privacy: target.native.privacy } : {}),
+      ...(target.ios?.privacy ? { privacy: target.ios.privacy } : {}),
       //? assetlinks.json vouches for `<appId>.debug` outside main, the suffix a debug build installs under.
       android: {
         debugAppIdSuffix: ".debug",
         ...(googleServices ? { googleServices: abs(googleServices) } : {}),
-        ...(target.native?.android?.autoplay ? { autoplay: true } : {}),
+        ...(target.android?.autoplay ? { autoplay: true } : {}),
       },
       keyboard: { resize: "none" },
       ...(desktop ? { desktop } : {}),
-      ...(target.assets?.icon ? { icon: NativeConfig.#icon(target.assets.icon, abs) } : {}),
-      ...(target.assets?.splash ? { splash: NativeConfig.#splash(target.assets.splash, abs) } : {}),
+      ...(target.icon ? { icon: NativeConfig.#icon(target.icon, abs) } : {}),
+      ...(target.splash ? { splash: NativeConfig.#splash(target.splash, abs) } : {}),
     };
     return { config, warnings };
   }
 
   static #icon(
-    icon: NonNullable<NonNullable<AkanMobileTargetConfig["assets"]>["icon"]>,
+    icon: NonNullable<AkanNativeTarget["icon"]>,
     abs: (relative: string) => string,
   ): NonNullable<AkanNativeConfig["icon"]> {
     return typeof icon === "string" ? abs(icon) : { ...icon, image: abs(icon.image) };
   }
 
   static #splash(
-    splash: NonNullable<NonNullable<AkanMobileTargetConfig["assets"]>["splash"]>,
+    splash: NonNullable<AkanNativeTarget["splash"]>,
     abs: (relative: string) => string,
   ): NonNullable<AkanNativeConfig["splash"]> {
     if (typeof splash === "string") return { image: abs(splash) };
@@ -238,8 +235,8 @@ export class NativeConfig {
 
   //? akanConfig refuses a target whose merged updates lack url or publicKey; the type still has them optional.
   static #updates(
-    target: AkanMobileTargetConfig,
-    env?: MobileEnv,
+    target: AkanNativeTarget,
+    env?: NativeEnv,
   ): NonNullable<AkanNativeConfig["updates"]> | undefined {
     const { url, publicKey, channel = env, ...rest } = target.updates ?? {};
     return url && publicKey ? { ...rest, url, publicKey, ...(channel ? { channel } : {}) } : undefined;
@@ -286,7 +283,7 @@ export class NativeConfig {
   }
 
   //* Every route sits under /:lang, so an app link limited to a basePath lists it once per locale.
-  static #deepLinks(target: AkanMobileTargetConfig, locales: readonly string[]) {
+  static #deepLinks(target: AkanNativeTarget, locales: readonly string[]) {
     const basePath = target.basePath?.replace(/^\/+|\/+$/g, "");
     const pathPrefixes = basePath ? locales.map((locale) => `/${locale}/${basePath}`) : undefined;
     return {

package/mobile/nativeWebDir.test.ts

@@ -1,13 +1,13 @@
 import { describe, expect, test } from "bun:test";
 import { mkdir, writeFile } from "node:fs/promises";
 import path from "node:path";
-import type { AkanMobileTargetConfig } from "../akanConfig";
+import type { AkanNativeTarget } from "../akanConfig";
 import { tempDirs } from "../testHelpers";
 import { NativeWebDir } from "./nativeWebDir";
 
 const makeTempRoot = tempDirs("akan-native-web-");
 
-const target: AkanMobileTargetConfig = {
+const target: AkanNativeTarget = {
   name: "admin",
   basePath: "/admin/",
   indexPath: "/home",
@@ -68,7 +68,7 @@ describe("NativeWebDir", () => {
     const root = await makeTempRoot();
     const web = new NativeWebDir(path.join(root, "web"));
     await expect(web.assemble(target, { html: path.join(root, "none.html") })).rejects.toThrow(
-      "CSR html for mobile target 'admin' not found",
+      "CSR html for native target 'admin' not found",
     );
 
     await write(path.join(root, "index.html"), "<html><head></head></html>");

package/mobile/nativeWebDir.ts

@@ -1,6 +1,6 @@
 import { cp, mkdir, rm, stat } from "node:fs/promises";
 import path from "node:path";
-import type { AkanMobileTargetConfig } from "akanjs";
+import type { AkanNativeTarget } from "akanjs";
 
 export interface NativeWebDirSources {
   /** The target's CSR bundle: one HTML file with its scripts and styles inlined. */
@@ -19,7 +19,7 @@ export class NativeWebDir {
 
   //* The bundle is inlined into this page and its own code names the global, so only the tag marks an injection;
   //* it goes first in <head>, ahead of every script, because the page reads it as it boots.
-  static injectTarget(html: string, target: Pick<AkanMobileTargetConfig, "name" | "basePath" | "indexPath">) {
+  static injectTarget(html: string, target: Pick<AkanNativeTarget, "name" | "basePath" | "indexPath">) {
     if (html.includes(NativeWebDir.#targetTag)) return html;
     const basePath = target.basePath?.replace(/^\/+|\/+$/g, "") ?? "";
     const script = `${NativeWebDir.#targetTag}${JSON.stringify({
@@ -40,9 +40,9 @@ export class NativeWebDir {
   }
 
   /** Rebuilds the folder from scratch and answers its files as web paths: relative, `/`-separated and sorted. */
-  async assemble(target: AkanMobileTargetConfig, { html, publicDir, fontsDir }: NativeWebDirSources) {
+  async assemble(target: AkanNativeTarget, { html, publicDir, fontsDir }: NativeWebDirSources) {
     if (!(await Bun.file(html).exists()))
-      throw new Error(`CSR html for mobile target '${target.name}' not found: ${html}`);
+      throw new Error(`CSR html for native target '${target.name}' not found: ${html}`);
     await this.clear();
     if (publicDir && (await NativeWebDir.#isDir(publicDir))) await cp(publicDir, this.dir, { recursive: true });
     if (fontsDir && (await NativeWebDir.#isDir(fontsDir)))