jcc-express-mvc 1.0.11 → 1.0.13

package/package.json

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

package/src/templating-engine/index.js

@@ -11,6 +11,8 @@ class Template {
     ternary:
       /@ternary\((?<condition>[a-zA-Z0-9_.-]+)\s*\?\s*(?<trueData>[\s\S]+?)\s*:\s*(?<falseData>[\s\S]+?)\)/,
     variable: /{{\s*(?<param>[a-zA-Z0-9_.-]+)\S*}}/,
+    auth: /@auth(?:(\((?<authData>[^)]*)\)))?(?<authBody>[\s\S]*?)@endauth/,
+    guest: /@guest(?<guestBody>[\s\S]*?)@endguest/,
   };
 
   constructor() {
@@ -58,9 +60,7 @@ class Template {
 
   #ternary(content, match, param) {
     let result = "";
-
     const value = Util.accessNestedProperty(param, match?.groups?.condition);
-
     if (value) {
       result = this.#parser(match.groups?.trueData, param);
     } else {
@@ -95,6 +95,24 @@ class Template {
     return content;
   }
 
+  #auth(content, match, param) {
+    let result = "";
+    if (Object.values(param?.Auth).length > 1) {
+      result = match?.groups?.authBody;
+    }
+    const { beforMatch, afterMatch } = Util.content(content, match);
+    return this.#parser(beforMatch + result + afterMatch, param);
+  }
+
+  #guest(content, match, param) {
+    let result = "";
+    if (Object.values(param?.Auth).length <= 0) {
+      result = match?.groups?.guestBody;
+    }
+    const { beforMatch, afterMatch } = Util.content(content, match);
+    return this.#parser(beforMatch + result + afterMatch, param);
+  }
+
   #parser(content, param = this.option) {
     const match = content.match(
       new RegExp(
@@ -104,36 +122,51 @@ class Template {
       )
     );
     if (!match) return content;
+    switch (true) {
+      case match[0].startsWith("@include"):
+        return this.#includes(content, match, param);
 
-    if (match[0].startsWith("@include")) {
-      return this.#includes(content, match, param);
-    }
-    if (match[0].startsWith("@foreach")) {
-      return this.#handleLoop(content, match, param);
-    }
-    if (match[0].startsWith("@if")) {
-      return this.#handleCondition(content, match, param);
-    }
-    if (match[0].startsWith("@ternary")) {
-      return this.#ternary(content, match, param);
-    }
+      case match[0].startsWith("@foreach"):
+        return this.#handleLoop(content, match, param);
+
+      case match[0].startsWith("@auth"):
+        return this.#auth(content, match, param);
+
+      case match[0].startsWith("@guest"):
+        return this.#guest(content, match, param);
 
-    return this.#handleVariable(content, match, param);
+      case match[0].startsWith("@if"):
+        return this.#handleCondition(content, match, param);
+
+      case match[0].startsWith("@ternary"):
+        return this.#ternary(content, match, param);
+
+      case match[0].startsWith("{{"):
+        return this.#handleVariable(content, match, param);
+      default:
+        return content;
+    }
   }
 
   #compiler(content) {
-    const newContent = this.#extends(content);
+    const newContent = this.#extends(content)
+      .replace(/(\{\{\-\-)/g, "<!--")
+      .replace(/(\-\-\}\})/g, "-->");
     const finalContent = this.#parser(newContent);
     return finalContent
       .replace(/(\{\{\-\-)/g, "<!--")
       .replace(/(\-\-\}\})/g, "-->");
   }
   render(filePath, locals, callback) {
-    return fs.readFile(filePath, "utf-8", (err, content) => {
-      if (err) return callback(err);
-      this.option = locals;
-      return callback(null, this.#compiler(content));
-    });
+    try {
+      return fs.readFile(filePath, "utf-8", (err, content) => {
+        if (err) return callback(err);
+        this.option = locals;
+        return callback(null, this.#compiler(content));
+      });
+    } catch (error) {
+      throw new Error(error?.message);
+    }
   }
 }