New features :3

bit-js · Jul 13, 2024 · 5b59527 · 5b59527
1 parent 1dcce4c
commit 5b59527
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bit-js/byte",
-  "version": "2.0.0-alpha.4",
+  "version": "2.0.0-alpha.5",
   "module": "index.js",
   "devDependencies": {
     "@types/bun": "latest",

diff --git a/src/core/server/route.ts b/src/core/server/route.ts
@@ -102,7 +102,7 @@ export class Route<
             for (let i = 0, lI = actions.length; i < lI; ++i) {
                 const list = actions[i];
 
-                for (let j = 0, lJ = list.length; j < lJ; ++j) {
+                for (let j = 0, lJ = list.length; j < lJ; ++j, ++idx) {
                     const action = list[j];
 
                     const fn = action[1];
@@ -117,7 +117,6 @@ export class Route<
                     const fnNoContext = fn.length === 0;
                     noContext &&= fnNoContext;
 
-                    ++idx;
                     switch (action[0]) {
                         case 1:
                             statements.push(`${fnAsync ? 'await ' : ''}${fnKey}(${noContext ? '' : 'c'})`);
@@ -153,13 +152,13 @@ export class Route<
             const fnAsync = isAsync(handler);
             hasAsync ||= fnAsync;
 
-            // Hold a ref to the context
-            statements.push(`const r=${fnAsync ? 'await ' : ''}$(${handlerNoContext ? '' : 'c'})`);
+            // Hold a ref to the response
+            statements.push(`let r=${fnAsync ? 'await ' : ''}$(${handlerNoContext ? '' : 'c'})`);
 
             for (let i = 0, { length } = defers; i < length; ++i) {
                 const list = defers[i];
 
-                for (let i = list.length - 1; i > -1; --i) {
+                for (let i = list.length - 1; i > -1; --i, ++idx) {
                     const fn = list[i];
                     const fnKey = `f${idx}`;
 
@@ -172,8 +171,7 @@ export class Route<
                     const fnNoContext = fn.length < 2;
                     noContext &&= fnNoContext;
 
-                    statements.push(`const c${idx}=${fnAsync ? 'await ' : ''}${fnKey}(${fn.length === 0 ? '' : noContext ? 'r' : 'r,c'});if(c${idx} instanceof Response)return c${idx};`);
-                    ++idx;
+                    statements.push(`const c${idx}=${fnAsync ? 'await ' : ''}${fnKey}(${fn.length === 0 ? '' : noContext ? 'r' : 'r,c'});if(c${idx} instanceof Response)r=c${idx}`);
                 }
             }
 

diff --git a/src/core/server/types/handler.ts b/src/core/server/types/handler.ts
@@ -77,4 +77,4 @@ export type BaseContext = Context<any>;
 export type BaseHandler<Path extends string, Set> = (c: Context<Params<Path>> & Set) => any;
 
 export type Fn<T = any> = (c: BaseContext & T) => any;
-export type DeferFn<T = any> = (res: Response, c: BaseContext & T) => any;
+export type DeferFn<T = any> = (res: any, c: BaseContext & T) => any;
diff --git a/tests/app.ts b/tests/app.ts
@@ -23,9 +23,9 @@ export const apiWithCsrf = new Byte()
 // Defers
 export const apiWithDefers = new Byte()
     .use((ctx) => console.time(ctx.path))
-    .defer((ctx) => {
+    .defer((res, ctx) => {
         // You should change the response here
-        console.log(ctx.res.ok);
+        console.log(res.ok);
         console.timeEnd(ctx.path);
     })
     .get('/', send.body('Hi'));