@esportsplus/routing 0.7.1 → 0.7.3

package/build/client/index.d.ts

@@ -10,7 +10,6 @@ declare const router: <const Factories extends readonly RouteFactory<any>[]>(...
         match(fallback: Route<InferOutput<Factories[number]>>): (request: Request<InferOutput<Factories[number]>>, next: Next<InferOutput<Factories[number]>>) => InferOutput<Factories[number]>;
     };
     redirect: <RouteName extends keyof AccumulateRoutes<Factories>>(name: RouteName, ...values: ExtractRequiredParams<RoutePath<AccumulateRoutes<Factories>, RouteName>> extends never ? ExtractOptionalParams<RoutePath<AccumulateRoutes<Factories>, RouteName>> extends never ? [] : [params?: PathParamsObject<RoutePath<AccumulateRoutes<Factories>, RouteName>>] : [params: PathParamsObject<RoutePath<AccumulateRoutes<Factories>, RouteName>>]) => void;
-    routes: Record<string, Route<InferOutput<Factories[number]>>>;
     uri: <RouteName extends keyof AccumulateRoutes<Factories>>(name: RouteName, ...values: ExtractRequiredParams<RoutePath<AccumulateRoutes<Factories>, RouteName>> extends never ? ExtractOptionalParams<RoutePath<AccumulateRoutes<Factories>, RouteName>> extends never ? [] : [params?: PathParamsObject<RoutePath<AccumulateRoutes<Factories>, RouteName>>] : [params: PathParamsObject<RoutePath<AccumulateRoutes<Factories>, RouteName>>]) => string;
 };
 export { router };

package/build/client/index.js

@@ -1,26 +1,26 @@
-import * as reactivity_f249ad01565249ca98ebd6d980e99aa90 from '@esportsplus/reactivity';
+import * as reactivity_b8c1970d69d44d969d8e19418a3a5cc10 from '@esportsplus/reactivity';
 import { effect, root } from '@esportsplus/reactivity';
 import { Router } from './router/index.js';
 import { PACKAGE_NAME } from './constants.js';
