@devp0nt/route0 1.0.0-next.26 → 1.0.0-next.28

package/src/index.ts

@@ -494,17 +494,45 @@ export class Route0<TDefinition extends string> {
   }
 
   isChildren(other: Route0<TDefinition>): boolean {
-    return (
-      this.pathDefinition.replace(/:([A-Za-z0-9_]+)/g, '__PARAM__') ===
-      other.pathDefinition.replace(/:([A-Za-z0-9_]+)/g, '__PARAM__')
-    )
+    // this is a child of other if:
+    // - paths are not exactly the same
+    // - other's path is a prefix of this path, matching params as wildcards
+    const getParts = (path: string) => (path === '/' ? ['/'] : path.split('/').filter(Boolean))
+    const thisParts = getParts(this.pathDefinition)
+    const otherParts = getParts(other.pathDefinition)
+
+    // A child must be deeper
+    if (thisParts.length <= otherParts.length) return false
+
+    for (let i = 0; i < otherParts.length; i++) {
+      const otherPart = otherParts[i]
+      const thisPart = thisParts[i]
+      if (otherPart.startsWith(':')) continue
+      if (otherPart !== thisPart) return false
+    }
+    // Not equal (depth already ensures not equal)
+    return true
   }
 
   isParent(other: Route0<TDefinition>): boolean {
-    return (
-      other.pathDefinition.replace(/:([A-Za-z0-9_]+)/g, '__PARAM__') ===
-      this.pathDefinition.replace(/:([A-Za-z0-9_]+)/g, '__PARAM__')
-    )
+    // this is a parent of other if:
+    // - paths are not exactly the same
+    // - this path is a prefix of other path, matching params as wildcards
+    const getParts = (path: string) => (path === '/' ? ['/'] : path.split('/').filter(Boolean))
+    const thisParts = getParts(this.pathDefinition)
+    const otherParts = getParts(other.pathDefinition)
+
+    // A parent must be shallower
+    if (thisParts.length >= otherParts.length) return false
+
+    for (let i = 0; i < thisParts.length; i++) {
+      const thisPart = thisParts[i]
+      const otherPart = otherParts[i]
+      if (thisPart.startsWith(':')) continue
+      if (thisPart !== otherPart) return false
+    }
+    // Not equal (depth already ensures not equal)
+    return true
   }
 
   isConflict(other: Route0<any>): boolean {
@@ -571,10 +599,18 @@ export class Route0<TDefinition extends string> {
 }
 
 export class Routes<const T extends RoutesRecord = RoutesRecord> {
-  readonly routes: RoutesRecordHydrated<T>
-  readonly pathsOrdering: string[]
-  readonly keysOrdering: string[]
-  readonly ordered: CallabelRoute[]
+  private readonly routes: RoutesRecordHydrated<T>
+  private readonly pathsOrdering: string[]
+  private readonly keysOrdering: string[]
+  private readonly ordered: CallabelRoute[]
+
+  _: {
+    getLocation: Routes<T>['getLocation']
+    override: Routes<T>['override']
+    pathsOrdering: Routes<T>['pathsOrdering']
+    keysOrdering: Routes<T>['keysOrdering']
+    ordered: Routes<T>['ordered']
+  }
 
   private constructor({
     routes,
@@ -589,11 +625,9 @@ export class Routes<const T extends RoutesRecord = RoutesRecord> {
     keysOrdering?: string[]
     ordered?: CallabelRoute[]
   }) {
-    this.routes = (
-      isHydrated ? (routes as RoutesRecordHydrated<T>) : Routes._hydrate(routes)
-    ) as RoutesRecordHydrated<T>
+    this.routes = (isHydrated ? (routes as RoutesRecordHydrated<T>) : Routes.hydrate(routes)) as RoutesRecordHydrated<T>
     if (!pathsOrdering || !keysOrdering || !ordered) {
-      const ordering = Routes._makeOrdering(this.routes)
+      const ordering = Routes.makeOrdering(this.routes)
       this.pathsOrdering = ordering.pathsOrdering
       this.keysOrdering = ordering.keysOrdering
       this.ordered = this.keysOrdering.map((key) => this.routes[key])
@@ -602,14 +636,21 @@ export class Routes<const T extends RoutesRecord = RoutesRecord> {
       this.keysOrdering = keysOrdering
       this.ordered = ordered
     }
+    this._ = {
+      getLocation: this.getLocation.bind(this),
+      override: this.override.bind(this),
+      pathsOrdering: this.pathsOrdering,
+      keysOrdering: this.keysOrdering,
+      ordered: this.ordered,
+    }
   }
 
   static create<const T extends RoutesRecord>(routes: T): RoutesPretty<T> {
     const instance = new Routes({ routes })
-    return Routes._prettify(instance)
+    return Routes.prettify(instance)
   }
 
-  static _prettify<const T extends RoutesRecord>(instance: Routes<T>): RoutesPretty<T> {
+  private static prettify<const T extends RoutesRecord>(instance: Routes<T>): RoutesPretty<T> {
     Object.setPrototypeOf(instance, Routes.prototype)
     Object.defineProperty(instance, Symbol.toStringTag, {
       value: 'Routes',
@@ -621,7 +662,7 @@ export class Routes<const T extends RoutesRecord = RoutesRecord> {
     return instance as unknown as RoutesPretty<T>
   }
 
-  static _hydrate<const T extends RoutesRecord>(routes: T): RoutesRecordHydrated<T> {
+  private static hydrate<const T extends RoutesRecord>(routes: T): RoutesRecordHydrated<T> {
     const result = {} as RoutesRecordHydrated<T>
     for (const key in routes) {
       if (Object.prototype.hasOwnProperty.call(routes, key)) {
@@ -632,13 +673,13 @@ export class Routes<const T extends RoutesRecord = RoutesRecord> {
     return result
   }
 
-  getLocation(href: `${string}://${string}`): UnknownLocation | ExactLocation
-  getLocation(hrefRel: `/${string}`): UnknownLocation | ExactLocation
-  getLocation(hrefOrHrefRel: string): UnknownLocation | ExactLocation
-  getLocation(location: AnyLocation): UnknownLocation | ExactLocation
-  getLocation(url: URL): UnknownLocation | ExactLocation
-  getLocation(hrefOrHrefRelOrLocation: string | AnyLocation | URL): UnknownLocation | ExactLocation
-  getLocation(hrefOrHrefRelOrLocation: string | AnyLocation | URL): UnknownLocation | ExactLocation {
+  private getLocation(href: `${string}://${string}`): UnknownLocation | ExactLocation
+  private getLocation(hrefRel: `/${string}`): UnknownLocation | ExactLocation
+  private getLocation(hrefOrHrefRel: string): UnknownLocation | ExactLocation
+  private getLocation(location: AnyLocation): UnknownLocation | ExactLocation
+  private getLocation(url: URL): UnknownLocation | ExactLocation
+  private getLocation(hrefOrHrefRelOrLocation: string | AnyLocation | URL): UnknownLocation | ExactLocation
+  private getLocation(hrefOrHrefRelOrLocation: string | AnyLocation | URL): UnknownLocation | ExactLocation {
     // Find the route that exactly matches the given location
     const input = hrefOrHrefRelOrLocation
     for (const route of this.ordered) {
@@ -651,8 +692,8 @@ export class Routes<const T extends RoutesRecord = RoutesRecord> {
     return typeof input === 'string' ? Route0.getLocation(input) : Route0.getLocation(input)
   }
 
-  static _makeOrdering(routes: RoutesRecord): { pathsOrdering: string[]; keysOrdering: string[] } {
-    const hydrated = Routes._hydrate(routes)
+  private static makeOrdering(routes: RoutesRecord): { pathsOrdering: string[]; keysOrdering: string[] } {
+    const hydrated = Routes.hydrate(routes)
     const entries = Object.entries(hydrated)
 
     const getParts = (path: string) => {
@@ -686,7 +727,7 @@ export class Routes<const T extends RoutesRecord = RoutesRecord> {
     return { pathsOrdering, keysOrdering }
   }
 
-  override(config: RouteConfigInput): RoutesPretty<T> {
+  private override(config: RouteConfigInput): RoutesPretty<T> {
     const newRoutes = {} as RoutesRecordHydrated<T>
     for (const key in this.routes) {
       if (Object.prototype.hasOwnProperty.call(this.routes, key)) {
@@ -700,7 +741,13 @@ export class Routes<const T extends RoutesRecord = RoutesRecord> {
       keysOrdering: this.keysOrdering,
       ordered: this.keysOrdering.map((key) => newRoutes[key]),
     })
-    return Routes._prettify(instance)
+    return Routes.prettify(instance)
+  }
+
+  static _ = {
+    prettify: Routes.prettify.bind(Routes),
+    hydrate: Routes.hydrate.bind(Routes),
+    makeOrdering: Routes.makeOrdering.bind(Routes),
   }
 }