@wxn0brp/falcon-frame 0.5.0 → 0.5.2

package/dist/helpers.d.ts

@@ -2,3 +2,4 @@ import { Cookies, RouteHandler, StaticServeOptions } from "./types.js";
 export declare function parseCookies(cookieHeader: string): Cookies;
 export declare function getContentType(filePath: string, utf8?: boolean): string;
 export declare function handleStaticFiles(dirPath: string, opts: StaticServeOptions): RouteHandler;
+export declare const ensureLeadingDot: (str: string) => string;

package/dist/helpers.js

@@ -45,6 +45,15 @@ export function handleStaticFiles(dirPath, opts) {
         throw new Error(`Directory ${dirPath} does not exist`);
     }
     const serveFile = (req, res, filePath, stats) => {
+        if (opts.render) {
+            const defaultRenderer = res.FF.getVar("view engine");
+            const renderStatement = (defaultRenderer && filePath.endsWith(ensureLeadingDot(defaultRenderer))) ||
+                (!opts.notRenderHtml && filePath.endsWith(".html"));
+            if (renderStatement) {
+                res.render(filePath, {}, { notUseViews: true });
+                return true;
+            }
+        }
         if (opts.etag) {
             const etag = `W/"${stats.size}-${stats.mtime.getTime()}"`;
             if (req.headers["if-none-match"] === etag) {
@@ -53,11 +62,6 @@ export function handleStaticFiles(dirPath, opts) {
             }
             res.setHeader("ETag", etag);
         }
-        if (opts.render && filePath.endsWith(".html")) {
-            res.ct("text/html");
-            res.render(filePath);
-            return true;
-        }
         res.ct(getContentType(filePath, opts.utf8));
         fs.createReadStream(filePath).pipe(res);
         return true;
@@ -104,3 +108,4 @@ export function handleStaticFiles(dirPath, opts) {
         next();
     };
 }
+export const ensureLeadingDot = (str) => (str.startsWith(".") ? str : "." + str);

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}}

package/dist/res.d.ts

@@ -1,6 +1,6 @@
 import http from "http";
 import FalconFrame from "./index.js";
-import { CookieOptions } from "./types.js";
+import { CookieOptions, RenderOptions } from "./types.js";
 export declare class FFResponse extends http.ServerResponse {
     _ended: boolean;
     FF: FalconFrame;
@@ -62,7 +62,7 @@ export declare class FFResponse extends http.ServerResponse {
      * @param data An object containing data to be injected into the template.
      * @returns The response object.
      */
-    render(view: string, data?: any): this;
+    render(view: string, data?: any, opts?: RenderOptions): this;
     /**
      * Initialize SSE headers to start a server-sent event stream.
      * Sets:

package/dist/res.js

@@ -1,7 +1,7 @@
 import { createReadStream } from "fs";
 import http from "http";
 import path from "path";
-import { getContentType } from "./helpers.js";
+import { ensureLeadingDot, getContentType } from "./helpers.js";
 export class FFResponse extends http.ServerResponse {
     _ended = false;
     FF;
@@ -104,20 +104,24 @@ export class FFResponse extends http.ServerResponse {
      * @param data An object containing data to be injected into the template.
      * @returns The response object.
      */
-    render(view, data = {}) {
+    render(view, data = {}, opts = {}) {
         const ff = this.FF;
-        const viewEngine = ff.getVar("view engine");
-        const viewsDir = ff.getVar("views") || ".";
-        let finalExt = path.extname(view);
+        const viewsDir = opts.baseDir ??
+            (opts.notUseViews ? "." : (ff.getVar("views") || "."));
+        let engineName = path.extname(view);
         let filePath = view;
-        if (!finalExt) {
-            const defaultExt = viewEngine ? (viewEngine.startsWith(".") ? viewEngine : "." + viewEngine) : ".html";
-            finalExt = defaultExt;
-            filePath += finalExt;
+        if (opts.engine) {
+            engineName = ensureLeadingDot(opts.engine);
         }
-        const engine = ff.engines[finalExt];
+        else if (!engineName) {
+            const defaultEngine = ff.getVar("view engine");
+            engineName = defaultEngine ? ensureLeadingDot(defaultEngine) : ".html";
+            if (!opts.notAppendExt)
+                filePath += engineName;
+        }
+        const engine = ff.engines[engineName];
         if (!engine) {
-            const errMessage = `No engine registered for extension ${finalExt}`;
+            const errMessage = `No engine registered for extension ${engineName}`;
             ff.logger.error(errMessage);
             this.status(500).end("Server Error: " + errMessage);
             return this;
@@ -130,7 +134,7 @@ export class FFResponse extends http.ServerResponse {
                     this.status(500).end("Server Error: Failed to render view.");
                 }
                 else {
-                    this.setHeader("Content-Type", "text/html");
+                    this.ct(opts.contentType || "text/html");
                     this.end(str);
                 }
             });

package/dist/types.d.ts

@@ -59,5 +59,13 @@ export interface StaticServeOptions {
     render?: boolean;
     etag?: boolean;
     errorIfDirNotFound?: boolean;
+    notRenderHtml?: boolean;
 }
 export type EngineCallback = (path: string, options: any, callback: (e: any, rendered?: string) => void) => void;
+export interface RenderOptions {
+    notUseViews?: boolean;
+    contentType?: string;
+    baseDir?: string;
+    engine?: string;
+    notAppendExt?: boolean;
+}

package/package.json

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