@esportsplus/routing 0.0.22 → 0.0.23

package/package.json

@@ -2,10 +2,10 @@
     "author": "ICJR",
     "dependencies": {
         "@esportsplus/pipeline": "^0.0.1",
-        "@esportsplus/reactivity": "^0.0.30"
+        "@esportsplus/reactivity": "^0.1.2"
     },
     "devDependencies": {
-        "@esportsplus/typescript": "^0.0.1"
+        "@esportsplus/typescript": "^0.0.3"
     },
     "main": "./build/index.js",
     "name": "@esportsplus/routing",
@@ -17,5 +17,5 @@
         "prepublishOnly": "npm run build"
     },
     "types": "./build/index.d.ts",
-    "version": "0.0.22"
+    "version": "0.0.23"
 }

package/build/hash.d.ts

@@ -1,70 +0,0 @@
-import { Router } from './types';
-declare let cache: {
-    factory: typeof request;
-    state: Record<PropertyKey, unknown>;
-}[];
-declare const back: () => void;
-declare const forward: () => void;
-declare const listener: {
-    register: (factory: (typeof cache)[0]['factory'], state: (typeof cache)[0]['state']) => () => void;
-    remove: (state: (typeof cache)[0]['state']) => void;
-};
-declare const factory: {
-    redirect: (router: Router) => (path: string, { state, values }: {
-        state?: Record<PropertyKey, unknown> | undefined;
-        values?: unknown[] | undefined;
-    }) => void;
-    uri: (router: Router) => (path: string, values?: unknown[]) => string;
-};
-declare const request: (url?: string) => {
-    href: string;
-    hostname: string;
-    method: string;
-    origin: string;
-    path: string;
-    port: string;
-    protocol: string;
-    query: {
-        [k: string]: string;
-    };
-};
-declare const _default: {
-    back: () => void;
-    factory: {
-        redirect: (router: Router) => (path: string, { state, values }: {
-            state?: Record<PropertyKey, unknown> | undefined;
-            values?: unknown[] | undefined;
-        }) => void;
-        uri: (router: Router) => (path: string, values?: unknown[]) => string;
-    };
-    forward: () => void;
-    listener: {
-        register: (factory: (url?: string) => {
-            href: string;
-            hostname: string;
-            method: string;
-            origin: string;
-            path: string;
-            port: string;
-            protocol: string;
-            query: {
-                [k: string]: string;
-            };
-        }, state: Record<PropertyKey, unknown>) => () => void;
-        remove: (state: Record<PropertyKey, unknown>) => void;
-    };
-    request: (url?: string) => {
-        href: string;
-        hostname: string;
-        method: string;
-        origin: string;
-        path: string;
-        port: string;
-        protocol: string;
-        query: {
-            [k: string]: string;
-        };
-    };
-};
-export default _default;
-export { back, factory, forward, listener, request };

package/build/hash.js

