@esportsplus/routing 0.6.0 → 0.6.2

package/src/client/router/node.ts

@@ -1,122 +1,122 @@
-import { PARAMETER, STATIC, WILDCARD } from '../constants';
-import { Route } from './index';
-
-
-class Node<T> {
-    parent: Node<T> | null = null;
-    path: string | null = null;
-    route: Route<T> | null = null;
-    static: Map<string | number, Node<T>> | null = null;
-    type: number | null = null;
-
-    // Parameter or Wildcard parameter name
-    name: string | null = null;
-    parameter: Node<T> | null = null;
-    wildcard: Node<T> | null = null;
-
-
-    constructor(parent: Node<T>['parent'] = null) {
-        this.parent = parent;
-    }
-
-
-    add(path: string, route: Route<T>) {
-        let node: Node<T> | undefined = this,
-            segments = path.split('/'),
-            type: Node<T>['type'] = STATIC,
-            unnamed = 0;
-
-        for (let i = 0, n = segments.length; i < n; i++) {
-            let segment = segments[i],
-                symbol = segment[0];
-
-            // Parameter
-            if (symbol === ':') {
-                if (!node.parameter) {
-                    node.parameter = new Node<T>(node);
-                    node.parameter.name = (segment.slice(1) || unnamed++).toString();
-                }
-
-                node = node.parameter;
-                type = PARAMETER;
-            }
-            // "*:" Wildcard
-            else if (symbol === '*') {
-                if (!node.wildcard) {
-                    node.wildcard = new Node<T>(node);
-                    node.wildcard.name = (segment.slice(2) || unnamed++).toString();
-                }
-
-                node = node.wildcard;
-                type = WILDCARD;
-            }
-            // Static name
-            else {
-                let next: Node<T> | undefined = node.static?.get(segment);
-
-                if (!next) {
-                    next = new Node<T>(node);
-                    (node.static ??= new Map()).set(segment, next);
-                }
-
-                node = next;
-            }
-        }
-
-        node.path = path;
-        node.route = route;
-        node.type = type;
-
-        return node;
-    }
-
-    find(path: string): {
-        parameters?: Readonly<Record<PropertyKey, unknown>>;
-        route?: Readonly<Route<T>>;
-    } {
-        let node: Node<T> | undefined = this,
-            parameters: Record<PropertyKey, unknown> | undefined,
-            segments = path.split('/'),
-            wildcard: { node: Node<T>, start: number } | undefined;
-
-        for (let i = 0, n = segments.length; i < n; i++) {
-            let segment = segments[i];
-
-            if (node.wildcard) {
-                wildcard = {
-                    node: node.wildcard,
-                    start: i
-                };
-            }
-
-            // Exact matches take precedence over parameters
-            let next: Node<T> | undefined = node.static?.get(segment) as Node<T> | undefined;
-
-            if (next) {
-                node = next;
-                continue;
-            }
-
-            if (!node.parameter) {
-                node = undefined;
-                break;
-            }
-
-            node = node.parameter;
-            (parameters ??= {})[node.name!] = segment;
-        }
-
-        if ((node === undefined || node.route === null) && wildcard) {
-            node = wildcard.node;
-            (parameters ??= {})[ node.name! ] = segments.slice(wildcard.start).join('/');
-        }
-
-        return {
-            parameters,
-            route: node?.route || undefined
-        };
-    }
-}
-
-
+import { PARAMETER, STATIC, WILDCARD } from '../constants';
+import { Route } from './index';
+
+
+class Node<T> {
+    parent: Node<T> | null = null;
+    path: string | null = null;
+    route: Route<T> | null = null;
+    static: Map<string | number, Node<T>> | null = null;
+    type: number | null = null;
+
+    // Parameter or Wildcard parameter name
+    name: string | null = null;
+    parameter: Node<T> | null = null;
+    wildcard: Node<T> | null = null;
+
+
+    constructor(parent: Node<T>['parent'] = null) {
+        this.parent = parent;
+    }
+
+
+    add(path: string, route: Route<T>) {
+        let node: Node<T> | undefined = this,
+            segments = path.split('/'),
+            type: Node<T>['type'] = STATIC,
+            unnamed = 0;
+
+        for (let i = 0, n = segments.length; i < n; i++) {
+            let segment = segments[i],
+                symbol = segment[0];
+
+            // Parameter
+            if (symbol === ':') {
+                if (!node.parameter) {
+                    node.parameter = new Node<T>(node);
+                    node.parameter.name = (segment.slice(1) || unnamed++).toString();
+                }
+
+                node = node.parameter;
+                type = PARAMETER;
+            }
+            // "*:" Wildcard
+            else if (symbol === '*') {
+                if (!node.wildcard) {
+                    node.wildcard = new Node<T>(node);
+                    node.wildcard.name = (segment.slice(2) || unnamed++).toString();
+                }
+
+                node = node.wildcard;
+                type = WILDCARD;
+            }
+            // Static name
+            else {
+                let next: Node<T> | undefined = node.static?.get(segment);
+
+                if (!next) {
+                    next = new Node<T>(node);
+                    (node.static ??= new Map()).set(segment, next);
+                }
+
+                node = next;
+            }
+        }
+
+        node.path = path;
+        node.route = route;
+        node.type = type;
+
+        return node;
+    }
+
+    find(path: string): {
+        parameters?: Readonly<Record<PropertyKey, unknown>>;
+        route?: Readonly<Route<T>>;
+    } {
+        let node: Node<T> | undefined = this,
+            parameters: Record<PropertyKey, unknown> | undefined,
+            segments = path.split('/'),
+            wildcard: { node: Node<T>, start: number } | undefined;
+
+        for (let i = 0, n = segments.length; i < n; i++) {
+            let segment = segments[i];
+
+            if (node.wildcard) {
+                wildcard = {
+                    node: node.wildcard,
+                    start: i
+                };
+            }
+
+            // Exact matches take precedence over parameters
+            let next: Node<T> | undefined = node.static?.get(segment) as Node<T> | undefined;
+
+            if (next) {
+                node = next;
+                continue;
+            }
+
+            if (!node.parameter) {
+                node = undefined;
+                break;
+            }
+
+            node = node.parameter;
+            (parameters ??= {})[node.name!] = segment;
+        }
+
+        if ((node === undefined || node.route === null) && wildcard) {
+            node = wildcard.node;
+            (parameters ??= {})[ node.name! ] = segments.slice(wildcard.start).join('/');
+        }
+
+        return {
+            parameters,
+            route: node?.route || undefined
+        };
+    }
+}
+
+
 export { Node };

