@marktiderman/genesis-native 0.1.0 → 0.3.0

package/dist/index.js

@@ -1,13 +1,19 @@
-import { createNativeQueryClient, connectQueryLifecycle } from './chunk-MMTPWUWI.js';
-export { DAY_MS, connectQueryLifecycle, createNativeQueryClient } from './chunk-MMTPWUWI.js';
+import { createNativeQueryClient, connectQueryLifecycle } from './chunk-VTJDIKFC.js';
+export { DAY_MS, connectQueryLifecycle, createNativeQueryClient } from './chunk-VTJDIKFC.js';
+export { normalizeLink } from './chunk-VKTIHNAV.js';
+import { reportToBlocks, BlocksProvider } from './chunk-65P7RU4V.js';
+export { mergeBlockSettings, useBlockSettings, useBlocks } from './chunk-65P7RU4V.js';
+import { createSessionStore, SessionProvider } from './chunk-NGYNYJPL.js';
+export { AuthGate, SessionProvider, createSessionStore, useSession } from './chunk-NGYNYJPL.js';
 import { createContext, useContext, useSyncExternalStore, Component, useRef, useEffect, useState } from 'react';
 import { View, Text, Pressable } from 'react-native';
 import { GenesisThemeProvider } from '@marktiderman/genesis-design-system/theme';
 import { createSupabaseProvider, GenesisProvider } from '@marktiderman/genesis-core/provider';
 import { renderSlot } from '@marktiderman/genesis-core/slots';
 import { KeyboardScrollProvider } from '@marktiderman/genesis-ui-native/layouts';
+import { NativeEmptyState, NativeButton, NativeToastProvider, GenesisModulesProvider, NativeSheetProvider } from '@marktiderman/genesis-ui-native/components';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
-import { NativeEmptyState, NativeButton } from '@marktiderman/genesis-ui-native/components';
+import { resolveBlocks } from '@marktiderman/genesis-features/blocks';
 
 var BootTimeoutError = class extends Error {
   step;
@@ -194,88 +200,6 @@ function installRejectionTracker({ enable, onError }) {
     }
   });
 }
