@rhinostone/swig-twig 2.0.0-alpha.8 → 2.0.1

package/README.md

@@ -1,18 +1,16 @@
 @rhinostone/swig-twig
 =====================
 
-[![NPM version](http://img.shields.io/npm/v/@rhinostone/swig-twig.svg?style=flat)](https://www.npmjs.org/package/@rhinostone/swig-twig) [![Socket Badge](https://socket.dev/api/badge/npm/package/@rhinostone/swig-twig)](https://socket.dev/npm/package/@rhinostone/swig-twig)
+[![NPM version](http://img.shields.io/npm/v/@rhinostone/swig-twig.svg?style=flat)](https://www.npmjs.com/package/@rhinostone/swig-twig) [![Socket Badge](https://socket.dev/api/badge/npm/package/@rhinostone/swig-twig)](https://socket.dev/npm/package/@rhinostone/swig-twig)
 
-> **Experimental alpha.** The render pipeline is wired end-to-end and the Twig render corpus passes, but the IR ABI is not stable across alpha minors. `2.0.0` stable is the target for production use.
-
-Twig frontend for the [@rhinostone/swig-core](https://www.npmjs.com/package/@rhinostone/swig-core) template engine. See #T16 in [ROADMAP.md](https://github.com/gina-io/swig/blob/develop/ROADMAP.md) for the multi-flavor roadmap.
+Twig-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.
 
 Installation
 ------------
 
-    npm install @rhinostone/swig-twig@alpha
+    npm install @rhinostone/swig-twig
 
-This pulls in `@rhinostone/swig-core` as a peer dependency, pinned to the matching alpha version. Do not mix alpha minors — lockstep only.
+This pulls in `@rhinostone/swig-core` as a peer dependency, pinned to the matching version. Frontends and the core release in lockstep — do not mix versions.
 
 Basic example
 -------------
@@ -26,8 +24,8 @@ var out = swig.render('Hello, {{ name|upper }}!', {
 // => Hello, WORLD!
 ```
 
-Supported surface (as of 2.0.0-alpha.5)
----------------------------------------
+Supported surface (as of 2.0.0)
+-------------------------------
 
 * **Tags** — `apply`, `block`, `extends`, `for`, `from`, `if`, `import`, `include`, `macro`, `set`, `verbatim`, `with`.
 * **Operators** — `..` range, `??` null-coalescing, `~` string concat, `is <test>` / `is not <test>`.

package/lib/lexer.js

@@ -221,7 +221,7 @@ var rules = [
   {
     type: TYPES.NUMBER,
     regex: [
-      /^[+\-]?\d+(\.\d+)?/
+      /^\d+(\.\d+)?/
     ]
   },
   {

package/lib/parser.js

@@ -515,8 +515,16 @@ exports.parse = function (swig, source, opts, tags, filters) {
       escapeRegExp(cmtOpen) + anyChar + escapeRegExp(cmtClose) +
       ')'
   );
-  var tagStrip = new RegExp('^' + escapeRegExp(tagOpen) + '\\s*|\\s*' + escapeRegExp(tagClose) + '$', 'g');
-  var varStrip = new RegExp('^' + escapeRegExp(varOpen) + '\\s*|\\s*' + escapeRegExp(varClose) + '$', 'g');
+  // Twig/Jinja2 whitespace-control. `{{- … -}}` / `{%- … -%}` strip
+  // surrounding whitespace; the `-?` lives only adjacent to the open /
+  // close marker (post-#T23 shape — drop the inner `-?` after `\s*` so
+  // `{{ -5 }}` doesn't have its expression-`-` eaten as a strip marker).
+  var tagStrip = new RegExp('^' + escapeRegExp(tagOpen) + '-?\\s*|\\s*-?' + escapeRegExp(tagClose) + '$', 'g');
+  var varStrip = new RegExp('^' + escapeRegExp(varOpen) + '-?\\s*|\\s*-?' + escapeRegExp(varClose) + '$', 'g');
+  var tagStripBefore = new RegExp('^' + escapeRegExp(tagOpen) + '-');
+  var tagStripAfter = new RegExp('-' + escapeRegExp(tagClose) + '$');
+  var varStripBefore = new RegExp('^' + escapeRegExp(varOpen) + '-');
+  var varStripAfter = new RegExp('-' + escapeRegExp(varClose) + '$');
 
   var line = 1;
   var stack = [];
@@ -524,6 +532,29 @@ exports.parse = function (swig, source, opts, tags, filters) {
   var tokens = [];
   var blocks = {};
   var inVerbatim = false;
+  // Carries `-}}` / `-%}` strip-after intent across the chunk boundary.
+  // Consumed by the next text chunk (leading whitespace stripped, flag
+  // reset). Mirrors native lib/parser.js's closure-scoped `stripNext`.
+  var stripNext = false;
+
+  /**
+   * If the previous token is a Text IR node, strip its trailing
+   * whitespace in-place. No-op for non-Text tokens.
+   *
+   * Mirrors lib/parser.js's stripPrevToken — same one-level-deep
+   * limitation: a `{%- endif %}` only strips the trailing whitespace of
+   * the last child of the immediately enclosing tag, not deeper.
+   *
+   * @param  {object} token IR node (typed), possibly a Text node.
+   * @return {object}       Same node; mutated when `type === 'Text'`.
+   * @private
+   */
+  function stripPrevToken(token) {
+    if (token && token.type === 'Text' && typeof token.value === 'string') {
+      token.value = token.value.replace(/\s*$/, '');
+    }
+    return token;
+  }
 
   /**
    * Build an IROutput node for a `{{ … }}` chunk.
@@ -628,13 +659,17 @@ exports.parse = function (swig, source, opts, tags, filters) {
   }
 
   utils.each(source.split(splitter), function (chunk) {
-    var token, lines;
+    var token, lines, stripPrev, prevToken, prevChildToken;
 
     if (!chunk) { return; }
 
     if (!inVerbatim && utils.startsWith(chunk, varOpen) && utils.endsWith(chunk, varClose)) {
+      stripPrev = varStripBefore.test(chunk);
+      stripNext = varStripAfter.test(chunk);
       token = parseVariable(chunk.replace(varStrip, ''), line);
     } else if (utils.startsWith(chunk, tagOpen) && utils.endsWith(chunk, tagClose)) {
+      stripPrev = tagStripBefore.test(chunk);
+      stripNext = tagStripAfter.test(chunk);
       token = parseTag(chunk.replace(tagStrip, ''), line);
       if (token) {
         if (token.name === 'extends') {
@@ -654,9 +689,28 @@ exports.parse = function (swig, source, opts, tags, filters) {
       line += lines ? lines.length : 0;
       return;
     } else {
+      if (stripNext) {
+        chunk = chunk.replace(/^\s*/, '');
+        stripNext = false;
+      }
       token = ir.text(chunk);
     }
 
+    // `{{-` / `{%-` strips the previous text chunk's trailing whitespace.
+    // Mirrors lib/parser.js: pop tokens.last; if it's a Text node strip
+    // it directly, else if it carries `.content` (a tag with body) drill
+    // one level into its last child. One-level-deep — matches native.
+    if (stripPrev && tokens.length) {
+      prevToken = tokens.pop();
+      if (prevToken && prevToken.type === 'Text') {
+        prevToken = stripPrevToken(prevToken);
+      } else if (prevToken && prevToken.content && prevToken.content.length) {
+        prevChildToken = stripPrevToken(prevToken.content.pop());
+        prevToken.content.push(prevChildToken);
+      }
+      tokens.push(prevToken);
+    }
+
     if (token) {
       if (stack.length) {
         stack[stack.length - 1].content.push(token);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rhinostone/swig-twig",
-  "version": "2.0.0-alpha.8",
-  "description": "Twig frontend for the @rhinostone/swig-core template engine. Phase 3 of the multi-flavor architecture (see @rhinostone/swig #T16).",
+  "version": "2.0.1",
+  "description": "Twig-syntax frontend for the @rhinostone/swig-core template engine. Part of the @rhinostone/swig multi-flavor family.",
   "keywords": [
     "template",
     "templating",
@@ -22,7 +22,7 @@
     "node": ">=12"
   },
   "peerDependencies": {
-    "@rhinostone/swig-core": "2.0.0-alpha.8"
+    "@rhinostone/swig-core": "2.0.1"
   },
   "publishConfig": {
     "access": "public"