jcc-express-mvc 1.0.16 → 1.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jcc-express-mvc",
-  "version": "1.0.16",
+  "version": "1.1.0",
   "description": "express mvc structure",
   "main": "index.js",
   "scripts": {

package/src/templating-engine/index.js

@@ -5,18 +5,19 @@ class Template {
   #directives = {
     extends: /@extends\((?<extendPath>['"]([^'"]+)['"])\)/,
     foreach:
-      /@foreach \s*\((?<loopvariable>[a-zA-Z0-9_-]+) in (?<loopData>[a-zA-Z0-9._-]+)\)(?<loopBody>[\s\S\t\n\r]+?)@endforeach/,
-    if: /@if \s*\((?<ifData>[a-zA-Z0-9._-]+)\)(?<ifBody>[\s\S]+?)@else(?<elseBody>[\s\S]+?)@endif/,
+      /@foreach\s*\((?<loopvariable>(.*?)+) in (?<loopData>(.*?)+)\)(?<loopBody>[\s\S\t\n\r]+?)@endforeach/,
+    if: /@if\s*\((?<ifData>(.*?))\)\s*(?<ifBody>[\s\S]*?)\s*(?:@else\s*(?<elseBody>[\s\S]*?)\s*)?@endif/g,
     include: /@include\((?<includePath>['"]([^'"]+)['"])\)/,
     ternary:
-      /@ternary \S*\((?<condition>[a-zA-Z0-9_.-]+)\s*\?\s*(?<trueData>[\s\S]+?)\s*:\s*(?<falseData>[\s\S]+?)\)/,
+      /@ternary\s*\((?<condition>[a-zA-Z0-9_.-]+)\s*\?\s*(?<trueData>[\s\S]+?)\s*:\s*(?<falseData>[\s\S]+?)\)/,
     variable: /{{\s*(?<param>(.*?))\s*}}/,
-    auth: /@auth\s*(?:(\((?<authData>[^)]*)\)))?(?<authBody>[\s\S]*?)@endauth/,
+    auth: /@auth\s*(?:(\((?<authData>(.*?)*)\)))?(?<authBody>[\s\S]*?)@endauth/,
     guest: /@guest\s*(?<guestBody>[\s\S]*?)@endguest/,
   };
 
   constructor() {
     this.option = {};
+    this.cache = new Map();
   }
 
   #handleVariable(content, match, param) {
@@ -31,12 +32,14 @@ class Template {
     const loopData = Util.accessNestedProperty(param, match?.groups.loopData);
     if (Array.isArray(loopData)) {
       const loopBody = match.groups.loopBody;
+
       result = loopData
         .map((item, index) => {
           const loopContext = {
             ...param,
-            [match.groups.loopvariable]: { ...item, loopIndex: index },
+            [match.groups.loopvariable]: item,
           };
+          loopContext[match.groups.loopvariable]["loopIndex"] = index;
           return this.#parser(loopBody + "@endforeach", loopContext);
         })
         .join("");
@@ -49,7 +52,10 @@ class Template {
 
   #handleCondition(content, match, param) {
     let result = "";
-    const value = Util.accessNestedProperty(param, match?.groups?.ifData);
+    const value =
+      Util.accessNestedProperty(param, match?.groups?.ifData) ??
+      match?.groups.ifData;
+
     if (value) {
       result = this.#parser(match.groups?.ifBody, param);
     } else {
@@ -73,7 +79,7 @@ class Template {
     return beforMatch + result + this.#parser(afterMatch, param);
   }
 
-  #extends(content) {
+  async #extends(content) {
     const match = content.match(this.#directives.extends);
     if (!match) return content;
     const layoutPath = match.groups?.extendPath;
@@ -101,7 +107,16 @@ class Template {
   #auth(content, match, param) {
     let result = "";
     if (Object.values(param?.Auth).length > 1) {
-      result = match?.groups?.authBody;
+      const authData = match?.groups?.authData?.replace(/(\'|\")/g, "");
+      if (
+        (authData && param?.Auth?.role === authData) ||
+        param?.Auth?.roleType === authData
+      ) {
+        result = match?.groups?.authBody;
+      }
+      if (!authData) {
+        result = match?.groups?.authBody;
+      }
     }
     const { beforMatch, afterMatch } = Util.content(content, match);
     return this.#parser(beforMatch + result + afterMatch, param);
@@ -151,22 +166,29 @@ class Template {
     }
   }
 
-  #compiler(content) {
-    const newContent = this.#extends(content)
-      .replace(/(\{\{\-\-)/g, "<!--")
-      .replace(/(\-\-\}\})/g, "-->");
+  async #compiler(content) {
+    const newContent = await this.#extends(content);
     const finalContent = this.#parser(newContent);
     return finalContent
-      .replace(/(\{\{\-\-)/g, "<!--")
-      .replace(/(\-\-\}\})/g, "-->");
+      .replace(/(\{\{\-\-)/gm, "<!--")
+      .replace(/(\-\-\}\})/gm, "-->");
+  }
+
+  async #renderFromCache(templatePath) {
+    const renderedContent = this.cache.get(templatePath);
+    return await this.#compiler(renderedContent);
   }
-  render(filePath, locals, callback) {
+  async render(filePath, locals, callback) {
     try {
-      return fs.readFile(filePath, "utf-8", (err, content) => {
-        if (err) return callback(err);
-        this.option = locals;
-        return callback(null, this.#compiler(content));
-      });
+      // if (this.cache.has(filePath)) {
+      //   return callback(null, await this.#renderFromCache(filePath));
+      // }
+      const content = fs.readFileSync(filePath, "utf-8");
+      this.option = locals;
+      const renderedContent = await this.#compiler(content);
+      // this.cache.set(filePath, renderedContent);
+
+      return callback(null, renderedContent);
     } catch (error) {
       throw new Error(error?.message);
     }