akanjs 3.0.0-alpha.6 → 3.0.0-alpha.8

package/client/clientRuntime.ts

@@ -75,6 +75,13 @@ globalWithRuntime[CLIENT_RUNTIME_KEY] = state;
 const missingRuntimeError = () =>
   new Error("Akan client runtime is not registered. Import the generated app client first.");
 
+const applyRuntimeErrorConstructor = (runtime: ClientRuntime) => {
+  const instance = (runtime.fetch as RuntimeFetch | undefined)?.instance as
+    | { setErrorConstructor?: (Err: unknown) => void }
+    | undefined;
+  if (typeof instance?.setErrorConstructor === "function") instance.setErrorConstructor(runtime.Err);
+};
+
 export const registerClientRuntime = <Runtime>(
   runtime: Runtime,
   { scope = "app" }: { scope?: RuntimeScope } = {},
@@ -82,6 +89,7 @@ export const registerClientRuntime = <Runtime>(
   if (state.scope === "app" && scope === "lib") return runtime;
   state.runtime = runtime as ClientRuntime;
   state.scope = scope;
+  applyRuntimeErrorConstructor(state.runtime);
   return runtime;
 };
 

package/common/deepObjectify.ts

@@ -1,9 +1,16 @@
 import { isDayjs } from "./isDayjs";
 
-export const deepObjectify = <T = unknown>(
-  obj: T | null | undefined,
-  option: { serializable?: boolean; convertDate?: "string" | "number" } = {},
-): T => {
+interface DeepObjectifyOption {
+  serializable?: boolean;
+  convertDate?: "string" | "number";
+}
+
+const objectifyChild = (value: unknown, option: DeepObjectifyOption): unknown => {
+  const modelValue = value as { __ModelType__?: string } | null | undefined;
+  return modelValue?.__ModelType__ && !option.serializable ? value : deepObjectify(value, option);
+};
+
+export const deepObjectify = <T = unknown>(obj: T | null | undefined, option: DeepObjectifyOption = {}): T => {
   if (isDayjs(obj) || obj?.constructor === Date) {
     if (!option.serializable && !option.convertDate) return obj as T;
     if (option.convertDate === "string") return obj.toISOString() as T;
@@ -12,13 +19,20 @@ export const deepObjectify = <T = unknown>(
     else return (isDayjs(obj) ? obj.toDate() : obj) as T;
   } else if (Array.isArray(obj)) {
     return obj.map((o: unknown) => deepObjectify(o, option)) as T;
+  } else if (obj instanceof Map) {
+    
+    const entries = [...obj.entries()].map(
+      ([key, value]: [string, unknown]) => [key, objectifyChild(value, option)] as const,
+    );
+    return (option.serializable ? Object.fromEntries(entries) : new Map(entries)) as T;
+  } else if (obj instanceof Set) {
+    const values = [...obj.values()].map((value: unknown) => objectifyChild(value, option));
+    return (option.serializable ? values : new Set(values)) as T;
   } else if (obj && typeof obj === "object") {
     const val: Record<string, unknown> = {};
     const objRecord = obj as Record<string, unknown>;
     Object.keys(obj).forEach((key) => {
-      const fieldValue = objRecord[key] as { __ModelType__: string } | null | undefined;
-      if (fieldValue?.__ModelType__ && !option.serializable) val[key] = fieldValue;
-      else if (typeof objRecord[key] !== "function") val[key] = deepObjectify(fieldValue, option);
+      if (typeof objRecord[key] !== "function") val[key] = objectifyChild(objRecord[key], option);
     });
     return val as T;
   } else {

package/common/index.ts

@@ -36,12 +36,17 @@ export { randomPicks } from "./randomPicks";
 export {
   assertUniqueRoutePatterns,
   compareRouteSpecificity,
+  getRouteExports,
   isRouteSourceFile,
   isSpecialRouteLeaf,
+  LAYOUT_ROUTE_EXPORTS,
   matchRoutePattern,
   normalizeRoutePattern,
+  PAGE_ROUTE_EXPORTS,
   type ParsedRouteModuleKey,
   parseRouteModuleKey,
+  RESERVED_ROUTE_CONFIG_EXPORTS,
+  ROOT_LAYOUT_ROUTE_EXPORTS,
   type RouteModuleKind,
   routeSegmentToPatternPart,
   routeSegmentToTreePath,

package/common/pathSet.ts

@@ -1,16 +1,28 @@
 type MutableIndexable = Record<string | number, unknown>;
 type PathSegment = string | number;
+type Container = MutableIndexable | Map<PathSegment, unknown>;
 
 const toPathSegments = (path: string | readonly PathSegment[]) =>
   Array.isArray(path) ? [...path] : path.toString().match(/[^.[\]]+/g) || [];
 
+const readChild = (container: Container, key: PathSegment) =>
+  container instanceof Map ? container.get(key) : container[key];
+
+const writeChild = (container: Container, key: PathSegment, value: unknown) => {
+  if (container instanceof Map) container.set(key, value);
+  else container[key] = value;
+};
+
 export const pathSet = <T>(obj: T, path: string | readonly PathSegment[], value: unknown): T => {
   if (Object(obj) !== obj) return obj;
   const pathSegments = toPathSegments(path);
-  pathSegments.slice(0, -1).reduce<MutableIndexable>((a, c, i) => {
-    if (Object(a[c]) === a[c]) return a[c] as MutableIndexable;
-    a[c] = Math.abs(Number(pathSegments[i + 1])) >> 0 === +pathSegments[i + 1] ? [] : {};
-    return a[c] as MutableIndexable;
-  }, obj as MutableIndexable)[pathSegments[pathSegments.length - 1]] = value;
+  const parent = pathSegments.slice(0, -1).reduce<Container>((a, c, i) => {
+    const child = readChild(a, c);
+    if (Object(child) === child) return child as Container;
+    const created = Math.abs(Number(pathSegments[i + 1])) >> 0 === +pathSegments[i + 1] ? [] : {};
+    writeChild(a, c, created);
+    return created as unknown as Container;
+  }, obj as Container);
+  writeChild(parent, pathSegments[pathSegments.length - 1], value);
   return obj;
 };

package/common/routeConvention.ts

@@ -9,6 +9,36 @@ const DIRECTORY_SCOPED_LEAVES = new Set(["_layout", "_index", "_overrides"]);
 
 export type RouteModuleKind = "page" | "layout" | "overrides";
 
+export const PAGE_ROUTE_EXPORTS: ReadonlySet<string> = new Set([
+  "default",
+  "pageConfig",
+  "head",
+  "metadata",
+  "generateHead",
+  "generateMetadata",
+  "Loading",
+]);
+export const LAYOUT_ROUTE_EXPORTS: ReadonlySet<string> = new Set([...PAGE_ROUTE_EXPORTS, "NotFound", "Error"]);
+export const ROOT_LAYOUT_ROUTE_EXPORTS: ReadonlySet<string> = new Set([
+  ...LAYOUT_ROUTE_EXPORTS,
+  "fonts",
+  "manifest",
+  "theme",
+  "reconnect",
+  "wsConnect",
+  "layoutStyle",
+  "gaTrackingId",
+]);
+/** Root-layout exports that are plain config rather than components, so a PascalCase check cannot allow them. */
+export const RESERVED_ROUTE_CONFIG_EXPORTS: ReadonlySet<string> = new Set(
+  [...ROOT_LAYOUT_ROUTE_EXPORTS].filter((name) => name !== "default" && !/^[A-Z]/.test(name)),
+);
+
+export function getRouteExports(kind: "page" | "layout", { rootLayout = false } = {}): ReadonlySet<string> {
+  if (kind === "page") return PAGE_ROUTE_EXPORTS;
+  return rootLayout ? ROOT_LAYOUT_ROUTE_EXPORTS : LAYOUT_ROUTE_EXPORTS;
+}
+
 export interface ParsedRouteModuleKey {
   key: string;
   kind: RouteModuleKind;

package/constant/crystalize.ts

@@ -30,8 +30,10 @@ export const crystalize = (field: FieldProps, value: unknown): unknown => {
       isArray: false,
       arrDepth: 0,
     };
+    
+    const entries = value instanceof Map ? [...value.entries()] : Object.entries(value as Record<string, unknown>);
     return new Map(
-      Object.entries(value as Record<string, unknown>).map(([key, val]) => [
+      entries.map(([key, val]: [string, unknown]) => [
         key,
         field.of
           ? applyFnToArrayObjects(val, (v: never) => crystalize(mapValueField, v))

package/document/into.ts

@@ -88,6 +88,8 @@ export type Mdl<
   updateMany(query: _RawQuery, update: DocumentUpdateInput<_RawDoc>): Promise<UpdateResult>;
   removeOne(query: _RawQuery): Promise<UpdateResult>;
   removeMany(query: _RawQuery): Promise<UpdateResult>;
+  updateById(id: string, update: DocumentUpdateInput<_RawDoc>, options?: DocumentUpdateOptions): Promise<UpdateResult>;
+  removeById(id: string): Promise<UpdateResult>;
   bulkWrite(operations: BulkWriteOperation<Raw, _RawDoc, _RawQuery>[]): Promise<UpdateResult>;
   /** @deprecated Renamed to `count`. */
   countDocuments(query: _RawQuery): Promise<number>;

package/fetch/client/fetchClient.ts

@@ -37,6 +37,16 @@ export type FetchProxy<
   FetchClient &
   FetchType & { slice: SliceMetaObj; instance: FetchClient; _FetchType: FetchType; _SliceMetaObj: SliceMetaObj };
 
+interface SharedClientState {
+  proxy: FetchProxy | null;
+  origin: string | null;
+}
+
+const SHARED_CLIENT_KEY = Symbol.for("akanjs.fetch.sharedClient");
+const globalWithSharedClient = globalThis as typeof globalThis & { [SHARED_CLIENT_KEY]?: SharedClientState };
+const sharedClientState: SharedClientState = globalWithSharedClient[SHARED_CLIENT_KEY] ?? { proxy: null, origin: null };
+globalWithSharedClient[SHARED_CLIENT_KEY] = sharedClientState;
+
 type ClientSignalMap<SigType extends { fetch: any }> = {
   [K in keyof SigType as SigType[K] extends DatabaseSignal<any, any, any, any>
     ? K
@@ -80,6 +90,19 @@ export class FetchClient {
     FetchClient.#sharedSerializedSignal = {};
     FetchClient.#sharedRegistryVersion++;
   }
+  static resetSharedClient() {
+    sharedClientState.proxy = null;
+    sharedClientState.origin = null;
+  }
+  static #resolveSharedClientProxy(origin: string, Err?: ErrorConstructor) {
+    if (typeof window === "undefined") return null;
+    
+    if (sharedClientState.proxy) return sharedClientState.origin === origin ? sharedClientState.proxy : null;
+    const proxy = FetchClient.#makeProxy<unknown, Record<string, SliceMeta>>(new FetchClient(origin, {}, {}, Err));
+    sharedClientState.proxy = proxy;
+    sharedClientState.origin = origin;
+    return proxy;
+  }
   static #mergeSerializedSignalInto(
     serializedSignal: { [key: string]: SerializedSignal },
     refName: string,
@@ -700,10 +723,11 @@ export class FetchClient {
     sig: ClientSignalMap<SigType>;
     fetch: SigType["fetch"];
   } {
-    if (base) base.instance.applySignal(serializedSignal);
+    const shared = base ?? FetchClient.#resolveSharedClientProxy(origin, Err);
+    if (shared) shared.instance.applySignal(serializedSignal);
     if (base && Err) base.instance.setErrorConstructor(Err);
     const proxy =
-      base ??
+      shared ??
       FetchClient.#makeProxy<unknown, Record<string, SliceMeta>>(new FetchClient(origin, {}, serializedSignal, Err));
     if (connect) proxy.instance.connect();
     const sig = {} as any;

package/fetch/client/wsClient.ts

@@ -40,6 +40,8 @@ export class WsClient {
   #roomSubscribeMap = new Map<string, SubscribeOption>();
   #listenerMap = new Map<string, Set<Listener>>();
   #destroyed = false;
+  #connectRequested = false;
+  #unconnectedWarnTimers = new Map<string, ReturnType<typeof setTimeout>>();
   #jwt: string | null = null;
   connected = false;
 
@@ -70,6 +72,7 @@ export class WsClient {
   }
 
   connect() {
+    this.#connectRequested = true;
     if (this.#ws && this.#ws.readyState !== WebSocket.CLOSED) return;
     this.logger.debug(`Connecting to ${this.url}`);
     this.#destroyed = false;
@@ -187,10 +190,13 @@ export class WsClient {
   destroy() {
     this.logger.debug(`WebSocket destroying`);
     this.#destroyed = true;
+    this.#connectRequested = false;
     if (this.#reconnectTimer) {
       clearTimeout(this.#reconnectTimer);
       this.#reconnectTimer = null;
     }
+    for (const timer of this.#unconnectedWarnTimers.values()) clearTimeout(timer);
+    this.#unconnectedWarnTimers.clear();
     this.#ws?.close();
     this.#ws = null;
   }
@@ -231,9 +237,18 @@ export class WsClient {
   }
   #warnNotConnected(action: "emit" | "subscribe", key: string) {
     console.warn(
-      `[akanjs] WebSocket is not connected. Call fetch.instance.connect() or enable root layout "wsConnect" before ${action} "${key}".`,
+      `[akanjs] WebSocket is not connected. Call fetch.instance.connect(), or drop the root layout "wsConnect = false", before ${action} "${key}".`,
     );
   }
+  #warnUnconnectedSubscribe(key: string) {
+    if (this.#connectRequested || this.#unconnectedWarnTimers.has(key)) return;
+    const timer = setTimeout(() => {
+      this.#unconnectedWarnTimers.delete(key);
+      if (this.#connectRequested || this.#destroyed) return;
+      this.#warnNotConnected("subscribe", key);
+    }, 0);
+    this.#unconnectedWarnTimers.set(key, timer);
+  }
   emit(key: string, data: WsRequestPayload) {
     if (this.#ws?.readyState !== WebSocket.OPEN) {
       this.logger.warn("WebSocket not connected");
@@ -246,7 +261,7 @@ export class WsClient {
   }
   subscribe(option: { key: string; data: unknown[]; handleEvent: (data: unknown) => void }) {
     const roomId = WsClient.makeRoomId(option.key, option.data);
-    if (!this.#ws) this.#warnNotConnected("subscribe", option.key);
+    if (!this.#ws) this.#warnUnconnectedSubscribe(option.key);
     if (!this.#roomSubscribeMap.has(roomId)) {
       this.#roomSubscribeMap.set(roomId, { key: option.key, data: option.data, listener: new Set() });
       if (this.#ws?.readyState === WebSocket.OPEN) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akanjs",
-  "version": "3.0.0-alpha.6",
+  "version": "3.0.0-alpha.8",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {

package/server/resolver/CascadeRunner.ts

@@ -186,7 +186,7 @@ export class CascadeRunner {
     }
     if (!lines.length) return;
     const bulk = lines.filter((line) => line.endsWith("(bulk)")).length;
-    this.#logger.info(`${lines.length} cascade edge(s), ${bulk} in one query`);
+    this.#logger.verbose(`${lines.length} cascade edge(s), ${bulk} in one query`);
     for (const line of lines) this.#logger.verbose(line);
   }
 

package/server/resolver/database.resolver.ts

@@ -240,6 +240,9 @@ export class DatabaseResolver {
           updateMany: (query: QueryOf<any>, update: DocumentUpdateInput) => store.updateManyByQuery(query, update),
           removeOne: (query: QueryOf<any>) => store.removeOneByQuery(query),
           removeMany: (query: QueryOf<any>) => store.removeManyByQuery(query),
+          updateById: (id: string, update: DocumentUpdateInput, options?: { upsert?: boolean }) =>
+            store.updateOneByQuery({ id }, update, options),
+          removeById: (id: string) => store.removeOneByQuery({ id }),
           
           countDocuments: (query: QueryOf<any>) => store.count(query),
           bulkWrite: (

package/server/routeTreeBuilder.ts

@@ -13,6 +13,7 @@ import type {
 import {
   assertUniqueRoutePatterns,
   compareRouteSpecificity,
+  getRouteExports,
   matchRoutePattern,
   parseBasePaths,
   parseRouteModuleKey,
@@ -49,44 +50,6 @@ export interface RouteModuleCacheStats {
 }
 
 export class RouteTreeBuilder {
-  static readonly #pageRouteExports = new Set([
-    "default",
-    "pageConfig",
-    "head",
-    "metadata",
-    "generateHead",
-    "generateMetadata",
-    "Loading",
-  ]);
-  static readonly #rootLayoutExports = new Set([
-    "default",
-    "pageConfig",
-    "head",
-    "metadata",
-    "generateHead",
-    "generateMetadata",
-    "fonts",
-    "manifest",
-    "theme",
-    "reconnect",
-    "wsConnect",
-    "layoutStyle",
-    "gaTrackingId",
-    "Loading",
-    "NotFound",
-    "Error",
-  ]);
-  static readonly #layoutRouteExports = new Set([
-    "default",
-    "pageConfig",
-    "head",
-    "metadata",
-    "generateHead",
-    "generateMetadata",
-    "Loading",
-    "NotFound",
-    "Error",
-  ]);
   static readonly #moduleCacheStats: RouteModuleCacheStats = {
     moduleCount: 0,
     loadedModuleCount: 0,
@@ -309,12 +272,7 @@ export class RouteTreeBuilder {
       return;
     }
     const parsed = parseRouteModuleKey(key);
-    const allowed =
-      kind === "page"
-        ? RouteTreeBuilder.#pageRouteExports
-        : parsed.isInternalRootLayout
-          ? RouteTreeBuilder.#rootLayoutExports
-          : RouteTreeBuilder.#layoutRouteExports;
+    const allowed = getRouteExports(kind, { rootLayout: parsed.isInternalRootLayout });
     for (const exportName of Object.keys(mod)) {
       if (!allowed.has(exportName)) {
         throw new Error(`[route-convention] unsupported export "${exportName}" in ${key}`);

package/store/action.ts

@@ -751,7 +751,7 @@ export const makeActions = (refName: string, slice: { [key: string]: SerializedS
       const id = typeof modelOrId === "string" ? modelOrId : modelOrId.id;
       this.set({ [names.modelFormLoading]: id, [names.modelModal]: modal ?? "edit" });
       const model = await (fetch[names.model] as (...args: any[]) => Promise<Full>)(id, { onError });
-      const modelForm = deepObjectify<Input>(model as unknown as Input);
+      const modelForm = immerify(modelRef, deepObjectify<Input>(model as unknown as Input) as object) as Input;
       this.set({
         [names.model]: model,
         [names.modelFormLoading]: false,

package/store/storeInstance.ts

@@ -1,13 +1,15 @@
 import { ACTION_META, STATE_DERIVED_META, STATE_INIT_META } from "akanjs/base";
 import { Translator } from "akanjs/client";
 import { capitalize, Logger, parseAkanI18nEnv } from "akanjs/common";
-import { produce } from "immer";
+import { enableMapSet, produce } from "immer";
 import type { RefObject } from "react";
 import { useEffect, useRef, useSyncExternalStore } from "./hooks";
 import type { RootStoreCls } from "./rootStore";
 import type { SliceStateKey } from "./state";
 import { evaluateInitializers, type SearchParamsState, type StateDerivedMeta } from "./stateBuilder";
 
+enableMapSet();
+
 type StoreStateRecord = Record<string, unknown>;
 type StoreAction = (...args: unknown[]) => unknown;
 type TranslationParam = Record<string, string | number>;

package/store/types.ts

@@ -36,6 +36,13 @@ export type Get<State, Actions> = {
   get: () => State & Actions;
 };
 
+type VoidAction<T> = T extends (...args: infer Args) => infer Ret
+  ? [Ret] extends [PromiseLike<unknown>]
+    ? (...args: Args) => Promise<void>
+    : (...args: Args) => void
+  : T;
+export type VoidActions<Action> = { [K in keyof Action]: VoidAction<Action[K]> };
+
 export type StoreSliceMap<SlceCls extends SliceCls> = SlceCls[typeof SLICE_META];
 export type StoreSliceSuffix<SlceCls extends SliceCls, Suffix extends keyof StoreSliceMap<SlceCls>> = Suffix & string;
 export type StoreSliceSuffixCap<SlceCls extends SliceCls, Suffix extends keyof StoreSliceMap<SlceCls>> = Capitalize<

package/store/withSelector.ts

@@ -2,7 +2,7 @@ import type { Prettify } from "akanjs/base";
 import type { FieldState } from "akanjs/constant";
 import type { RefObject } from "react";
 import type { RootStoreCls } from "./rootStore";
-import type { SliceStateAction } from "./types";
+import type { SliceStateAction, VoidActions } from "./types";
 
 type SetKey<Key extends string> = `set${Capitalize<Key>}`;
 
@@ -28,7 +28,7 @@ type WithSelectorsOf<State, WritableState, Action, InternalSliceObj> = {
   use: {
     [K in keyof State]: () => State[K];
   };
-  do: Action & {
+  do: VoidActions<Action> & {
     [K in keyof WritableState as K extends string ? SetKey<K> : never]: (value: FieldState<WritableState[K]>) => void;
   };
   get: () => State;
@@ -52,9 +52,7 @@ export interface SliceSelectors<RefName extends string, State, Action> {
     [K in keyof State]: () => State[K];
   };
   do: Prettify<
-    {
-      [K in keyof Action]: Action[K];
-    } & {
+    VoidActions<Action> & {
       [K in keyof State as K extends string ? SetKey<K> : never]: (value: FieldState<State[K]>) => void;
     }
   >;

package/types/common/deepObjectify.d.ts

@@ -1,4 +1,6 @@
-export declare const deepObjectify: <T = unknown>(obj: T | null | undefined, option?: {
+interface DeepObjectifyOption {
     serializable?: boolean;
     convertDate?: "string" | "number";
-}) => T;
+}
+export declare const deepObjectify: <T = unknown>(obj: T | null | undefined, option?: DeepObjectifyOption) => T;
+export {};

package/types/common/index.d.ts

@@ -23,7 +23,7 @@ export { pathGet } from "./pathGet.d.ts";
 export { pathSet } from "./pathSet.d.ts";
 export { randomPick } from "./randomPick.d.ts";
 export { randomPicks } from "./randomPicks.d.ts";
-export { assertUniqueRoutePatterns, compareRouteSpecificity, isRouteSourceFile, isSpecialRouteLeaf, matchRoutePattern, normalizeRoutePattern, type ParsedRouteModuleKey, parseRouteModuleKey, type RouteModuleKind, routeSegmentToPatternPart, routeSegmentToTreePath, tryParseRouteModuleKey, type ValidatePageSourceFileOptions, type ValidateSubRoutePageKeyOptions, validatePageSourceFile, validateSubRoutePageKey, } from "./routeConvention.d.ts";
+export { assertUniqueRoutePatterns, compareRouteSpecificity, getRouteExports, isRouteSourceFile, isSpecialRouteLeaf, LAYOUT_ROUTE_EXPORTS, matchRoutePattern, normalizeRoutePattern, PAGE_ROUTE_EXPORTS, type ParsedRouteModuleKey, parseRouteModuleKey, RESERVED_ROUTE_CONFIG_EXPORTS, ROOT_LAYOUT_ROUTE_EXPORTS, type RouteModuleKind, routeSegmentToPatternPart, routeSegmentToTreePath, tryParseRouteModuleKey, type ValidatePageSourceFileOptions, type ValidateSubRoutePageKeyOptions, validatePageSourceFile, validateSubRoutePageKey, } from "./routeConvention.d.ts";
 export { sleep } from "./sleep.d.ts";
 export { splitVersion } from "./splitVersion.d.ts";
 export { getBasePathFromPathname, parseBasePaths, parseSubRouteHosts, resolveSubRouteHosts } from "./subRoute.d.ts";

package/types/common/routeConvention.d.ts

@@ -1,4 +1,12 @@
 export type RouteModuleKind = "page" | "layout" | "overrides";
+export declare const PAGE_ROUTE_EXPORTS: ReadonlySet<string>;
+export declare const LAYOUT_ROUTE_EXPORTS: ReadonlySet<string>;
+export declare const ROOT_LAYOUT_ROUTE_EXPORTS: ReadonlySet<string>;
+/** Root-layout exports that are plain config rather than components, so a PascalCase check cannot allow them. */
+export declare const RESERVED_ROUTE_CONFIG_EXPORTS: ReadonlySet<string>;
+export declare function getRouteExports(kind: "page" | "layout", { rootLayout }?: {
+    rootLayout?: boolean | undefined;
+}): ReadonlySet<string>;
 export interface ParsedRouteModuleKey {
     key: string;
     kind: RouteModuleKind;

package/types/document/into.d.ts

@@ -62,6 +62,8 @@ export type Mdl<Doc, Raw, _RawDoc = DocumentModel<Raw>, _RawQuery extends Docume
     updateMany(query: _RawQuery, update: DocumentUpdateInput<_RawDoc>): Promise<UpdateResult>;
     removeOne(query: _RawQuery): Promise<UpdateResult>;
     removeMany(query: _RawQuery): Promise<UpdateResult>;
+    updateById(id: string, update: DocumentUpdateInput<_RawDoc>, options?: DocumentUpdateOptions): Promise<UpdateResult>;
+    removeById(id: string): Promise<UpdateResult>;
     bulkWrite(operations: BulkWriteOperation<Raw, _RawDoc, _RawQuery>[]): Promise<UpdateResult>;
     /** @deprecated Renamed to `count`. */
     countDocuments(query: _RawQuery): Promise<number>;

package/types/fetch/client/fetchClient.d.ts

@@ -35,6 +35,7 @@ export declare class FetchClient {
         [key: string]: SerializedSignal;
     }, ErrorCls?: ErrorConstructor | undefined);
     static resetSharedRegistry(): void;
+    static resetSharedClient(): void;
     setErrorConstructor(ErrorCls?: ErrorConstructor): void;
     applySignal(serializedSignal: {
         [key: string]: SerializedSignal;

package/types/store/baseSt.d.ts

@@ -297,7 +297,7 @@ export declare const st: {
         deviceToken: () => string;
         currentPath: () => string;
     };
-    do: RootStore & {
+    do: import("./types.d.ts").VoidActions<RootStore> & {
         setCsrLoaded: (value: boolean) => void;
         setPath: (value: string) => void;
         setPathname: (value: string) => void;

package/types/store/types.d.ts

@@ -30,6 +30,10 @@ export interface SetPick<State = any> {
 export type Get<State, Actions> = {
     get: () => State & Actions;
 };
+type VoidAction<T> = T extends (...args: infer Args) => infer Ret ? [Ret] extends [PromiseLike<unknown>] ? (...args: Args) => Promise<void> : (...args: Args) => void : T;
+export type VoidActions<Action> = {
+    [K in keyof Action]: VoidAction<Action[K]>;
+};
 export type StoreSliceMap<SlceCls extends SliceCls> = SlceCls[typeof SLICE_META];
 export type StoreSliceSuffix<SlceCls extends SliceCls, Suffix extends keyof StoreSliceMap<SlceCls>> = Suffix & string;
 export type StoreSliceSuffixCap<SlceCls extends SliceCls, Suffix extends keyof StoreSliceMap<SlceCls>> = Capitalize<StoreSliceSuffix<SlceCls, Suffix>>;

package/types/store/withSelector.d.ts

@@ -2,7 +2,7 @@ import type { Prettify } from "akanjs/base";
 import type { FieldState } from "akanjs/constant";
 import type { RefObject } from "react";
 import type { RootStoreCls } from "./rootStore.d.ts";
-import type { SliceStateAction } from "./types.d.ts";
+import type { SliceStateAction, VoidActions } from "./types.d.ts";
 type SetKey<Key extends string> = `set${Capitalize<Key>}`;
 export type WithSelectors<RtStoreCls extends RootStoreCls> = RtStoreCls extends RootStoreCls<any, infer WritableState, infer Action, infer InternalSliceObj, any, any, infer State> ? WithSelectorsOf<State, WritableState, Action, InternalSliceObj> : never;
 type WithSelectorsOf<State, WritableState, Action, InternalSliceObj> = {
@@ -18,7 +18,7 @@ type WithSelectorsOf<State, WritableState, Action, InternalSliceObj> = {
     use: {
         [K in keyof State]: () => State[K];
     };
-    do: Action & {
+    do: VoidActions<Action> & {
         [K in keyof WritableState as K extends string ? SetKey<K> : never]: (value: FieldState<WritableState[K]>) => void;
     };
     get: () => State;
@@ -32,9 +32,7 @@ export interface SliceSelectors<RefName extends string, State, Action> {
     use: {
         [K in keyof State]: () => State[K];
     };
-    do: Prettify<{
-        [K in keyof Action]: Action[K];
-    } & {
+    do: Prettify<VoidActions<Action> & {
         [K in keyof State as K extends string ? SetKey<K> : never]: (value: FieldState<State[K]>) => void;
     }>;
     get: () => State;

package/types/ui/CsrImage.d.ts

@@ -7,7 +7,7 @@ type CsrImageProps = Omit<ImgHTMLAttributes<HTMLImageElement>, "alt" | "src"> &
         imageSize: [number, number];
         abstractData?: string | null;
     } | null;
-    abstractData?: string;
+    abstractData?: string | null;
     priority?: boolean;
     preload?: boolean;
     quality?: number;

package/types/ui/Image.d.ts

@@ -19,7 +19,7 @@ type AkanImageProps = NativeImageProps & {
     /** Akan file object or file-like value with url and imageSize metadata. */
     file?: ImageLikeFile;
     /** Low-quality preview data. Overrides file.abstractData when provided. */
-    abstractData?: string;
+    abstractData?: string | null;
     /** Accessible alt text. Defaults to "image" when omitted. */
     alt?: string;
     /** Image optimizer quality. Defaults to 75. */
@@ -34,11 +34,11 @@ type AkanImageProps = NativeImageProps & {
 export declare const Image: ({ src, file, className, abstractData, alt, quality, priority, preload, unoptimized, ...props }: AkanImageProps & ({
     src?: string;
     file?: ProtoFile;
-    abstractData?: string;
+    abstractData?: string | null;
     alt?: string;
 } | {
     src?: undefined;
-    abstractData?: string;
+    abstractData?: string | null;
     file: {
         url: string;
         imageSize: [number, number];

package/ui/CsrImage.tsx

@@ -5,7 +5,7 @@ import type { ImgHTMLAttributes } from "react";
 type CsrImageProps = Omit<ImgHTMLAttributes<HTMLImageElement>, "alt" | "src"> & {
   src?: string;
   file?: ProtoFile | { url: string; imageSize: [number, number]; abstractData?: string | null } | null;
-  abstractData?: string;
+  abstractData?: string | null;
   priority?: boolean;
   preload?: boolean;
   quality?: number;

package/ui/Image.tsx

@@ -30,7 +30,7 @@ type AkanImageProps = NativeImageProps & {
   /** Akan file object or file-like value with url and imageSize metadata. */
   file?: ImageLikeFile;
   /** Low-quality preview data. Overrides file.abstractData when provided. */
-  abstractData?: string;
+  abstractData?: string | null;
   /** Accessible alt text. Defaults to "image" when omitted. */
   alt?: string;
   /** Image optimizer quality. Defaults to 75. */
@@ -59,12 +59,12 @@ export const Image = ({
     | {
         src?: string;
         file?: ProtoFile;
-        abstractData?: string;
+        abstractData?: string | null;
         alt?: string;
       }
     | {
         src?: undefined;
-        abstractData?: string;
+        abstractData?: string | null;
         file: { url: string; imageSize: [number, number]; abstractData?: string | null } | null;
         alt?: string;
       }

package/webkit/bootCsr.tsx

@@ -18,6 +18,7 @@ import {
 } from "akanjs/client";
 import {
   assertUniqueRoutePatterns,
+  getRouteExports,
   Logger,
   parseAkanI18nEnv,
   parseBasePaths,
@@ -303,39 +304,7 @@ function validateRouteModuleExports(key: string, mod: RouteModule) {
     if (!mod.default) throw new Error(`[route-convention] ${key} generated override wrapper has no default export`);
     return;
   }
-  const allowed =
-    parsed.kind === "page"
-      ? new Set(["default", "pageConfig", "head", "metadata", "generateHead", "generateMetadata", "Loading"])
-      : parsed.isInternalRootLayout
-        ? new Set([
-            "default",
-            "pageConfig",
-            "head",
-            "metadata",
-            "generateHead",
-            "generateMetadata",
-            "fonts",
-            "manifest",
-            "theme",
-            "reconnect",
-            "wsConnect",
-            "layoutStyle",
-            "gaTrackingId",
-            "Loading",
-            "NotFound",
-            "Error",
-          ])
-        : new Set([
-            "default",
-            "pageConfig",
-            "head",
-            "metadata",
-            "generateHead",
-            "generateMetadata",
-            "Loading",
-            "NotFound",
-            "Error",
-          ]);
+  const allowed = getRouteExports(parsed.kind, { rootLayout: parsed.isInternalRootLayout });
   for (const exportName of Object.keys(mod)) {
     if (!allowed.has(exportName)) {
       throw new Error(`[route-convention] unsupported export "${exportName}" in ${key}`);