@tanstack/router-core 0.0.1-beta.194 → 0.0.1-beta.196

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/router-core",
   "author": "Tanner Linsley",
-  "version": "0.0.1-beta.194",
+  "version": "0.0.1-beta.196",
   "license": "MIT",
   "repository": "tanstack/router",
   "homepage": "https://tanstack.com/router",
@@ -43,6 +43,7 @@
     "tiny-invariant": "^1.3.1",
     "tiny-warning": "^1.0.3",
     "@tanstack/store": "^0.0.1",
+    "@tanstack/history": "0.0.1-beta.194",
     "@gisatcz/cross-package-react-context": "^0.2.0"
   },
   "scripts": {

package/src/fileRoute.ts

@@ -130,14 +130,7 @@ export class FileRoute<
       >,
       'getParentRoute' | 'path' | 'id'
     > &
-      UpdatableRouteOptions<
-        TLoader,
-        TSearchSchema,
-        TFullSearchSchema,
-        TAllParams,
-        TRouteContext,
-        TContext
-      >,
+      UpdatableRouteOptions<TLoader, TFullSearchSchema, TAllParams, TContext>,
   ): Route<
     TParentRoute,
     TPath,

package/src/index.ts

@@ -1,6 +1,6 @@
+export * from '@tanstack/history'
 export { default as invariant } from 'tiny-invariant'
 export { default as warning } from 'tiny-warning'
-export * from './history'
 export * from './link'
 export * from './path'
 export * from './qss'

package/src/route.ts

