mikel 0.12.0 → 0.14.0

package/README.md

@@ -25,6 +25,17 @@ Mikel supports the following syntax for rendering templates:
 
 Use double curly braces `{{ }}` to insert variables into your template. Variables will be replaced with the corresponding values from the data object.
 
+#### Fallback values
+
+> Added in `v0.14.0`.
+
+You can specify a value as a fallback, using the double OR `||` operator and followed by the fallback value.
+
+```javascript
+const result = m(`Hello {{name || "World"}}!`, {});
+// Output: 'Hello World!'
+```
+
 ### Sections
 
 Sections allow for conditional rendering of blocks of content based on the presence or absence of a value in the data object. Use the pound symbol `#` to start a section and the caret `^` to denote an inverted section. End the section with a forward slash `/`.
@@ -110,6 +121,27 @@ const result = m("User: {{> user currentUser}}", data, {partials});
 // Output: 'User: John Doe <john@example.com>'
 ```
 
+#### Keyword arguments in partials
+
+> This feature was added in `v0.13.0`.
+
+You can provide keyword arguments in partials to generate a new context object using the provided keywords.
+
+```javascript
+const data = {
+    name: "John Doe",
+    email: "john@example.com",
+};
+const partials = {
+    user: "{{userName}} <{{userEmail}}>",
+};
+
+const result = m("User: {{>user userName=name userEmail=email }}", data, {partials});
+// Output: 'User: John Doe <john@example.com>'
+```
+
+Please note that providing keyword arguments and a custom context to a partial is not supported. On this situation, the partial will be evaluated only with the custom context.
+
 ### Built-in helpers
 
 > Added in `v0.4.0`.

package/index.js

@@ -71,12 +71,6 @@ const create = (template = "", options = {}) => {
             if (i % 2 === 0) {
                 output.push(tokens[i]);
             }
-            else if (tokens[i].startsWith("@")) {
-                output.push(get(vars, tokens[i].slice(1).trim() ?? "_") ?? "");
-            }
-            else if (tokens[i].startsWith("!")) {
-                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, opt] = parseArgs(tokens[i].slice(1), context, vars);
                 const j = i + 1;
@@ -110,9 +104,10 @@ const create = (template = "", options = {}) => {
                 }
             }
             else if (tokens[i].startsWith(">")) {
-                const [t, v] = tokens[i].slice(1).trim().split(" ");
+                const [t, args, opt] = parseArgs(tokens[i].slice(1), context, vars);
                 if (typeof partials[t] === "string") {
-                    compile(partials[t].split(tags), output, v ? get(context, v) : context, vars, 0, "");
+                    const newCtx = args.length > 0 ? args[0] : (Object.keys(opt).length > 0 ? opt : context);
+                    compile(partials[t].split(tags), output, newCtx, vars, 0, "");
                 }
             }
             else if (tokens[i].startsWith("=")) {
@@ -128,7 +123,15 @@ const create = (template = "", options = {}) => {
                 break;
             }
             else {
-                output.push(escape(get(context, tokens[i].trim())));
+                const t = tokens[i].split("||").map(v => {
+                    // check if the returned value should not be escaped
+                    if (v.trim().startsWith("!")) {
+                        return parse(v.trim().slice(1).trim(), context, vars);
+                    }
+                    // escape the returned value
+                    return escape(parse(v.trim(), context, vars));
+                });
+                output.push(t.find(v => !!v) ?? "");
             }
             i = i + 1;
         }

package/package.json

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