@esportsplus/routing 0.0.4 → 0.0.5

package/build/url.js

@@ -1,5 +1,5 @@
 const parse = (url = window.location.href) => {
-    let data = new URL(url), parts = data.host.split('.'), subdomain = '';
+    let { hash, host, hostname, href, origin, pathname, port, protocol } = new URL(url), parts = host.split('.'), path = hash?.replace('#/', '/')?.split('?') || ['/', ''], subdomain = '';
     if (parts.length > 2) {
         subdomain = parts[0];
         if (['127', 'www'].includes(subdomain)) {
@@ -8,14 +8,14 @@ const parse = (url = window.location.href) => {
     }
     return {
         data: {},
-        href: data.href,
-        hostname: data.hostname,
-        uri: data.hash.replace('#/', '/') || '/',
-        origin: data.origin,
-        pathname: data.pathname,
-        port: data.port,
-        protocol: data.protocol,
-        query: Object.fromEntries(data.searchParams.entries()),
+        href: href,
+        hostname: hostname,
+        uri: path[0],
+        origin: origin,
+        pathname: pathname,
+        port: port,
+        protocol: protocol,
+        query: Object.fromEntries((new URLSearchParams(path[1])).entries()),
         subdomain
     };
 };

package/package.json

@@ -22,5 +22,5 @@
             ]
         }
     },
-    "version": "0.0.4"
+    "version": "0.0.5"
 }

package/src/group.ts

@@ -1,11 +1,11 @@
-import { Group } from "./types";
-
-
-export default (): Group => {
-    return {
-        middleware: [],
-        name: '',
-        pattern: '',
-        subdomain: ''
-    };
-};
+import { Group } from "./types";
+
+
+export default (): Group => {
+    return {
+        middleware: [],
+        name: '',
+        pattern: '',
+        subdomain: ''
+    };
+};

package/src/index.ts

@@ -1,9 +1,9 @@
-import middleware from './middleware';
-import redirect from './redirect';
-import listener from './listener';
-import routes from './routes';
-import url from './url';
-
-
-export default { listener, middleware, redirect, routes, url };
-export { listener, middleware, redirect, routes, url };
+import middleware from './middleware';
+import redirect from './redirect';
+import listener from './listener';
+import routes from './routes';
+import url from './url';
+
+
+export default { listener, middleware, redirect, routes, url };
+export { listener, middleware, redirect, routes, url };

package/src/middleware/common/dispatch.ts

@@ -1,17 +1,17 @@
-import { factory } from '~/middleware';
-import { Request } from '~/types';
-
-
-export default (request: Request) => {
-    let route = request.data.route;
-
-    if (!route) {
-        throw new Error(`Route dispatching failed, route was not defined!`);
-    }
-
-    if (!route.middleware.length) {
-        return route.responder(request);
-    }
-
-    return factory(...route.middleware, (request => route.responder(request)))(request);
-};
+import { factory } from '~/middleware';
+import { Request } from '~/types';
+
+
+export default (request: Request) => {
+    let route = request.data.route;
+
+    if (!route) {
+        throw new Error(`Route dispatching failed, route was not defined!`);
+    }
+
+    if (!route.middleware.length) {
+        return route.responder(request);
+    }
+
+    return factory(...route.middleware, (request => route.responder(request)))(request);
+};

package/src/middleware/common/index.ts

@@ -1,5 +1,5 @@
-import dispatch from './dispatch';
-import match from './match';
-
-
-export default { dispatch, match };
+import dispatch from './dispatch';
+import match from './match';
+
+
+export default { dispatch, match };

package/src/middleware/common/match.ts

@@ -1,26 +1,26 @@
-import { Routes } from '~/routes';
-import { Next, Request } from '~/types';
-
-
-export default (routes: Routes) => {
-    return (request: Request, next: Next) => {
-        let name = (routes.subdomains[request.subdomain] || {})[request.uri],
-            route = routes.static[name];
-
-        // Dynamic routing
-        if (!route) {
-            // TODO:
-            // - Trie based routing
-            // - Bind variables to request
-        }
-
-        // Fallback route
-        if (!route && routes.fallback) {
-            route = routes.static[routes.fallback];
-        }
-
-        request.data.route = route;
-
-        return next(request);
-    };
-};
+import { Routes } from '~/routes';
+import { Next, Request } from '~/types';
+
+
+export default (routes: Routes) => {
+    return (request: Request, next: Next) => {
+        let name = (routes.subdomains[request.subdomain] || {})[request.uri],
+            route = routes.static[name];
+
+        // Dynamic routing
+        if (!route) {
+            // TODO:
+            // - Trie based routing
+            // - Bind variables to request
+        }
+
+        // Fallback route
+        if (!route && routes.fallback) {
+            route = routes.static[routes.fallback];
+        }
+
+        request.data.route = route;
+
+        return next(request);
+    };
+};