@@ -24,7 +24,6 @@ export interface RegisterRouteComponent<
   TLoader = unknown,
   TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends Record<string, any> = AnyContext,
   TAllContext extends Record<string, any> = AnyContext,
 > {
   // RouteComponent: unknown // This is registered by the framework
@@ -32,7 +31,6 @@ export interface RegisterRouteComponent<
 export interface RegisterErrorRouteComponent<
   TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends Record<string, any> = AnyContext,
   TAllContext extends Record<string, any> = AnyContext,
 > {
   // ErrorRouteComponent: unknown // This is registered by the framework
@@ -40,7 +38,6 @@ export interface RegisterErrorRouteComponent<
 export interface RegisterPendingRouteComponent<
   TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends Record<string, any> = AnyContext,
   TAllContext extends Record<string, any> = AnyContext,
 > {
   // PendingRouteComponent: unknown // This is registered by the framework
@@ -50,7 +47,6 @@ export interface RegisterRouteProps<
   TLoader = unknown,
   TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends Record<string, any> = AnyContext,
   TAllContext extends Record<string, any> = AnyContext,
 > {
   // RouteProps: unknown // This is registered by the framework
@@ -58,7 +54,6 @@ export interface RegisterRouteProps<
 export interface RegisterErrorRouteProps<
   TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends Record<string, any> = AnyContext,
   TAllContext extends Record<string, any> = AnyContext,
 > {
   // ErrorRouteProps: unknown // This is registered by the framework
@@ -67,7 +62,6 @@ export interface RegisterErrorRouteProps<
 export interface RegisterPendingRouteProps<
   TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends Record<string, any> = AnyContext,
   TAllContext extends Record<string, any> = AnyContext,
 > {
   // PendingRouteProps: unknown // This is registered by the framework
@@ -77,13 +71,11 @@ export type RegisteredRouteComponent<
   TLoader = unknown,
   TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends Record<string, any> = AnyContext,
   TAllContext extends Record<string, any> = AnyContext,
 > = RegisterRouteComponent<
   TLoader,
   TFullSearchSchema,
   TAllParams,
-  TRouteContext,
   TAllContext
 > extends {
   RouteComponent: infer T
@@ -94,12 +86,10 @@ export type RegisteredRouteComponent<
 export type RegisteredErrorRouteComponent<
   TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends Record<string, any> = AnyContext,
   TAllContext extends Record<string, any> = AnyContext,
 > = RegisterErrorRouteComponent<
   TFullSearchSchema,
   TAllParams,
-  TRouteContext,
   TAllContext
 > extends {
   ErrorRouteComponent: infer T
@@ -110,12 +100,10 @@ export type RegisteredErrorRouteComponent<
 export type RegisteredPendingRouteComponent<
   TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends Record<string, any> = AnyContext,
   TAllContext extends Record<string, any> = AnyContext,
 > = RegisterPendingRouteComponent<
   TFullSearchSchema,
   TAllParams,
-  TRouteContext,
   TAllContext
 > extends {
   PendingRouteComponent: infer T
@@ -127,13 +115,11 @@ export type RegisteredRouteProps<
   TLoader = unknown,
   TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends Record<string, any> = AnyContext,
   TAllContext extends Record<string, any> = AnyContext,
 > = RegisterRouteProps<
   TLoader,
   TFullSearchSchema,
   TAllParams,
-  TRouteContext,
   TAllContext
 > extends {
   RouteProps: infer T
@@ -144,14 +130,8 @@ export type RegisteredRouteProps<
 export type RegisteredErrorRouteProps<
   TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends Record<string, any> = AnyContext,
   TAllContext extends Record<string, any> = AnyContext,
-> = RegisterRouteProps<
-  TFullSearchSchema,
-  TAllParams,
-  TRouteContext,
-  TAllContext
-> extends {
+> = RegisterRouteProps<TFullSearchSchema, TAllParams, TAllContext> extends {
   ErrorRouteProps: infer T
 }
   ? T
@@ -160,14 +140,8 @@ export type RegisteredErrorRouteProps<
 export type RegisteredPendingRouteProps<
   TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends Record<string, any> = AnyContext,
   TAllContext extends Record<string, any> = AnyContext,
-> = RegisterRouteProps<
-  TFullSearchSchema,
-  TAllParams,
-  TRouteContext,
-  TAllContext
-> extends {
+> = RegisterRouteProps<TFullSearchSchema, TAllParams, TAllContext> extends {
   PendingRouteProps: infer T
 }
   ? T
@@ -194,7 +168,7 @@ export type MetaOptions = keyof PickRequired<RouteMeta> extends never
       meta: RouteMeta
     }
 
-export type AnyRouteProps = RegisteredRouteProps<any, any, any, any, any>
+export type AnyRouteProps = RegisteredRouteProps<any, any, any, any>
 
 export type RouteOptions<
   TParentRoute extends AnyRoute = AnyRoute,
@@ -221,14 +195,7 @@ export type RouteOptions<
   TRouteContext,
   TAllContext
 > &
-  UpdatableRouteOptions<
-    TLoader,
-    TSearchSchema,
-    TFullSearchSchema,
-    TAllParams,
-    TRouteContext,
-    TAllContext
-  >
+  UpdatableRouteOptions<TLoader, TFullSearchSchema, TAllParams, TAllContext>
 
 export type ParamsFallback<
   TPath extends string,
@@ -320,10 +287,8 @@ type BeforeLoadFn<
 
 export type UpdatableRouteOptions<
   TLoader,
-  TSearchSchema extends Record<string, any>,
   TFullSearchSchema extends Record<string, any>,
   TAllParams extends AnyPathParams,
-  TRouteContext extends Record<string, any>,
   TAllContext extends Record<string, any>,
 > = MetaOptions & {
   // If true, this route will be matched as case-sensitive
@@ -335,21 +300,18 @@ export type UpdatableRouteOptions<
     TLoader,
     TFullSearchSchema,
     TAllParams,
-    TRouteContext,
     TAllContext
   >
   // The content to be rendered when the route encounters an error
   errorComponent?: RegisteredErrorRouteComponent<
     TFullSearchSchema,
     TAllParams,
-    TRouteContext,
     TAllContext
   > //
   // If supported by your framework, the content to be rendered as the fallback content until the route is ready to render
   pendingComponent?: RegisteredPendingRouteComponent<
     TFullSearchSchema,
     TAllParams,
-    TRouteContext,
     TAllContext
   >
   // Filter functions that can manipulate search params *before* they are passed to links and navigate
@@ -438,7 +400,7 @@ export interface LoaderContext<
   abortController: AbortController
   preload: boolean
   params: TAllParams
-  context: DeepMergeAll<[TAllContext, TLoaderContext, TRouteContext]>
+  context: Expand<DeepMergeAll<[TAllContext, TLoaderContext, TRouteContext]>>
 }
 
 export type SearchFilter<T, U = T> = (prev: T) => U
@@ -635,10 +597,8 @@ export class Route<
     > &
       UpdatableRouteOptions<
         TLoader,
-        TSearchSchema,
         TFullSearchSchema,
         TAllParams,
-        TRouteContext,
         TAllContext
       >,
   ) {
@@ -743,10 +703,8 @@ export class Route<
   update = (
     options: UpdatableRouteOptions<
       TLoader,
-      TSearchSchema,
       TFullSearchSchema,
       TAllParams,
-      TRouteContext,
       TAllContext
     >,
   ) => {

package/src/routeInfo.ts

@@ -61,9 +61,7 @@ export type RoutePaths<TRouteTree extends AnyRoute> =
 
 export type FullSearchSchema<TRouteTree extends AnyRoute> = Partial<
   Expand<
-    UnionToIntersection<
-      ParseRoute<TRouteTree>['types']['fullSearchSchema']
-    > & {}
+    UnionToIntersection<ParseRoute<TRouteTree>['types']['fullSearchSchema']>
   >
 >
 

package/src/router.ts

@@ -1,5 +1,12 @@
 import { Store } from '@tanstack/store'
 import invariant from 'tiny-invariant'
+import {
+  createBrowserHistory,
+  createMemoryHistory,
+  HistoryLocation,
+  HistoryState,
+  RouterHistory,
+} from '@tanstack/history'
 
 //
 
@@ -53,13 +60,6 @@ import {
   partialDeepEqual,
   NonNullableUpdater,
 } from './utils'
-import {
-  createBrowserHistory,
-  createMemoryHistory,
-  HistoryLocation,
-  HistoryState,
-  RouterHistory,
-} from './history'
 
 //
 
@@ -69,6 +69,13 @@ declare global {
   }
 }
 
+declare module '@tanstack/history' {
+  interface HistoryState {
+    __tempLocation?: HistoryLocation
+    __tempKey?: string
+  }
+}
+
 export interface Register {
   // router: Router
 }
@@ -163,19 +170,16 @@ export interface RouterOptions<
     unknown,
     AnySearchSchema,
     AnyPathParams,
-    AnyContext,
     AnyContext
   >
   defaultErrorComponent?: RegisteredErrorRouteComponent<
     AnySearchSchema,
     AnyPathParams,
-    AnyContext,
     AnyContext
   >
   defaultPendingComponent?: RegisteredPendingRouteComponent<
     AnySearchSchema,
     AnyPathParams,
-    AnyContext,
     AnyContext
   >
   defaultMaxAge?: number

package/src/utils.ts

@@ -19,6 +19,7 @@ export type PickRequired<T> = {
   [K in keyof T as undefined extends T[K] ? never : K]: T[K]
 }
 
+// export type Expand<T> = T
 export type Expand<T> = T extends object
   ? T extends infer O
     ? { [K in keyof O]: O[K] }

package/build/cjs/history.js

@@ -1,228 +0,0 @@
-/**
- * @tanstack/router-core/src/index.ts
- *
- * Copyright (c) TanStack
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE.md file in the root directory of this source tree.
- *
- * @license MIT
- */
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-// While the public API was clearly inspired by the "history" npm package,
-// This implementation attempts to be more lightweight by
-// making assumptions about the way TanStack Router works
-
-const pushStateEvent = 'pushstate';
-const popStateEvent = 'popstate';
-const beforeUnloadEvent = 'beforeunload';
-const beforeUnloadListener = event => {
-  event.preventDefault();
-  // @ts-ignore
-  return event.returnValue = '';
-};
-const stopBlocking = () => {
-  removeEventListener(beforeUnloadEvent, beforeUnloadListener, {
-    capture: true
-  });
-};
-function createHistory(opts) {
-  let location = opts.getLocation();
-  let unsub = () => {};
-  let subscribers = new Set();
-  let blockers = [];
-  let queue = [];
-  const tryFlush = () => {
-    if (blockers.length) {
-      blockers[0]?.(tryFlush, () => {
-        blockers = [];
-        stopBlocking();
-      });
-      return;
-    }
-    while (queue.length) {
-      queue.shift()?.();
-    }
-    if (!opts.subscriber) {
-      onUpdate();
-    }
-  };
-  const queueTask = task => {
-    queue.push(task);
-    tryFlush();
-  };
-  const onUpdate = () => {
-    location = opts.getLocation();
-    subscribers.forEach(subscriber => subscriber());
-  };
-  return {
-    get location() {
-      return location;
-    },
-    subscribe: cb => {
-      if (subscribers.size === 0) {
-        unsub = typeof opts.subscriber === 'function' ? opts.subscriber(onUpdate) : () => {};
-      }
-      subscribers.add(cb);
-      return () => {
-        subscribers.delete(cb);
-        if (subscribers.size === 0) {
-          unsub();
-        }
-      };
-    },
-    push: (path, state) => {
-      assignKey(state);
-      queueTask(() => {
-        opts.pushState(path, state);
-      });
-    },
-    replace: (path, state) => {
-      assignKey(state);
-      queueTask(() => {
-        opts.replaceState(path, state);
-      });
-    },
-    go: index => {
-      queueTask(() => {
-        opts.go(index);
-      });
-    },
-    back: () => {
-      queueTask(() => {
-        opts.back();
-      });
-    },
-    forward: () => {
-      queueTask(() => {
-        opts.forward();
-      });
-    },
-    createHref: str => opts.createHref(str),
-    block: cb => {
-      blockers.push(cb);
-      if (blockers.length === 1) {
-        addEventListener(beforeUnloadEvent, beforeUnloadListener, {
-          capture: true
-        });
-      }
-      return () => {
-        blockers = blockers.filter(b => b !== cb);
-        if (!blockers.length) {
-          stopBlocking();
-        }
-      };
-    }
-  };
-}
-function assignKey(state) {
-  state.key = createRandomKey();
-  // if (state.__actualLocation) {
-  //   state.__actualLocation.state = {
-  //     ...state.__actualLocation.state,
-  //     key,
-  //   }
-  // }
-}
-
-function createBrowserHistory(opts) {
-  const getHref = opts?.getHref ?? (() => `${window.location.pathname}${window.location.search}${window.location.hash}`);
-  const createHref = opts?.createHref ?? (path => path);
-  const getLocation = () => parseLocation(getHref(), window.history.state);
-  return createHistory({
-    getLocation,
-    subscriber: onUpdate => {
-      window.addEventListener(pushStateEvent, onUpdate);
-      window.addEventListener(popStateEvent, onUpdate);
-      var pushState = window.history.pushState;
-      window.history.pushState = function () {
-        let res = pushState.apply(history, arguments);
-        onUpdate();
-        return res;
-      };
-      var replaceState = window.history.replaceState;
-      window.history.replaceState = function () {
-        let res = replaceState.apply(history, arguments);
-        onUpdate();
-        return res;
-      };
-      return () => {
-        window.history.pushState = pushState;
-        window.history.replaceState = replaceState;
-        window.removeEventListener(pushStateEvent, onUpdate);
-        window.removeEventListener(popStateEvent, onUpdate);
-      };
-    },
-    pushState: (path, state) => {
-      window.history.pushState(state, '', createHref(path));
-    },
-    replaceState: (path, state) => {
-      window.history.replaceState(state, '', createHref(path));
-    },
-    back: () => window.history.back(),
-    forward: () => window.history.forward(),
-    go: n => window.history.go(n),
-    createHref: path => createHref(path)
-  });
-}
-function createHashHistory() {
-  return createBrowserHistory({
-    getHref: () => window.location.hash.substring(1),
-    createHref: path => `#${path}`
-  });
-}
-function createMemoryHistory(opts = {
-  initialEntries: ['/']
-}) {
-  const entries = opts.initialEntries;
-  let index = opts.initialIndex ?? entries.length - 1;
-  let currentState = {
-    key: createRandomKey()
-  };
-  const getLocation = () => parseLocation(entries[index], currentState);
-  return createHistory({
-    getLocation,
-    subscriber: false,
-    pushState: (path, state) => {
-      currentState = state;
-      entries.push(path);
-      index++;
-    },
-    replaceState: (path, state) => {
-      currentState = state;
-      entries[index] = path;
-    },
-    back: () => {
-      index--;
-    },
-    forward: () => {
-      index = Math.min(index + 1, entries.length - 1);
-    },
-    go: n => window.history.go(n),
-    createHref: path => path
-  });
-}
-function parseLocation(href, state) {
-  let hashIndex = href.indexOf('#');
-  let searchIndex = href.indexOf('?');
-  return {
-    href,
-    pathname: href.substring(0, hashIndex > 0 ? searchIndex > 0 ? Math.min(hashIndex, searchIndex) : hashIndex : searchIndex > 0 ? searchIndex : href.length),
-    hash: hashIndex > -1 ? href.substring(hashIndex) : '',
-    search: searchIndex > -1 ? href.slice(searchIndex, hashIndex === -1 ? undefined : hashIndex) : '',
-    state: state || {}
-  };
-}
-
-// Thanks co-pilot!
-function createRandomKey() {
-  return (Math.random() + 1).toString(36).substring(7);
-}
-
-exports.createBrowserHistory = createBrowserHistory;
-exports.createHashHistory = createHashHistory;
-exports.createMemoryHistory = createMemoryHistory;
-//# sourceMappingURL=history.js.map

package/build/cjs/history.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"history.js","sources":["../../src/history.ts"],"sourcesContent":["// While the public API was clearly inspired by the \"history\" npm package,\n// This implementation attempts to be more lightweight by\n// making assumptions about the way TanStack Router works\n\nexport interface RouterHistory {\n  location: HistoryLocation\n  subscribe: (cb: () => void) => () => void\n  push: (path: string, state?: any) => void\n  replace: (path: string, state?: any) => void\n  go: (index: number) => void\n  back: () => void\n  forward: () => void\n  createHref: (href: string) => string\n  block: (blockerFn: BlockerFn) => () => void\n}\n\nexport interface HistoryLocation extends ParsedPath {\n  state: HistoryState\n}\n\nexport interface ParsedPath {\n  href: string\n  pathname: string\n  search: string\n  hash: string\n}\n\nexport interface HistoryState {\n  key: string\n  __tempLocation?: HistoryLocation\n  __tempKey?: string\n}\n\ntype BlockerFn = (retry: () => void, cancel: () => void) => void\n\nconst pushStateEvent = 'pushstate'\nconst popStateEvent = 'popstate'\nconst beforeUnloadEvent = 'beforeunload'\n\nconst beforeUnloadListener = (event: Event) => {\n  event.preventDefault()\n  // @ts-ignore\n  return (event.returnValue = '')\n}\n\nconst stopBlocking = () => {\n  removeEventListener(beforeUnloadEvent, beforeUnloadListener, {\n    capture: true,\n  })\n}\n\nfunction createHistory(opts: {\n  getLocation: () => HistoryLocation\n  subscriber: false | ((onUpdate: () => void) => () => void)\n  pushState: (path: string, state: any) => void\n  replaceState: (path: string, state: any) => void\n  go: (n: number) => void\n  back: () => void\n  forward: () => void\n  createHref: (path: string) => string\n}): RouterHistory {\n  let location = opts.getLocation()\n  let unsub = () => {}\n  let subscribers = new Set<() => void>()\n  let blockers: BlockerFn[] = []\n  let queue: (() => void)[] = []\n\n  const tryFlush = () => {\n    if (blockers.length) {\n      blockers[0]?.(tryFlush, () => {\n        blockers = []\n        stopBlocking()\n      })\n      return\n    }\n\n    while (queue.length) {\n      queue.shift()?.()\n    }\n\n    if (!opts.subscriber) {\n      onUpdate()\n    }\n  }\n\n  const queueTask = (task: () => void) => {\n    queue.push(task)\n    tryFlush()\n  }\n\n  const onUpdate = () => {\n    location = opts.getLocation()\n    subscribers.forEach((subscriber) => subscriber())\n  }\n\n  return {\n    get location() {\n      return location\n    },\n    subscribe: (cb: () => void) => {\n      if (subscribers.size === 0) {\n        unsub =\n          typeof opts.subscriber === 'function'\n            ? opts.subscriber(onUpdate)\n            : () => {}\n      }\n      subscribers.add(cb)\n\n      return () => {\n        subscribers.delete(cb)\n        if (subscribers.size === 0) {\n          unsub()\n        }\n      }\n    },\n    push: (path: string, state: any) => {\n      assignKey(state)\n      queueTask(() => {\n        opts.pushState(path, state)\n      })\n    },\n    replace: (path: string, state: any) => {\n      assignKey(state)\n      queueTask(() => {\n        opts.replaceState(path, state)\n      })\n    },\n    go: (index) => {\n      queueTask(() => {\n        opts.go(index)\n      })\n    },\n    back: () => {\n      queueTask(() => {\n        opts.back()\n      })\n    },\n    forward: () => {\n      queueTask(() => {\n        opts.forward()\n      })\n    },\n    createHref: (str) => opts.createHref(str),\n    block: (cb) => {\n      blockers.push(cb)\n\n      if (blockers.length === 1) {\n        addEventListener(beforeUnloadEvent, beforeUnloadListener, {\n          capture: true,\n        })\n      }\n\n      return () => {\n        blockers = blockers.filter((b) => b !== cb)\n\n        if (!blockers.length) {\n          stopBlocking()\n        }\n      }\n    },\n  }\n}\n\nfunction assignKey(state: HistoryState) {\n  state.key = createRandomKey()\n  // if (state.__actualLocation) {\n  //   state.__actualLocation.state = {\n  //     ...state.__actualLocation.state,\n  //     key,\n  //   }\n  // }\n}\n\nexport function createBrowserHistory(opts?: {\n  getHref?: () => string\n  createHref?: (path: string) => string\n}): RouterHistory {\n  const getHref =\n    opts?.getHref ??\n    (() =>\n      `${window.location.pathname}${window.location.search}${window.location.hash}`)\n\n  const createHref = opts?.createHref ?? ((path) => path)\n\n  const getLocation = () => parseLocation(getHref(), window.history.state)\n\n  return createHistory({\n    getLocation,\n    subscriber: (onUpdate) => {\n      window.addEventListener(pushStateEvent, onUpdate)\n      window.addEventListener(popStateEvent, onUpdate)\n\n      var pushState = window.history.pushState\n      window.history.pushState = function () {\n        let res = pushState.apply(history, arguments as any)\n        onUpdate()\n        return res\n      }\n      var replaceState = window.history.replaceState\n      window.history.replaceState = function () {\n        let res = replaceState.apply(history, arguments as any)\n        onUpdate()\n        return res\n      }\n\n      return () => {\n        window.history.pushState = pushState\n        window.history.replaceState = replaceState\n        window.removeEventListener(pushStateEvent, onUpdate)\n        window.removeEventListener(popStateEvent, onUpdate)\n      }\n    },\n    pushState: (path, state) => {\n      window.history.pushState(state, '', createHref(path))\n    },\n    replaceState: (path, state) => {\n      window.history.replaceState(state, '', createHref(path))\n    },\n    back: () => window.history.back(),\n    forward: () => window.history.forward(),\n    go: (n) => window.history.go(n),\n    createHref: (path) => createHref(path),\n  })\n}\n\nexport function createHashHistory(): RouterHistory {\n  return createBrowserHistory({\n    getHref: () => window.location.hash.substring(1),\n    createHref: (path) => `#${path}`,\n  })\n}\n\nexport function createMemoryHistory(\n  opts: {\n    initialEntries: string[]\n    initialIndex?: number\n  } = {\n    initialEntries: ['/'],\n  },\n): RouterHistory {\n  const entries = opts.initialEntries\n  let index = opts.initialIndex ?? entries.length - 1\n  let currentState = {\n    key: createRandomKey(),\n  } as HistoryState\n\n  const getLocation = () => parseLocation(entries[index]!, currentState)\n\n  return createHistory({\n    getLocation,\n    subscriber: false,\n    pushState: (path, state) => {\n      currentState = state\n      entries.push(path)\n      index++\n    },\n    replaceState: (path, state) => {\n      currentState = state\n      entries[index] = path\n    },\n    back: () => {\n      index--\n    },\n    forward: () => {\n      index = Math.min(index + 1, entries.length - 1)\n    },\n    go: (n) => window.history.go(n),\n    createHref: (path) => path,\n  })\n}\n\nfunction parseLocation(href: string, state: HistoryState): HistoryLocation {\n  let hashIndex = href.indexOf('#')\n  let searchIndex = href.indexOf('?')\n\n  return {\n    href,\n    pathname: href.substring(\n      0,\n      hashIndex > 0\n        ? searchIndex > 0\n          ? Math.min(hashIndex, searchIndex)\n          : hashIndex\n        : searchIndex > 0\n        ? searchIndex\n        : href.length,\n    ),\n    hash: hashIndex > -1 ? href.substring(hashIndex) : '',\n    search:\n      searchIndex > -1\n        ? href.slice(searchIndex, hashIndex === -1 ? undefined : hashIndex)\n        : '',\n    state: state || {},\n  }\n}\n\n// Thanks co-pilot!\nfunction createRandomKey() {\n  return (Math.random() + 1).toString(36).substring(7)\n}\n"],"names":["pushStateEvent","popStateEvent","beforeUnloadEvent","beforeUnloadListener","event","preventDefault","returnValue","stopBlocking","removeEventListener","capture","createHistory","opts","location","getLocation","unsub","subscribers","Set","blockers","queue","tryFlush","length","shift","subscriber","onUpdate","queueTask","task","push","forEach","subscribe","cb","size","add","delete","path","state","assignKey","pushState","replace","replaceState","go","index","back","forward","createHref","str","block","addEventListener","filter","b","key","createRandomKey","createBrowserHistory","getHref","window","pathname","search","hash","parseLocation","history","res","apply","arguments","n","createHashHistory","substring","createMemoryHistory","initialEntries","entries","initialIndex","currentState","Math","min","href","hashIndex","indexOf","searchIndex","slice","undefined","random","toString"],"mappings":"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"}

package/build/types/history.d.ts

@@ -1,36 +0,0 @@
-export interface RouterHistory {
-    location: HistoryLocation;
-    subscribe: (cb: () => void) => () => void;
-    push: (path: string, state?: any) => void;
-    replace: (path: string, state?: any) => void;
-    go: (index: number) => void;
-    back: () => void;
-    forward: () => void;
-    createHref: (href: string) => string;
-    block: (blockerFn: BlockerFn) => () => void;
-}
-export interface HistoryLocation extends ParsedPath {
-    state: HistoryState;
-}
-export interface ParsedPath {
-    href: string;
-    pathname: string;
-    search: string;
-    hash: string;
-}
-export interface HistoryState {
-    key: string;
-    __tempLocation?: HistoryLocation;
-    __tempKey?: string;
-}
-type BlockerFn = (retry: () => void, cancel: () => void) => void;
-export declare function createBrowserHistory(opts?: {
-    getHref?: () => string;
-    createHref?: (path: string) => string;
-}): RouterHistory;
-export declare function createHashHistory(): RouterHistory;
-export declare function createMemoryHistory(opts?: {
-    initialEntries: string[];
-    initialIndex?: number;
-}): RouterHistory;
-export {};