@rhinostone/swig-jinja2 2.8.4 → 2.9.1

package/README.md

@@ -1,7 +1,7 @@
 @rhinostone/swig-jinja2
 =======================
 
-[![NPM version](https://img.shields.io/npm/v/@rhinostone/swig-jinja2.svg?style=flat)](https://www.npmjs.com/package/@rhinostone/swig-jinja2) [![Socket Badge](https://socket.dev/api/badge/npm/package/@rhinostone/swig-jinja2)](https://socket.dev/npm/package/@rhinostone/swig-jinja2)
+[![NPM version](https://img.shields.io/npm/v/@rhinostone/swig-jinja2.svg?style=flat)](https://www.npmjs.com/package/@rhinostone/swig-jinja2) [![Socket Badge](https://socket.dev/api/badge/npm/package/@rhinostone/swig-jinja2)](https://socket.dev/npm/package/@rhinostone/swig-jinja2) [![OpenSSF Scorecard](https://img.shields.io/ossf-scorecard/github.com/gina-io/swig?label=openssf%20scorecard&style=flat)](https://scorecard.dev/viewer/?uri=github.com/gina-io/swig)
 
 Jinja2-syntax frontend for the [@rhinostone/swig-core](https://www.npmjs.com/package/@rhinostone/swig-core) template engine. Part of the multi-flavor architecture introduced in `2.0.0` — see [ROADMAP.md](https://github.com/gina-io/swig/blob/develop/ROADMAP.md) for the release narrative.
 

package/lib/filters.js

@@ -611,11 +611,16 @@ exports.striptags = function (input) {
   if (out !== undefined) {
     return out;
   }
-  return String(input)
-    .replace(/<!--[\s\S]*?-->/g, '')
-    .replace(/<[^>]*>/g, '')
-    .replace(/\s+/g, ' ')
-    .replace(/^\s+|\s+$/g, '');
+  // The comment and tag regexes take time quadratic in the input length on
+  // many <!-- or < with no --> or > after them, and the trailing \s+$ on a
+  // long run of whitespace; the swig-core helpers give the same output in
+  // linear time.
+  // return String(input)
+  //   .replace(/<!--[\s\S]*?-->/g, '')
+  //   .replace(/<[^>]*>/g, '')
+  //   .replace(/\s+/g, ' ')
+  //   .replace(/^\s+|\s+$/g, '');
+  return utils.strip(utils.stripTags(utils.stripComments(String(input)), true).replace(/\s+/g, ' '));
 };
 
 /**
@@ -645,9 +650,13 @@ exports.trim = function (input, chars) {
   } else {
     pattern = '[' + String(chars).replace(/[\\\[\]\^\-]/g, '\\$&') + ']';
   }
-  return input
-    .replace(new RegExp('^' + pattern + '+'), '')
-    .replace(new RegExp(pattern + '+$'), '');
+  // A pattern + '+$' regex takes quadratic time on a long run of trimmed
+  // characters inside the string; trimEnd removes the same code units in
+  // linear time.
+  // return input
+  //   .replace(new RegExp('^' + pattern + '+'), '')
+  //   .replace(new RegExp(pattern + '+$'), '');
+  return utils.trimEnd(input.replace(new RegExp('^' + pattern + '+'), ''), pattern === '\\s' ? undefined : String(chars));
 };
 
 /**
@@ -753,7 +762,14 @@ function formatGeneral(num, prec) {
  */
 function sprintf(fmt, args) {
   var idx = 0;
-  return fmt.replace(/%([-+ 0]*)(\d+)?(?:\.(\d+))?([sdiufFeEgGxXoc%])/g, function (m, flags, width, prec, conv) {
+  // The flags and the width both take zeros, so on a % followed by a long run
+  // of zeros and no conversion this regex backtracked over every split,
+  // taking quadratic time. Each lookahead below captures its run once and
+  // the backreference consumes it, so nothing backtracks; the matches are
+  // the same, except that an absent width is "" instead of undefined, which
+  // the callback reads the same way.
+  // return fmt.replace(/%([-+ 0]*)(\d+)?(?:\.(\d+))?([sdiufFeEgGxXoc%])/g, function (m, flags, width, prec, conv) {
+  return fmt.replace(/%(?=([-+ 0]*))\1(?=(\d*))\2(?:\.(?=(\d+))\3)?([sdiufFeEgGxXoc%])/g, function (m, flags, width, prec, conv) {
     var arg, hasPrec, sign, s, num, pad;
 
     function withSign(value) {
@@ -1179,7 +1195,7 @@ exports.slice = function (input, slices, fill) {
  * and `reverse` flips the order.
  *
  * @example
- * {% for k, v in {"b":2,"a":1}|dictsort %}{{ k }}={{ v }};{% endfor %}
+ * {% for p in {"b":2,"a":1}|dictsort %}{{ p[0] }}={{ p[1] }};{% endfor %}
  * // => a=1;b=2;
  *
  * @param  {object}  input

package/lib/index.js

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

package/lib/lexer.js

@@ -108,7 +108,7 @@ var rules = [
   {
     type: TYPES.COMPARATOR,
     regex: [
-      /^(===|==|\!==|\!=|<=|<|>=|>|in\s)\s*/
+      /^(===|==|\!==|\!=|<=|<|>=|>|not\s+in\s|in\s)\s*/
     ],
     idx: 1
   },

package/lib/parser.js

@@ -21,6 +21,27 @@ 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 in right`, or of `left not in right` when `negate`
+ * is set: a BinaryOp `in` flagged with this flavor's name, so swig-core
+ * emits Jinja2's membership test (`_utils.isIn`) instead of the JavaScript
+ * `in` operator, which tests keys.
+ *
+ * @param  {object}  left     The needle.
+ * @param  {object}  right    The container.
+ * @param  {boolean} [negate] The `not in` form.
+ * @return {object}           IRBinaryOp.
+ * @private
+ */
+function membership(left, right, negate) {
+  var node = ir.binaryOp('in', left, right);
+  node.membership = 'jinja2';
+  if (negate) {
+    node.negate = true;
+  }
+  return node;
+}
+
 /**
  * Jinja2 expression parser — Pratt-style recursive descent.
  *
@@ -110,6 +131,9 @@ exports.parseExpr = function (tokens, filters, _posOut) {
       if (m === '===' || m === '!==' || m === '==' || m === '!=') {
         return { op: m, prec: 3 };
       }
+      if (/^not\s+in$/.test(m)) {
+        return { op: 'not in', prec: 4 };
+      }
       return { op: m, prec: 4 };
     }
     if (tok.type === _t.OPERATOR) {
@@ -468,6 +492,8 @@ exports.parseExpr = function (tokens, filters, _posOut) {
         // Math.floor(a / b). Matches Python `//` for ints and floats,
         // including negative operands (floors toward negative infinity).
         left = ir.fnCall(ir.varRef(['Math', 'floor']), [ir.binaryOp('/', left, right)]);
+      } else if (info.op === 'in' || info.op === 'not in') {
+        left = membership(left, right, info.op === 'not in');
       } else {
         left = ir.binaryOp(info.op, left, right);
       }

package/package.json

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