@wxn0brp/falcon-frame 0.5.1 → 0.5.3

package/dist/index.js

@@ -27,9 +27,9 @@ export class FalconFrame extends Router {
             this.addBodyParser(json(this, { limit: this.opts.bodyLimit }));
         if (!this.opts.disableUrlencodedParser)
             this.addBodyParser(urlencoded(this, { limit: this.opts.bodyLimit }));
-        this.engine(".html", (path, options, callback) => {
+        this.engine(".html", (path, options, callback, FF) => {
             try {
-                const content = renderHTML(path, options);
+                const content = renderHTML(path, options, [], FF);
                 callback(null, content);
             }
             catch (e) {
@@ -65,9 +65,8 @@ export class FalconFrame extends Router {
         };
     }
     engine(ext, callback) {
-        if (ext[0] !== ".") {
+        if (ext[0] !== ".")
             ext = "." + ext;
-        }
         this.engines[ext] = callback;
         return this;
     }

package/dist/render.js

@@ -3,8 +3,13 @@ import path from "path";
 export function renderHTML(templatePath, data, renderedPaths = [], FF) {
     try {
         const realPath = path.resolve(templatePath);
-        if (renderedPaths.includes(realPath)) {
+        if (renderedPaths.includes(realPath))
             return `<!-- Circular dependency detected: tried to render ${templatePath} again -->`;
+        if (FF && FF.vars["render data"]) {
+            data = {
+                ...FF.vars["render data"],
+                ...data,
+            };
         }
         let template = fs.readFileSync(templatePath, "utf8");
         // Inserting data, e.g. {{name}}
@@ -15,7 +20,7 @@ export function renderHTML(templatePath, data, renderedPaths = [], FF) {
             return renderHTML(partialPath, data, [
                 ...renderedPaths,
                 realPath,
-            ]);
+            ], FF);
         });
         // Layout
         if (FF && FF.vars["layout"]) {
@@ -26,7 +31,7 @@ export function renderHTML(templatePath, data, renderedPaths = [], FF) {
                 return template;
             if (!hasHtmlStructure && forceNoLayout)
                 return template;
-            return renderHTML(FF.vars["layout"], { ...data, body: template }, [...renderedPaths, realPath]);
+            return renderHTML(FF.vars["layout"], { ...data, body: template }, [...renderedPaths, realPath], FF);
         }
         return template;
     }

package/dist/res.js

@@ -137,7 +137,7 @@ export class FFResponse extends http.ServerResponse {
                     this.ct(opts.contentType || "text/html");
                     this.end(str);
                 }
-            });
+            }, opts.notShareFF ? undefined : this.FF);
         }
         catch (err) {
             ff.logger.error(`Unhandled error in template engine: ${err}`);

package/dist/types.d.ts

@@ -61,11 +61,12 @@ export interface StaticServeOptions {
     errorIfDirNotFound?: boolean;
     notRenderHtml?: boolean;
 }
-export type EngineCallback = (path: string, options: any, callback: (e: any, rendered?: string) => void) => void;
+export type EngineCallback = (path: string, options: any, callback: (e: any, rendered?: string) => void, FF?: FalconFrame) => void;
 export interface RenderOptions {
     notUseViews?: boolean;
     contentType?: string;
     baseDir?: string;
     engine?: string;
     notAppendExt?: boolean;
+    notShareFF?: boolean;
 }

package/package.json

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