@rhinostone/swig 2.5.1 → 2.5.3

package/lib/tags/extends.js

@@ -1,3 +1,5 @@
+var _t = require('@rhinostone/swig-core/lib/tokentypes');
+
 /**
  * Makes the current template extend a parent template. This tag must be the first item in your template.
  *
@@ -8,7 +10,13 @@
  * @example
  * {% extends "./layout.html" %}
  *
- * @param {string} parentFile  Relative path to the file that this template extends.
+ * @example
+ * // A dynamic parent path resolves on the async render path
+ * // (renderFile(path, locals, cb) with loader.async === true); the
+ * // synchronous render path requires a string literal.
+ * {% extends layout_var %}
+ *
+ * @param {string|var} parentFile  Relative path to the file that this template extends. A dynamic (variable) path is resolved on the async render path only.
  */
 // extends is a parse-time declaration, not an emit-time construct. The
 // engine's getParents / remapBlocks resolves the parent chain before the
@@ -24,4 +32,27 @@ exports.parse = function () {
   return true;
 };
 
+/*!
+ * Lower a dynamic parent-path to IR so `{% extends layout_var %}`
+ * resolves at render time on the async codegen path. A lone
+ * string-literal path (`{% extends "x.html" %}`) returns undefined, so
+ * the engine keeps its existing tokens.parent string + ir.literal path
+ * unchanged; only a dynamic path is lowered. Mirrors include.js. The
+ * resulting IRExpr is read back as token.irExpr.file by the parser
+ * splitter and stashed on the sibling tokens.parentExpr slot.
+ */
+exports.lowerExpr = function (parser, tokens) {
+  var i, tk, pathTokens = [];
+  for (i = 0; i < tokens.length; i += 1) {
+    tk = tokens[i];
+    if (tk.type === _t.WHITESPACE) { continue; }
+    pathTokens.push(tk);
+  }
+  if (!pathTokens.length) { return undefined; }
+  if (pathTokens.length === 1 && pathTokens[0].type === _t.STRING) {
+    return undefined;
+  }
+  return { file: parser.parseExpr(tokens) };
+};
+
 exports.ends = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rhinostone/swig",
-  "version": "2.5.1",
+  "version": "2.5.3",
   "description": "A simple, powerful, and extendable templating engine for node.js and browsers, similar to Django, Jinja2, and Twig.",
   "keywords": [
     "template",
@@ -21,7 +21,7 @@
     "Rhinostone <contact@gina.io>"
   ],
   "dependencies": {
-    "@rhinostone/swig-core": "2.5.1"
+    "@rhinostone/swig-core": "2.5.3"
   },
   "devDependencies": {
     "esbuild": "^0.28.0",