package/src/client/types.ts

@@ -1,105 +1,105 @@
-import { NeverAsync } from '@esportsplus/utilities';
-import { Router } from './router';
-import pipeline from '@esportsplus/pipeline';
-
-
-type AccumulateRoutes<T extends readonly RouteFactory<any>[]> =
-    T extends readonly [infer F extends RouteFactory<any>, ...infer Rest extends readonly RouteFactory<any>[]]
-        ? ExtractRoutes<F> & AccumulateRoutes<Rest>
-        : {};
-
-type ExtractOptionalParams<Path extends string> =
-    Path extends `/${infer Segment}/${infer Rest}`
-        ? (Segment extends `?:${infer Param}` ? Param : never) | ExtractOptionalParams<`/${Rest}`>
-        : Path extends `/${infer Segment}`
-            ? (Segment extends `?:${infer Param}` ? Param : never)
-            : never;
-
-type ExtractParamsTuple<Path extends string> =
-    Path extends `${infer _Start}:${infer Param}/${infer Rest}`
-        ? [Param, ...ExtractParamsTuple<`/${Rest}`>]
-        : Path extends `${infer _Start}:${infer Param}`
-            ? [Param]
-            : [];
-
-type ExtractRequiredParams<Path extends string> =
-    Path extends `/${infer Segment}/${infer Rest}`
-        ? (Segment extends `:${infer Param}` ? Param : never) | ExtractRequiredParams<`/${Rest}`>
-        : Path extends `/${infer Segment}`
-            ? (Segment extends `:${infer Param}` ? Param : never)
-            : never;
-
-type ExtractRoutes<F> =
-    F extends (r: Router<any, any>) => Router<any, infer Routes extends RouteRegistry>
-        ? Routes
-        : never;
-
-type InferOutput<F> = F extends RouteFactory<infer T> ? T : never;
-
-type LabeledParamsTuple<Params extends string[]> =
-    Params extends [infer _First extends string, ...infer Rest extends string[]]
-        ? [_First: string | number, ...LabeledParamsTuple<Rest>]
-        : [];
-
-type Middleware<T> = NeverAsync<(input: Request<T>, next: Next<T>) => T>;
-
-type Name = string;
-
-type Next<T> = NeverAsync<(input: Request<T>) => T>;
-
-type Options<T> = {
-    middleware?: Middleware<T>[];
-    name?: string;
-    path?: string;
-    subdomain?: string;
-};
-
-type PathParamsObject<Path extends string> =
-    { [K in ExtractRequiredParams<Path>]: string | number } &
-    { [K in ExtractOptionalParams<Path>]?: string | number };
-
-type PathParamsTuple<Path extends string> =
-    LabeledParamsTuple<ExtractParamsTuple<Path>>;
-
-type Request<T> = {
-    data: Record<PropertyKey, unknown> & ReturnType<Router<T>['match']>;
-    hostname: string;
-    href: string;
-    method: string;
-    origin: string;
-    path: string;
-    port: string;
-    protocol: string;
-    query: Record<string, unknown>;
-    subdomain?: string;
-};
-
-type Route<T> = {
-    name: Name | null;
-    path: string | null;
-    pipeline: ReturnType<typeof pipeline<Request<T>, T>>,
-    subdomain: string | null;
-};
-
-type RouteFactory<T> = (router: Router<T, any>) => Router<T, RouteRegistry>;
-
-type RouteOptions<T> = Options<T> & {
-    responder: Next<T>;
-};
-
-type RoutePath<Routes, K extends keyof Routes> =
-    Routes[K] extends { path: infer P extends string } ? P : string;
-
-type RouteRegistry = Record<string, { path: string }>;
-
-
-export type {
-    AccumulateRoutes,
-    ExtractOptionalParams, ExtractRequiredParams,
-    InferOutput,
-    Middleware,
-    Name, Next,
-    Options,
-    PathParamsObject, PathParamsTuple,
-    Request, Router, Route, RouteFactory, RouteOptions, RoutePath, RouteRegistry
-};
+import { NeverAsync } from '@esportsplus/utilities';
+import { Router } from './router';
+import pipeline from '@esportsplus/pipeline';
+
+
+type AccumulateRoutes<T extends readonly RouteFactory<any>[]> =
+    T extends readonly [infer F extends RouteFactory<any>, ...infer Rest extends readonly RouteFactory<any>[]]
+        ? ExtractRoutes<F> & AccumulateRoutes<Rest>
+        : {};
+
+type ExtractOptionalParams<Path extends string> =
+    Path extends `/${infer Segment}/${infer Rest}`
+        ? (Segment extends `?:${infer Param}` ? Param : never) | ExtractOptionalParams<`/${Rest}`>
+        : Path extends `/${infer Segment}`
+            ? (Segment extends `?:${infer Param}` ? Param : never)
+            : never;
+
+type ExtractParamsTuple<Path extends string> =
+    Path extends `${infer _Start}:${infer Param}/${infer Rest}`
+        ? [Param, ...ExtractParamsTuple<`/${Rest}`>]
+        : Path extends `${infer _Start}:${infer Param}`
+            ? [Param]
+            : [];
+
+type ExtractRequiredParams<Path extends string> =
+    Path extends `/${infer Segment}/${infer Rest}`
+        ? (Segment extends `:${infer Param}` ? Param : never) | ExtractRequiredParams<`/${Rest}`>
+        : Path extends `/${infer Segment}`
+            ? (Segment extends `:${infer Param}` ? Param : never)
+            : never;
+
+type ExtractRoutes<F> =
+    F extends (r: Router<any, any>) => Router<any, infer Routes extends RouteRegistry>
+        ? Routes
+        : never;
+
+type InferOutput<F> = F extends RouteFactory<infer T> ? T : never;
+
+type LabeledParamsTuple<Params extends string[]> =
+    Params extends [infer _First extends string, ...infer Rest extends string[]]
+        ? [_First: string | number, ...LabeledParamsTuple<Rest>]
+        : [];
+
+type Middleware<T> = NeverAsync<(input: Request<T>, next: Next<T>) => T>;
+
+type Name = string;
+
+type Next<T> = NeverAsync<(input: Request<T>) => T>;
+
+type Options<T> = {
+    middleware?: Middleware<T>[];
+    name?: string;
+    path?: string;
+    subdomain?: string;
+};
+
+type PathParamsObject<Path extends string> =
+    { [K in ExtractRequiredParams<Path>]: string | number } &
+    { [K in ExtractOptionalParams<Path>]?: string | number };
+
+type PathParamsTuple<Path extends string> =
+    LabeledParamsTuple<ExtractParamsTuple<Path>>;
+
+type Request<T> = {
+    data: Record<PropertyKey, unknown> & ReturnType<Router<T>['match']>;
+    hostname: string;
+    href: string;
+    method: string;
+    origin: string;
+    path: string;
+    port: string;
+    protocol: string;
+    query: Record<string, unknown>;
+    subdomain?: string;
+};
+
+type Route<T> = {
+    name: Name | null;
+    path: string | null;
+    pipeline: ReturnType<typeof pipeline<Request<T>, T>>,
+    subdomain: string | null;
+};
+
+type RouteFactory<T> = (router: Router<T, any>) => Router<T, RouteRegistry>;
+
+type RouteOptions<T> = Options<T> & {
+    responder: Next<T>;
+};
+
+type RoutePath<Routes, K extends keyof Routes> =
+    Routes[K] extends { path: infer P extends string } ? P : string;
+
+type RouteRegistry = Record<string, { path: string }>;
+
+
+export type {
+    AccumulateRoutes,
+    ExtractOptionalParams, ExtractRequiredParams,
+    InferOutput,
+    Middleware,
+    Name, Next,
+    Options,
+    PathParamsObject, PathParamsTuple,
+    Request, Router, Route, RouteFactory, RouteOptions, RoutePath, RouteRegistry
+};

package/src/constants.ts

@@ -1,4 +1,4 @@
-const PACKAGE_NAME = '@esportsplus/routing';
-
-
+const PACKAGE_NAME = '@esportsplus/routing';
+
+
 export { PACKAGE_NAME };