@@ -1,75 +0,0 @@
-let cache = [], registered = false;
-function update() {
-    for (let i = 0, n = cache.length; i < n; i++) {
-        let { factory, state } = cache[i], values = factory();
-        for (let key in values) {
-            state[key] = values[key];
-        }
-    }
-}
-const back = () => window.history.back();
-const forward = () => window.history.forward();
-const listener = {
-    register: (factory, state) => {
-        cache.push({ factory, state });
-        if (!registered) {
-            registered = true;
-            update();
-            window.addEventListener('popstate', update);
-        }
-        return () => {
-            listener.remove(state);
-        };
-    },
-    remove: (state) => {
-        for (let i = 0, n = cache.length; i < n; i++) {
-            if (cache[i].state !== state) {
-                continue;
-            }
-            cache[i] = cache[n - 1];
-            cache.pop();
-            if (cache.length === 0) {
-                window.removeEventListener('popstate', update);
-            }
-            return;
-        }
-    }
-};
-const factory = {
-    redirect: (router) => {
-        return (path, { state, values }) => {
-            if (path.startsWith('http://') || path.startsWith('https://')) {
-                return window.location.replace(path);
-            }
-            let uri = router.uri(path, values || []);
-            if (uri[0] === '/') {
-                uri = '#' + uri;
-            }
-            window.history.pushState(state || {}, '', uri);
-        };
-    },
-    uri: (router) => {
-        return (path, values = []) => {
-            let uri = router.uri(path, values || []);
-            if (uri[0] === '/') {
-                uri = '#' + uri;
-            }
-            return uri;
-        };
-    }
-};
-const request = (url = window?.location?.href || '') => {
-    let { hash, hostname, href, origin, port, protocol } = new URL(url), path = hash?.replace('#/', '/')?.split('?') || ['/', ''];
-    return {
-        href,
-        hostname,
-        method: 'GET',
-        origin,
-        path: path[0],
-        port,
-        protocol,
-        query: Object.fromEntries((new URLSearchParams(path[1])).entries())
-    };
-};
-export default { back, factory, forward, listener, request };
-export { back, factory, forward, listener, request };

package/build/middleware/dispatch.d.ts

@@ -1,9 +0,0 @@
-import { Request } from '../types';
-import { Router } from '../router';
-declare const _default: <R>(request: Request & {
-    data: {
-        parameters?: Record<PropertyKey, unknown> | undefined;
-        route?: import("../router/route").Route<R> | undefined;
-    };
-}) => import("../types").Response<R>;
-export default _default;

package/build/middleware/dispatch.js

@@ -1,7 +0,0 @@
-export default (request) => {
-    let { route } = request.data;
-    if (route === undefined) {
-        throw new Error(`Routing: route dispatching failed, route is undefined!`);
-    }
-    return route.dispatcher(request);
-};

package/build/middleware/factory.d.ts

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

package/build/middleware/factory.js

@@ -1,13 +0,0 @@
-function error() {
-    throw new Error('Routing: request middleware did not return a responder');
-}
-export default (...middleware) => {
-    let stack = [];
-    for (let i = 0, n = middleware.length; i < n; i++) {
-        stack[i] = (request) => middleware[i](request, stack[i + 1] || error);
-    }
-    if (!stack.length) {
-        throw new Error('Routing: request middleware has not been defined');
-    }
-    return (request) => stack[0](request);
-};

package/build/middleware/index.d.ts

@@ -1,13 +0,0 @@
-import dispatch from './dispatch';
-import match from './match';
-declare const _default: {
-    dispatch: <R>(request: import("../types").Request & {
-        data: {
-            parameters?: Record<PropertyKey, unknown> | undefined;
-            route?: import("../router/route").Route<R> | undefined;
-        };
-    }) => import("../types").Response<R>;
-    match: <R_1>(router: import("../router").Router<R_1>, subdomain?: string | undefined) => import("../types").Middleware<R_1>;
-};
-export default _default;
-export { dispatch, match };

package/build/middleware/index.js

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

package/build/middleware/match.d.ts

@@ -1,3 +0,0 @@
-import { Middleware, Router } from '../types';
-declare const _default: <R>(router: Router<R>, subdomain?: string) => Middleware<R>;
-export default _default;

package/build/middleware/match.js

@@ -1,23 +0,0 @@
-export default (router, subdomain) => {
-    return (request, next) => {
-        let match = subdomain || request.subdomain;
-        if (match === undefined) {
-            if (router.subdomains) {
-                for (let i = 0, n = router.subdomains.length; i < n; i++) {
-                    if (!request.hostname.startsWith(router.subdomains[i])) {
-                        continue;
-                    }
-                    match = router.subdomains[i];
-                    break;
-                }
-            }
-            if (match === undefined) {
-                match = '';
-            }
-        }
-        let { parameters, route } = router.match(request.method, request.path, match);
-        request.data.parameters = parameters;
-        request.data.route = route;
-        return next(request);
-    };
-};

