@wxn0brp/falcon-frame 0.6.2 → 0.7.0

package/dist/body-utils.d.ts

@@ -1,6 +1,6 @@
-import FalconFrame, { FFResponse } from "./index.js";
+import { FFResponse } from "./index.js";
 import type { FFRequest, ParseBodyFunction, RouteHandler, StandardBodyParserOptions } from "./types.js";
 export declare function parseLimit(limit: string | number): number;
 export declare function getContentType(req: FFRequest): string | undefined;
 export declare function getRawBody(req: FFRequest, res: FFResponse, limit: number): Promise<string>;
-export declare function getStandardBodyParser(type: string, parser: ParseBodyFunction, FF: FalconFrame, opts: StandardBodyParserOptions): RouteHandler;
+export declare function getStandardBodyParser(type: string, parser: ParseBodyFunction, opts: StandardBodyParserOptions): RouteHandler;

package/dist/body-utils.js

@@ -35,8 +35,6 @@ export function getRawBody(req, res, limit) {
                 res.status(413);
                 res.FF._413(req, res);
                 req.destroy();
-                // @ts-ignore
-                error.cancel = true;
                 return reject(error);
             }
         });
@@ -48,7 +46,7 @@ export function getRawBody(req, res, limit) {
         });
     });
 }
-export function getStandardBodyParser(type, parser, FF, opts) {
+export function getStandardBodyParser(type, parser, opts) {
     const limit = parseLimit(opts.limit || "100k");
     return async (req, res, next) => {
         if ((typeof req.body == "object" && Object.keys(req.body).length) || getContentType(req) !== type) {
@@ -56,11 +54,11 @@ export function getStandardBodyParser(type, parser, FF, opts) {
         }
         try {
             const body = await getRawBody(req, res, limit);
-            req.body = await parser(body, req, FF);
+            req.body = await parser(body, req, res);
             next();
         }
         catch (err) {
-            if (err.cancel)
+            if (res._ended)
                 return;
             req.body = {};
             next();

package/dist/body.d.ts

@@ -1,4 +1,3 @@
-import FalconFrame from "./index.js";
 import { RouteHandler, StandardBodyParserOptions } from "./types.js";
-export declare function json(FF: FalconFrame, opts?: StandardBodyParserOptions): RouteHandler;
-export declare function urlencoded(FF: FalconFrame, opts?: StandardBodyParserOptions): RouteHandler;
+export declare function json(opts?: StandardBodyParserOptions): RouteHandler;
+export declare function urlencoded(opts?: StandardBodyParserOptions): RouteHandler;

package/dist/body.js

@@ -1,8 +1,8 @@
 import querystring from "querystring";
 import { getStandardBodyParser } from "./body-utils.js";
-export function json(FF, opts = {}) {
-    return getStandardBodyParser("application/json", (body) => JSON.parse(body), FF, opts);
+export function json(opts = {}) {
+    return getStandardBodyParser("application/json", (body) => JSON.parse(body), opts);
 }
-export function urlencoded(FF, opts = {}) {
-    return getStandardBodyParser("application/x-www-form-urlencoded", (body) => querystring.parse(body), FF, opts);
+export function urlencoded(opts = {}) {
+    return getStandardBodyParser("application/x-www-form-urlencoded", (body) => querystring.parse(body), opts);
 }

package/dist/index.d.ts

@@ -4,7 +4,7 @@ import { renderHTML } from "./render.js";
 import { FFResponse } from "./res.js";
 import { Router } from "./router.js";
 import type { BeforeHandleRequest, CombinedVars, EngineCallback, ErrorHandler, FFOpts, FFRequest, RouteHandler, ValidationErrorFormatter } from "./types.js";
-export declare class FalconFrame<Vars extends Record<string, any> = Record<string, any>> extends Router {
+export declare class FalconFrame<Vars extends Record<string, any> = {}> extends Router {
     logger: Logger;
     bodyParsers: RouteHandler[];
     vars: CombinedVars<Vars>;
@@ -19,9 +19,9 @@ export declare class FalconFrame<Vars extends Record<string, any> = Record<strin
     listen(port: number | string, callback?: (() => void) | boolean, beforeHandleRequest?: BeforeHandleRequest): http.Server<typeof http.IncomingMessage, typeof http.ServerResponse>;
     getApp(beforeHandleRequest?: BeforeHandleRequest): (req: any, res: any) => Promise<void>;
     engine(ext: string, callback: EngineCallback): this;
-    setVar(key: keyof CombinedVars<Vars>, value: typeof this.vars[keyof CombinedVars<Vars>]): void;
-    set(key: keyof CombinedVars<Vars>, value: typeof this.vars[keyof CombinedVars<Vars>]): void;
-    getVar(key: keyof CombinedVars<Vars>): typeof this.vars[keyof CombinedVars<Vars>];
+    setVar<K extends keyof CombinedVars<Vars>>(key: K, value: CombinedVars<Vars>[K]): this;
+    set<K extends keyof CombinedVars<Vars>>(key: K, value: CombinedVars<Vars>[K]): this;
+    getVar<K extends keyof CombinedVars<Vars>>(key: K): CombinedVars<Vars>[K];
     /**
      * Sets the allowed origins for CORS.
      * This method is a shortcut that simplifies CORS configuration

package/dist/index.js

@@ -40,9 +40,9 @@ export class FalconFrame extends Router {
             ...opts,
         };
         if (!this.opts.disableJsonParser)
-            this.addBodyParser(json(this, { limit: this.opts.bodyLimit }));
+            this.addBodyParser(json({ limit: this.opts.bodyLimit }));
         if (!this.opts.disableUrlencodedParser)
-            this.addBodyParser(urlencoded(this, { limit: this.opts.bodyLimit }));
+            this.addBodyParser(urlencoded({ limit: this.opts.bodyLimit }));
         this.engine(".html", (path, options, callback, FF) => {
             try {
                 const content = renderHTML(path, options, [], FF);
@@ -102,15 +102,13 @@ export class FalconFrame extends Router {
         return this;
     }
     setVar(key, value) {
-        // @ts-ignore
         this.vars[key] = value;
+        return this;
     }
     set(key, value) {
-        // @ts-ignore
-        this.vars[key] = value;
+        return this.setVar(key, value);
     }
     getVar(key) {
-        // @ts-ignore
         return this.vars[key];
     }
     /**

package/dist/render.d.ts

@@ -2,4 +2,4 @@ import FalconFrame from "./index.js";
 export interface RenderOptions {
     noLayout?: boolean;
 }
-export declare function renderHTML(templatePath: string, data?: Record<string, any>, renderedPaths?: string[], FF?: FalconFrame, opts?: RenderOptions): string;
+export declare function renderHTML(templatePath: string, data?: Record<string, any>, renderedPaths?: string[], FF?: FalconFrame<any>, opts?: RenderOptions): string;

package/dist/req.d.ts

@@ -1,4 +1,4 @@
 import FalconFrame from "./index.js";
 import { FFResponse } from "./res.js";
 import { FFRequest } from "./types.js";
-export declare function handleRequest(req: FFRequest, res: FFResponse, FF: FalconFrame): void;
+export declare function handleRequest(req: FFRequest, res: FFResponse, FF: FalconFrame<any>): void;

package/dist/req.js

@@ -5,6 +5,7 @@ import { FFResponse } from "./res.js";
 import { validate } from "./valid.js";
 export function handleRequest(req, res, FF) {
     Object.setPrototypeOf(res, FFResponse.prototype);
+    req.FF = FF;
     res.FF = FF;
     const originalEnd = res.end;
     res.end = function (...any) {

package/dist/res.d.ts

@@ -3,7 +3,7 @@ import FalconFrame from "./index.js";
 import { CookieOptions, RenderOptions } from "./types.js";
 export declare class FFResponse extends http.ServerResponse {
     _ended: boolean;
-    FF: FalconFrame;
+    FF: FalconFrame<any>;
     /**
      * bind end for compatibility
      */

package/dist/types.d.ts

@@ -17,11 +17,12 @@ export interface Query {
 export interface Body {
     [key: string]: any;
 }
-export type ParseBodyFunction = (body: string, req: FFRequest, FF: FalconFrame) => Promise<Record<string, any>>;
+export type ParseBodyFunction = (body: string, req: FFRequest, res: FFResponse) => Promise<Record<string, any>>;
 export interface StandardBodyParserOptions {
     limit?: string | number;
 }
 export declare class FFRequest extends http.IncomingMessage {
+    FF: FalconFrame<any>;
     path: string;
     query: Query;
     params: Params;

package/dist/types.js

@@ -1,5 +1,6 @@
 import http from "http";
 export class FFRequest extends http.IncomingMessage {
+    FF;
     path;
     query;
     params;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wxn0brp/falcon-frame",
-  "version": "0.6.2",
+  "version": "0.7.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "wxn0brP",