@rhinostone/swig-django 2.10.0 → 2.11.0

package/README.md

@@ -24,8 +24,8 @@ var out = swig.render('Hello, {{ name|upper }}!', {
 // => Hello, WORLD!
 ```
 
-Supported surface (as of 2.7.0)
--------------------------------
+Supported surface
+-----------------
 
 Renders real Django templates — everything below was cross-checked against Django 5.2.
 
@@ -33,6 +33,7 @@ Renders real Django templates — everything below was cross-checked against Dja
 * **Variable resolution** — Django-faithful attribute / dictionary / index lookup. Callable attributes are auto-called (honoring `alters_data` / `do_not_call_in_templates`), numeric indexing works (`{{ list.0 }}`), and dicts iterate via `.keys` / `.values` / `.items`.
 * **Filter arguments** — Django colon syntax (`{{ value|date:"Y-m-d" }}`).
 * **Filters** — 42 built-ins (`add`, `addslashes`, `capfirst`, `center`, `cut`, `date`, `default`, `default_if_none`, `divisibleby`, `escape` / `e`, `escapejs`, `filesizeformat`, `first`, `floatformat`, `force_escape`, `get_digit`, `iriencode`, `join`, `last`, `length`, `linebreaks`, `linebreaksbr`, `linenumbers`, `ljust`, `lower`, `make_list`, `phone2numeric`, `pluralize`, `rjust`, `safe`, `slice`, `slugify`, `striptags`, `time`, `title`, `truncatechars`, `truncatewords`, `upper`, `urlencode`, `wordcount`, `wordwrap`, `yesno`). See `lib/filters.js` for the full list.
+* **Equality** — `==`, `!=` and `in` compare as Python does: a string never equals a number, and lists and mappings compare item by item.
 * **Unknown names** — a filter name the instance does not hold is a compile error wherever it stands, as in Django. Register custom filters before the compile that uses them.
 * **Async** — `renderFile(path, locals, cb)` against a loader with `async === true`, or `compileFile` with `codegenMode: 'async'`; `renderFileAsync` / `compileFileAsync` still work but are deprecated.
 

package/lib/index.js

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

package/lib/parser.js

@@ -25,6 +25,23 @@ function escapeRegExp(str) {
  */
 var _reserved = ['break', 'case', 'catch', 'continue', 'debugger', 'default', 'delete', 'do', 'else', 'finally', 'for', 'function', 'if', 'in', 'instanceof', 'new', 'return', 'switch', 'this', 'throw', 'try', 'typeof', 'var', 'void', 'while', 'with'];
 
+/**
+ * Build the IR of `left == right` or `left != right`, flagged so swig-core
+ * emits Python's equality (`_utils.pyEq`) instead of JavaScript's loose
+ * operators.
+ *
+ * @param  {string} op     `==` or `!=`.
+ * @param  {object} left   Left operand IR.
+ * @param  {object} right  Right operand IR.
+ * @return {object}        IRBinaryOp.
+ * @private
+ */
+function equality(op, left, right) {
+  var node = ir.binaryOp(op, left, right);
+  node.pyEq = 'django';
+  return node;
+}
+
 /**
  * Build the IR of `left in right`, or of `left not in right` when `negate`
  * is set: a BinaryOp `in` flagged with this flavor's name, so swig-core
@@ -533,7 +550,11 @@ exports.parseExpr = function (tokens, filters, _posOut, _scope) {
         continue;
       }
       var right = parseExpression(info.prec + 1);
-      left = (info.op === 'in' || info.op === 'not in') ? membership(left, right, info.op === 'not in') : ir.binaryOp(info.op, left, right);
+      if (info.op === 'in' || info.op === 'not in') {
+        left = membership(left, right, info.op === 'not in');
+      } else {
+        left = (info.op === '==' || info.op === '!=') ? equality(info.op, left, right) : ir.binaryOp(info.op, left, right);
+      }
     }
     return left;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rhinostone/swig-django",
-  "version": "2.10.0",
+  "version": "2.11.0",
   "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.10.0"
+    "@rhinostone/swig-core": "2.11.0"
   },
   "publishConfig": {
     "access": "public"