akanjs 3.0.0-beta.9 → 3.0.1

package/client/makePageProto.tsx

@@ -29,12 +29,12 @@ const getPageInfo = (): { locale: string; path: string } => {
   if (getEnv().side !== "server") {
     const [, firstSegment = "", ...rest] = window.location.pathname.split("/");
     const hasLocalePrefix = localeSet.has(firstSegment);
-
+    
     const locale = activeLocale ?? (hasLocalePrefix ? firstSegment : defaultLocale);
     return { locale, path: activePath ?? (hasLocalePrefix ? `/${rest.join("/")}` : window.location.pathname) };
   }
   const h = untrackedHeaders();
-
+  
   const localeHeader = h.get("x-locale");
   const pathHeader = h.get("x-path");
   if (localeHeader && pathHeader) return { locale: localeHeader, path: pathHeader };
@@ -164,13 +164,12 @@ export const makePageProto = <
             dangerouslySetInnerHTML={{
               __html: translator.translate(lang, key, {
                 ...param,
-
                 br: `<br />`,
               }),
             }}
           />
         ) as ReactNode;
-
+      
       l.trans = <Returns extends ReactNode>(
         translation: Record<"en" | "ko" | (string & {}), Returns>,
       ): Returns extends string ? string : Returns => {

package/client/native/accessibility.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/accessibility/src/index.ts";

package/client/native/app-state.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/app-state/src/index.ts";

package/client/native/app.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/app/src/index.ts";

package/client/native/appearance.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/appearance/src/index.ts";

package/client/native/auth-session.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/auth-session/src/index.ts";

package/client/native/autostart.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/autostart/src/index.ts";

package/client/native/badge.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/badge/src/index.ts";

package/client/native/biometric.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/biometric/src/index.ts";

package/client/native/browser.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/browser/src/index.ts";

package/client/native/camera.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/camera/src/index.ts";

package/client/native/clipboard.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/clipboard/src/index.ts";

package/client/native/contacts.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/contacts/src/index.ts";

package/client/native/device.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/device/src/index.ts";

package/client/native/dialog.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/dialog/src/index.ts";

package/client/native/dock.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/dock/src/index.ts";

package/client/native/file-picker.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/file-picker/src/index.ts";

package/client/native/filesystem.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/filesystem/src/index.ts";

package/client/native/geolocation.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/geolocation/src/index.ts";

package/client/native/global-shortcut.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/global-shortcut/src/index.ts";

package/client/native/haptics.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/haptics/src/index.ts";

package/client/native/http.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/http/src/index.ts";

package/client/native/iap.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/iap/src/index.ts";

package/client/native/keep-awake.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/keep-awake/src/index.ts";

package/client/native/keyboard.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/keyboard/src/index.ts";

package/client/native/local-notifications.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/local-notifications/src/index.ts";

package/client/native/menu.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/menu/src/index.ts";

package/client/native/network.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/network/src/index.ts";

package/client/native/opener.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/opener/src/index.ts";

package/client/native/preferences.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/preferences/src/index.ts";

package/client/native/push.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/push/src/index.ts";

package/client/native/screen-orientation.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/screen-orientation/src/index.ts";

package/client/native/screen.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/screen/src/index.ts";

package/client/native/secure-storage.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/secure-storage/src/index.ts";

package/client/native/share.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/share/src/index.ts";

package/client/native/single-instance.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/single-instance/src/index.ts";

package/client/native/splash-screen.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/splash-screen/src/index.ts";

package/client/native/sqlite.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/sqlite/src/index.ts";

package/client/native/toast.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/toast/src/index.ts";

package/client/native/tray.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/tray/src/index.ts";

package/client/native/updates.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/updates/src/index.ts";

package/client/native/volume.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/volume/src/index.ts";

package/client/native/window-state.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/window-state/src/index.ts";

package/client/native/window.ts

@@ -0,0 +1 @@
+export * from "../../vendor/@akanjs/native/plugins/window/src/index.ts";

package/client/native.ts

@@ -0,0 +1,79 @@
+import { isNative, platform } from "../vendor/@akanjs/native/packages/core/src/index.ts";
+import { browser } from "../vendor/@akanjs/native/plugins/browser/src/index.ts";
+import { opener } from "../vendor/@akanjs/native/plugins/opener/src/index.ts";
+
+export type { LiveValue, Plugin } from "../vendor/@akanjs/native/packages/core/src/index.ts";
+export {
+  AkanNativeError,
+  createLiveValue,
+  definePlugin,
+  defineWebPlugin,
+  fileBlob,
+  isAkanNativeError,
+  releaseFile,
+  shallowEqual,
+} from "../vendor/@akanjs/native/packages/core/src/index.ts";
+export { app } from "../vendor/@akanjs/native/plugins/app/src/index.ts";
+export { appState } from "../vendor/@akanjs/native/plugins/app-state/src/index.ts";
+export type { AuthSessionApi } from "../vendor/@akanjs/native/plugins/auth-session/src/index.ts";
+export { authSession } from "../vendor/@akanjs/native/plugins/auth-session/src/index.ts";
+export type { Photo } from "../vendor/@akanjs/native/plugins/camera/src/index.ts";
+export type { Contact } from "../vendor/@akanjs/native/plugins/contacts/src/index.ts";
+export type { DeviceInfo } from "../vendor/@akanjs/native/plugins/device/src/index.ts";
+export { device } from "../vendor/@akanjs/native/plugins/device/src/index.ts";
+export { dialog } from "../vendor/@akanjs/native/plugins/dialog/src/index.ts";
+export type {
+  DirectoryFile,
+  PickDirectoryOptions,
+  PickDirectoryResult,
+  PickedFile,
+  PickFilesOptions,
+  SaveFileOptions,
+  SaveFileResult,
+} from "../vendor/@akanjs/native/plugins/file-picker/src/index.ts";
+export { filePicker } from "../vendor/@akanjs/native/plugins/file-picker/src/index.ts";
+export type { Position } from "../vendor/@akanjs/native/plugins/geolocation/src/index.ts";
+export { haptics } from "../vendor/@akanjs/native/plugins/haptics/src/index.ts";
+export type { IapProduct, IapTransaction } from "../vendor/@akanjs/native/plugins/iap/src/index.ts";
+export { keyboard } from "../vendor/@akanjs/native/plugins/keyboard/src/index.ts";
+export { preferences } from "../vendor/@akanjs/native/plugins/preferences/src/index.ts";
+export type {
+  PushAction,
+  PushMessage,
+  PushPermissionState,
+  PushToken as NativePushToken,
+} from "../vendor/@akanjs/native/plugins/push/src/index.ts";
+export { push } from "../vendor/@akanjs/native/plugins/push/src/index.ts";
+export { secureStorage } from "../vendor/@akanjs/native/plugins/secure-storage/src/index.ts";
+export type { UpdateCheck, UpdateProgress, UpdateState } from "../vendor/@akanjs/native/plugins/updates/src/index.ts";
+export { markReady, updates, useUpdateState } from "../vendor/@akanjs/native/plugins/updates/src/index.ts";
+export type { VolumeState } from "../vendor/@akanjs/native/plugins/volume/src/index.ts";
+export { volume } from "../vendor/@akanjs/native/plugins/volume/src/index.ts";
+export { useLiveValue, usePluginEvent } from "../vendor/@akanjs/native/packages/react/src/index.ts";
+export { browser, opener };
+
+export const loadCamera = () => import("../vendor/@akanjs/native/plugins/camera/src/index.ts");
+export const loadContacts = () => import("../vendor/@akanjs/native/plugins/contacts/src/index.ts");
+export const loadGeolocation = () => import("../vendor/@akanjs/native/plugins/geolocation/src/index.ts");
+export const loadIap = () => import("../vendor/@akanjs/native/plugins/iap/src/index.ts");
+
+/** Inside an iOS or Android shell of the native runtime; a mobile target opened in a browser is not. */
+export const isNativeApp = () => isNative && (platform === "ios" || platform === "android");
+
+/** Inside any shell of the native runtime, desktop included. */
+export const isNativeShell = () => isNative;
+
+export const nativePlatform = () => (isNativeApp() ? (platform as "ios" | "android") : null);
+
+export const desktopPlatform = () =>
+  isNative && (platform === "macos" || platform === "windows" || platform === "linux") ? platform : null;
+
+/** http(s) in the in-app browser, anything else (mailto:, tel:) in the app the system picks. */
+export const openExternalUrl = async (url: string) => {
+  if (!isNativeApp()) {
+    window.open(url, "_blank", "noopener,noreferrer");
+    return;
+  }
+  if (/^https?:/i.test(url)) await browser.open({ url });
+  else await opener.openUrl({ url });
+};

package/client/resolveServerUrl.ts

@@ -0,0 +1,11 @@
+import { getEnv } from "akanjs/base";
+
+export const resolveServerUrl = (url: string): string => {
+  if (!url.startsWith("/") || url.startsWith("//")) return url;
+  const env = getEnv();
+  if (env.side !== "client" || env.renderMode !== "csr") return url;
+  if (url !== env.apiPrefix && !url.startsWith(`${env.apiPrefix}/`)) return url;
+  const server = new URL(env.serverHttpUri);
+  const serverOrigin = `${server.protocol}//${server.host}`;
+  return serverOrigin === `${window.location.protocol}//${window.location.host}` ? url : `${serverOrigin}${url}`;
+};

package/client/route/RootLayoutDefinition.ts

@@ -12,7 +12,6 @@ export class RootLayoutDefinition<Args extends RouteArgsShape = Record<never, ne
   #reconnect?: boolean;
   #wsConnect?: boolean;
   #layoutStyle?: "mobile" | "web";
-  #gaTrackingId?: string;
 
   fonts(fonts: ReactFont[]) {
     this.#fonts = fonts;
@@ -38,10 +37,6 @@ export class RootLayoutDefinition<Args extends RouteArgsShape = Record<never, ne
     this.#layoutStyle = style;
     return this;
   }
-  gaTrackingId(id: string) {
-    this.#gaTrackingId = id;
-    return this;
-  }
 
   protected override extendModule(module: PageModule & LayoutModule): PageModule & LayoutModule {
     return {
@@ -52,7 +47,6 @@ export class RootLayoutDefinition<Args extends RouteArgsShape = Record<never, ne
       ...(this.#reconnect !== undefined ? { reconnect: this.#reconnect } : {}),
       ...(this.#wsConnect !== undefined ? { wsConnect: this.#wsConnect } : {}),
       ...(this.#layoutStyle ? { layoutStyle: this.#layoutStyle } : {}),
-      ...(this.#gaTrackingId ? { gaTrackingId: this.#gaTrackingId } : {}),
     };
   }
 }

package/client/route/RouteDefinition.ts

@@ -9,7 +9,7 @@ import {
 import { parseAkanI18nEnv } from "akanjs/common";
 import { deserialize } from "akanjs/constant";
 import type { ReactNode } from "react";
-import type { AkanMetadata, Head, LayoutModule, PageConfig, PageModule } from "../csrTypes";
+import type { Head, LayoutModule, PageConfig, PageModule } from "../csrTypes";
 import { AkanNotFoundError } from "../router";
 import { RouteArgError, type RouteArgInfo, type RouteArgInput, type RouteBaseArgs } from "./routeArgs";
 
@@ -17,9 +17,10 @@ export type RouteArgsShape = Record<string, unknown>;
 export type RouteKind = "page" | "layout" | "rootLayout";
 /** Interned: a definition built inside the pages bundle must be recognised by a loader bundled apart from it. */
 export const routeDefinitionMarker = Symbol.for("akan.routeDefinition");
+/** Interned like the marker: the declared args ride on the module's render function, read by the CSR render cache. */
+export const routeArgsMarker = Symbol.for("akan.routeArgs");
 
 type HeadStage<Args> = Head | ((args: Args) => PromiseOrObject<Head | null | undefined>);
-type MetadataStage<Args> = AkanMetadata | ((args: Args) => PromiseOrObject<AkanMetadata | null | undefined>);
 
 interface RouteRenderProps {
   params: Record<string, string>;
@@ -32,10 +33,7 @@ export interface RouteArgResolveOption {
   strict?: boolean;
 }
 
-/**
- * What a route file declares in place of named exports. The chain is the only surface — the module exports the
- * finished definition and the loader turns it back into the module shape every renderer already reads.
- */
+/** What a route file declares in place of named exports; the loader turns it back into the module shape. */
 export abstract class RouteDefinition<
   Args extends RouteArgsShape = Record<never, never>,
   Extra extends object = Record<never, never>,
@@ -46,9 +44,13 @@ export abstract class RouteDefinition<
   #config?: PageConfig;
 
   #head?: HeadStage<never>;
-  #metadata?: MetadataStage<never>;
   #loading?: (args: never) => PromiseOrObject<ReactNode>;
   #render?: (args: never) => PromiseOrObject<ReactNode>;
+  #renderRoute?: {
+    render: (args: never) => PromiseOrObject<ReactNode>;
+    argCount: number;
+    route: (props: RouteRenderProps) => Promise<ReactNode>;
+  };
 
   config(config: PageConfig) {
     this.#config = config;
@@ -58,10 +60,6 @@ export abstract class RouteDefinition<
     this.#head = head as HeadStage<never>;
     return this;
   }
-  metadata(metadata: MetadataStage<RouteBaseArgs & Args>) {
-    this.#metadata = metadata as MetadataStage<never>;
-    return this;
-  }
   loading(render: (args: RouteBaseArgs & Args & Extra) => PromiseOrObject<ReactNode>) {
     this.#loading = render as (args: never) => PromiseOrObject<ReactNode>;
     return this;
@@ -83,11 +81,7 @@ export abstract class RouteDefinition<
     this.args.push(arg);
   }
 
-  /**
-   * Typed values out of the URL halves the router matched. A path value the declared type refuses is a URL that
-   * matched the pattern and nothing under it, so a page answers not-found; a search value that fails is dropped
-   * the way an absent one is. Under `strict` both are refused by name, which is what a prompt caller can act on.
-   */
+  /** A path value the type refuses answers not-found; a failing search value is dropped. `strict` refuses both by name. */
   resolveArgs(input: RouteArgInput, { strict = false }: RouteArgResolveOption = {}): Record<string, unknown> {
     const resolved: Record<string, unknown> = {};
     for (const arg of this.args) {
@@ -107,10 +101,7 @@ export abstract class RouteDefinition<
     return resolved;
   }
 
-  /**
-   * The `[x]` segments of the file's path against the `.param()` stages. A page must name every segment it sits
-   * under, so nothing reaches its body undeclared; a layout may name a subset, since most read none of them.
-   */
+  /** A page must declare every `[x]` segment it sits under with `.param()`; a layout may declare a subset. */
   assertPattern(pattern: string, key: string) {
     const inPath = pattern
       .split("/")
@@ -136,21 +127,15 @@ export abstract class RouteDefinition<
     if (!render)
       throw new Error(`[route-convention] a ${this.kind}() chain ends with .render(), and this one has none`);
     const head = this.#head;
-    const metadata = this.#metadata;
     const loading = this.#loading;
     const module: PageModule & LayoutModule = {
-      default: (async (props: RouteRenderProps) => await render(this.#argsOf(props) as never)) as never,
+      default: this.#renderRouteOf(render) as never,
       ...(this.#config ? { pageConfig: this.#config } : {}),
       ...(head === undefined
         ? {}
         : typeof head === "function"
           ? { generateHead: async (props: RouteRenderProps) => await head(this.#argsOf(props) as never) }
           : { head }),
-      ...(metadata === undefined
-        ? {}
-        : typeof metadata === "function"
-          ? { generateMetadata: async (props: RouteRenderProps) => await metadata(this.#argsOf(props) as never) }
-          : { metadata }),
       ...(loading
         ? {
             Loading: ((props: RouteRenderProps) =>
@@ -165,6 +150,39 @@ export abstract class RouteDefinition<
     return module;
   }
 
+  #renderRouteOf(render: (args: never) => PromiseOrObject<ReactNode>) {
+    const kept = this.#renderRoute;
+    if (kept?.render === render && kept.argCount === this.args.length) return kept.route;
+    const route = async (props: RouteRenderProps) => await render(this.#argsOf(props) as never);
+    Object.defineProperty(route, routeArgsMarker, { value: this.args.map(({ kind, name }) => ({ kind, name })) });
+    this.#renderRoute = { render, argCount: this.args.length, route };
+    return route;
+  }
+
+  /**
+   * What a route's render output depends on: a chain's declared args plus `lang`. A legacy module declares nothing,
+   * so it depends on the params of its own path (`paramNames`, every param when unknown) and, for a page, every
+   * search value — a layout reads no query.
+   */
+  static renderArgsKey(
+    render: unknown,
+    props: { params: Record<string, string>; searchParams?: Record<string, string | string[]> },
+    { isPage, paramNames }: { isPage: boolean; paramNames?: string[] },
+  ): string {
+    const declared = (render as { [routeArgsMarker]?: Pick<RouteArgInfo, "kind" | "name">[] } | null)?.[
+      routeArgsMarker
+    ];
+    const searchParams = props.searchParams ?? {};
+    if (!declared) {
+      const params = paramNames ? paramNames.map((name) => props.params[name]) : props.params;
+      return JSON.stringify([params, isPage ? searchParams : null]);
+    }
+    return JSON.stringify([
+      props.params.lang,
+      ...declared.map(({ kind, name }) => (kind === "param" ? props.params[name] : searchParams[name])),
+    ]);
+  }
+
   #argsOf(props: RouteRenderProps): RouteBaseArgs & Args & Extra {
     const { lang = parseAkanI18nEnv().defaultLocale } = props.params;
     const resolved = this.resolveArgs({ params: props.params, searchParams: props.searchParams ?? {} });
@@ -172,10 +190,7 @@ export abstract class RouteDefinition<
     return (this.kind === "page" ? args : { ...args, children: props.children }) as RouteBaseArgs & Args & Extra;
   }
 
-  /**
-   * A single value where a list was declared is a one-item list: the URL spells `?tags=a` for one tag. A prompt
-   * argument is one string whatever it holds, so under `strict` a list is read comma-separated.
-   */
+  /** One value where a list was declared is a one-item list (`?tags=a`); under `strict` a list is comma-separated. */
   static #lift(arg: RouteArgInfo, raw: string | string[], strict: boolean): unknown {
     if (!arg.list) return Array.isArray(raw) ? raw[0] : raw;
     if (Array.isArray(raw)) return raw;

package/client/route/resolveRouteModule.ts

@@ -20,11 +20,7 @@ export interface ResolvedRouteModule {
 export const isRouteDefinition = (value: unknown): value is RouteDefinition =>
   typeof value === "object" && value !== null && (value as Record<symbol, unknown>)[routeDefinitionMarker] === true;
 
-/**
- * Every loader — the RSC worker, the CSR boot, the generated root layout — reads route modules by their named
- * exports. A chain module has one export, so it is unfolded into that shape here and nothing downstream learns
- * which of the two it was reading; a legacy module passes through untouched.
- */
+/** Unfolds a chain module into the named-export shape every loader reads; a legacy module passes through untouched. */
 export const resolveRouteModule = (
   mod: RouteModuleSource,
   key: string,