mikel 0.20.2 → 0.22.0

package/README.md

@@ -391,7 +391,7 @@ Custom helper functions receive a single object as argument, containing the foll
 - `args`: an array containing the variables with the helper is called in the template.
 - `opt`: an object containing the keyword arguments provided to the helper.
 - `data`: the current data where the helper has been executed.
-- `context` (**DEPRECATED**): the current context (data) where the helper has been executed.
+- `variables`: an object containing the runtime variables available in the current context (e.g., `@root`, `@index`, etc.).
 - `fn`: a function that executes the template provided in the helper block and returns a string with the evaluated template in the provided context.
 
 The helper function must return a string, which will be injected into the result string. Example:
@@ -508,7 +508,8 @@ Functions will receive a single object as argument, containing the following key
 
 - `args`: an array containing the variables with the function is called in the template.
 - `opt`: an object containing the keyword arguments provided to the function.
-- `context`: the current context (data) where the function has been executed.
+- `data`: the current data object where the function has been executed.
+- `variables`: an object containing the runtime variables available in the current context (e.g., `@root`, `@index`, etc.).
 
 Example:
 

package/index.js

@@ -20,7 +20,7 @@ const untokenize = (ts = [], s = "{{", e = "}}") => {
 const parseArgs = (str = "", data = {}, vars = {}, argv = [], opt = {}) => {
     const [t, ...args] = str.trim().match(/(?:[^\s"]+|"[^"]*")+/g);
     args.forEach(argStr => {
-        if (argStr.includes("=")) {
+        if (argStr.includes("=") && !argStr.startsWith(`"`)) {
             const [k, v] = argStr.split("=");
             opt[k] = parse(v, data, vars);
         }
@@ -85,9 +85,9 @@ const create = (template = "", options = {}) => {
                     args: args,
                     opt: opt,
                     data: data,
-                    context: data,
+                    variables: vars,
                     fn: (blockData = {}, blockVars = {}, blockOutput = []) => {
-                        i = compile(tokens, blockOutput, blockData, {...vars, ...blockVars, root: vars.root}, j, t);
+                        i = compile(tokens, blockOutput, blockData, {...vars, ...blockVars, parent: data, root: vars.root}, j, t);
                         return blockOutput.join("");
                     },
                 }));
@@ -130,7 +130,7 @@ const create = (template = "", options = {}) => {
             else if (tokens[i].startsWith("=")) {
                 const [t, args, opt] = parseArgs(tokens[i].slice(1), data, vars);
                 if (typeof ctx.functions[t] === "function") {
-                    output.push(ctx.functions[t]({args, opt, data}) || "");
+                    output.push(ctx.functions[t]({args, opt, data, variables: vars}) || "");
                 }
             }
             else if (tokens[i].startsWith("/")) {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "mikel",
     "description": "Micro templating library with zero dependencies",
-    "version": "0.20.2",
+    "version": "0.22.0",
     "type": "module",
     "author": {
         "name": "Josemi Juanes",
@@ -19,7 +19,8 @@
     },
     "scripts": {
         "release": "node ./scripts/release.js",
-        "test": "node test.js && yarn test:markdown",
+        "test": "node test.js && yarn test:eval && yarn test:markdown",
+        "test:eval": "node ./packages/mikel-eval/test.js",
         "test:markdown": "node ./packages/mikel-markdown/test.js"
     },
     "keywords": [