package/src/routes.ts

@@ -1,63 +1,63 @@
-import { Group, Responder, Route } from './types';
-
-
-class Routes {
-    dynamic: Record<Route['name'], Route> = {};
-    fallback?: string;
-    groups: Group[] = [];
-    static: Record<Route['name'], Route> = {};
-    subdomains: Record<Route['subdomain'], Record<Route['pattern'], Route['name']>> = {};
-
-
-    add(name: string, pattern: string, responder: Responder) {
-        let route: Route = {
-                middleware: [],
-                name: '',
-                pattern: '',
-                responder,
-                subdomain: ''
-            };
-
-        for (let i = 0, n = this.groups.length; i < n; i++) {
-            let group = this.groups[i];
-
-            route.name += group.name;
-            route.pattern += group.pattern;
-            route.subdomain = group.subdomain + route.subdomain;
-
-            if (group.middleware.length) {
-                route.middleware.push(...group.middleware);
-            }
-        }
-
-        route.name += name;
-        route.pattern += pattern;
-
-        if (route.pattern[0] !== '/') {
-            route.pattern = `/${route.pattern}`;
-        }
-
-        if (route.subdomain === 'www') {
-            route.subdomain = '';
-        }
-
-        if (!this.subdomains[route.subdomain]) {
-            this.subdomains[route.subdomain] = {};
-        }
-
-        this.static[route.name] = route;
-        this.subdomains[route.subdomain][route.pattern] = route.name;
-
-        return route;
-    }
-
-    group(group: any, routes: (routes: Routes) => void) {
-        this.groups.push(group);
-        routes(this);
-        this.groups.pop();
-    }
-}
-
-
-export default new Routes();
+import { Group, Responder, Route } from './types';
+
+
+class Routes {
+    dynamic: Record<Route['name'], Route> = {};
+    fallback?: string;
+    groups: Group[] = [];
+    static: Record<Route['name'], Route> = {};
+    subdomains: Record<Route['subdomain'], Record<Route['pattern'], Route['name']>> = {};
+
+
+    add(name: string, pattern: string, responder: Responder) {
+        let route: Route = {
+                middleware: [],
+                name: '',
+                pattern: '',
+                responder,
+                subdomain: ''
+            };
+
+        for (let i = 0, n = this.groups.length; i < n; i++) {
+            let group = this.groups[i];
+
+            route.name += group.name;
+            route.pattern += group.pattern;
+            route.subdomain = group.subdomain + route.subdomain;
+
+            if (group.middleware.length) {
+                route.middleware.push(...group.middleware);
+            }
+        }
+
+        route.name += name;
+        route.pattern += pattern;
+
+        if (route.pattern[0] !== '/') {
+            route.pattern = `/${route.pattern}`;
+        }
+
+        if (route.subdomain === 'www') {
+            route.subdomain = '';
+        }
+
+        if (!this.subdomains[route.subdomain]) {
+            this.subdomains[route.subdomain] = {};
+        }
+
+        this.static[route.name] = route;
+        this.subdomains[route.subdomain][route.pattern] = route.name;
+
+        return route;
+    }
+
+    group(group: any, routes: (routes: Routes) => void) {
+        this.groups.push(group);
+        routes(this);
+        this.groups.pop();
+    }
+}
+
+
+export default new Routes();
 export { Routes };

package/src/url.ts

