@tanstack/router-core 0.0.1-beta.16 → 0.0.1-beta.161

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Tanner Linsley
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/build/cjs/fileRoute.js

@@ -0,0 +1,29 @@
+/**
+ * @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 });
+
+var route = require('./route.js');
+
+class FileRoute {
+  constructor(path) {
+    this.path = path;
+  }
+  createRoute = options => {
+    const route$1 = new route.Route(options);
+    route$1.isRoot = false;
+    return route$1;
+  };
+}
+
+exports.FileRoute = FileRoute;
+//# sourceMappingURL=fileRoute.js.map

package/build/cjs/fileRoute.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fileRoute.js","sources":["../../src/fileRoute.ts"],"sourcesContent":["import { ParsePathParams } from './link'\nimport {\n  AnyRoute,\n  ResolveFullPath,\n  AnySearchSchema,\n  ResolveFullSearchSchema,\n  MergeParamsFromParent,\n  RouteContext,\n  AnyContext,\n  RouteOptions,\n  InferFullSearchSchema,\n  UpdatableRouteOptions,\n  Route,\n  AnyPathParams,\n  RootRouteId,\n  TrimPathLeft,\n  RouteConstraints,\n} from './route'\n\nexport interface FileRoutesByPath {\n  // '/': {\n  //   parentRoute: typeof rootRoute\n  // }\n}\n\ntype Replace<\n  S extends string,\n  From extends string,\n  To extends string,\n> = S extends `${infer Start}${From}${infer Rest}`\n  ? `${Start}${To}${Replace<Rest, From, To>}`\n  : S\n\nexport type TrimLeft<\n  T extends string,\n  S extends string,\n> = T extends `${S}${infer U}` ? U : T\n\nexport type TrimRight<\n  T extends string,\n  S extends string,\n> = T extends `${infer U}${S}` ? U : T\n\nexport type Trim<T extends string, S extends string> = TrimLeft<\n  TrimRight<T, S>,\n  S\n>\n\nexport type RemoveUnderScores<T extends string> = Replace<\n  Replace<TrimRight<TrimLeft<T, '/_'>, '_'>, '_/', '/'>,\n  '/_',\n  '/'\n>\n\nexport type ResolveFilePath<\n  TParentRoute extends AnyRoute,\n  TFilePath extends string,\n> = TParentRoute['id'] extends RootRouteId\n  ? TrimPathLeft<TFilePath>\n  : Replace<\n      TrimPathLeft<TFilePath>,\n      TrimPathLeft<TParentRoute['__types']['customId']>,\n      ''\n    >\n\nexport type FileRoutePath<\n  TParentRoute extends AnyRoute,\n  TFilePath extends string,\n> = ResolveFilePath<TParentRoute, TFilePath> extends `_${infer _}`\n  ? string\n  : ResolveFilePath<TParentRoute, TFilePath>\n\nexport class FileRoute<\n  TFilePath extends keyof FileRoutesByPath,\n  TParentRoute extends AnyRoute = FileRoutesByPath[TFilePath]['parentRoute'],\n  TId extends RouteConstraints['TId'] = TFilePath,\n  TPath extends RouteConstraints['TPath'] = FileRoutePath<\n    TParentRoute,\n    TFilePath\n  >,\n  TFullPath extends RouteConstraints['TFullPath'] = ResolveFullPath<\n    TParentRoute,\n    RemoveUnderScores<TPath>\n  >,\n> {\n  constructor(public path: TFilePath) {}\n\n  createRoute = <\n    TLoader = unknown,\n    TSearchSchema extends RouteConstraints['TSearchSchema'] = {},\n    TFullSearchSchema extends RouteConstraints['TFullSearchSchema'] = ResolveFullSearchSchema<\n      TParentRoute,\n      TSearchSchema\n    >,\n    TParams extends RouteConstraints['TParams'] = ParsePathParams<TPath> extends never\n      ? AnyPathParams\n      : Record<ParsePathParams<TPath>, RouteConstraints['TPath']>,\n    TAllParams extends RouteConstraints['TAllParams'] = MergeParamsFromParent<\n      TParentRoute['__types']['allParams'],\n      TParams\n    >,\n    TParentContext extends RouteConstraints['TParentContext'] = TParentRoute['__types']['routeContext'],\n    TAllParentContext extends RouteConstraints['TId'] = TParentRoute['__types']['context'],\n    TRouteContext extends RouteConstraints['TRouteContext'] = RouteContext,\n    TContext extends RouteConstraints['TAllContext'] = MergeParamsFromParent<\n      TParentRoute['__types']['context'],\n      TRouteContext\n    >,\n    TRouterContext extends RouteConstraints['TRouterContext'] = AnyContext,\n    TChildren extends RouteConstraints['TChildren'] = unknown,\n    TRouteTree extends RouteConstraints['TRouteTree'] = AnyRoute,\n  >(\n    options: Omit<\n      RouteOptions<\n        TParentRoute,\n        string,\n        string,\n        TLoader,\n        InferFullSearchSchema<TParentRoute>,\n        TSearchSchema,\n        TFullSearchSchema,\n        TParams,\n        TAllParams,\n        TParentContext,\n        TAllParentContext,\n        TRouteContext,\n        TContext\n      >,\n      'getParentRoute' | 'path' | 'id'\n    > &\n      UpdatableRouteOptions<\n        TLoader,\n        TSearchSchema,\n        TFullSearchSchema,\n        TAllParams,\n        TRouteContext,\n        TContext\n      >,\n  ): Route<\n    TParentRoute,\n    TPath,\n    TFullPath,\n    TFilePath,\n    TId,\n    TLoader,\n    TSearchSchema,\n    TFullSearchSchema,\n    TParams,\n    TAllParams,\n    TParentContext,\n    TAllParentContext,\n    TRouteContext,\n    TContext,\n    TRouterContext,\n    TChildren,\n    TRouteTree\n  > => {\n    const route = new Route(options as any)\n    ;(route as any).isRoot = false\n    return route as any\n  }\n}\n"],"names":["FileRoute","constructor","path","createRoute","options","route","Route","isRoot"],"mappings":";;;;;;;;;;;;;;;;AAwEO,MAAMA,SAAS,CAYpB;EACAC,WAAWA,CAAQC,IAAe,EAAE;IAAA,IAAjBA,CAAAA,IAAe,GAAfA,IAAe,CAAA;AAAG,GAAA;EAErCC,WAAW,GAyBTC,OAyBG,IAmBA;AACH,IAAA,MAAMC,OAAK,GAAG,IAAIC,WAAK,CAACF,OAAc,CAAC,CAAA;IACrCC,OAAK,CAASE,MAAM,GAAG,KAAK,CAAA;AAC9B,IAAA,OAAOF,OAAK,CAAA;GACb,CAAA;AACH;;;;"}

package/build/cjs/history.js

@@ -0,0 +1,226 @@
+/**
+ * @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 listeners = new Set();
+  let blockers = [];
+  let queue = [];
+  const tryFlush = () => {
+    if (blockers.length) {
+      blockers[0]?.(tryFlush, () => {
+        blockers = [];
+        stopBlocking();
+      });
+      return;
+    }
+    while (queue.length) {
+      queue.shift()?.();
+    }
+    if (!opts.listener) {
+      onUpdate();
+    }
+  };
+  const queueTask = task => {
+    queue.push(task);
+    tryFlush();
+  };
+  const onUpdate = () => {
+    location = opts.getLocation();
+    listeners.forEach(listener => listener());
+  };
+  return {
+    get location() {
+      return location;
+    },
+    listen: cb => {
+      if (listeners.size === 0) {
+        unsub = typeof opts.listener === 'function' ? opts.listener(onUpdate) : () => {};
+      }
+      listeners.add(cb);
+      return () => {
+        listeners.delete(cb);
+        if (listeners.size === 0) {
+          unsub();
+        }
+      };
+    },
+    push: (path, state) => {
+      queueTask(() => {
+        opts.pushState(path, state);
+      });
+    },
+    replace: (path, 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 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(), history.state);
+  return createHistory({
+    getLocation,
+    listener: 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,
+        key: createRandomKey()
+      }, '', createHref(path));
+    },
+    replaceState: (path, state) => {
+      window.history.replaceState({
+        ...state,
+        key: createRandomKey()
+      }, '', 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 = {};
+  const getLocation = () => parseLocation(entries[index], currentState);
+  return createHistory({
+    getLocation,
+    listener: false,
+    pushState: (path, state) => {
+      currentState = {
+        ...state,
+        key: createRandomKey()
+      };
+      entries.push(path);
+      index++;
+    },
+    replaceState: (path, state) => {
+      currentState = {
+        ...state,
+        key: createRandomKey()
+      };
+      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
+  };
+}
+
+// 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

@@ -0,0 +1 @@
+{"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: RouterLocation\n  listen: (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 ParsedPath {\n  href: string\n  pathname: string\n  search: string\n  hash: string\n}\n\nexport interface RouterLocation extends ParsedPath {\n  state: any\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: () => RouterLocation\n  listener: 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 listeners = 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.listener) {\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    listeners.forEach((listener) => listener())\n  }\n\n  return {\n    get location() {\n      return location\n    },\n    listen: (cb: () => void) => {\n      if (listeners.size === 0) {\n        unsub =\n          typeof opts.listener === 'function'\n            ? opts.listener(onUpdate)\n            : () => {}\n      }\n      listeners.add(cb)\n\n      return () => {\n        listeners.delete(cb)\n        if (listeners.size === 0) {\n          unsub()\n        }\n      }\n    },\n    push: (path: string, state: any) => {\n      queueTask(() => {\n        opts.pushState(path, state)\n      })\n    },\n    replace: (path: string, state: any) => {\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\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  const createHref = opts?.createHref ?? ((path) => path)\n  const getLocation = () => parseLocation(getHref(), history.state)\n\n  return createHistory({\n    getLocation,\n    listener: (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(\n        { ...state, key: createRandomKey() },\n        '',\n        createHref(path),\n      )\n    },\n    replaceState: (path, state) => {\n      window.history.replaceState(\n        { ...state, key: createRandomKey() },\n        '',\n        createHref(path),\n      )\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\n  const getLocation = () => parseLocation(entries[index]!, currentState)\n\n  return createHistory({\n    getLocation,\n    listener: false,\n    pushState: (path, state) => {\n      currentState = {\n        ...state,\n        key: createRandomKey(),\n      }\n      entries.push(path)\n      index++\n    },\n    replaceState: (path, state) => {\n      currentState = {\n        ...state,\n        key: createRandomKey(),\n      }\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: any): RouterLocation {\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,\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","listeners","Set","blockers","queue","tryFlush","length","shift","listener","onUpdate","queueTask","task","push","forEach","listen","cb","size","add","delete","path","state","pushState","replace","replaceState","go","index","back","forward","createHref","str","block","addEventListener","filter","b","createBrowserHistory","getHref","window","pathname","search","hash","parseLocation","history","res","apply","arguments","key","createRandomKey","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/cjs/index.js

@@ -0,0 +1,78 @@
+/**
+ * @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 });
+
+var invariant = require('tiny-invariant');
+var tinyWarning = require('tiny-warning');
+var history = require('./history.js');
+var path = require('./path.js');
+var qss = require('./qss.js');
+var route = require('./route.js');
+var fileRoute = require('./fileRoute.js');
+var router = require('./router.js');
+var searchParams = require('./searchParams.js');
+var utils = require('./utils.js');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var invariant__default = /*#__PURE__*/_interopDefaultLegacy(invariant);
+var tinyWarning__default = /*#__PURE__*/_interopDefaultLegacy(tinyWarning);
+
+
+
+Object.defineProperty(exports, 'invariant', {
+	enumerable: true,
+	get: function () { return invariant__default["default"]; }
+});
+Object.defineProperty(exports, 'warning', {
+	enumerable: true,
+	get: function () { return tinyWarning__default["default"]; }
+});
+exports.createBrowserHistory = history.createBrowserHistory;
+exports.createHashHistory = history.createHashHistory;
+exports.createMemoryHistory = history.createMemoryHistory;
+exports.cleanPath = path.cleanPath;
+exports.interpolatePath = path.interpolatePath;
+exports.joinPaths = path.joinPaths;
+exports.matchByPath = path.matchByPath;
+exports.matchPathname = path.matchPathname;
+exports.parsePathname = path.parsePathname;
+exports.resolvePath = path.resolvePath;
+exports.trimPath = path.trimPath;
+exports.trimPathLeft = path.trimPathLeft;
+exports.trimPathRight = path.trimPathRight;
+exports.decode = qss.decode;
+exports.encode = qss.encode;
+exports.RootRoute = route.RootRoute;
+exports.Route = route.Route;
+exports.RouterContext = route.RouterContext;
+exports.rootRouteId = route.rootRouteId;
+exports.FileRoute = fileRoute.FileRoute;
+exports.PathParamError = router.PathParamError;
+exports.Router = router.Router;
+exports.SearchParamError = router.SearchParamError;
+exports.componentTypes = router.componentTypes;
+exports.isRedirect = router.isRedirect;
+exports.lazyFn = router.lazyFn;
+exports.redirect = router.redirect;
+exports.defaultParseSearch = searchParams.defaultParseSearch;
+exports.defaultStringifySearch = searchParams.defaultStringifySearch;
+exports.parseSearchWith = searchParams.parseSearchWith;
+exports.stringifySearchWith = searchParams.stringifySearchWith;
+exports.functionalUpdate = utils.functionalUpdate;
+exports.isPlainObject = utils.isPlainObject;
+exports.last = utils.last;
+exports.partialDeepEqual = utils.partialDeepEqual;
+exports.pick = utils.pick;
+exports.replaceEqualDeep = utils.replaceEqualDeep;
+//# sourceMappingURL=index.js.map