-var DEFAULT_WAIT_MS = 5e3;
-function defaultUserId(session) {
-  const id = session?.user?.id;
-  return typeof id === "string" ? id : null;
-}
-function isNetworkError(error) {
-  const e = error;
-  return e?.name === "AuthRetryableFetchError" || e?.status === 0;
-}
-function storedSessionReader(client) {
-  return async () => {
-    const auth = client.auth;
-    if (!auth.storage || typeof auth.storageKey !== "string") return null;
-    const raw = await auth.storage.getItem(auth.storageKey);
-    if (typeof raw !== "string") return raw ?? null;
-    try {
-      return JSON.parse(raw);
-    } catch {
-      return null;
-    }
-  };
-}
-function createSessionStore(client, options = {}) {
-  const { onUserChange, waitMs = DEFAULT_WAIT_MS, userIdOf = defaultUserId } = options;
-  const readStored = options.readStoredSession ?? storedSessionReader(client);
-  const listeners = /* @__PURE__ */ new Set();
-  let state = { status: "loading", session: null, userId: null, offline: false };
-  let version = 0;
-  const set = (session, offline = false) => {
-    const userId = session ? userIdOf(session) : null;
-    const previous = state;
-    if (previous.status !== "loading" && previous.session === session && previous.offline === offline) return;
-    state = { status: session ? "signedIn" : "signedOut", session, userId, offline };
-    for (const listener of listeners) listener();
-    if (previous.status !== "loading" && previous.userId !== userId) onUserChange?.(previous.userId, userId);
-  };
-  return {
-    getState: () => state,
-    subscribe(listener) {
-      listeners.add(listener);
-      return () => listeners.delete(listener);
-    },
-    async load() {
-      const startedAt = version;
-      let timer;
-      const timedOut = new Promise((resolve) => {
-        timer = setTimeout(() => resolve("timeout"), waitMs);
-      });
-      const result = await Promise.race([client.auth.getSession(), timedOut]).finally(() => clearTimeout(timer));
-      if (version !== startedAt) return;
-      if (result !== "timeout" && !result.error) return set(result.data.session);
-      if (result !== "timeout" && !isNetworkError(result.error)) {
-        const error = result.error;
-        throw error instanceof Error ? error : new Error("Could not read the session.", { cause: error });
-      }
-      const stored = await readStored().catch(() => null);
-      if (version !== startedAt) return;
-      set(stored, stored !== null);
-    },
-    start() {
-      const { data } = client.auth.onAuthStateChange((_event, session) => {
-        version++;
-        set(session);
-      });
-      return () => data.subscription.unsubscribe();
-    }
-  };
-}
-var SessionContext = createContext(null);
-function SessionProvider({ store, children }) {
-  return /* @__PURE__ */ jsx(SessionContext.Provider, { value: store, children });
-}
-function useSession() {
-  const store = useContext(SessionContext);
-  if (!store) throw new Error("useSession must be used inside <GenesisNativeApp> or <SessionProvider>.");
-  return useSyncExternalStore(store.subscribe, store.getState, store.getState);
-}
-function AuthGate({ signedIn, signedOut, loading = null }) {
-  const { status } = useSession();
-  if (status === "loading") return /* @__PURE__ */ jsx(Fragment, { children: loading });
-  return /* @__PURE__ */ jsx(Fragment, { children: status === "signedIn" ? signedIn : signedOut });
-}
 function createLinkHold() {
   let held = null;
   const listeners = /* @__PURE__ */ new Set();
@@ -327,31 +251,71 @@ function GenesisNativeApp(props) {
   const [rootKey, setRootKey] = useState(0);
   const onErrorRef = useRef(props.onError);
   onErrorRef.current = props.onError;
+  const blocksRef = useRef(givenBlocks(props));
+  const splashRef = useRef(props.splash);
+  splashRef.current = props.splash;
   return /* @__PURE__ */ jsx(
     GenesisErrorBoundary,
     {
       fallback: PlainFatalScreen,
-      onError: (e, r) => onErrorRef.current?.(e, r),
+      onError: (e, r) => {
+        reportToBlocks(blocksRef.current, e, r);
+        try {
+          onErrorRef.current?.(e, r);
+        } catch {
+        }
+        splashRef.current?.hideAsync().catch(() => {
+        });
+      },
       onRetry: () => setRootKey((key) => key + 1),
       children: /* @__PURE__ */ jsx(ThemedShell, { ...props })
     },
     rootKey
   );
 }
+var MISSING_KEYBOARD_PROVIDER = 'GenesisNativeApp: `keyboardScroll` was given without `keyboardProvider`, so form screens won\'t move above the keyboard. Pass `keyboardProvider={KeyboardProvider}` from "react-native-keyboard-controller" too.';
+var TOOLBAR_WITHOUT_SCROLL = 'GenesisNativeApp: `keyboardToolbar` was given without `keyboardScroll`, so it is ignored. Pass `keyboardScroll={KeyboardAwareScrollView}` and `keyboardProvider={KeyboardProvider}` from "react-native-keyboard-controller" too.';
 function ThemedShell(props) {
-  const { brand, keyboardScroll } = props;
-  const body = /* @__PURE__ */ jsx(Shell, { ...props });
-  return /* @__PURE__ */ jsx(ThemeProvider, { brand, syncNativeAppearance: true, children: keyboardScroll ? /* @__PURE__ */ jsx(KeyboardScrollProvider, { component: keyboardScroll, children: body }) : body });
+  const { brand, keyboardScroll, keyboardToolbar } = props;
+  const [Keyboard] = useState(() => props.keyboardProvider);
+  const [modules] = useState(() => props.modules);
+  const [toast] = useState(() => props.toast === null ? null : { position: "top", ...props.toast });
+  const missingProvider = Boolean(keyboardScroll) && !Keyboard;
+  const toolbarWithoutScroll = Boolean(keyboardToolbar) && !keyboardScroll;
+  useEffect(() => {
+    if (typeof __DEV__ === "undefined" || !__DEV__) return;
+    if (missingProvider) console.error(MISSING_KEYBOARD_PROVIDER);
+    if (toolbarWithoutScroll) console.error(TOOLBAR_WITHOUT_SCROLL);
+  }, [missingProvider, toolbarWithoutScroll]);
+  let body = /* @__PURE__ */ jsx(Shell, { ...props });
+  if (toast) body = /* @__PURE__ */ jsx(NativeToastProvider, { ...toast, children: body });
+  if (modules) body = /* @__PURE__ */ jsx(GenesisModulesProvider, { modules, children: body });
+  if (keyboardScroll) body = /* @__PURE__ */ jsx(KeyboardScrollProvider, { component: keyboardScroll, toolbar: keyboardToolbar, children: body });
+  if (Keyboard) body = /* @__PURE__ */ jsx(Keyboard, { children: body });
+  return /* @__PURE__ */ jsx(ThemeProvider, { brand, syncNativeAppearance: true, children: body });
 }
 var SESSION_STEP_MARGIN_MS = 15e3;
 function Shell(props) {
   const { supabase, provider, queryClient: queryOptions, persist, splash, links, steps = [], bootOptions, sessionWaitMs = 5e3 } = props;
-  const { errorUtils, rejectionTracker, lifecycle, slots, slotProps, children } = props;
+  const { errorUtils, rejectionTracker, lifecycle, slotProps, children } = props;
   const latest = useRef(props);
   latest.current = props;
-  const onError = (error, report) => latest.current.onError?.(error, report);
+  const [blockList] = useState(() => givenBlocks(props));
+  const [bottomSheet] = useState(() => props.bottomSheet);
+  const onError = (error, report) => {
+    reportToBlocks(blockList, error, report);
+    try {
+      latest.current.onError?.(error, report);
+    } catch {
+    }
+  };
   const fatalShown = useRef(0);
   const [parts] = useState(() => {
+    const list = blockList;
+    const blocks = resolveBlocks(list, props.appFeatures ? [...list.map((b) => b.id), ...props.appFeatures] : void 0, {
+      platform: "native",
+      slots: NATIVE_APP_SLOT_NAMES
+    });
     const client2 = queryOptions?.client ?? createNativeQueryClient(queryOptions?.config);
     const persistence2 = persist ? persist(client2) : null;
     const session2 = createSessionStore(supabase, {
@@ -366,8 +330,8 @@ function Shell(props) {
     const boot2 = createBoot(
       [
         ...steps,
-        // Settles within its own timeout and never throws: a policy that can't load never blocks the app.
-        ...props.updates ? [props.updates.bootStep] : [],
+        // Blocks' steps, in dependency order (the updates block's settles within its own timeout and never throws).
+        ...blocks.blocks.flatMap((block) => block.bootSteps ?? []),
         { id: "genesis:session", run: () => session2.load(), timeoutMs: sessionWaitMs + SESSION_STEP_MARGIN_MS },
         // After the session, so only the cache saved for this user is restored.
         ...persistence2 ? [{ id: "genesis:query-cache", run: () => persistence2.restore(session2.getState().userId ?? "") }] : []
@@ -381,15 +345,17 @@ function Shell(props) {
           fatalShown.current--;
         };
       }, []);
-      const { slots: s, slotProps: sp } = latest.current;
+      const { slotProps: sp } = latest.current;
+      const s = withBlockSlots(blocks.slots, latest.current.slots);
       return (
         // A `fatal` slot that throws falls back to the plain screen.
         /* @__PURE__ */ jsx(GenesisErrorBoundary, { fallback: PlainFatalScreen, onError, onRetry: fallbackProps.retry, children: renderSlot(FatalScreen, s?.fatal, fallbackProps, sp?.fatal) })
       );
     }
-    return { client: client2, persistence: persistence2, session: session2, boot: boot2, FatalFallback: FatalFallback2, updates: props.updates, provider: provider ?? createSupabaseProvider(supabase) };
+    return { client: client2, persistence: persistence2, session: session2, boot: boot2, FatalFallback: FatalFallback2, blocks, provider: provider ?? createSupabaseProvider(supabase) };
   });
   const { boot, session, persistence, client, FatalFallback } = parts;
+  const slots = withBlockSlots(parts.blocks.slots, props.slots);
   const bootState = useSyncExternalStore(boot.subscribe, boot.getState, boot.getState);
   const sessionState = useSyncExternalStore(session.subscribe, session.getState, session.getState);
   const [fatal, setFatal] = useState(null);
@@ -444,10 +410,33 @@ function Shell(props) {
       { fallback: FatalFallback, onError, resetKey, onRetry: retry, children: screens },
       slotProps?.errorBoundary
     );
-    const Updates = parts.updates?.Root;
-    content = Updates ? /* @__PURE__ */ jsx(Updates, { slots, slotProps, children: guarded }) : guarded;
+    content = parts.blocks.blocks.reduceRight((inner, block) => {
+      const Root = block.Root;
+      return Root ? /* @__PURE__ */ jsx(Root, { slots, slotProps, children: inner }, block.id) : inner;
+    }, guarded);
   }
-  return /* @__PURE__ */ jsx(GenesisProvider, { provider: parts.provider, queryClient: client, children: /* @__PURE__ */ jsx(SessionProvider, { store: session, children: /* @__PURE__ */ jsx(BootProvider, { boot, children: /* @__PURE__ */ jsx(GenesisErrorBoundary, { fallback: FatalFallback, onError, onRetry: retry, children: content }, resetKey) }) }) });
+  return /* @__PURE__ */ jsx(GenesisProvider, { provider: parts.provider, queryClient: client, children: /* @__PURE__ */ jsx(SessionProvider, { store: session, children: /* @__PURE__ */ jsx(BootProvider, { boot, children: /* @__PURE__ */ jsx(BlocksProvider, { value: parts.blocks, children: /* @__PURE__ */ jsx(GenesisErrorBoundary, { fallback: FatalFallback, onError, onRetry: retry, children: bottomSheet ? /* @__PURE__ */ jsx(NativeSheetProvider, { bottomSheet, children: content }) : content }, resetKey) }) }) }) });
+}
+var SLOT_NAMES = {
+  boot: true,
+  fatal: true,
+  errorBoundary: true,
+  signedOut: true,
+  forceUpgrade: true,
+  maintenance: true,
+  updateBanner: true,
+  whatsNew: true,
+  devtoolsFeedback: true,
+  pushPrompt: true
+};
+var NATIVE_APP_SLOT_NAMES = Object.keys(SLOT_NAMES);
+function withBlockSlots(fills, own) {
+  if (Object.keys(fills).length === 0) return own;
+  return { ...fills, ...own };
+}
+function givenBlocks(props) {
+  const given = props.blocks ?? [];
+  return props.updates && !given.includes(props.updates) ? [...given, props.updates] : given;
 }
 var NO_HOLD = {
   hold: () => {
@@ -503,98 +492,6 @@ function createHydrationGate({ onDroppedWrite } = {}) {
   return gate;
 }
 
-// src/links.ts
-var URL_PATTERN = /^([a-z][a-z0-9+.-]*):\/\/([^/?#]*)([^?#]*)(\?[^#]*)?(#.*)?$/i;
-function parse(url, schemes, hosts) {
-  const trimmed = url.trim();
-  const match = URL_PATTERN.exec(trimmed);
-  if (!match) {
-    if (/^[a-z][a-z0-9+.-]*:/i.test(trimmed)) return null;
-    const noHash = trimmed.split("#")[0] ?? "";
-    const at = noHash.indexOf("?");
-    return at < 0 ? { path: noHash, query: "" } : { path: noHash.slice(0, at), query: noHash.slice(at) };
-  }
-  const [, scheme = "", host = "", path = "", query = ""] = match;
-  const lowerScheme = scheme.toLowerCase();
-  if (lowerScheme === "http" || lowerScheme === "https") {
-    const bareHost = host.toLowerCase().replace(/:\d+$/, "");
-    if (!hosts.some((h) => h.toLowerCase() === bareHost)) return null;
-    return { path, query };
-  }
-  if (!schemes.some((s) => s.toLowerCase() === lowerScheme)) return null;
-  return { path: `/${host}${path}`, query };
-}
-function clean(path) {
-  const joined = `/${path}`.replace(/\/{2,}/g, "/");
-  return joined.length > 1 ? joined.replace(/\/$/, "") : joined;
-}
-function matchPattern(pattern, path) {
-  const want = clean(pattern).split("/").slice(1);
-  const have = path.split("/").slice(1);
-  const params = {};
-  for (let i = 0; i < want.length; i++) {
-    const segment = want[i];
-    if (segment === "*" && i === want.length - 1) {
-      params["*"] = have.slice(i).join("/");
-      return params;
-    }
-    const value = have[i];
-    if (value === void 0) return null;
-    if (segment.startsWith(":")) params[segment.slice(1)] = value;
-    else if (segment !== value) return null;
-  }
-  return want.length === have.length ? params : null;
-}
-function fill(target, params) {
-  if (typeof target === "function") return target(params);
-  return target.replace(
-    /:([A-Za-z_][A-Za-z0-9_]*)|\*$/g,
-    (token, name) => name === void 0 ? params["*"] ?? "" : params[name] ?? token
-  );
-}
-function isDotSegment(segment) {
-  let decoded = segment;
-  try {
-    decoded = decodeURIComponent(segment);
-  } catch {
-  }
-  return decoded === "." || decoded === "..";
-}
-function withQuery(path, query) {
-  if (!query || query === "?") return path;
-  return path.includes("?") ? `${path}&${query.slice(1)}` : `${path}${query}`;
-}
-function normalizeLink(url, options) {
-  const { schemes = [], hosts = [], map, ignore = [], onUnknown } = options;
-  const unknown = () => {
-    onUnknown?.(url);
-    return "/";
-  };
-  let parsed;
-  try {
-    parsed = parse(url, schemes, hosts);
-  } catch {
-    parsed = null;
-  }
-  if (!parsed) return unknown();
-  const path = clean(parsed.path);
-  if (path.split("/").some(isDotSegment)) {
-    return unknown();
-  }
-  if (ignore.some((pattern) => matchPattern(pattern, path))) return null;
-  if (path === "/") return withQuery("/", parsed.query);
-  for (const [pattern, target] of Object.entries(map)) {
-    const params = matchPattern(pattern, path);
-    if (!params) continue;
-    try {
-      return withQuery(fill(target, params), parsed.query);
-    } catch {
-      return unknown();
-    }
-  }
-  return unknown();
-}
-
-export { AuthGate, BootProvider, BootScreen, BootTimeoutError, FatalScreen, GenesisErrorBoundary, GenesisNativeApp, PlainFatalScreen, SessionProvider, createBoot, createHydrationGate, createLinkHold, createSessionStore, defaultErrorUtils, defaultRejectionTracker, installGlobalErrorHandler, installRejectionTracker, normalizeLink, useBoot, useHeldLink, useSession };
+export { BootProvider, BootScreen, BootTimeoutError, FatalScreen, GenesisErrorBoundary, GenesisNativeApp, PlainFatalScreen, createBoot, createHydrationGate, createLinkHold, defaultErrorUtils, defaultRejectionTracker, installGlobalErrorHandler, installRejectionTracker, useBoot, useHeldLink };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map