@@ -1,6 +1,7 @@
 const parse = (url: string = window.location.href) => {
-    let data = new URL( url ),
-        parts = data.host.split('.'),
+    let { hash, host, hostname, href, origin, pathname, port, protocol } = new URL( url ),
+        parts = host.split('.'),
+        path = hash?.replace('#/', '/')?.split('?') || ['/', ''],
         subdomain = '';
 
     if (parts.length > 2) {
@@ -13,14 +14,14 @@ const parse = (url: string = window.location.href) => {
 
     return {
         data: {} as Record<string, any>,
-        href: data.href,
-        hostname: data.hostname,
-        uri: data.hash.replace('#/', '/') || '/',
-        origin: data.origin,
-        pathname: data.pathname,
-        port: data.port,
-        protocol: data.protocol,
-        query: Object.fromEntries( data.searchParams.entries() ),
+        href: href,
+        hostname: hostname,
+        uri: path[0],
+        origin: origin,
+        pathname: pathname,
+        port: port,
+        protocol: protocol,
+        query: Object.fromEntries( (new URLSearchParams(path[1])).entries() ),
         subdomain
     };
 };

package/build/middleware/dispatch.d.ts

@@ -1,3 +0,0 @@
-import { Request } from '../types';
-declare const _default: (request: Request) => any;
-export default _default;

package/build/middleware/dispatch.js

@@ -1,11 +0,0 @@
-import { middleware } from '../request';
-export default (request) => {
-    let route = request.data.route;
-    if (!route) {
-        throw new Error(`Route dispatching failed, route was not defined!`);
-    }
-    if (!route.middleware.length) {
-        return route.responder(request);
-    }
-    return middleware(...route.middleware, (request => route.responder(request)))(request);
-};

package/build/middleware/match.d.ts

@@ -1,4 +0,0 @@
-import { Routes } from '../routes';
-import { Next, Request } from '../types';
-declare const _default: (routes: Routes) => (request: Request, next: Next) => unknown;
-export default _default;

package/build/middleware/match.js

@@ -1,12 +0,0 @@
-export default (routes) => {
-    return (request, next) => {
-        let name = (routes.subdomains[request.subdomain] || {})[request.uri], route = routes.static[name];
-        if (!route) {
-        }
-        if (!route && routes.fallback) {
-            route = routes.static[routes.fallback];
-        }
-        request.data.route = route;
-        return next(request);
-    };
-};

package/build/request/index.d.ts

@@ -1,34 +0,0 @@
-import middleware from './middleware';
-import parse from './parse';
-declare const _default: {
-    middleware: (...middleware: import("./types").Middleware[]) => (request: {
-        data: Record<string, any>;
-        href: string;
-        hostname: string;
-        uri: string;
-        origin: string;
-        pathname: string;
-        port: string;
-        protocol: string;
-        query: {
-            [k: string]: string;
-        };
-        subdomain: string;
-    }) => Promise<unknown>;
-    parse: (url?: string) => {
-        data: Record<string, any>;
-        href: string;
-        hostname: string;
-        uri: string;
-        origin: string;
-        pathname: string;
-        port: string;
-        protocol: string;
-        query: {
-            [k: string]: string;
-        };
-        subdomain: string;
-    };
-};
-export default _default;
-export { middleware, parse };

package/build/request/index.js

@@ -1,4 +0,0 @@
-import middleware from './middleware';
-import parse from './parse';
-export default { middleware, parse };
-export { middleware, parse };

package/build/request/middleware.d.ts

@@ -1,3 +0,0 @@
-import { Middleware, Request } from './types';
-declare const _default: (...middleware: Middleware[]) => (request: Request) => Promise<unknown>;
-export default _default;

package/build/request/middleware.js

@@ -1,12 +0,0 @@
-export default (...middleware) => {
-    let i = -1, n = middleware.length, next = (request) => middleware[++i](request, (i < n ? next : () => {
-        throw new Error('Request middleware did not return a responder');
-    }));
-    return async (request) => {
-        if (!middleware.length) {
-            throw new Error('Request middleware has not been defined');
-        }
-        i = -1;
-        return await next(request);
-    };
-};

package/build/request/parse.d.ts

@@ -1,15 +0,0 @@
-declare const _default: (url?: string) => {
-    data: Record<string, any>;
-    href: string;
-    hostname: string;
-    uri: string;
-    origin: string;
-    pathname: string;
-    port: string;
-    protocol: string;
-    query: {
-        [k: string]: string;
-    };
-    subdomain: string;
-};
-export default _default;

package/build/request/parse.js

@@ -1,18 +0,0 @@
-export default (url = window.location.href) => {
-    let data = new URL(url), subdomain = data.host.split('.')[0] || '';
-    if (['127', 'www'].includes(`${subdomain}`)) {
-        subdomain = '';
-    }
-    return {
-        data: {},
-        href: data.href,
-        hostname: data.hostname,
-        uri: data.hash.replace('#/', '/') || '/',
-        origin: data.origin,
-        pathname: data.pathname,
-        port: data.port,
-        protocol: data.protocol,
-        query: Object.fromEntries(data.searchParams.entries()),
-        subdomain
-    };
-};

package/build/request/types.d.ts

@@ -1,6 +0,0 @@
-import parse from './parse';
-type Middleware = (request: Request, next: Next) => unknown;
-type Next = (request: Request) => unknown;
-type Request = ReturnType<typeof parse>;
-type Responder = (request: Request) => Promise<unknown> | unknown;
-export { Middleware, Next, Request, Responder };

package/build/request/types.js

@@ -1 +0,0 @@
-export {};