new Template class

MahoCommerce · Dec 12, 2024 · acecb26 · acecb26
1 parent f5f5921
commit acecb26
Showing 1 changed file with 17 additions and 19 deletions.
diff --git a/public/js/varien/js.js b/public/js/varien/js.js
@@ -664,7 +664,7 @@ Calendar.initialize = async function(event) {
 
 class Template
 {
-    static #DEFAULT_PATTERN = /(?:^|.|\r|\n)(#\{(.*?)\})/g;
+    static #DEFAULT_PATTERN = /#\{(.*?)\}/g;
 
     /**
      * Creates a Template object for string interpolation
@@ -687,26 +687,24 @@ class Template
             throw new TypeError('Data object cannot be null or undefined');
         }
 
-        return this.template.replaceAll(this.pattern, (match, prefix = '', expr) => {
+        return this.template.replace(this.pattern, (match, expr) => {
             try {
-                // Handle escape sequences
-                if (prefix === '\\') return match;
-
-                // Parse nested properties using optional chaining
-                const value = expr.split('.')
-                    .reduce((obj, prop) => {
-                        // Handle array notation [index]
-                        const arrayMatch = prop.match(/(\w+)\[(\d+)\]/);
-                        if (arrayMatch) {
-                            const [, propName, index] = arrayMatch;
-                            return obj?.[propName]?.[index];
-                        }
-                        return obj?.[prop];
-                    }, data);
-
-                return `${prefix}${value ?? ''}`;
+                let value = data;
+                const parts = expr.trim().split('.');
+
+                for (const part of parts) {
+                    if (part.includes('[')) {
+                        const [name, index] = part.split('[');
+                        const cleanIndex = parseInt(index.replace(']', ''));
+                        value = value[name][cleanIndex];
+                    } else {
+                        value = value[part];
+                    }
+                }
+
+                return value ?? '';
             } catch (error) {
-                return `${prefix}`;
+                return '';
             }
         });
     }