@esportsplus/routing 0.0.41 → 0.0.43

package/src/router/node.ts

@@ -1,141 +1,141 @@
-import { PLACEHOLDER, STATIC, WILDCARD } from '~/constants';
-import { Route } from './index';
-
-
-class Node<T> {
-    children: Map<string | number, Node<T>> | null = null;
-    parent: Node<T> | null = null;
-    path: string | null = null;
-    property: string | null = null;
-    route: Route<T> | null = null;
-    type: number | 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 child: Node<T> | undefined = node.children?.get(segments[i]);
-
-            if (!child) {
-                let segment = segments[i],
-                    symbol = segment[0];
-
-                if (!node.children) {
-                    node.children = new Map();
-                }
-
-                node.children.set(segment, (child = new Node<T>(node)));
-
-                // Named property
-                if (symbol === ':') {
-                    child.property = (segment.slice(1) || unnamed++).toString();
-                    node.children.set(PLACEHOLDER, child);
-                    type = null;
-                }
-                // "*:" Wildcard property
-                else if (symbol === '*') {
-                    child.property = (segment.slice(2) || unnamed++).toString();
-                    node.children.set(WILDCARD, child);
-                    type = null;
-                }
-            }
-
-            node = child;
-        }
-
-        node.path = path;
-        node.route = route;
-        node.type = type;
-
-        return node;
-    }
-
-    find(path: string): {
-        parameters?: Record<PropertyKey, unknown>;
-        route?: Route<T>;
-    } {
-        let node: Node<T> | undefined = this,
-            parameters: Record<PropertyKey, unknown> = {},
-            segments = path.split('/'),
-            wildcard: { node: Node<T>, value: string } | null = null;
-
-        for (let i = 0, n = segments.length; i < n; i++) {
-            let segment = segments[i],
-                wc = node.children?.get(WILDCARD);
-
-            if (wc) {
-                wildcard = {
-                    node: wc,
-                    value: segments.slice(i).join('/')
-                };
-            }
-
-            // Exact matches take precedence over placeholders
-            let next: Node<T> | undefined = node.children?.get(segment);
-
-            if (next) {
-                node = next;
-            }
-            else {
-                node = node.children?.get(PLACEHOLDER);
-
-                if (!node) {
-                    break;
-                }
-
-                parameters[ node.property! ] = segment;
-            }
-        }
-
-        if ((!node || !node.route) && wildcard) {
-            node = wildcard.node;
-            parameters[ node.property! ] = wildcard.value;
-        }
-
-        if (!node) {
-            return {};
-        }
-
-        return {
-            parameters,
-            route: node.route!
-        };
-    }
-
-    remove(path: string) {
-        let node: Node<T> | undefined = this,
-            segments = path.split('/');
-
-        for (let i = 0, n = segments.length; i < n; i++) {
-            node = node.children?.get( segments[i] );
-
-            if (!node) {
-                return;
-            }
-        }
-
-        if (node.children?.size) {
-            return;
-        }
-
-        let parent = node.parent;
-
-        if (parent && parent.children) {
-            parent.children.delete( segments[segments.length - 1] );
-            parent.children.delete(WILDCARD);
-            parent.children.delete(PLACEHOLDER);
-        }
-    }
-}
-
-
+import { PLACEHOLDER, STATIC, WILDCARD } from '~/constants';
+import { Route } from './index';
+
+
+class Node<T> {
+    children: Map<string | number, Node<T>> | null = null;
+    parent: Node<T> | null = null;
+    path: string | null = null;
+    property: string | null = null;
+    route: Route<T> | null = null;
+    type: number | 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 child: Node<T> | undefined = node.children?.get(segments[i]);
+
+            if (!child) {
+                let segment = segments[i],
+                    symbol = segment[0];
+
+                if (!node.children) {
+                    node.children = new Map();
+                }
+
+                node.children.set(segment, (child = new Node<T>(node)));
+
+                // Named property
+                if (symbol === ':') {
+                    child.property = (segment.slice(1) || unnamed++).toString();
+                    node.children.set(PLACEHOLDER, child);
+                    type = null;
+                }
+                // "*:" Wildcard property
+                else if (symbol === '*') {
+                    child.property = (segment.slice(2) || unnamed++).toString();
+                    node.children.set(WILDCARD, child);
+                    type = null;
+                }
+            }
+
+            node = child;
+        }
+
+        node.path = path;
+        node.route = route;
+        node.type = type;
+
+        return node;
+    }
+
+    find(path: string): {
+        parameters?: Record<PropertyKey, unknown>;
+        route?: Route<T>;
+    } {
+        let node: Node<T> | undefined = this,
+            parameters: Record<PropertyKey, unknown> = {},
+            segments = path.split('/'),
+            wildcard: { node: Node<T>, value: string } | null = null;
+
+        for (let i = 0, n = segments.length; i < n; i++) {
+            let segment = segments[i],
+                wc = node.children?.get(WILDCARD);
+
+            if (wc) {
+                wildcard = {
+                    node: wc,
+                    value: segments.slice(i).join('/')
+                };
+            }
+
+            // Exact matches take precedence over placeholders
+            let next: Node<T> | undefined = node.children?.get(segment);
+
+            if (next) {
+                node = next;
+            }
+            else {
+                node = node.children?.get(PLACEHOLDER);
+
+                if (!node) {
+                    break;
+                }
+
+                parameters[ node.property! ] = segment;
+            }
+        }
+
+        if ((!node || !node.route) && wildcard) {
+            node = wildcard.node;
+            parameters[ node.property! ] = wildcard.value;
+        }
+
+        if (!node) {
+            return {};
+        }
+
+        return {
+            parameters,
+            route: node.route!
+        };
+    }
+
+    remove(path: string) {
+        let node: Node<T> | undefined = this,
+            segments = path.split('/');
+
+        for (let i = 0, n = segments.length; i < n; i++) {
+            node = node.children?.get( segments[i] );
+
+            if (!node) {
+                return;
+            }
+        }
+
+        if (node.children?.size) {
+            return;
+        }
+
+        let parent = node.parent;
+
+        if (parent && parent.children) {
+            parent.children.delete( segments[segments.length - 1] );
+            parent.children.delete(WILDCARD);
+            parent.children.delete(PLACEHOLDER);
+        }
+    }
+}
+
+
 export { Node };