-class ReactiveObject_f249ad01565249ca98ebd6d980e99aa91 extends reactivity_f249ad01565249ca98ebd6d980e99aa90.ReactiveObject {
+class ReactiveObject_b8c1970d69d44d969d8e19418a3a5cc11 extends reactivity_b8c1970d69d44d969d8e19418a3a5cc10.ReactiveObject {
     #parameters;
     #route;
     constructor(_p0, _p1) {
         super(null);
-        this.#parameters = this[reactivity_f249ad01565249ca98ebd6d980e99aa90.SIGNAL](_p0);
-        this.#route = this[reactivity_f249ad01565249ca98ebd6d980e99aa90.SIGNAL](_p1);
+        this.#parameters = this[reactivity_b8c1970d69d44d969d8e19418a3a5cc10.SIGNAL](_p0);
+        this.#route = this[reactivity_b8c1970d69d44d969d8e19418a3a5cc10.SIGNAL](_p1);
     }
     get parameters() {
-        return reactivity_f249ad01565249ca98ebd6d980e99aa90.read(this.#parameters);
+        return reactivity_b8c1970d69d44d969d8e19418a3a5cc10.read(this.#parameters);
     }
     set parameters(_v0) {
-        reactivity_f249ad01565249ca98ebd6d980e99aa90.write(this.#parameters, _v0);
+        reactivity_b8c1970d69d44d969d8e19418a3a5cc10.write(this.#parameters, _v0);
     }
     get route() {
-        return reactivity_f249ad01565249ca98ebd6d980e99aa90.read(this.#route);
+        return reactivity_b8c1970d69d44d969d8e19418a3a5cc10.read(this.#route);
     }
     set route(_v1) {
-        reactivity_f249ad01565249ca98ebd6d980e99aa90.write(this.#route, _v1);
+        reactivity_b8c1970d69d44d969d8e19418a3a5cc10.write(this.#route, _v1);
     }
 }
 let cache = [], location = window.location;
@@ -90,7 +90,7 @@ function middleware(request, router) {
         return route.middleware(request);
     };
     host.match = (fallback) => {
-        let state = new ReactiveObject_f249ad01565249ca98ebd6d980e99aa91(undefined, undefined);
+        let state = new ReactiveObject_b8c1970d69d44d969d8e19418a3a5cc11(undefined, undefined);
         if (fallback === undefined) {
             throw new Error(`${PACKAGE_NAME}: fallback route does not exist`);
         }
@@ -130,7 +130,7 @@ function onpopstate() {
     }
 }
 const router = (...factories) => {
-    let instance = factories.reduce((r, factory) => factory(r), new Router()), request = reactivity_f249ad01565249ca98ebd6d980e99aa90.reactive(Object.assign(href(), { data: {} }));
+    let instance = factories.reduce((r, factory) => factory(r), new Router()), request = reactivity_b8c1970d69d44d969d8e19418a3a5cc10.reactive(Object.assign(href(), { data: {} }));
     if (cache.push(request) === 1) {
         window.addEventListener('hashchange', onpopstate);
     }
@@ -144,7 +144,6 @@ const router = (...factories) => {
             }
             window.location.hash = normalize(instance.uri(name, values));
         },
-        routes: instance.routes,
         uri: (name, ...values) => {
             return normalize(instance.uri(name, values));
         }

package/build/client/router/index.js

@@ -16,20 +16,23 @@ function normalize(path) {
 }
 function set(route, options) {
     let middleware = route.middleware;
-    for (let key in options) {
-        let value = options[key];
-        if (key === 'middleware') {
-            for (let i = 0, n = value.length; i < n; i++) {
-                middleware.push(value[i]);
-            }
-        }
-        else if (key === 'responder') {
-            middleware.push(value);
-        }
-        else {
-            route[key] = (route[key] || '') + value;
+    if (options.middleware) {
+        for (let i = 0, n = options.middleware.length; i < n; i++) {
+            middleware.push(options.middleware[i]);
         }
     }
+    if ('responder' in options) {
+        middleware.push(options.responder);
+    }
+    if (options.name) {
+        route.name = (route.name || '') + options.name;
+    }
+    if (options.path) {
+        route.path = (route.path || '') + options.path;
+    }
+    if (options.subdomain) {
+        route.subdomain = (route.subdomain || '') + options.subdomain;
+    }
 }
 class Router {
     bucket = {};

package/package.json

@@ -28,7 +28,7 @@
   },
   "type": "module",
   "types": "./build/index.d.ts",
-  "version": "0.7.1",
+  "version": "0.7.3",
   "scripts": {
     "build": "tsc",
     "build:test": "vite build --config test/vite.config.ts",

package/src/client/index.ts

@@ -149,8 +149,7 @@ function onpopstate() {
         let state = cache[i];
 
         for (let key in values) {
-            // @ts-ignore
-            state[key] = values[key];
+            (state as Record<string, unknown>)[key] = (values as Record<string, unknown>)[key];
         }
     }
 }
@@ -188,7 +187,6 @@ const router = <const Factories extends readonly RouteFactory<any>[]>(...factori
 
             window.location.hash = normalize(instance.uri(name as any, values as any));
         },
-        routes: instance.routes,
         uri: <RouteName extends keyof Routes>(
             name: RouteName,
             ...values: ExtractRequiredParams<RoutePath<Routes, RouteName>> extends never

package/src/client/router/index.ts

@@ -24,22 +24,27 @@ function normalize(path: string) {
 function set<T>(route: Route<T>, options: Options<T> | RouteOptions<T>) {
     let middleware = route.middleware as Middleware<T>[];
 
-    for (let key in options) {
-        let value = options[key as keyof typeof options] as any;
-
-        if (key === 'middleware') {
-            for (let i = 0, n = value.length; i < n; i++) {
-                middleware.push(value[i]);
-            }
-        }
-        else if (key === 'responder') {
-            middleware.push(value);
-        }
-        else {
-            // @ts-ignore
-            route[key] = (route[key] || '') + value;
+    if (options.middleware) {
+        for (let i = 0, n = options.middleware.length; i < n; i++) {
+            middleware.push(options.middleware[i]);
         }
     }
+
+    if ('responder' in options) {
+        middleware.push((options as RouteOptions<T>).responder);
+    }
+
+    if (options.name) {
+        route.name = (route.name || '') + options.name;
+    }
+
+    if (options.path) {
+        route.path = (route.path || '') + options.path;
+    }
+
+    if (options.subdomain) {
+        route.subdomain = (route.subdomain || '') + options.subdomain;
+    }
 }