@devp0nt/route0 1.0.0-next.73 → 1.0.0-next.75

package/dist/cjs/index.d.cts

@@ -28,6 +28,16 @@ declare class Route0<TDefinition extends string, TSearchInput extends UnknownSea
     readonly params: _ParamsDefinition<TDefinition>;
     private _origin;
     private _callable;
+    private _regexBaseStrictString?;
+    private _regexBaseString?;
+    private _regexStrictString?;
+    private _regexString?;
+    private _regexStrict?;
+    private _regex?;
+    private _regexAncestor?;
+    private _captureKeys?;
+    private _normalizedDefinition?;
+    private _definitionParts?;
     Infer: {
         ParamsDefinition: _ParamsDefinition<TDefinition>;
         ParamsInput: _ParamsInput<TDefinition>;
@@ -63,12 +73,18 @@ declare class Route0<TDefinition extends string, TSearchInput extends UnknownSea
     getTokens(): RouteToken[];
     /** Clones route with optional config override. */
     clone(config?: RouteConfigInput): CallableRoute<TDefinition>;
-    getRegexBaseStrictString(): string;
-    getRegexBaseString(): string;
-    getRegexStrictString(): string;
-    getRegexString(): string;
-    getRegexStrict(): RegExp;
-    getRegex(): RegExp;
+    get regexBaseStrictString(): string;
+    get regexBaseString(): string;
+    get regexStrictString(): string;
+    get regexString(): string;
+    get regexStrict(): RegExp;
+    get regex(): RegExp;
+    get regexAncestor(): RegExp;
+    private get captureKeys();
+    private get normalizedDefinition();
+    private get definitionParts();
+    /** Fast pathname check without building a full location object. */
+    isExactPathnameMatch(pathname: string): boolean;
     /** Creates a grouped strict regex pattern string from many routes. */
     static getRegexStrictStringGroup(routes: AnyRoute[]): string;
     /** Creates a strict grouped regex from many routes. */
@@ -353,10 +369,7 @@ type UnknownSearchParsedValue = string | UnknownSearchParsed | Array<UnknownSear
 interface UnknownSearchParsed {
     [key: string]: UnknownSearchParsedValue;
 }
-type UnknownSearchInputValue = string | number | boolean | undefined | UnknownSearchInput | Array<UnknownSearchInputValue>;
-interface UnknownSearchInput {
-    [key: string]: UnknownSearchInputValue;
-}
+type UnknownSearchInput = Record<string, unknown>;
 /** It is when route not match at all, but params partially match. */
 type WeakDescendantLocationState<TRoute extends AnyRoute | string = AnyRoute | string> = {
     known: true;
@@ -437,4 +450,4 @@ type SchemaRoute0<TInput extends Record<string, unknown>, TOutput extends Record
     safeParse: (input: unknown) => _SafeParseInputResult<TOutput>;
 };
 
-export { type AncestorLocation, type AncestorLocationState, type AnyLocation, type AnyRoute, type AnyRouteOrDefinition, type CallableRoute, type DedupeSlashes, type Definition, type DescendantLocation, type DescendantLocationState, type EmptyRecord, type ExactLocation, type ExactLocationState, type Extended, type ExtractRoute, type ExtractRoutesKeys, type GetPathInput, type GetPathInputByRoute, type HasParams, type HasRequiredParams, type HasWildcard, type IsAncestor, type IsAny, type IsDescendant, type IsParamsOptional, type IsSame, type IsSameParams, type JoinPath, type KnownLocation, type LocationParams, type OnlyIfHasParams, type OnlyIfNoParams, type ParamsDefinition, type ParamsInput, type ParamsInputStringOnly, type ParamsOutput, type PathExtended, type ReplacePathParams, Route0, type RouteConfigInput, type RouteToken, Routes, type RoutesPretty, type RoutesRecord, type RoutesRecordHydrated, type SchemaRoute0, type StripTrailingWildcard, type UnknownLocation, type UnknownLocationState, type UnknownSearchInput, type UnknownSearchInputValue, type UnknownSearchParsed, type UnknownSearchParsedValue, type UnmatchedLocation, type UnmatchedLocationState, type WeakAncestorLocation, type WeakAncestorLocationState, type WeakDescendantLocation, type WeakDescendantLocationState, type _ExtractParamsDefinitionBySegments, type _GeneralLocation, type _IfNoKeys, type _IsAncestor, type _IsDescendant, type _IsSame, type _IsSameParams, type _MergeParamDefinitions, type _ParamDefinitionFromSegment, type _ParamsDefinition, type _ParamsInput, type _ParamsInputStringOnly, type _RequiredParamKeys, type _SafeParseInputResult, type _Simplify, type _SplitPathSegments };
+export { type AncestorLocation, type AncestorLocationState, type AnyLocation, type AnyRoute, type AnyRouteOrDefinition, type CallableRoute, type DedupeSlashes, type Definition, type DescendantLocation, type DescendantLocationState, type EmptyRecord, type ExactLocation, type ExactLocationState, type Extended, type ExtractRoute, type ExtractRoutesKeys, type GetPathInput, type GetPathInputByRoute, type HasParams, type HasRequiredParams, type HasWildcard, type IsAncestor, type IsAny, type IsDescendant, type IsParamsOptional, type IsSame, type IsSameParams, type JoinPath, type KnownLocation, type LocationParams, type OnlyIfHasParams, type OnlyIfNoParams, type ParamsDefinition, type ParamsInput, type ParamsInputStringOnly, type ParamsOutput, type PathExtended, type ReplacePathParams, Route0, type RouteConfigInput, type RouteToken, Routes, type RoutesPretty, type RoutesRecord, type RoutesRecordHydrated, type SchemaRoute0, type StripTrailingWildcard, type UnknownLocation, type UnknownLocationState, type UnknownSearchInput, type UnknownSearchParsed, type UnknownSearchParsedValue, type UnmatchedLocation, type UnmatchedLocationState, type WeakAncestorLocation, type WeakAncestorLocationState, type WeakDescendantLocation, type WeakDescendantLocationState, type _ExtractParamsDefinitionBySegments, type _GeneralLocation, type _IfNoKeys, type _IsAncestor, type _IsDescendant, type _IsSame, type _IsSameParams, type _MergeParamDefinitions, type _ParamDefinitionFromSegment, type _ParamsDefinition, type _ParamsInput, type _ParamsInputStringOnly, type _RequiredParamKeys, type _SafeParseInputResult, type _Simplify, type _SplitPathSegments };

package/dist/esm/index.d.ts

@@ -28,6 +28,16 @@ declare class Route0<TDefinition extends string, TSearchInput extends UnknownSea
     readonly params: _ParamsDefinition<TDefinition>;
     private _origin;
     private _callable;
+    private _regexBaseStrictString?;
+    private _regexBaseString?;
+    private _regexStrictString?;
+    private _regexString?;
+    private _regexStrict?;
+    private _regex?;
+    private _regexAncestor?;
+    private _captureKeys?;
+    private _normalizedDefinition?;
+    private _definitionParts?;
     Infer: {
         ParamsDefinition: _ParamsDefinition<TDefinition>;
         ParamsInput: _ParamsInput<TDefinition>;
@@ -63,12 +73,18 @@ declare class Route0<TDefinition extends string, TSearchInput extends UnknownSea
     getTokens(): RouteToken[];
     /** Clones route with optional config override. */
     clone(config?: RouteConfigInput): CallableRoute<TDefinition>;
-    getRegexBaseStrictString(): string;
-    getRegexBaseString(): string;
-    getRegexStrictString(): string;
-    getRegexString(): string;
-    getRegexStrict(): RegExp;
-    getRegex(): RegExp;
+    get regexBaseStrictString(): string;
+    get regexBaseString(): string;
+    get regexStrictString(): string;
+    get regexString(): string;
+    get regexStrict(): RegExp;
+    get regex(): RegExp;
+    get regexAncestor(): RegExp;
+    private get captureKeys();
+    private get normalizedDefinition();
+    private get definitionParts();
+    /** Fast pathname check without building a full location object. */
+    isExactPathnameMatch(pathname: string): boolean;
     /** Creates a grouped strict regex pattern string from many routes. */
     static getRegexStrictStringGroup(routes: AnyRoute[]): string;
     /** Creates a strict grouped regex from many routes. */
@@ -353,10 +369,7 @@ type UnknownSearchParsedValue = string | UnknownSearchParsed | Array<UnknownSear
 interface UnknownSearchParsed {
     [key: string]: UnknownSearchParsedValue;
 }
-type UnknownSearchInputValue = string | number | boolean | undefined | UnknownSearchInput | Array<UnknownSearchInputValue>;
-interface UnknownSearchInput {
-    [key: string]: UnknownSearchInputValue;
-}
+type UnknownSearchInput = Record<string, unknown>;
 /** It is when route not match at all, but params partially match. */
 type WeakDescendantLocationState<TRoute extends AnyRoute | string = AnyRoute | string> = {
     known: true;
@@ -437,4 +450,4 @@ type SchemaRoute0<TInput extends Record<string, unknown>, TOutput extends Record
     safeParse: (input: unknown) => _SafeParseInputResult<TOutput>;
 };
 
-export { type AncestorLocation, type AncestorLocationState, type AnyLocation, type AnyRoute, type AnyRouteOrDefinition, type CallableRoute, type DedupeSlashes, type Definition, type DescendantLocation, type DescendantLocationState, type EmptyRecord, type ExactLocation, type ExactLocationState, type Extended, type ExtractRoute, type ExtractRoutesKeys, type GetPathInput, type GetPathInputByRoute, type HasParams, type HasRequiredParams, type HasWildcard, type IsAncestor, type IsAny, type IsDescendant, type IsParamsOptional, type IsSame, type IsSameParams, type JoinPath, type KnownLocation, type LocationParams, type OnlyIfHasParams, type OnlyIfNoParams, type ParamsDefinition, type ParamsInput, type ParamsInputStringOnly, type ParamsOutput, type PathExtended, type ReplacePathParams, Route0, type RouteConfigInput, type RouteToken, Routes, type RoutesPretty, type RoutesRecord, type RoutesRecordHydrated, type SchemaRoute0, type StripTrailingWildcard, type UnknownLocation, type UnknownLocationState, type UnknownSearchInput, type UnknownSearchInputValue, type UnknownSearchParsed, type UnknownSearchParsedValue, type UnmatchedLocation, type UnmatchedLocationState, type WeakAncestorLocation, type WeakAncestorLocationState, type WeakDescendantLocation, type WeakDescendantLocationState, type _ExtractParamsDefinitionBySegments, type _GeneralLocation, type _IfNoKeys, type _IsAncestor, type _IsDescendant, type _IsSame, type _IsSameParams, type _MergeParamDefinitions, type _ParamDefinitionFromSegment, type _ParamsDefinition, type _ParamsInput, type _ParamsInputStringOnly, type _RequiredParamKeys, type _SafeParseInputResult, type _Simplify, type _SplitPathSegments };
+export { type AncestorLocation, type AncestorLocationState, type AnyLocation, type AnyRoute, type AnyRouteOrDefinition, type CallableRoute, type DedupeSlashes, type Definition, type DescendantLocation, type DescendantLocationState, type EmptyRecord, type ExactLocation, type ExactLocationState, type Extended, type ExtractRoute, type ExtractRoutesKeys, type GetPathInput, type GetPathInputByRoute, type HasParams, type HasRequiredParams, type HasWildcard, type IsAncestor, type IsAny, type IsDescendant, type IsParamsOptional, type IsSame, type IsSameParams, type JoinPath, type KnownLocation, type LocationParams, type OnlyIfHasParams, type OnlyIfNoParams, type ParamsDefinition, type ParamsInput, type ParamsInputStringOnly, type ParamsOutput, type PathExtended, type ReplacePathParams, Route0, type RouteConfigInput, type RouteToken, Routes, type RoutesPretty, type RoutesRecord, type RoutesRecordHydrated, type SchemaRoute0, type StripTrailingWildcard, type UnknownLocation, type UnknownLocationState, type UnknownSearchInput, type UnknownSearchParsed, type UnknownSearchParsedValue, type UnmatchedLocation, type UnmatchedLocationState, type WeakAncestorLocation, type WeakAncestorLocationState, type WeakDescendantLocation, type WeakDescendantLocationState, type _ExtractParamsDefinitionBySegments, type _GeneralLocation, type _IfNoKeys, type _IsAncestor, type _IsDescendant, type _IsSame, type _IsSameParams, type _MergeParamDefinitions, type _ParamDefinitionFromSegment, type _ParamsDefinition, type _ParamsInput, type _ParamsInputStringOnly, type _RequiredParamKeys, type _SafeParseInputResult, type _Simplify, type _SplitPathSegments };

package/dist/esm/index.js

@@ -71,11 +71,42 @@ const validateRouteDefinition = (definition) => {
   }
 };
 const stripTrailingWildcard = (definition) => definition.replace(/\*\??$/, "");
+const normalizePathname = (pathname) => {
+  if (pathname.length > 1 && pathname.endsWith("/")) {
+    return pathname.slice(0, -1);
+  }
+  return pathname;
+};
+const getNormalizedPathnameFromInput = (hrefOrHrefRelOrLocation) => {
+  if (hrefOrHrefRelOrLocation instanceof URL) {
+    return normalizePathname(hrefOrHrefRelOrLocation.pathname);
+  }
+  if (typeof hrefOrHrefRelOrLocation !== "string") {
+    if (typeof hrefOrHrefRelOrLocation.pathname === "string") {
+      return normalizePathname(hrefOrHrefRelOrLocation.pathname);
+    }
+    hrefOrHrefRelOrLocation = hrefOrHrefRelOrLocation.href || hrefOrHrefRelOrLocation.hrefRel;
+  }
+  const abs = /^[a-zA-Z][a-zA-Z\d+\-.]*:\/\//.test(hrefOrHrefRelOrLocation);
+  const base = abs ? void 0 : "http://example.com";
+  const url = new URL(hrefOrHrefRelOrLocation, base);
+  return normalizePathname(url.pathname);
+};
 class Route0 {
   definition;
   params;
   _origin;
   _callable;
+  _regexBaseStrictString;
+  _regexBaseString;
+  _regexStrictString;
+  _regexString;
+  _regexStrict;
+  _regex;
+  _regexAncestor;
+  _captureKeys;
+  _normalizedDefinition;
+  _definitionParts;
   Infer = null;
   /** Base URL used when generating absolute URLs (`abs: true`). */
   get origin() {
@@ -240,27 +271,73 @@ class Route0 {
   clone(config) {
     return Route0.create(this.definition, config);
   }
-  getRegexBaseStrictString() {
-    return getRouteRegexBaseStrictString(this.definition);
+  get regexBaseStrictString() {
+    if (this._regexBaseStrictString === void 0) {
+      this._regexBaseStrictString = getRouteRegexBaseStrictString(this.definition);
+    }
+    return this._regexBaseStrictString;
   }
-  getRegexBaseString() {
-    return this.getRegexBaseStrictString().replace(/\/+$/, "") + "/?";
+  get regexBaseString() {
+    if (this._regexBaseString === void 0) {
+      this._regexBaseString = this.regexBaseStrictString.replace(/\/+$/, "") + "/?";
+    }
+    return this._regexBaseString;
   }
-  getRegexStrictString() {
-    return `^${this.getRegexBaseStrictString()}$`;
+  get regexStrictString() {
+    if (this._regexStrictString === void 0) {
+      this._regexStrictString = `^${this.regexBaseStrictString}$`;
+    }
+    return this._regexStrictString;
   }
-  getRegexString() {
-    return `^${this.getRegexBaseString()}$`;
+  get regexString() {
+    if (this._regexString === void 0) {
+      this._regexString = `^${this.regexBaseString}$`;
+    }
+    return this._regexString;
   }
-  getRegexStrict() {
-    return new RegExp(this.getRegexStrictString());
+  get regexStrict() {
+    if (this._regexStrict === void 0) {
+      this._regexStrict = new RegExp(this.regexStrictString);
+    }
+    return this._regexStrict;
   }
-  getRegex() {
-    return new RegExp(this.getRegexString());
+  get regex() {
+    if (this._regex === void 0) {
+      this._regex = new RegExp(this.regexString);
+    }
+    return this._regex;
+  }
+  get regexAncestor() {
+    if (this._regexAncestor === void 0) {
+      this._regexAncestor = new RegExp(`^${this.regexBaseString}(?:/.*)?$`);
+    }
+    return this._regexAncestor;
+  }
+  get captureKeys() {
+    if (this._captureKeys === void 0) {
+      this._captureKeys = getRouteCaptureKeys(this.definition);
+    }
+    return this._captureKeys;
+  }
+  get normalizedDefinition() {
+    if (this._normalizedDefinition === void 0) {
+      this._normalizedDefinition = this.definition.length > 1 && this.definition.endsWith("/") ? this.definition.slice(0, -1) : this.definition;
+    }
+    return this._normalizedDefinition;
+  }
+  get definitionParts() {
+    if (this._definitionParts === void 0) {
+      this._definitionParts = this.normalizedDefinition === "/" ? ["/"] : this.normalizedDefinition.split("/").filter(Boolean);
+    }
+    return this._definitionParts;
+  }
+  /** Fast pathname check without building a full location object. */
+  isExactPathnameMatch(pathname) {
+    return this.regex.test(normalizePathname(pathname));
   }
   /** Creates a grouped strict regex pattern string from many routes. */
   static getRegexStrictStringGroup(routes) {
-    const patterns = routes.map((route) => route.getRegexStrictString()).join("|");
+    const patterns = routes.map((route) => route.regexStrictString).join("|");
     return `(${patterns})`;
   }
   /** Creates a strict grouped regex from many routes. */
@@ -270,7 +347,7 @@ class Route0 {
   }
   /** Creates a grouped regex pattern string from many routes. */
   static getRegexStringGroup(routes) {
-    const patterns = routes.map((route) => route.getRegexString()).join("|");
+    const patterns = routes.map((route) => route.regexString).join("|");
     return `(${patterns})`;
   }
   /** Creates a grouped regex from many routes. */
@@ -354,11 +431,11 @@ class Route0 {
     const location = Route0.getLocation(hrefOrHrefRelOrLocation);
     location.route = this.definition;
     location.params = {};
-    const pathname = location.pathname.length > 1 && location.pathname.endsWith("/") ? location.pathname.slice(0, -1) : location.pathname;
-    const paramNames = getRouteCaptureKeys(this.definition);
-    const def = this.definition.length > 1 && this.definition.endsWith("/") ? this.definition.slice(0, -1) : this.definition;
-    const exactRe = new RegExp(`^${this.getRegexBaseString()}$`);
-    const ancestorRe = new RegExp(`^${this.getRegexBaseString()}(?:/.*)?$`);
+    const pathname = normalizePathname(location.pathname);
+    const paramNames = this.captureKeys;
+    const defParts = this.definitionParts;
+    const exactRe = this.regex;
+    const ancestorRe = this.regexAncestor;
     const exactMatch = pathname.match(exactRe);
     const ancestorMatch = pathname.match(ancestorRe);
     const exact = !!exactMatch;
@@ -376,9 +453,7 @@ class Route0 {
     } else {
       location.params = {};
     }
-    const getParts = (path) => path === "/" ? ["/"] : path.split("/").filter(Boolean);
-    const defParts = getParts(def);
-    const pathParts = getParts(pathname);
+    const pathParts = pathname === "/" ? ["/"] : pathname.split("/").filter(Boolean);
     let isPrefix = true;
     if (pathParts.length > defParts.length) {
       isPrefix = false;
@@ -579,8 +654,8 @@ class Route0 {
   isConflict(other) {
     if (!other) return false;
     other = Route0.create(other);
-    const thisRegex = this.getRegex();
-    const otherRegex = other.getRegex();
+    const thisRegex = this.regex;
+    const otherRegex = other.regex;
     const makeCandidates = (definition) => {
       const tokens = getRouteTokens(definition);
       const values = (token) => {
@@ -709,8 +784,12 @@ class Routes {
   }
   _getLocation(hrefOrHrefRelOrLocation) {
     const input = hrefOrHrefRelOrLocation;
+    const pathname = getNormalizedPathnameFromInput(input);
     for (const route of this._ordered) {
-      const loc = route.getLocation(hrefOrHrefRelOrLocation);
+      if (!route.isExactPathnameMatch(pathname)) {
+        continue;
+      }
+      const loc = route.getLocation(input);
       if (loc.exact) {
         return loc;
       }