@esportsplus/routing 0.6.7 → 0.7.2

package/build/client/index.d.ts

@@ -5,7 +5,7 @@ declare const router: <const Factories extends readonly RouteFactory<any>[]>(...
     back: typeof back;
     forward: typeof forward;
     middleware: {
-        (...stages: Middleware<InferOutput<Factories[number]>>[]): InferOutput<Factories[number]>;
+        (...middleware: Middleware<InferOutput<Factories[number]>>[]): InferOutput<Factories[number]>;
         dispatch(request: Request<InferOutput<Factories[number]>>): InferOutput<Factories[number]>;
         match(fallback: Route<InferOutput<Factories[number]>>): (request: Request<InferOutput<Factories[number]>>, next: Next<InferOutput<Factories[number]>>) => InferOutput<Factories[number]>;
     };

package/build/client/index.js

@@ -1,33 +1,40 @@
-import * as reactivity_133ba2c86bd54849af03b85c9ce9b48a0 from '@esportsplus/reactivity';
+import * as reactivity_ffa278ace0bb4e959ff55da8933387190 from '@esportsplus/reactivity';
 import { effect, root } from '@esportsplus/reactivity';
 import { Router } from './router/index.js';
-import pipeline from '@esportsplus/pipeline';
 import { PACKAGE_NAME } from './constants.js';
-class ReactiveObject_133ba2c86bd54849af03b85c9ce9b48a1 extends reactivity_133ba2c86bd54849af03b85c9ce9b48a0.ReactiveObject {
+class ReactiveObject_ffa278ace0bb4e959ff55da8933387191 extends reactivity_ffa278ace0bb4e959ff55da8933387190.ReactiveObject {
     #parameters;
     #route;
     constructor(_p0, _p1) {
         super(null);
-        this.#parameters = this[reactivity_133ba2c86bd54849af03b85c9ce9b48a0.SIGNAL](_p0);
-        this.#route = this[reactivity_133ba2c86bd54849af03b85c9ce9b48a0.SIGNAL](_p1);
+        this.#parameters = this[reactivity_ffa278ace0bb4e959ff55da8933387190.SIGNAL](_p0);
+        this.#route = this[reactivity_ffa278ace0bb4e959ff55da8933387190.SIGNAL](_p1);
     }
     get parameters() {
-        return reactivity_133ba2c86bd54849af03b85c9ce9b48a0.read(this.#parameters);
+        return reactivity_ffa278ace0bb4e959ff55da8933387190.read(this.#parameters);
     }
     set parameters(_v0) {
-        reactivity_133ba2c86bd54849af03b85c9ce9b48a0.write(this.#parameters, _v0);
+        reactivity_ffa278ace0bb4e959ff55da8933387190.write(this.#parameters, _v0);
     }
     get route() {
-        return reactivity_133ba2c86bd54849af03b85c9ce9b48a0.read(this.#route);
+        return reactivity_ffa278ace0bb4e959ff55da8933387190.read(this.#route);
     }
     set route(_v1) {
-        reactivity_133ba2c86bd54849af03b85c9ce9b48a0.write(this.#route, _v1);
+        reactivity_ffa278ace0bb4e959ff55da8933387190.write(this.#route, _v1);
     }
 }
 let cache = [], location = window.location;
 function back() {
     window.history.back();
 }
+function build(stages) {
+    let chain = () => { throw new Error(`${PACKAGE_NAME}: final stage did not return a value`); };
+    for (let i = stages.length - 1; i >= 0; i--) {
+        let next = chain, stage = stages[i];
+        chain = (input) => stage(input, next);
+    }
+    return chain;
+}
 function forward() {
     window.history.forward();
 }
@@ -64,12 +71,12 @@ function match(request, router, subdomain) {
     return router.match(request.method, request.path, subdomain || '');
 }
 function middleware(request, router) {
-    let middleware = pipeline();
-    function host(...stages) {
-        for (let i = 0, n = stages.length; i < n; i++) {
-            middleware.add(stages[i]);
+    let stages = [];
+    function host(...middleware) {
+        for (let i = 0, n = middleware.length; i < n; i++) {
+            stages.push(middleware[i]);
         }
-        return middleware.dispatch(request);
+        return build(stages)(request);
     }
     ;
     host.dispatch = (request) => {
@@ -77,10 +84,13 @@ function middleware(request, router) {
         if (route === undefined) {
             throw new Error(`${PACKAGE_NAME}: route is undefined!`);
         }
-        return route.pipeline.dispatch(request);
+        if (typeof route.middleware !== 'function') {
+            route.middleware = build(route.middleware);
+        }
+        return route.middleware(request);
     };
     host.match = (fallback) => {
-        let state = new ReactiveObject_133ba2c86bd54849af03b85c9ce9b48a1(undefined, undefined);
+        let state = new ReactiveObject_ffa278ace0bb4e959ff55da8933387191(undefined, undefined);
         if (fallback === undefined) {
             throw new Error(`${PACKAGE_NAME}: fallback route does not exist`);
         }
@@ -120,7 +130,7 @@ function onpopstate() {
     }
 }
 const router = (...factories) => {
-    let instance = factories.reduce((r, factory) => factory(r), new Router()), request = reactivity_133ba2c86bd54849af03b85c9ce9b48a0.reactive(Object.assign(href(), { data: {} }));
+    let instance = factories.reduce((r, factory) => factory(r), new Router()), request = reactivity_ffa278ace0bb4e959ff55da8933387190.reactive(Object.assign(href(), { data: {} }));
     if (cache.push(request) === 1) {
         window.addEventListener('hashchange', onpopstate);
     }

package/build/client/router/index.js

@@ -1,6 +1,5 @@
 import { ON_DELETE, ON_GET, ON_POST, ON_PUT, PACKAGE_NAME } from '../constants.js';
 import { Node } from './node.js';
-import pipeline from '@esportsplus/pipeline';
 function key(method, subdomain) {
     return (method + (subdomain ? ' ' + subdomain : '')).toUpperCase();
 }
@@ -16,21 +15,24 @@ function normalize(path) {
     return path || '/';
 }
 function set(route, options) {
-    let pipeline = route.pipeline;
-    for (let key in options) {
-        let value = options[key];
-        if (key === 'middleware') {
-            for (let i = 0, n = value.length; i < n; i++) {
-                pipeline.add(value[i]);
-            }
-        }
-        else if (key === 'responder') {
-            pipeline.add(value);
-        }
-        else {
-            route[key] = (route[key] || '') + value;
+    let middleware = route.middleware;
+    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 = {};
@@ -57,7 +59,7 @@ class Router {
         let groups = this.groups, route = {
             name: null,
             path: null,
-            pipeline: pipeline(),
+            middleware: [],
             subdomain: null
         };
         for (let i = 0, n = groups.length; i < n; i++) {

package/build/client/types.d.ts

@@ -1,6 +1,5 @@
 import { NeverAsync } from '@esportsplus/utilities';
 import { Router } from './router/index.js';
-import pipeline from '@esportsplus/pipeline';
 type AccumulateRoutes<T extends readonly RouteFactory<any>[]> = T extends readonly [infer F extends RouteFactory<any>, ...infer Rest extends readonly RouteFactory<any>[]] ? ExtractRoutes<F> & AccumulateRoutes<Rest> : {};
 type ExtractOptionalParams<Path extends string> = Path extends `/${infer Segment}/${infer Rest}` ? (Segment extends `?:${infer Param}` ? Param : never) | ExtractOptionalParams<`/${Rest}`> : Path extends `/${infer Segment}` ? (Segment extends `?:${infer Param}` ? Param : never) : never;
 type ExtractParamsTuple<Path extends string> = Path extends `${infer _Start}:${infer Param}/${infer Rest}` ? [Param, ...ExtractParamsTuple<`/${Rest}`>] : Path extends `${infer _Start}:${infer Param}` ? [Param] : [];
@@ -38,7 +37,7 @@ type Request<T> = {
 type Route<T> = {
     name: Name | null;
     path: string | null;
-    pipeline: ReturnType<typeof pipeline<Request<T>, T>>;
+    middleware: Middleware<T>[] | Next<T>;
     subdomain: string | null;
 };
 type RouteFactory<T> = (router: Router<T, any>) => Router<T, RouteRegistry>;

package/package.json

@@ -1,7 +1,6 @@
 {
   "author": "ICJR",
   "dependencies": {
-    "@esportsplus/pipeline": "^1.2.2",
     "@esportsplus/reactivity": "^0.30.2",
     "@esportsplus/typescript": "^0.29.0",
     "@esportsplus/utilities": "^0.27.2"
@@ -29,7 +28,7 @@
   },
   "type": "module",
   "types": "./build/index.d.ts",
-  "version": "0.6.7",
+  "version": "0.7.2",
   "scripts": {
     "build": "tsc",
     "build:test": "vite build --config test/vite.config.ts",

package/src/client/index.ts

@@ -1,7 +1,6 @@
 import { effect, reactive, root } from '@esportsplus/reactivity';
 import { AccumulateRoutes, ExtractOptionalParams, ExtractRequiredParams, InferOutput, Middleware, Next, PathParamsObject, Request, Route, RouteFactory, RoutePath } from './types';
 import { Router } from './router';
-import pipeline from '@esportsplus/pipeline';
 import { PACKAGE_NAME } from './constants';
 
 
@@ -13,6 +12,19 @@ function back() {
     window.history.back();
 }
 
+function build<T>(stages: Middleware<T>[]): Next<T> {
+    let chain: Next<T> = () => { throw new Error(`${PACKAGE_NAME}: final stage did not return a value`); };
+
+    for (let i = stages.length - 1; i >= 0; i--) {
+        let next = chain,
+            stage = stages[i];
+
+        chain = (input) => stage(input, next);
+    }
+
+    return chain;
+}
+
 function forward() {
     window.history.forward();
 }
@@ -62,24 +74,28 @@ function match<T>(request: Request<T>, router: Router<T>, subdomain?: string) {
 }
 
 function middleware<T>(request: Request<T>, router: Router<T>) {
-    let middleware = pipeline<Request<T>, T>();
+    let stages: Middleware<T>[] = [];
 
-    function host(...stages: Middleware<T>[]) {
-        for (let i = 0, n = stages.length; i < n; i++) {
-            middleware.add( stages[i] );
+    function host(...middleware: Middleware<T>[]) {
+        for (let i = 0, n = middleware.length; i < n; i++) {
+            stages.push( middleware[i] );
         }
 
-        return middleware.dispatch(request) as T;
+        return build(stages)(request);
     };
 
     host.dispatch = (request: Request<T>) => {
-        let { route } = request.data;
+        let { route } = request.data as { route: Route<T> | undefined };
 
         if (route === undefined) {
             throw new Error(`${PACKAGE_NAME}: route is undefined!`);
         }
 
-        return route.pipeline.dispatch(request);
+        if (typeof route.middleware !== 'function') {
+            route.middleware = build(route.middleware);
+        }
+
+        return route.middleware(request);
     };
 
     host.match = (fallback: Route<T>) => {
@@ -133,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];
         }
     }
 }

package/src/client/router/index.ts

@@ -1,7 +1,6 @@
 import { ON_DELETE, ON_GET, ON_POST, ON_PUT, PACKAGE_NAME } from '../constants';
-import { Route, Name, Options, PathParamsTuple, Request, RouteOptions, RouteRegistry } from '../types';
+import { Middleware, Route, Name, Options, PathParamsTuple, RouteOptions, RouteRegistry } from '../types';
 import { Node } from './node';
-import pipeline from '@esportsplus/pipeline';
 
 
 function key(method: string, subdomain?: string | null) {
@@ -23,24 +22,29 @@ function normalize(path: string) {
 }
 
 function set<T>(route: Route<T>, options: Options<T> | RouteOptions<T>) {
-    let pipeline = route.pipeline;
+    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++) {
-                pipeline.add(value[i]);
-            }
-        }
-        else if (key === 'responder') {
-            pipeline.add(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;
+    }
 }
 
 
@@ -76,7 +80,7 @@ class Router<T, TRoutes extends RouteRegistry = {}> {
             route: Route<T> = {
                 name: null,
                 path: null,
-                pipeline: pipeline<Request<T>, T>(),
+                middleware: [],
                 subdomain: null
             };
 

package/src/client/types.ts

@@ -1,6 +1,5 @@
 import { NeverAsync } from '@esportsplus/utilities';
 import { Router } from './router';
-import pipeline from '@esportsplus/pipeline';
 
 
 type AccumulateRoutes<T extends readonly RouteFactory<any>[]> =
@@ -77,7 +76,7 @@ type Request<T> = {
 type Route<T> = {
     name: Name | null;
     path: string | null;
-    pipeline: ReturnType<typeof pipeline<Request<T>, T>>,
+    middleware: Middleware<T>[] | Next<T>,
     subdomain: string | null;
 };