mikel 0.8.1 → 0.9.1

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

@@ -1,4 +1,5 @@
 const tags = /\{\{|\}\}/;
+const endl = "\n";
 const escapedChars = {
     "&": "&",
     "<": "&lt;",
@@ -11,6 +12,74 @@ 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 || ".");
+};
+
+// @description tiny yaml parser
+const yamlParser = (str = "") => {
+    const lines = str.split(endl), result = {}, levels = [{ctx: result, indent: 0}];
+    let level = 0, i = 0;
+    while (i < lines.length) {
+        const line = lines[i] || "";
+        if (!!line.trim() && !line.trim().startsWith("#")) {
+            const indent = (line.match(/^( *)/m)?.[0] || "").length;
+            while(level > 0 && indent < levels[level].indent) {
+                levels.pop();
+                level = level - 1;
+            }
+            const isArrayItem = line.trim().startsWith("-");
+            let [key, value] = line.trim().split(":").map(v => v.trim());
+            // Check if is a new item of the array
+            if (isArrayItem) {
+                key = key.replace(/^(- *)/m, "");
+                if (typeof value === "undefined") {
+                    value = key;
+                }
+                else {
+                    const newIndent = (line.slice(0, line.indexOf(key))).length;
+                    levels[level].ctx.push({});
+                    levels.push({ctx: levels[level].ctx[levels[level].ctx.length - 1], indent: newIndent});
+                    level = level + 1;
+                }
+            }
+            // Check for empty value --> entering into a nested object or array
+            if (!value) {
+                const nextLine = lines[i + 1] || "";
+                const nextIndent = (nextLine.match(/^( *)/m)?.[0] || "").length;
+                levels[level].ctx[key] = nextLine.trim().startsWith("-") ? [] : {};
+                if (nextIndent > levels[level].indent) {
+                    levels.push({ctx: levels[level].ctx[key], indent: nextIndent});
+                    level = level + 1;
+                }
+            }
+            else if(value && Array.isArray(levels[level].ctx)) {
+                levels[level].ctx.push(JSON.parse(value));
+            }
+            else if (value) {
+                levels[level].ctx[key] = JSON.parse(value);
+            }
+        }
+        i = i + 1;
+    }
+    return result;
+};
+
+// @description tiny front-matter parser
+const frontmatter = (str = "", parser = null) => {
+    let body = (str || "").trim(), data = {};
+    const matches = Array.from(body.matchAll(/^(--- *)/gm))
+    if (matches?.length === 2 && matches[0].index === 0) {
+        const front = body.substring(0 + matches[0][1].length, matches[1].index).trim();
+        body = body.substring(matches[1].index + matches[1][1].length).trim();
+        data = typeof parser === "function" ? parser(front) : yamlParser(front);
+    }
+    return {body, data};
+};
+
 const defaultHelpers = {
     "each": (value, opt) => {
         return (typeof value === "object" ? Object.entries(value || {}) : [])
@@ -19,6 +88,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 +105,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);
@@ -70,9 +141,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 +172,8 @@ const mikel = (str, context = {}, opt = {}, output = []) => {
 // @description assign utilities
 mikel.escape = escape;
 mikel.get = get;
+mikel.parse = parse;
+mikel.yaml = yamlParser;
+mikel.frontmatter = frontmatter;
 
 export default mikel;

package/package.json

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