package/build/router/path.d.ts

@@ -1,6 +0,0 @@
-declare const normalize: (path: string) => string;
-declare const radixkey: (path: string, { method, subdomain }?: {
-    method?: string | null | undefined;
-    subdomain?: string | null | undefined;
-}) => string;
-export { normalize, radixkey };

package/build/router/path.js

@@ -1,20 +0,0 @@
-const normalize = (path) => {
-    if (path[0] !== '/') {
-        path = '/' + path;
-    }
-    if (path.endsWith('/')) {
-        path = path.slice(0, -1);
-    }
-    return path || '/';
-};
-const radixkey = (path, { method, subdomain } = {}) => {
-    let prefix = '';
-    if (subdomain) {
-        prefix = subdomain + ' ';
-    }
-    if (method) {
-        prefix += method + ' ';
-    }
-    return prefix.toUpperCase() + normalize(path);
-};
-export { normalize, radixkey };

package/build/spa.d.ts

@@ -1,14 +0,0 @@
-import { Middleware, Response, Router } from './types';
-declare function back(): void;
-declare function forward(): void;
-declare const _default: <R>(router: Router<R>) => {
-    back: typeof back;
-    forward: typeof forward;
-    middleware: (...fns: Middleware<R>[]) => () => Response<R>;
-    redirect: (path: string, { state, values }: {
-        state?: Record<PropertyKey, unknown> | undefined;
-        values?: unknown[] | undefined;
-    }) => void;
-    uri: (path: string, values?: unknown[]) => string;
-};
-export default _default;

package/build/spa.js

@@ -1,63 +0,0 @@
-import { reactive } from '@esportsplus/reactivity';
-import pipeline from '@esportsplus/pipeline';
-let cache = [], registered = false;
-function back() {
-    window.history.back();
-}
-function forward() {
-    window.history.forward();
-}
-function normalize(uri) {
-    if (uri[0] === '/') {
-        return '#' + uri;
-    }
-    return uri;
-}
-function request() {
-    let { hash, hostname, href, origin, port, protocol } = new URL(window.location?.href || ''), path = hash ? hash.slice(1).split('?') : ['/', ''];
-    return {
-        data: {},
-        href,
-        hostname,
-        method: 'GET',
-        origin,
-        path: path[0],
-        port,
-        protocol,
-        query: path[1] ? Object.fromEntries((new URLSearchParams(path[1])).entries()) : {}
-    };
-}
-function event() {
-    let values = request();
-    for (let i = 0, n = cache.length; i < n; i++) {
-        let state = cache[i];
-        for (let key in values) {
-            state[key] = values[key];
-        }
-    }
-}
-export default (router) => {
-    let state = reactive(request());
-    cache.push(state);
-    if (!registered) {
-        registered = true;
-        window.addEventListener('popstate', event);
-    }
-    return {
-        back,
-        forward,
-        middleware: (...fns) => {
-            let instance = pipeline(...fns);
-            return () => instance(state);
-        },
-        redirect: (path, { state, values }) => {
-            if (path.startsWith('https://') || path.startsWith('http://')) {
-                return window.location.replace(path);
-            }
-            window.history.pushState((state || {}), '', normalize(router.uri(path, values || [])));
-        },
-        uri: (path, values = []) => {
-            return normalize(router.uri(path, values || []));
-        }
-    };
-};

package/build/symbols.d.ts

@@ -1,4 +0,0 @@
-declare const PLACEHOLDER = 0;
-declare const STATIC = 1;
-declare const WILDCARD = 2;
-export { PLACEHOLDER, STATIC, WILDCARD };

package/build/symbols.js

@@ -1,4 +0,0 @@
-const PLACEHOLDER = 0;
-const STATIC = 1;
-const WILDCARD = 2;
-export { PLACEHOLDER, STATIC, WILDCARD };