.

src/inc/routes/index.mjs

@@ -1,22 +1,12 @@
 import router from "../router.mjs";
 import cfg from "../../../config.json";
-import fs from "fs";
+import path from "path";
 import url from "url";
 import sql from "../sql.mjs";
 import lib from "../lib.mjs";
 import tpl from "../tpl.mjs";
 
-const templates = {
-  contact:  fs.readFileSync("./views/contact.html",         "utf-8"),
-  how:      fs.readFileSync("./views/how.html",             "utf-8"),
-  index:    fs.readFileSync("./views/index.html",           "utf-8"),
-  item:     fs.readFileSync("./views/item.html",            "utf-8"),
-  snippets: {
-    navbar: fs.readFileSync("./views/snippets/navbar.html", "utf-8")
-  }
-};
-
-tpl.snippets = templates.snippets;
+tpl.readdir("views");
 
 router.get("/", async (req, res) => {
   const query = await sql.query("select id, mime from items order by id desc limit 300");
@@ -25,7 +15,7 @@ router.get("/", async (req, res) => {
     last: query[query.length - 1].id
   };
 
-  res.reply({ body: tpl.render(templates.index, data) });
+  res.reply({ body: tpl.render("views/index", data) });
 });
 
 router.get(/^\/([0-9]+)$/, async (req, res) => {
@@ -58,11 +48,11 @@ router.get(/^\/([0-9]+)$/, async (req, res) => {
     next: query[1].length ? query[1][0].id : null,
     prev: query[2].length ? query[2][0].id : null
   };
-  res.reply({ body: tpl.render(templates.item, data) });
+  res.reply({ body: tpl.render("views/item", data) });
 });
 
 router.get(/^\/(contact|help|how)$/, (req, res) => {
-  res.reply({ body: tpl.render(templates[req.url.split[0]]) });
+  res.reply({ body: tpl.render(`views/${req.url.split[0]}`) });
 });
 
 router.get("/random", async (req, res) => {

src/inc/tpl.mjs

@@ -1,18 +1,24 @@
+import fs from "fs";
+import path from "path";
+
 export default new class {
-  snippets = {};
+  #templates = {};
   #syntax = [
-    [ "each", t => {
-      const tmp = t.slice(4).trim().split(" ");
-      return `util.forEach(${tmp[0]},(${(tmp[1] === "as" && tmp[2]) ? tmp[2] : "value"},key)=>{`;
-    } ],
+    [ "each", (t, args = t.slice(4).trim().split(" ")) => `util.forEach(${args[0]},(${(args[1] === "as" && args[2]) ? args[2] : "value"},key)=>{` ],
     [ "/each", () => "});" ],
     [ "if", t => `if(${t.slice(2).trim()}){` ],
     [ "elseif", t => `}else if(${t.slice(6).trim()}){` ],
     [ "else", () => "}else{" ],
     [ "/if", () => "}" ],
-    [ "include", t => `html+=util.snippets["${t.slice(7).trim()}"];`],
+    [ "include", t => `html+=util.tpl["${t.slice(7).trim()}"];`],
     [ "=", t => `html+=${t.slice(1).trim()};` ]
   ];
+  readdir(dir, root = dir, rel = dir.replace(`${root}/`, "")) {
+    for(const d of fs.readdirSync(`${path.resolve()}/${dir}`))
+      d.endsWith(".html")
+        ? this.#templates[`${rel}/${d.split(".")[0]}`] = fs.readFileSync(`${dir}/${d}`, "utf-8").replace(/\'/g, "\\'")
+        : this.readdir(`${dir}/${d}`, root);
+  }
   forEach(o, f) {
     if(Array.isArray(o))
       o.forEach(f);
@@ -22,13 +28,13 @@ export default new class {
       throw new Error(`${o} is not a iterable object`);
   }
   render(tpl, data = {}, f) {
-    return new Function("util", "data", "let html = \"\";with(data){" + tpl
+    return new Function("util", "data", "let html = \"\";with(data){" + this.#templates[tpl]
       .trim()
       .replace(/[\n\r]/g, "")
       .split(/{{\s*([^}]+)\s*}}/)
       .filter(Boolean)
       .map(t => !(f = this.#syntax.filter(s => t.startsWith(s[0]))[0]) ? `html+='${t}';` : f[1](t))
-      .join("") + "}return html.trim().replace(/>[\\n\\r\\s]*?</g, '><')")
-      .bind(null, { forEach: this.forEach, snippets: this.snippets })(data);
+      .join("") + "}return html.trim().replace(/>[\\n\\r\\s]*?</g, '><')"
+    ).bind(null, { forEach: this.forEach, tpl: this.#templates })(data);
   }
 };