@rhinostone/swig-django 2.9.1 → 2.9.3

package/lib/index.js

@@ -32,7 +32,7 @@ exports.name = 'django';
  *
  * @type {String}
  */
-exports.version = "2.9.1";
+exports.version = "2.9.3";
 
 /**
  * Expression-level parser — Pratt-style recursive descent that consumes

package/lib/tags/for.js

@@ -14,6 +14,14 @@
  * fields and expose the enclosing loop, so nested-loop safety and the
  * for-empty handling come for free.
  *
+ * Binding follows Django through the opt-in `mapKeys` and `unpack` flags: one
+ * name over a dict binds each key, and two names over a list unpack each item
+ * into its first and second values (a list's items, a string's characters, a
+ * mapping's keys). An item that does not hold two values binds what it holds,
+ * a missing value rendering empty, where Django raises. Two names over a
+ * mapping bind the key and the value, a swig extension (Django iterates the
+ * keys and unpacks each one) that the `.items` rewrite relies on.
+ *
  * Loop variable names must be bare identifiers — dotted paths are rejected
  * at parse time, and the CVE-2023-25345 `_dangerousProps` guard runs on
  * every bound name (key and val).
@@ -77,9 +85,8 @@ function resolveVar(path) {
  *
  *   - `.keys`   → `_utils.keys(obj)` (a plain key array; a one-name `for`
  *                 binds each key).
- *   - `.values` → the object itself; swig's one-name object iteration binds
- *                 each VALUE (`_utils.each(obj, fn(value, key))`), matching
- *                 Django.
+ *   - `.values` → `_utils.values(obj)` (a plain value array; a one-name `for`
+ *                 binds each value).
  *   - `.items`  → the object itself, walked with the two-name form, so swig
  *                 binds key + value per entry exactly as Django's two-name
  *                 `{% for k, v in d.items %}`. The one-name tuple form is
@@ -113,11 +120,14 @@ function rewriteDictIterable(it, hasTwoNames, line, filename) {
     // (emitFnCall reads a callee path directly, never through emitVarRef).
     return ir.fnCall(ir.varRef(['_utils', 'keys']), [resolveVar(objPath)]);
   }
+  if (lastSeg === 'values') {
+    return ir.fnCall(ir.varRef(['_utils', 'values']), [resolveVar(objPath)]);
+  }
   if (lastSeg === 'items' && !hasTwoNames) {
     utils.throwError('The "items" pseudo-method in a "for" tag requires two loop variables — use {% for key, value in ' + objPath.join('.') + '.items %}', line, filename);
   }
-  // `.values` (one-name → value) and `.items` (two-name → key, value) both
-  // walk the object directly through swig's object iteration.
+  // `.items` walks the object directly: two names over a mapping bind the key
+  // and the value.
   return resolveVar(objPath);
 }
 
@@ -210,8 +220,8 @@ exports.parse = function (str, line, parser, types, stack, opts, swig, token) {
 
 /**
  * Emit an IRFor node, splitting `content` at an `{% empty %}` marker into
- * the loop body and the empty body, and setting the Django `forloop`
- * opt-in flags. The backend's `For` branch owns the loopcache +
+ * the loop body and the empty body, and setting the Django `forloop` and
+ * binding opt-in flags. The backend's `For` branch owns the loopcache +
  * `_utils.each` scaffolding.
  *
  * @return {object} IRFor node.
@@ -258,5 +268,12 @@ exports.compile = function (compiler, args, content, parents, options, blockName
   node.loopName = 'forloop';
   node.loopFields = DJANGO_LOOP_FIELDS;
   node.loopParent = true;
+  // Django binding (see the IRFor typedef): two names unpack each item of a
+  // list, one name binds each key of a dict.
+  if (args.length === 2) {
+    node.unpack = true;
+  } else {
+    node.mapKeys = true;
+  }
   return node;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rhinostone/swig-django",
-  "version": "2.9.1",
+  "version": "2.9.3",
   "description": "Django-syntax frontend for the @rhinostone/swig-core template engine. Part of the @rhinostone/swig multi-flavor family.",
   "keywords": [
     "template",
@@ -22,7 +22,7 @@
     "node": ">=12"
   },
   "peerDependencies": {
-    "@rhinostone/swig-core": "2.9.1"
+    "@rhinostone/swig-core": "2.9.3"
   },
   "publishConfig": {
     "access": "public"