@esportsplus/routing 0.0.38 → 0.0.40

package/build/browser.d.ts

@@ -8,7 +8,7 @@ declare const _default: <T>(instance?: Router<T> | undefined) => {
     middleware: {
         (...middleware: Middleware<T>[]): () => T;
         dispatch(request: Request<T>): T;
-        match(fallback: Route<T>, scheduler: Scheduler, subdomain?: string | undefined): (request: Request<T>, next: Next<T>) => import("@esportsplus/template/build/types").Template;
+        match(fallback: Route<T>, scheduler: Scheduler, subdomain?: string | undefined): (request: Request<T>, next: Next<T>) => import("@esportsplus/template/build/types").Renderable;
     };
     redirect: (path: string, values?: unknown[]) => void;
     router: Router<T>;

package/build/browser.js

@@ -1,7 +1,12 @@
-import { effect, reactive, root } from '@esportsplus/reactivity';
-import { html } from '@esportsplus/template';
-import pipeline from '@esportsplus/pipeline';
-import factory from './router';
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const reactivity_1 = require("@esportsplus/reactivity");
+const template_1 = require("@esportsplus/template");
+const pipeline_1 = __importDefault(require("@esportsplus/pipeline"));
+const router_1 = __importDefault(require("./router"));
 let cache = [];
 function back() {
     window.history.back();
@@ -10,18 +15,23 @@ function forward() {
     window.history.forward();
 }
 function href() {
-    let { hash, hostname, href, origin, port, protocol } = new URL(window.location?.href || ''), path = hash ? hash.slice(1).split('?') : ['/', ''];
-    return {
+    let data = new URL(window.location?.href || ''), path = data.hash ? data.hash.slice(1).split('?') : ['/', ''], request = {
         data: {},
-        href,
-        hostname,
+        href: data.href,
+        hostname: data.hostname,
         method: 'GET',
-        origin,
+        origin: data.origin,
         path: path[0],
-        port,
-        protocol,
-        query: path[1] ? Object.fromEntries((new URLSearchParams(path[1])).entries()) : {},
+        port: data.port,
+        protocol: data.protocol,
+        query: {}
     };
+    if (path[1]) {
+        for (let [key, value] of (new URLSearchParams(path[1])).entries()) {
+            request.query[key] = value;
+        }
+    }
+    return request;
 }
 function match(request, router, subdomain) {
     if (router.subdomains !== null) {
@@ -37,7 +47,7 @@ function match(request, router, subdomain) {
 }
 function middleware(request, router) {
     function host(...middleware) {
-        let instance = pipeline(...middleware);
+        let instance = (0, pipeline_1.default)(...middleware);
         return () => instance(request);
     }
     ;
@@ -49,31 +59,31 @@ function middleware(request, router) {
         return route.dispatch(request);
     };
     host.match = (fallback, scheduler, subdomain) => {
-        let state = reactive({
+        let state = (0, reactivity_1.reactive)({
             parameters: undefined,
-            route: undefined,
-            root: undefined
+            root: undefined,
+            route: undefined
         });
         if (fallback === undefined) {
             throw new Error('Middleware: fallback route does not exist');
         }
-        effect(() => {
+        (0, reactivity_1.effect)(() => {
             let { parameters, route } = match(request, router, subdomain);
             state.parameters = parameters;
             state.route = route || fallback;
         });
         return (request, next) => {
-            return html `${() => {
+            return (0, template_1.html) `${() => {
                 if (state.route === undefined) {
                     throw new Error('Routing: route is undefined');
                 }
                 if (state.root !== undefined) {
                     state.root.dispose();
                 }
-                return root((instance) => {
+                return (0, reactivity_1.root)((root) => {
                     request.data.parameters = state.parameters;
                     request.data.route = state.route;
-                    state.root = instance;
+                    state.root = root;
                     return next(request);
                 }, scheduler);
             }}`;
@@ -96,8 +106,8 @@ function onpopstate() {
         }
     }
 }
-export default (instance) => {
-    let request = reactive(href()), router = instance || factory();
+exports.default = (instance) => {
+    let request = (0, reactivity_1.reactive)(href()), router = instance || (0, router_1.default)();
     if (cache.push(request) === 1) {
         window.addEventListener('hashchange', onpopstate);
     }

package/build/constants.js

@@ -1,4 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WILDCARD = exports.STATIC = exports.PLACEHOLDER = void 0;
 const PLACEHOLDER = 0;
+exports.PLACEHOLDER = PLACEHOLDER;
 const STATIC = 1;
+exports.STATIC = STATIC;
 const WILDCARD = 2;
-export { PLACEHOLDER, STATIC, WILDCARD };
+exports.WILDCARD = WILDCARD;

package/build/index.js

@@ -1,5 +1,27 @@
-import browser from './browser';
-import router from './router';
-import slugify from './slugify';
-export { browser, router, slugify };
-export * from './types';
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.slugify = exports.router = exports.browser = void 0;
+const browser_1 = __importDefault(require("./browser"));
+exports.browser = browser_1.default;
+const router_1 = __importDefault(require("./router"));
+exports.router = router_1.default;
+const slugify_1 = __importDefault(require("./slugify"));
+exports.slugify = slugify_1.default;
+__exportStar(require("./types"), exports);

package/build/router/index.js

@@ -1,6 +1,10 @@
-import { STATIC } from '../constants';
-import { Node } from './node';
-import { Route } from './route';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Route = exports.Router = void 0;
+const constants_1 = require("../constants");
+const node_1 = require("./node");
+const route_1 = require("./route");
+Object.defineProperty(exports, "Route", { enumerable: true, get: function () { return route_1.Route; } });
 let { isArray } = Array;
 function normalize(path) {
     if (path[0] !== '/') {
@@ -39,10 +43,10 @@ class Router {
     static = {};
     subdomains = null;
     constructor() {
-        this.root = new Node();
+        this.root = new node_1.Node();
     }
     add(radixkey, route) {
-        if (radixkey.indexOf(':') === -1 || this.root.add(radixkey, route).type === STATIC) {
+        if (radixkey.indexOf(':') === -1 || this.root.add(radixkey, route).type === constants_1.STATIC) {
             if (this.static[radixkey]) {
                 throw new Error(`Routing: static path '${radixkey}' is already in use`);
             }
@@ -51,7 +55,7 @@ class Router {
         return this;
     }
     route({ middleware, name, path, responder, subdomain }) {
-        let route = new Route(responder);
+        let route = new route_1.Route(responder);
         for (let i = 0, n = this.groups.length; i < n; i++) {
             let { middleware, name, path, subdomain } = this.groups[i];
             set(route, 'name', name);
@@ -161,5 +165,5 @@ class Router {
         return resolved.join('/');
     }
 }
-export default () => new Router();
-export { Router, Route };
+exports.Router = Router;
+exports.default = () => new Router();

package/build/router/node.js

@@ -1,4 +1,7 @@
-import { PLACEHOLDER, STATIC, WILDCARD } from '../constants';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Node = void 0;
+const constants_1 = require("../constants");
 class Node {
     children = null;
     parent = null;
@@ -10,7 +13,7 @@ class Node {
         this.parent = parent;
     }
     add(path, route) {
-        let node = this, segments = path.split('/'), type = STATIC, unnamed = 0;
+        let node = this, segments = path.split('/'), type = constants_1.STATIC, unnamed = 0;
         for (let i = 0, n = segments.length; i < n; i++) {
             let child = node.children?.get(segments[i]);
             if (!child) {
@@ -21,12 +24,12 @@ class Node {
                 node.children.set(segment, (child = new Node(node)));
                 if (symbol === ':') {
                     child.property = (segment.slice(1) || unnamed++).toString();
-                    node.children.set(PLACEHOLDER, child);
+                    node.children.set(constants_1.PLACEHOLDER, child);
                     type = null;
                 }
                 else if (symbol === '*') {
                     child.property = (segment.slice(2) || unnamed++).toString();
-                    node.children.set(WILDCARD, child);
+                    node.children.set(constants_1.WILDCARD, child);
                     type = null;
                 }
             }
@@ -40,7 +43,7 @@ class Node {
     find(path) {
         let node = this, parameters = {}, segments = path.split('/'), wildcard = null;
         for (let i = 0, n = segments.length; i < n; i++) {
-            let segment = segments[i], wc = node.children?.get(WILDCARD);
+            let segment = segments[i], wc = node.children?.get(constants_1.WILDCARD);
             if (wc) {
                 wildcard = {
                     node: wc,
@@ -52,7 +55,7 @@ class Node {
                 node = next;
             }
             else {
-                node = node.children?.get(PLACEHOLDER);
+                node = node.children?.get(constants_1.PLACEHOLDER);
                 if (!node) {
                     break;
                 }
@@ -85,9 +88,9 @@ class Node {
         let parent = node.parent;
         if (parent && parent.children) {
             parent.children.delete(segments[segments.length - 1]);
-            parent.children.delete(WILDCARD);
-            parent.children.delete(PLACEHOLDER);
+            parent.children.delete(constants_1.WILDCARD);
+            parent.children.delete(constants_1.PLACEHOLDER);
         }
     }
 }
-export { Node };
+exports.Node = Node;

package/build/router/route.js

@@ -1,4 +1,10 @@
-import pipeline from '@esportsplus/pipeline';
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Route = void 0;
+const pipeline_1 = __importDefault(require("@esportsplus/pipeline"));
 class Route {
     middleware = null;
     name = null;
@@ -12,7 +18,7 @@ class Route {
         if (this.middleware === null) {
             return this.responder(request);
         }
-        return pipeline(...this.middleware, (request) => this.responder(request))(request);
+        return (0, pipeline_1.default)(...this.middleware, (request) => this.responder(request))(request);
     }
 }
-export { Route };
+exports.Route = Route;

package/build/slugify.js

@@ -1,3 +1,5 @@
-export default (value) => {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = (value) => {
     return value.replace(/\W+/g, '-').replace(/[-]+$/, '').toLowerCase();
 };

package/build/types.js

@@ -1,2 +1,6 @@
-import { Route, Router } from './router';
-export { Route, Router };
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Router = exports.Route = void 0;
+const router_1 = require("./router");
+Object.defineProperty(exports, "Route", { enumerable: true, get: function () { return router_1.Route; } });
+Object.defineProperty(exports, "Router", { enumerable: true, get: function () { return router_1.Router; } });

package/package.json

@@ -2,11 +2,11 @@
     "author": "ICJR",
     "dependencies": {
         "@esportsplus/pipeline": "^0.0.5",
-        "@esportsplus/reactivity": "^0.1.17",
-        "@esportsplus/template": "^0.1.8"
+        "@esportsplus/reactivity": "^0.1.18",
+        "@esportsplus/template": "^0.1.29"
     },
     "devDependencies": {
-        "@esportsplus/typescript": "^0.0.15"
+        "@esportsplus/typescript": "^0.0.18"
     },
     "main": "./build/index.js",
     "name": "@esportsplus/routing",
@@ -18,5 +18,5 @@
         "prepublishOnly": "npm run build"
     },
     "types": "./build/index.d.ts",
-    "version": "0.0.38"
+    "version": "0.0.40"
 }

package/src/browser.ts

@@ -17,20 +17,27 @@ function forward() {
 }
 
 function href<T>(): Request<T> {
-    let { hash, hostname, href, origin, port, protocol } = new URL( window.location?.href || '' ),
-        path = hash ? hash.slice(1).split('?') : ['/', ''];
+    let data = new URL( window.location?.href || '' ),
+        path = data.hash ? data.hash.slice(1).split('?') : ['/', ''],
+        request: Request<T> = {
+            data: {},
+            href: data.href,
+            hostname: data.hostname,
+            method: 'GET',
+            origin: data.origin,
+            path: path[0],
+            port: data.port,
+            protocol: data.protocol,
+            query: {}
+        };
 
-    return {
-        data: {},
-        href,
-        hostname,
-        method: 'GET',
-        origin,
-        path: path[0],
-        port,
-        protocol,
-        query: path[1] ? Object.fromEntries( (new URLSearchParams(path[1])).entries() ) : {},
-    };
+    if (path[1]) {
+        for (let [key, value] of (new URLSearchParams(path[1])).entries()) {
+            request.query[key] = value;
+        }
+    }
+
+    return request;
 }
 
 function match<T>(request: Request<T>, router: Router<T>, subdomain?: string) {
@@ -68,8 +75,8 @@ function middleware<T>(request: Request<T>, router: Router<T>) {
     host.match = (fallback: Route<T>, scheduler: Scheduler, subdomain?: string) => {
         let state = reactive<ReturnType<typeof router.match> & { root?: Root }>({
                 parameters: undefined,
-                route: undefined,
-                root: undefined
+                root: undefined,
+                route: undefined
             });
 
         if (fallback === undefined) {
@@ -93,11 +100,11 @@ function middleware<T>(request: Request<T>, router: Router<T>) {
                     state.root.dispose();
                 }
 
-                return root((instance) => {
+                return root((root) => {
                     request.data.parameters = state.parameters;
                     request.data.route = state.route;
 
-                    state.root = instance;
+                    state.root = root;
 
                     return next(request);
                 }, scheduler);