jcc-express-mvc 1.0.12 → 1.0.14

package/package.json

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

package/src/templating-engine/index.js

@@ -10,8 +10,8 @@ class Template {
     include: /@include\((?<includePath>['"]([^'"]+)['"])\)/,
     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(?<authBody>[\s\S]*?)@endauth/,
+    variable: /{{\s*(?<param>(.*?))\s*}}/,
+    auth: /@auth(?:(\((?<authData>[^)]*)\)))?(?<authBody>[\s\S]*?)@endauth/,
     guest: /@guest(?<guestBody>[\s\S]*?)@endguest/,
   };
 
@@ -118,35 +118,40 @@ class Template {
       new RegExp(
         Object.values(this.#directives)
           .map((regex) => `(${regex.source})`)
-          .join("|")
-      )
+          .join("|"),
+      ),
     );
     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("@auth")) {
-      return this.#auth(content, match, param);
-    }
-    if (match[0].startsWith("@guest")) {
-      return this.#guest(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);
 
-    return this.#handleVariable(content, match, param);
+      case match[0].startsWith("@guest"):
+        return this.#guest(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, "<!--")

package/src/templating-engine/utils.js

@@ -33,7 +33,7 @@ class Util {
       if (item.length === 2) {
         const newLayout = layoutContent.replace(
           `@yield(${item[0]})`,
-          item[1].replace(/\"/g, "")
+          item[1].replace(/\"/g, ""),
         );
         const { beforMatch, afterMatch } = Util.content(content, match);
         return Util.layout(beforMatch + afterMatch, newLayout);
@@ -42,7 +42,7 @@ class Util {
     if (sectionContent) {
       const newLayout = layoutContent.replace(
         `@yield(${sectionContent})`,
-        match?.groups?.sectionBody
+        match?.groups?.sectionBody,
       );
       const { beforMatch, afterMatch } = Util.content(content, match);
       return Util.layout(beforMatch + afterMatch, newLayout);
@@ -51,7 +51,7 @@ class Util {
   }
 
   static accessNestedProperty(obj, propertyString) {
-    const properties = propertyString?.split(".") ?? [];
+    const properties = propertyString.replace(/\s/g, "")?.split(".") ?? [];
     return properties.reduce((acc, prop) => acc?.[prop], obj) ?? "";
   }