@esportsplus/routing 0.0.25 → 0.0.26

package/build/browser.d.ts

@@ -28,7 +28,10 @@ declare const _default: <T>(instance?: Router<T> | undefined) => {
             dispose: () => void;
             reset: () => void;
             nodes: {
-                data: import("@esportsplus/reactivity/build/signal").default<Record<PropertyKey, unknown> & {
+                data: import("@esportsplus/reactivity/build/signal").default<{
+                    [x: string]: unknown;
+                    [x: number]: unknown;
+                    [x: symbol]: unknown;
                     parameters?: Record<PropertyKey, unknown> | undefined;
                     route?: import("./router/route").Route<T> | undefined;
                 }>;

package/build/types.d.ts

@@ -1,7 +1,8 @@
+import { Prettify } from '@esportsplus/typescript';
 import { Next as N, Stage } from '@esportsplus/pipeline';
 import { Route, Router } from './router';
-type Middleware<T> = Stage<Request<T>, Response<T>>;
-type Next<T> = N<Request<T>, Response<T>>;
+type Middleware<T> = Stage<Request<T>, T>;
+type Next<T> = N<Request<T>, T>;
 type Options<T> = {
     middleware?: Middleware<T>[];
     name?: string;
@@ -10,7 +11,7 @@ type Options<T> = {
     subdomain?: string;
 };
 type Request<T> = {
-    data: Record<PropertyKey, unknown> & ReturnType<Router<T>['match']>;
+    data: Prettify<Record<PropertyKey, unknown> & ReturnType<Router<T>['match']>>;
     href: string;
     hostname: string;
     method: string;
@@ -21,6 +22,5 @@ type Request<T> = {
     query: Record<string, unknown>;
     subdomain?: string;
 };
-type Responder<T> = (request: Request<T>) => Response<T>;
-type Response<T> = T;
-export { Middleware, Next, Options, Request, Responder, Response, Route, Router };
+type Responder<T> = (request: Request<T>) => T;
+export { Middleware, Next, Options, Request, Responder, Route, Router };

package/package.json

@@ -17,5 +17,5 @@
         "prepublishOnly": "npm run build"
     },
     "types": "./build/index.d.ts",
-    "version": "0.0.25"
+    "version": "0.0.26"
 }

package/src/browser.ts

@@ -1,5 +1,5 @@
 import { reactive } from '@esportsplus/reactivity';
-import { Middleware, Request, Response, Router } from './types';
+import { Middleware, Request, Router } from './types';
 import pipeline from '@esportsplus/pipeline';
 import factory from './router';
 
@@ -70,7 +70,7 @@ export default <T>(instance?: Router<T>) => {
         back,
         forward,
         middleware: (...middleware: Middleware<T>[]) => {
-            let instance = pipeline<Request<T>, Response<T>>(...middleware);
+            let instance = pipeline(...middleware);
 
             return {
                 pipeline: () => instance(state),

package/src/types.ts

@@ -1,10 +1,11 @@
+import { Prettify } from '@esportsplus/typescript';
 import { Next as N, Stage } from '@esportsplus/pipeline';
 import { Route, Router } from './router';
 
 
-type Middleware<T> = Stage<Request<T>, Response<T>>;
+type Middleware<T> = Stage<Request<T>, T>;
 
-type Next<T> = N<Request<T>, Response<T>>;
+type Next<T> = N<Request<T>, T>;
 
 type Options<T> = {
     middleware?: Middleware<T>[];
@@ -15,7 +16,7 @@ type Options<T> = {
 };
 
 type Request<T> = {
-    data: Record<PropertyKey, unknown> & ReturnType<Router<T>['match']>;
+    data: Prettify<Record<PropertyKey, unknown> & ReturnType<Router<T>['match']>>;
     href: string;
     hostname: string;
     method: string;
@@ -27,9 +28,7 @@ type Request<T> = {
     subdomain?: string;
 };
 
-type Responder<T> = (request: Request<T>) => Response<T>;
+type Responder<T> = (request: Request<T>) => T;
 
-type Response<T> = T;
 
-
-export { Middleware, Next, Options, Request, Responder, Response, Route, Router };
+export { Middleware, Next, Options, Request, Responder, Route, Router };