package/src/router/route.ts

@@ -1,28 +1,28 @@
-import { Middleware, Next, Request } from '~/types';
-import pipeline from '@esportsplus/pipeline';
-
-
-class Route<T> {
-    middleware: Middleware<T>[] | null = null;
-    name: string | null = null;
-    path: string | null = null;
-    responder: Next<T>;
-    subdomain: string | null = null;
-
-
-    constructor(responder: Next<T>) {
-        this.responder = responder;
-    }
-
-
-    dispatch(request: Request<T>) {
-        if (this.middleware === null) {
-            return this.responder(request);
-        }
-
-        return pipeline(...this.middleware, (request) => this.responder(request))(request);
-    }
-}
-
-
+import { Middleware, Next, Request } from '~/types';
+import pipeline from '@esportsplus/pipeline';
+
+
+class Route<T> {
+    middleware: Middleware<T>[] | null = null;
+    name: string | null = null;
+    path: string | null = null;
+    responder: Next<T>;
+    subdomain: string | null = null;
+
+
+    constructor(responder: Next<T>) {
+        this.responder = responder;
+    }
+
+
+    dispatch(request: Request<T>) {
+        if (this.middleware === null) {
+            return this.responder(request);
+        }
+
+        return pipeline(...this.middleware, (request) => this.responder(request))(request);
+    }
+}
+
+
 export { Route };

package/src/slugify.ts

@@ -1,4 +1,4 @@
-// https://twitter.com/Swizec/status/1589416111971635201
-export default (value: string) => {
-    return value.replace(/\W+/g, '-').replace(/[-]+$/, '').toLowerCase();
+// https://twitter.com/Swizec/status/1589416111971635201
+export default (value: string) => {
+    return value.replace(/\W+/g, '-').replace(/[-]+$/, '').toLowerCase();
 };

package/src/types.ts

@@ -1,31 +1,31 @@
-import { NeverAsync } from '@esportsplus/typescript';
-import { Route, Router } from './router';
-
-
-type Middleware<T> = NeverAsync<(input: Request<T>, next: Next<T>) => T>;
-
-type Next<T> = NeverAsync<(input: Request<T>) => T>;
-
-type Options<T> = {
-    middleware?: Middleware<T>[];
-    name?: string;
-    path?: string;
-    responder: Next<T>;
-    subdomain?: string;
-};
-
-type Request<T> = {
-    data: Record<PropertyKey, unknown> & ReturnType<Router<T>['match']>;
-    href: string;
-    hostname: string;
-    method: string;
-    origin: string;
-    path: string;
-    port: string;
-    protocol: string;
-    query: Record<string, unknown>;
-    subdomain?: string;
-};
-
-
+import { NeverAsync } from '@esportsplus/typescript';
+import { Route, Router } from './router';
+
+
+type Middleware<T> = NeverAsync<(input: Request<T>, next: Next<T>) => T>;
+
+type Next<T> = NeverAsync<(input: Request<T>) => T>;
+
+type Options<T> = {
+    middleware?: Middleware<T>[];
+    name?: string;
+    path?: string;
+    responder: Next<T>;
+    subdomain?: string;
+};
+
+type Request<T> = {
+    data: Record<PropertyKey, unknown> & ReturnType<Router<T>['match']>;
+    href: string;
+    hostname: string;
+    method: string;
+    origin: string;
+    path: string;
+    port: string;
+    protocol: string;
+    query: Record<string, unknown>;
+    subdomain?: string;
+};
+
+
 export { Middleware, Next, Options, Request, Route, Router };

package/tsconfig.json

@@ -1,10 +1,11 @@
-{
-    "compilerOptions": {
-        "baseUrl": ".",
-        "declarationDir": "build",
-        "outDir": "build",
-    },
-    "exclude": ["node_modules"],
-    "extends": "@esportsplus/typescript/tsconfig.base.json",
-    "include": ["src"]
+{
+    "compilerOptions": {
+        "baseUrl": ".",
+        "declaration": true,
+        "declarationDir": "build",
+        "outDir": "build"
+    },
+    "exclude": ["node_modules"],
+    "extends": "./node_modules/@esportsplus/typescript/tsconfig.base.json",
+    "include": ["src"]
 }