mikel 0.8.0 → 0.9.0

package/README.md

@@ -199,6 +199,26 @@ const data = {
 console.log(m("{{#unless isAdmin}}Hello guest{{/unless}}", data)); // --> 'Hello guest'
 ```
 
+#### eq
+
+> Added in `v0.9.0`.
+
+The `eq` helper renders the blocks only if the two values provided as argument are equal. Example:
+
+```javascript
+console.log(m(`{{#eq name "bob"}}Hello bob{{/eq}}`, {name: "bob"})); // --> 'Hello bob'
+```
+
+#### ne
+
+> Added in `v0.9.0`.
+
+The `ne` helper renders the block only if the two values provided as argument are not equal. Example:
+
+```javascript
+console.log(m(`{{#ne name "bob"}}Not bob{{/ne}}`, {name: "John"})); // --> 'Not bob'
+```
+
 ### Custom Helpers
 
 > Added in `v0.5.0`.

package/index.js

@@ -11,6 +11,13 @@ const escape = s => s.toString().replace(/[&<>\"']/g, m => escapedChars[m]);
 
 const get = (c, p) => (p === "." ? c : p.split(".").reduce((x, k) => x?.[k], c)) ?? "";
 
+const parse = (v, context = {}, vars = {}) => {
+    if ((v.startsWith(`"`) && v.endsWith(`"`)) || /^-?\d*\.?\d*$/.test(v) || v === "true" || v === "false" || v === "null") {
+        return JSON.parse(v);
+    }
+    return (v || "").startsWith("@") ? get(vars, v.slice(1)) : get(context, v || ".");
+};
+
 const defaultHelpers = {
     "each": (value, opt) => {
         return (typeof value === "object" ? Object.entries(value || {}) : [])
@@ -19,6 +26,8 @@ const defaultHelpers = {
     },
     "if": (value, opt) => !!value ? opt.fn(opt.context) : "",
     "unless": (value, opt) => !!!value ? opt.fn(opt.context) : "",
+    "eq": (a, b, opt) => a === b ? opt.fn(opt.context) : "",
+    "ne": (a, b, opt) => a !== b ? opt.fn(opt.context) : "",
 };
 
 const compile = (tokens, output, context, partials, helpers, vars, fn = {}, index = 0, section = "") => {
@@ -34,9 +43,9 @@ const compile = (tokens, output, context, partials, helpers, vars, fn = {}, inde
             output.push(get(context, tokens[i].slice(1).trim()));
         }
         else if (tokens[i].startsWith("#") && typeof helpers[tokens[i].slice(1).trim().split(" ")[0]] === "function") {
-            const [t, ...args] = tokens[i].slice(1).trim().split(" ");
+            const [t, ...args] = tokens[i].slice(1).trim().match(/(?:[^\s"]+|"[^"]*")+/g);
             const j = i + 1;
-            output.push(helpers[t](...args.map(v => (v || "").startsWith("@") ? get(vars, v.slice(1)) : get(context, v || ".")), {
+            output.push(helpers[t](...args.map(v => parse(v, context, vars)), {
                 context: context,
                 fn: (blockContext = {}, blockVars = {}, blockOutput = []) => {
                     i = compile(tokens, blockOutput, blockContext, partials, helpers, {...vars, ...blockVars, root: vars.root}, fn, j, t);
@@ -45,7 +54,7 @@ const compile = (tokens, output, context, partials, helpers, vars, fn = {}, inde
             }));
             // Make sure that this block is executed at least once
             if (i + 1 === j) {
-                i = compile(tokens, [], {}, {}, {}, {}, {}, j, t);
+                i = compile(tokens, [], {}, {}, helpers, {}, {}, j, t);
             }
         }
         else if (tokens[i].startsWith("#") || tokens[i].startsWith("^")) {
@@ -70,9 +79,9 @@ const compile = (tokens, output, context, partials, helpers, vars, fn = {}, inde
             }
         }
         else if (tokens[i].startsWith("=")) {
-            const [t, ...args] = tokens[i].slice(1).trim().split(" ");
+            const [t, ...args] = tokens[i].slice(1).trim().match(/(?:[^\s"]+|"[^"]*")+/g);
             if (typeof fn[t] === "function") {
-                output.push(fn[t](...args.map(v => (v || "").startsWith("@") ? get(vars, v.slice(1)) : get(context, v || "."))) || "");
+                output.push(fn[t](...args.map(v => parse(v, context, vars))) || "");
             }
         }
         else if (tokens[i].startsWith("/")) {
@@ -101,5 +110,6 @@ const mikel = (str, context = {}, opt = {}, output = []) => {
 // @description assign utilities
 mikel.escape = escape;
 mikel.get = get;
+mikel.parse = parse;
 
 export default mikel;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "mikel",
     "description": "Micro templating library with zero dependencies",
-    "version": "0.8.0",
+    "version": "0.9.0",
     "type": "module",
     "author": {
         "name": "Josemi Juanes",