@resistdesign/voltra 3.0.0-alpha.45 → 3.0.0-alpha.46

package/README.md

@@ -242,6 +242,7 @@ const coords = layout.computeNativeCoords({
 
 Voltra routing uses the same `Route` API across app/web/native.
 Use the platform barrel for root `Route` so runtime mechanics are auto-wired.
+The routing model is path/history based on every platform.
 
 Reference example: `examples/routing/app-routing.ts`
 
@@ -271,10 +272,22 @@ import { Route } from "@resistdesign/voltra/native";
 </Route>;
 ```
 
+On native, Voltra provides the missing browser-like pieces:
+
+- history-style path state for environments without the browser History API
+- deep-link URL ingress so app opens behave like web navigations
+- hardware back wiring into that same history model
+- the `native` barrel auto-selects browser behavior on React Native web targets
+  and native-history behavior on mobile targets
+
 How it works:
 
 - Root `<Route>` (no `path`) is provider mode.
 - Nested `<Route path="...">` entries are matcher mode.
+- Shared app routing matches normalized path strings on every platform.
+- Web already receives a browser pathname.
+- Native provides the browser-like history/path source that mobile lacks.
+- Native deep-link ingress is mapped into that same path/history model.
 - Strategy is auto-selected:
   - DOM + History API => browser history strategy.
   - Otherwise => in-memory native strategy.

package/native/index.js

@@ -1,9 +1,9 @@
 import { computeTrackPixels } from '../chunk-TJFTWPXQ.js';
-import { createFormRenderer, createHistoryBackHandler, buildHistoryPath, AutoFormView, AutoForm, parseTemplate, validateAreas, computeAreaBounds, parseHistoryPath, createMemoryHistory, Route, buildRoutePath } from '../chunk-44BMFTKD.js';
+import { createFormRenderer, createHistoryBackHandler, buildHistoryPath, AutoFormView, AutoForm, parseTemplate, validateAreas, computeAreaBounds, parseHistoryPath, createMemoryHistory, createBrowserRouteAdapter, Route, createRouteAdapterFromHistory } from '../chunk-44BMFTKD.js';
 import { ERROR_MESSAGE_CONSTANTS } from '../chunk-YCTVEW2I.js';
-import { resolveRouteAdapterPath, getPathArray } from '../chunk-WNFRDIBW.js';
+import '../chunk-WNFRDIBW.js';
 import '../chunk-I2KLQ2HA.js';
-import { createElement, useMemo } from 'react';
+import { createElement, useMemo, useRef } from 'react';
 import { Text, View, Platform, Switch, TextInput, Pressable, BackHandler } from 'react-native';
 import { jsx } from 'react/jsx-runtime';
 
@@ -580,10 +580,13 @@ var createNativeHistory = (options = {}) => {
     adapter,
     initialPath = "/",
     onIncomingURL = "replace",
-    mapURLToPath = mapNativeURLToPath
+    mapURLToPath = mapNativeURLToPath,
+    backHandler
   } = options;
   const history = createMemoryHistory(initialPath);
+  const historyBackHandler = createHistoryBackHandler(history);
   let unsubscribe;
+  let stopBackHandler;
   let started = false;
   const applyIncomingURL = (url) => {
     if (!url) {
@@ -620,6 +623,20 @@ var createNativeHistory = (options = {}) => {
         return;
       }
       started = true;
+      if (backHandler && !stopBackHandler) {
+        const listener = () => historyBackHandler.handle();
+        const subscription = backHandler.addEventListener(
+          "hardwareBackPress",
+          listener
+        );
+        stopBackHandler = () => {
+          if (typeof subscription?.remove === "function") {
+            subscription.remove();
+            return;
+          }
+          backHandler.removeEventListener?.("hardwareBackPress", listener);
+        };
+      }
       if (!adapter) {
         return;
       }
@@ -651,23 +668,13 @@ var createNativeHistory = (options = {}) => {
       }
       unsubscribe?.();
       unsubscribe = void 0;
+      stopBackHandler?.();
+      stopBackHandler = void 0;
       started = false;
     }
   };
 };
 var createNativeBackHandler = (history) => createHistoryBackHandler(history);
-var createNavigationStateRouteAdapter = (options) => {
-  const getPath = () => options.toPath(options.getState());
-  const resolvePath = (path) => resolveRouteAdapterPath(getPath(), path);
-  return {
-    getPath,
-    subscribe: (listener) => options.subscribe(() => {
-      listener(getPath());
-    }),
-    push: options.navigate ? (path) => options.navigate?.(resolvePath(path)) : void 0,
-    replace: options.replace ? (path) => options.replace?.(resolvePath(path)) : void 0
-  };
-};
 var createNativeHardwareBackHandler = (adapter) => {
   return () => {
     if (adapter.canGoBack?.()) {
@@ -696,53 +703,63 @@ var createNativeRouteBackIntegration = (backHandler) => {
     setup: (adapter) => registerNativeHardwareBackHandler(adapter, backHandler)
   };
 };
+var createNativeHistoryRouteAdapter = (initialPath, ingress, backHandler) => {
+  const history = createNativeHistory({
+    initialPath,
+    backHandler,
+    ...ingress ? {
+      adapter: {
+        getInitialURL: async () => await ingress.getInitialURL?.() ?? null,
+        subscribe: (listener) => ingress.subscribe?.(listener) ?? (() => {
+        })
+      },
+      onIncomingURL: ingress.onIncomingURL,
+      mapURLToPath: ingress.mapURLToPath
+    } : {}
+  });
+  const adapter = createRouteAdapterFromHistory(history);
+  let subscribers = 0;
+  return {
+    ...adapter,
+    subscribe: (listener) => {
+      subscribers += 1;
+      if (subscribers === 1) {
+        void history.start();
+      }
+      const unlisten = adapter.subscribe(listener);
+      return () => {
+        unlisten();
+        subscribers = Math.max(0, subscribers - 1);
+        if (subscribers === 0) {
+          history.stop();
+        }
+      };
+    }
+  };
+};
 var Route2 = (props) => {
   const hasMatcherProps = typeof props.path !== "undefined" || typeof props.exact !== "undefined" || typeof props.onParamsChange !== "undefined";
   const nativeRuntime = {
     platformOS: String(Platform?.OS ?? ""),
     backHandler: BackHandler
   };
-  const runtimeIntegration = (() => {
-    if (hasMatcherProps || nativeRuntime.platformOS === "web") {
-      return void 0;
-    }
-    const backHandler = nativeRuntime.backHandler;
-    if (!backHandler) {
-      return void 0;
-    }
-    return createNativeRouteBackIntegration(backHandler);
-  })();
-  return /* @__PURE__ */ jsx(
+  const shouldUseAutoAdapter = !hasMatcherProps && typeof props.adapter === "undefined";
+  const routeProps = props;
+  const adapterRef = useRef(null);
+  if (shouldUseAutoAdapter && !adapterRef.current) {
+    adapterRef.current = nativeRuntime.platformOS === "web" ? createBrowserRouteAdapter() : createNativeHistoryRouteAdapter(
+      props.initialPath,
+      props.ingress,
+      nativeRuntime.backHandler
+    );
+  }
+  return shouldUseAutoAdapter ? /* @__PURE__ */ jsx(
     Route,
     {
-      ...props,
-      runtimeIntegration
+      ...routeProps,
+      adapter: adapterRef.current ?? void 0
     }
-  );
-};
-var expandPattern = (pattern, params = {}) => {
-  const segments = getPathArray(pattern, "/", true, true, false, false);
-  return segments.map((segment) => {
-    if (segment.startsWith(":")) {
-      const key = segment.slice(1);
-      if (!(key in params)) {
-        throw new Error(`Missing param "${key}" for route pattern "${pattern}".`);
-      }
-      return params[key];
-    }
-    return segment;
-  });
-};
-var buildPathFromRouteChain = (routeChain, config, query) => {
-  const segments = [];
-  routeChain.forEach((route) => {
-    const pattern = config[route.name];
-    if (!pattern) {
-      throw new Error(`Missing route pattern for "${route.name}".`);
-    }
-    segments.push(...expandPattern(pattern, route.params));
-  });
-  return buildRoutePath(segments, query);
+  ) : /* @__PURE__ */ jsx(Route, { ...routeProps });
 };
 
-export { ArrayContainer, ArrayItemWrapper, AutoField, AutoForm2 as AutoForm, AutoFormView2 as AutoFormView, Button, ErrorMessage, FieldWrapper, NativeEasyLayoutView, Route2 as Route, buildPathFromRouteChain, createNativeBackHandler, createNativeFormRenderer, createNativeHardwareBackHandler, createNativeHistory, createNativeRouteBackIntegration, createNavigationStateRouteAdapter, makeNativeEasyLayout, mapNativeURLToPath, nativeAutoField, nativeSuite, registerNativeHardwareBackHandler, useNativeEasyLayout };
+export { ArrayContainer, ArrayItemWrapper, AutoField, AutoForm2 as AutoForm, AutoFormView2 as AutoFormView, Button, ErrorMessage, FieldWrapper, NativeEasyLayoutView, Route2 as Route, createNativeBackHandler, createNativeFormRenderer, createNativeHardwareBackHandler, createNativeHistory, createNativeRouteBackIntegration, makeNativeEasyLayout, mapNativeURLToPath, nativeAutoField, nativeSuite, registerNativeHardwareBackHandler, useNativeEasyLayout };

package/native/utils/History.d.ts

@@ -1,13 +1,15 @@
 /**
  * @packageDocumentation
  *
- * Native history helpers that adapt deep links into the shared history state machine.
+ * Native history helpers that provide the mobile equivalent of browser
+ * location/history behavior for shared app Route matching.
  */
 import type { HistoryController } from "../../app/utils/History";
 /**
  * Adapter contract for React Native deep-link APIs.
  *
- * Intended for RN `Linking` wrappers.
+ * Intended for RN `Linking` wrappers so native URL opens behave like browser
+ * navigations entering the shared Voltra history model.
  */
 export type NativeLinkAdapter = {
     /**
@@ -23,8 +25,19 @@ export type NativeLinkAdapter = {
  * Mode for incoming URL handling.
  */
 export type NativeIncomingURLMode = "push" | "replace";
+/**
+ * BackHandler-like contract for native platform back actions.
+ */
+export type NativeBackHandlerLike = {
+    addEventListener: (eventName: "hardwareBackPress", listener: () => boolean) => {
+        remove?: () => void;
+    } | void;
+    removeEventListener?: (eventName: "hardwareBackPress", listener: () => boolean) => void;
+};
 /**
  * Native history controller with explicit lifecycle hooks.
+ *
+ * This is the native/mobile analogue to browser-backed history in web apps.
  */
 export type NativeHistoryController = HistoryController & {
     /**
@@ -62,16 +75,25 @@ export type CreateNativeHistoryOptions = {
      * Default: {@link mapNativeURLToPath}.
      */
     mapURLToPath?: (url: string) => string;
+    /**
+     * Optional native platform back handler wired into this history runtime.
+     */
+    backHandler?: NativeBackHandlerLike;
 };
 /**
  * Default native URL -> path mapping.
  *
- * Strips scheme and host, preserves path + query + hash.
+ * Strips scheme and host, preserves path + query + hash so incoming native URLs
+ * become the same route paths used on web.
  */
 export declare const mapNativeURLToPath: (url: string) => string;
 /**
  * Create a native history controller backed by in-memory history.
  *
+ * This is the primary native routing primitive when the environment does not
+ * provide browser history. It gives shared Route matching a stable path/history
+ * source and applies incoming deep links as navigations in that same model.
+ *
  * Lifecycle behavior:
  * - `start()` is idempotent.
  * - `stop()` is idempotent.

package/native/utils/Route.d.ts

@@ -1,54 +1,19 @@
 /**
  * @packageDocumentation
  *
- * Native routing helpers that adapt common navigation state to RouteAdapter.
- */
-import { type PropsWithChildren } from "react";
-import type { RouteAdapter, RouteProps, RouteQuery, RouteRuntimeIntegration } from "../../app/utils/Route";
-/**
- * Options to adapt a navigation state container into a RouteAdapter.
- */
-export type NavigationStateAdapterOptions<TState> = {
-    /** Return the current navigation state. */
-    getState: () => TState;
-    /** Subscribe to navigation state changes. */
-    subscribe: (listener: () => void) => () => void;
-    /** Convert navigation state into a path string. */
-    toPath: (state: TState) => string;
-    /** Optional navigation handler used for push-style transitions. */
-    navigate?: (path: string) => void;
-    /** Optional navigation handler used for replace-style transitions. */
-    replace?: (path: string) => void;
-};
-/**
- * Contract for React Native BackHandler-like integrations.
- */
-export type NativeBackHandlerLike = {
-    addEventListener: (eventName: "hardwareBackPress", listener: () => boolean) => {
-        remove?: () => void;
-    } | void;
-    removeEventListener?: (eventName: "hardwareBackPress", listener: () => boolean) => void;
-};
-/**
- * Route node in a navigation chain.
- */
-export type NavigationRouteNode = {
-    /** Route name as reported by the navigation library. */
-    name: string;
-    /** Optional route params used to populate path patterns. */
-    params?: Record<string, any>;
-};
-/**
- * Mapping of route names to path patterns (e.g. "books/:id").
- */
-export type NavigationRouteConfig = Record<string, string>;
-/**
- * Create a RouteAdapter from a navigation state container (e.g., react-navigation).
+ * Native routing helpers that keep shared app Route semantics intact on mobile.
  *
- * @param options - Adapter options for accessing and observing navigation state.
- * @returns RouteAdapter bound to the navigation state.
+ * The primary native model is still Voltra path/history routing. These helpers
+ * supply the runtime selection needed by the `native` barrel:
+ * - React Native mobile uses native history + deep-link + platform back
+ * - React Native web uses the browser adapter
+ *
+ * This separation keeps `app` free of native-platform code.
  */
-export declare const createNavigationStateRouteAdapter: <TState>(options: NavigationStateAdapterOptions<TState>) => RouteAdapter;
+import { type PropsWithChildren } from "react";
+import type { RouteProps, RouteRuntimeIntegration } from "../../app/utils/Route";
+import type { RouteAdapter } from "../../app/utils/Route";
+import { type NativeBackHandlerLike } from "./History";
 /**
  * Create a hardware-back listener from a route adapter.
  */
@@ -58,23 +23,19 @@ export declare const createNativeHardwareBackHandler: (adapter: RouteAdapter) =>
  */
 export declare const registerNativeHardwareBackHandler: (adapter: RouteAdapter, backHandler: NativeBackHandlerLike) => () => void;
 /**
- * Build a core Route runtime integration using a native BackHandler.
+ * Low-level helper to build a Route runtime integration from a BackHandler.
+ *
+ * Native Route no longer uses this for the default path because platform back
+ * ownership now lives with the native adapter/history layer. This remains
+ * available for manual integrations.
  */
 export declare const createNativeRouteBackIntegration: (backHandler: NativeBackHandlerLike) => RouteRuntimeIntegration;
 /**
  * Native Route wrapper for root/provider mode.
  *
  * Behavior:
- * - On mobile native runtimes, injects back-handler integration into app Route.
- * - On web runtimes, passes no integration so app Route uses browser behavior.
+ * - On React Native mobile runtimes, auto-injects a native-history-backed
+ *   adapter so native history owns platform back actions.
+ * - On React Native web runtimes, auto-injects the browser adapter.
  */
 export declare const Route: <ParamsType extends Record<string, any>>(props: PropsWithChildren<RouteProps<ParamsType>>) => import("react/jsx-runtime").JSX.Element;
-/**
- * Build a path from a navigation route chain and route config mapping.
- *
- * @param routeChain - Ordered list of routes from root to leaf.
- * @param config - Route name to path pattern mapping.
- * @param query - Optional query parameters appended to the path.
- * @returns Serialized path string.
- */
-export declare const buildPathFromRouteChain: (routeChain: NavigationRouteNode[], config: NavigationRouteConfig, query?: RouteQuery) => string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@resistdesign/voltra",
-  "version": "3.0.0-alpha.45",
+  "version": "3.0.0-alpha.46",
   "description": "With our powers combined!",
   "homepage": "https://voltra.app",
   "repository": "git@github.com:resistdesign/voltra.git",