package/build/cjs/{packages/router-core/src/index.js.map → index.js.map}

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/build/cjs/{packages/router-core/src/path.js → path.js}

@@ -1,5 +1,5 @@
 /**
- * router-core
+ * @tanstack/router-core/src/index.ts
  *
  * Copyright (c) TanStack
  *
@@ -31,8 +31,8 @@ function trimPath(path) {
   return trimPathRight(trimPathLeft(path));
 }
 function resolvePath(basepath, base, to) {
-  base = base.replace(new RegExp("^" + basepath), '/');
-  to = to.replace(new RegExp("^" + basepath), '/');
+  base = base.replace(new RegExp(`^${basepath}`), '/');
+  to = to.replace(new RegExp(`^${basepath}`), '/');
   let baseSegments = parsePathname(base);
   const toSegments = parsePathname(to);
   toSegments.forEach((toSegment, index) => {
@@ -45,13 +45,10 @@ function resolvePath(basepath, base, to) {
         baseSegments.push(toSegment);
       } else ;
     } else if (toSegment.value === '..') {
-      var _last;
-
       // Extra trailing slash? pop it off
-      if (baseSegments.length > 1 && ((_last = utils.last(baseSegments)) == null ? void 0 : _last.value) === '/') {
+      if (baseSegments.length > 1 && utils.last(baseSegments)?.value === '/') {
         baseSegments.pop();
       }
-
       baseSegments.pop();
     } else if (toSegment.value === '.') {
       return;
@@ -66,10 +63,8 @@ function parsePathname(pathname) {
   if (!pathname) {
     return [];
   }
-
   pathname = cleanPath(pathname);
   const segments = [];
-
   if (pathname.slice(0, 1) === '/') {
     pathname = pathname.substring(1);
     segments.push({
@@ -77,34 +72,30 @@ function parsePathname(pathname) {
       value: '/'
     });
   }
-
   if (!pathname) {
     return segments;
-  } // Remove empty segments and '.' segments
-
+  }
 
+  // Remove empty segments and '.' segments
   const split = pathname.split('/').filter(Boolean);
   segments.push(...split.map(part => {
-    if (part.startsWith('*')) {
+    if (part === '$' || part === '*') {
       return {
         type: 'wildcard',
         value: part
       };
     }
-
-    if (part.charAt(0) === ':') {
+    if (part.charAt(0) === '$') {
       return {
         type: 'param',
         value: part
       };
     }
-
     return {
       type: 'pathname',
       value: part
     };
   }));
-
   if (pathname.slice(-1) === '/') {
     pathname = pathname.substring(1);
     segments.push({
@@ -112,66 +103,70 @@ function parsePathname(pathname) {
       value: '/'
     });
   }
-
   return segments;
 }
-function interpolatePath(path, params, leaveWildcard) {
+function interpolatePath(path, params, leaveWildcards = false) {
   const interpolatedPathSegments = parsePathname(path);
   return joinPaths(interpolatedPathSegments.map(segment => {
-    if (segment.value === '*' && !leaveWildcard) {
-      return '';
+    if (segment.type === 'wildcard') {
+      const value = params[segment.value];
+      if (leaveWildcards) return `${segment.value}${value ?? ''}`;
+      return value;
     }
-
     if (segment.type === 'param') {
-      var _segment$value$substr;
-
-      return (_segment$value$substr = params[segment.value.substring(1)]) != null ? _segment$value$substr : '';
+      return params[segment.value.substring(1)] ?? '';
     }
-
     return segment.value;
   }));
 }
-function matchPathname(currentPathname, matchLocation) {
-  const pathParams = matchByPath(currentPathname, matchLocation); // const searchMatched = matchBySearch(currentLocation.search, matchLocation)
+function matchPathname(basepath, currentPathname, matchLocation) {
+  const pathParams = matchByPath(basepath, currentPathname, matchLocation);
+  // const searchMatched = matchBySearch(location.search, matchLocation)
 
   if (matchLocation.to && !pathParams) {
     return;
-  } // if (matchLocation.search && !searchMatched) {
-  //   return
-  // }
-
-
-  return pathParams != null ? pathParams : {};
+  }
+  return pathParams ?? {};
 }
-function matchByPath(from, matchLocation) {
-  var _matchLocation$to;
-
+function matchByPath(basepath, from, matchLocation) {
+  // Remove the base path from the pathname
+  from = basepath != '/' ? from.substring(basepath.length) : from;
+  // Default to to $ (wildcard)
+  const to = `${matchLocation.to ?? '$'}`;
+  // Parse the from and to
   const baseSegments = parsePathname(from);
-  const routeSegments = parsePathname("" + ((_matchLocation$to = matchLocation.to) != null ? _matchLocation$to : '*'));
+  const routeSegments = parsePathname(to);
+  if (!from.startsWith('/')) {
+    baseSegments.unshift({
+      type: 'pathname',
+      value: '/'
+    });
+  }
+  if (!to.startsWith('/')) {
+    routeSegments.unshift({
+      type: 'pathname',
+      value: '/'
+    });
+  }
   const params = {};
-
   let isMatch = (() => {
     for (let i = 0; i < Math.max(baseSegments.length, routeSegments.length); i++) {
       const baseSegment = baseSegments[i];
       const routeSegment = routeSegments[i];
-      const isLastRouteSegment = i === routeSegments.length - 1;
-      const isLastBaseSegment = i === baseSegments.length - 1;
-
+      const isLastBaseSegment = i >= baseSegments.length - 1;
+      const isLastRouteSegment = i >= routeSegments.length - 1;
       if (routeSegment) {
         if (routeSegment.type === 'wildcard') {
-          if (baseSegment != null && baseSegment.value) {
+          if (baseSegment?.value) {
             params['*'] = joinPaths(baseSegments.slice(i).map(d => d.value));
             return true;
           }
-
           return false;
         }
-
         if (routeSegment.type === 'pathname') {
-          if (routeSegment.value === '/' && !(baseSegment != null && baseSegment.value)) {
+          if (routeSegment.value === '/' && !baseSegment?.value) {
             return true;
           }
-
           if (baseSegment) {
             if (matchLocation.caseSensitive) {
               if (routeSegment.value !== baseSegment.value) {
@@ -182,30 +177,24 @@ function matchByPath(from, matchLocation) {
             }
           }
         }
-
         if (!baseSegment) {
           return false;
         }
-
         if (routeSegment.type === 'param') {
-          if ((baseSegment == null ? void 0 : baseSegment.value) === '/') {
+          if (baseSegment?.value === '/') {
             return false;
           }
-
-          if (!baseSegment.value.startsWith(':')) {
+          if (baseSegment.value.charAt(0) !== '$') {
             params[routeSegment.value.substring(1)] = baseSegment.value;
           }
         }
       }
-
-      if (isLastRouteSegment && !isLastBaseSegment) {
+      if (!isLastBaseSegment && isLastRouteSegment) {
         return !!matchLocation.fuzzy;
       }
     }
-
     return true;
   })();
-
   return isMatch ? params : undefined;
 }
 

package/build/cjs/path.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"path.js","sources":["../../src/path.ts"],"sourcesContent":["import { AnyPathParams } from './route'\nimport { MatchLocation } from './router'\nimport { last } from './utils'\n\nexport interface Segment {\n  type: 'pathname' | 'param' | 'wildcard'\n  value: string\n}\n\nexport function joinPaths(paths: (string | undefined)[]) {\n  return cleanPath(paths.filter(Boolean).join('/'))\n}\n\nexport function cleanPath(path: string) {\n  // remove double slashes\n  return path.replace(/\\/{2,}/g, '/')\n}\n\nexport function trimPathLeft(path: string) {\n  return path === '/' ? path : path.replace(/^\\/{1,}/, '')\n}\n\nexport function trimPathRight(path: string) {\n  return path === '/' ? path : path.replace(/\\/{1,}$/, '')\n}\n\nexport function trimPath(path: string) {\n  return trimPathRight(trimPathLeft(path))\n}\n\nexport function resolvePath(basepath: string, base: string, to: string) {\n  base = base.replace(new RegExp(`^${basepath}`), '/')\n  to = to.replace(new RegExp(`^${basepath}`), '/')\n\n  let baseSegments = parsePathname(base)\n  const toSegments = parsePathname(to)\n\n  toSegments.forEach((toSegment, index) => {\n    if (toSegment.value === '/') {\n      if (!index) {\n        // Leading slash\n        baseSegments = [toSegment]\n      } else if (index === toSegments.length - 1) {\n        // Trailing Slash\n        baseSegments.push(toSegment)\n      } else {\n        // ignore inter-slashes\n      }\n    } else if (toSegment.value === '..') {\n      // Extra trailing slash? pop it off\n      if (baseSegments.length > 1 && last(baseSegments)?.value === '/') {\n        baseSegments.pop()\n      }\n      baseSegments.pop()\n    } else if (toSegment.value === '.') {\n      return\n    } else {\n      baseSegments.push(toSegment)\n    }\n  })\n\n  const joined = joinPaths([basepath, ...baseSegments.map((d) => d.value)])\n\n  return cleanPath(joined)\n}\n\nexport function parsePathname(pathname?: string): Segment[] {\n  if (!pathname) {\n    return []\n  }\n\n  pathname = cleanPath(pathname)\n\n  const segments: Segment[] = []\n\n  if (pathname.slice(0, 1) === '/') {\n    pathname = pathname.substring(1)\n    segments.push({\n      type: 'pathname',\n      value: '/',\n    })\n  }\n\n  if (!pathname) {\n    return segments\n  }\n\n  // Remove empty segments and '.' segments\n  const split = pathname.split('/').filter(Boolean)\n\n  segments.push(\n    ...split.map((part): Segment => {\n      if (part === '$' || part === '*') {\n        return {\n          type: 'wildcard',\n          value: part,\n        }\n      }\n\n      if (part.charAt(0) === '$') {\n        return {\n          type: 'param',\n          value: part,\n        }\n      }\n\n      return {\n        type: 'pathname',\n        value: part,\n      }\n    }),\n  )\n\n  if (pathname.slice(-1) === '/') {\n    pathname = pathname.substring(1)\n    segments.push({\n      type: 'pathname',\n      value: '/',\n    })\n  }\n\n  return segments\n}\n\nexport function interpolatePath(\n  path: string | undefined,\n  params: any,\n  leaveWildcards: boolean = false,\n) {\n  const interpolatedPathSegments = parsePathname(path)\n\n  return joinPaths(\n    interpolatedPathSegments.map((segment) => {\n      if (segment.type === 'wildcard') {\n        const value = params[segment.value]\n        if (leaveWildcards) return `${segment.value}${value ?? ''}`\n        return value\n      }\n\n      if (segment.type === 'param') {\n        return params![segment.value.substring(1)] ?? ''\n      }\n\n      return segment.value\n    }),\n  )\n}\n\nexport function matchPathname(\n  basepath: string,\n  currentPathname: string,\n  matchLocation: Pick<MatchLocation, 'to' | 'fuzzy' | 'caseSensitive'>,\n): AnyPathParams | undefined {\n  const pathParams = matchByPath(basepath, currentPathname, matchLocation)\n  // const searchMatched = matchBySearch(location.search, matchLocation)\n\n  if (matchLocation.to && !pathParams) {\n    return\n  }\n\n  return pathParams ?? {}\n}\n\nexport function matchByPath(\n  basepath: string,\n  from: string,\n  matchLocation: Pick<MatchLocation, 'to' | 'caseSensitive' | 'fuzzy'>,\n): Record<string, string> | undefined {\n  // Remove the base path from the pathname\n  from = basepath != '/' ? from.substring(basepath.length) : from\n  // Default to to $ (wildcard)\n  const to = `${matchLocation.to ?? '$'}`\n  // Parse the from and to\n  const baseSegments = parsePathname(from)\n  const routeSegments = parsePathname(to)\n\n  if (!from.startsWith('/')) {\n    baseSegments.unshift({\n      type: 'pathname',\n      value: '/',\n    })\n  }\n\n  if (!to.startsWith('/')) {\n    routeSegments.unshift({\n      type: 'pathname',\n      value: '/',\n    })\n  }\n\n  const params: Record<string, string> = {}\n\n  let isMatch = (() => {\n    for (\n      let i = 0;\n      i < Math.max(baseSegments.length, routeSegments.length);\n      i++\n    ) {\n      const baseSegment = baseSegments[i]\n      const routeSegment = routeSegments[i]\n\n      const isLastBaseSegment = i >= baseSegments.length - 1\n      const isLastRouteSegment = i >= routeSegments.length - 1\n\n      if (routeSegment) {\n        if (routeSegment.type === 'wildcard') {\n          if (baseSegment?.value) {\n            params['*'] = joinPaths(baseSegments.slice(i).map((d) => d.value))\n            return true\n          }\n          return false\n        }\n\n        if (routeSegment.type === 'pathname') {\n          if (routeSegment.value === '/' && !baseSegment?.value) {\n            return true\n          }\n\n          if (baseSegment) {\n            if (matchLocation.caseSensitive) {\n              if (routeSegment.value !== baseSegment.value) {\n                return false\n              }\n            } else if (\n              routeSegment.value.toLowerCase() !==\n              baseSegment.value.toLowerCase()\n            ) {\n              return false\n            }\n          }\n        }\n\n        if (!baseSegment) {\n          return false\n        }\n\n        if (routeSegment.type === 'param') {\n          if (baseSegment?.value === '/') {\n            return false\n          }\n          if (baseSegment.value.charAt(0) !== '$') {\n            params[routeSegment.value.substring(1)] = baseSegment.value\n          }\n        }\n      }\n\n      if (!isLastBaseSegment && isLastRouteSegment) {\n        return !!matchLocation.fuzzy\n      }\n    }\n\n    return true\n  })()\n\n  return isMatch ? (params as Record<string, string>) : undefined\n}\n"],"names":["joinPaths","paths","cleanPath","filter","Boolean","join","path","replace","trimPathLeft","trimPathRight","trimPath","resolvePath","basepath","base","to","RegExp","baseSegments","parsePathname","toSegments","forEach","toSegment","index","value","length","push","last","pop","joined","map","d","pathname","segments","slice","substring","type","split","part","charAt","interpolatePath","params","leaveWildcards","interpolatedPathSegments","segment","matchPathname","currentPathname","matchLocation","pathParams","matchByPath","from","routeSegments","startsWith","unshift","isMatch","i","Math","max","baseSegment","routeSegment","isLastBaseSegment","isLastRouteSegment","caseSensitive","toLowerCase","fuzzy","undefined"],"mappings":"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"}