mikel 0.36.0 → 0.37.0

package/README.md

@@ -732,9 +732,9 @@ console.log(result); // --> "Users: John Doe and Alice Smith"
 
 ### Subexpressions  
 
-> Added in `v0.30.0`.
+> Added in `v0.30.0`. Supported in helpers and partials in `v0.37.0`.
 
-Subexpressions allow you to evaluate a function call inside another function call. They are written using parentheses, and can be used anywhere a normal function argument is allowed. Example:
+Subexpressions allow you to evaluate a function call inside another function call, helpers, or partials. They are written using parentheses, and can be used anywhere a normal function argument is allowed. Example:
 
 ```hbs
 {{=sum (sum 3 4) 3}}
@@ -751,6 +751,18 @@ Result:
 10
 ```
 
+Subexpressions can be used in helpers also:
+
+```hbs
+{{#sayHello name=(concat "John" "Doe")}}{{/sayHello}}
+```
+
+And in partials:
+
+```hbs
+{{>heading text=(concat "Hello" "World")}}
+``` 
+
 #### Nested subexpressions
 
 Subexpressions can be nested to any depth:
@@ -783,8 +795,7 @@ You can reference variables or paths normally:
 
 #### Limitations
 
-- Subexpressions are currently supported **only for functions** (`{{=...}}`).
-- Subexpressions inside helper arguments are not yet supported.
+- Subexpressions are currently supported in **functions** (`{{=...}}`), **helpers** (`{{# ...}}`), and **partials** (`{{> ...}}`).
 - Parentheses must be balanced; malformed expressions will throw an error.
 
 

package/index.js

@@ -130,7 +130,7 @@ const compile = (ctx, tokens, output, data, state, index = 0, section = "") => {
             output.push(tokens[i]);
         }
         else if (tokens[i].startsWith("#") && typeof ctx.helpers[tokens[i].slice(1).trim().split(" ")[0]] === "function") {
-            const [t, args, opt] = parseArgs(tokens[i].slice(1), data, state);
+            const [t, args, opt] = parseArgs(tokens[i].slice(1), data, state, ctx.functions);
             const j = i + 1;
             i = findClosingToken(tokens, j, t);
             output.push(ctx.helpers[t]({
@@ -173,7 +173,7 @@ const compile = (ctx, tokens, output, data, state, index = 0, section = "") => {
             }
         }
         else if (tokens[i].startsWith(">")) {
-            const [t, args, opt] = parseArgs(tokens[i].replace(/^>{1,2}/, ""), data, state);
+            const [t, args, opt] = parseArgs(tokens[i].replace(/^>{1,2}/, ""), data, state, ctx.functions);
             const j = i + 1, blockContent = []; // to store partial block content
             if (tokens[i].startsWith(">>")) {
                 i = compile(ctx, tokens, blockContent, data, state, i + 1, t);

package/package.json

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