@rhinostone/swig-twig 2.4.2 → 2.5.0

package/lib/filters.js

@@ -800,7 +800,7 @@ exports.merge = function (input, other) {
  *
  * Twig's native `|date` accepts DateTime / DateInterval objects, a
  * timezone string argument, and locale-aware month/day names. Those are
- * Phase 4 concerns — today this filter supports the same surface as
+ * deferred — today this filter supports the same surface as
  * native swig's `date` filter: Date object or epoch-ms number input, a
  * format string, an optional numeric `offset` in minutes from GMT, and
  * an optional `abbr` timezone abbreviation (output-only).

package/lib/index.js

@@ -1,7 +1,7 @@
 /**
  * @rhinostone/swig-twig — Twig frontend for the @rhinostone/swig family.
  *
- * Phase 3 Session 17: end-to-end render wiring (Path A). The package now
+ * End-to-end render wiring (Path A). The package now
  * exposes a Twig constructor + default instance via `engine.install(self,
  * frontend)` from @rhinostone/swig-core, so callers can `render(source,
  * locals)` / `renderFile(path, locals, cb)` directly against Twig syntax.

package/lib/lexer.js

@@ -11,7 +11,7 @@ var TYPES = require('./tokentypes');
  */
 
 /*!
- * Phase 3 Session 2–4 — Twig lexer rule table.
+ * Twig lexer rule table.
  *
  * Covers the swig-shared token subset plus all Twig-only operators
  * including string interpolation (`~` concat, `..` range, `??`
@@ -168,7 +168,7 @@ var rules = [
     // cleanly decomposes into VAR `start` + RANGE `..` + VAR `end`. Native
     // swig-core's VAR rule still uses `\w*` because it has no RANGE token;
     // do not copy this tightening back without also auditing native's path
-    // semantics. Phase 3 Session 6.
+    // semantics.
     type: TYPES.VAR,
     regex: [
       /^[a-zA-Z_$]\w*((\.\$?\w+)+)?/,
@@ -256,7 +256,7 @@ exports.types = TYPES;
  * Match the next token at the start of `str`.
  *
  * Throws via utils.throwError when no rule matches — including every
- * Twig-only operator until Session 3 adds its rules. The throw is
+ * Twig-only operator until its rules land. The throw is
  * opaque (no line / file info); the Twig frontend's onCompileError
  * callback attaches filename + line per the swig-core / frontend seam
  * rule.

package/lib/parser.js

@@ -517,7 +517,7 @@ exports.parse = function (swig, source, opts, tags, filters) {
   );
   // 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
+  // close marker (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');

package/lib/tags/apply.js

@@ -1,5 +1,5 @@
 /*!
- * Phase 3 Session 11 — Twig `{% apply filter %}…{% endapply %}` tag.
+ * Twig `{% apply filter %}…{% endapply %}` tag.
  *
  * Twig apply syntax — pipe the captured body through one or more filters,
  * left-to-right:

package/lib/tags/block.js

@@ -1,5 +1,5 @@
 /*!
- * Phase 3 Session 9 — Twig `{% block %}` tag.
+ * Twig `{% block %}` tag.
  *
  * Named override point for template inheritance:
  *

package/lib/tags/extends.js

@@ -1,5 +1,5 @@
 /*!
- * Phase 3 Session 9 — Twig `{% extends %}` tag.
+ * Twig `{% extends %}` tag.
  *
  * Declares a parent template for inheritance:
  *

package/lib/tags/for.js

@@ -1,5 +1,5 @@
 /*!
- * Phase 3 Session 8 — Twig `{% for %}` tag.
+ * Twig `{% for %}` tag.
  *
  * Twig iteration:
  *   {% for <val> in <iterable> %}…{% endfor %}

package/lib/tags/from.js

@@ -1,5 +1,5 @@
 /*!
- * Phase 3 Session 11 — Twig `{% from "file" import a, b as c %}` tag.
+ * Twig `{% from "file" import a, b as c %}` tag.
  *
  * Selective macro import syntax — binds a named subset of an imported
  * template's macros into the current context, optionally renaming each
@@ -142,7 +142,7 @@ exports.parse = function (str, line, parser, types, stack, opts, swig, token) {
   var path = pathTok.match.replace(/^['"]|['"]$/g, '');
 
   if (opts && opts.codegenMode === 'async') {
-    // Phase 2 (#T22): async mode skips parse-time parseFile + macro
+    // Async mode skips parse-time parseFile + macro
     // pre-render. compile() emits IRFromImportDeferred; runtime resolves
     // the template via _swig.getTemplate and binds each entry on _ctx.
     token.args = [{ path: path, entries: entries }];
@@ -239,7 +239,7 @@ exports.parse = function (str, line, parser, types, stack, opts, swig, token) {
  *                  `IRLegacyJS`.
  */
 exports.compile = function (compiler, args, content, parents, options) {
-  // Phase 2 (#T22): async-codegen branch. Parse stashed a single bundle
+  // Async-codegen branch. Parse stashed a single bundle
   // `[{path, entries: [{origName, aliasName}, ...]}]` in async mode (no
   // macro pre-render); emit IRFromImportDeferred so the backend's
   // `_swig.getTemplate` + per-entry `_ctx.<bind>` assignment happens at

package/lib/tags/if.js

@@ -1,5 +1,5 @@
 /*!
- * Phase 3 Session 7 — Twig `{% if %}` tag.
+ * Twig `{% if %}` tag.
  *
  * Twig conditional: `{% if <expr> %}…{% endif %}`. The test expression
  * is parsed via `parser.parseExpr` and attached to `token.irExpr`; the
@@ -7,8 +7,8 @@
  * mechanism (parser.js sets `ends: true` so subsequent tokens append to
  * `token.content` until the matching `{% endif %}` arrives).
  *
- * Session 7 ships a single-branch shape — `{% else %}` / `{% elseif %}`
- * are deferred to a later session. The compile path emits one
+ * Ships a single-branch shape — `{% else %}` / `{% elseif %}` are
+ * deferred. The compile path emits one
  * IRIfBranch carrying the test IRExpr and the recursively-compiled
  * body wrapped in IRLegacyJS.
  */

package/lib/tags/import.js

@@ -1,5 +1,5 @@
 /*!
- * Phase 3 Session 10 — Twig `{% import %}` tag.
+ * Twig `{% import %}` tag.
  *
  * Twig import syntax:
  *
@@ -116,7 +116,7 @@ exports.parse = function (str, line, parser, types, stack, opts, swig, token) {
   var path = pathTok.match.replace(/^['"]|['"]$/g, '');
 
   if (opts && opts.codegenMode === 'async') {
-    // Phase 2 (#T22): async mode skips the parse-time parseFile + macro
+    // Async mode skips the parse-time parseFile + macro
     // pre-render. compile() emits IRImportDeferred; runtime resolves the
     // template via _swig.getTemplate and binds .exports under the alias.
     token.args = [path, aliasTok.match];
@@ -194,7 +194,7 @@ exports.parse = function (str, line, parser, types, stack, opts, swig, token) {
  *                  imported macro into it.
  */
 exports.compile = function (compiler, args, content, parents, options) {
-  // Phase 2 (#T22): async-codegen branch. Parse stashed `[path, alias]`
+  // Async-codegen branch. Parse stashed `[path, alias]`
   // in async mode (no macro pre-render); emit IRImportDeferred so the
   // backend's `_swig.getTemplate` + `.exports` bind happens at runtime.
   if (options && options.codegenMode === 'async') {

package/lib/tags/include.js

@@ -1,5 +1,5 @@
 /*!
- * Phase 3 Session 10 — Twig `{% include %}` tag.
+ * Twig `{% include %}` tag.
  *
  * Twig include syntax:
  *

package/lib/tags/index.js

@@ -1,5 +1,5 @@
 /*!
- * Phase 3 Session 7 — Twig per-flavor tag registry.
+ * Twig per-flavor tag registry.
  *
  * Each tag exports `{ parse, compile, ends, block }` with a Twig-tailored
  * shape:
@@ -12,11 +12,8 @@
  * native-swig `parser.on(types.X, fn)` callback indirection — Twig tags own
  * their own arg-parsing path.
  *
- * Session 7 begins with an empty registry; subsequent commits within the
- * session add `set` (assignment) and `if` (flow control) to validate the
- * per-flavor shape. Future sessions add `for`, `block`, `extends`,
- * `include`, `import`, `macro`, `apply`, `verbatim`, `with`,
- * `from … import`.
+ * The registry covers `set`, `if`, `for`, `block`, `extends`, `include`,
+ * `import`, `macro`, `apply`, `verbatim`, `with`, and `from … import`.
  */
 
 module.exports = {

package/lib/tags/macro.js

@@ -1,5 +1,5 @@
 /*!
- * Phase 3 Session 10 — Twig `{% macro %}` tag.
+ * Twig `{% macro %}` tag.
  *
  * Twig macro syntax:
  *
@@ -17,8 +17,8 @@
  * binding slots reject any `.` in the match before the
  * `_dangerousProps` check.
  *
- * Twig kwargs (`{% macro foo(a=1, b="x") %}`) are deferred — Phase 4 with
- * the rest of the Twig-specific surface.
+ * Twig kwargs (`{% macro foo(a=1, b="x") %}`) are deferred with the
+ * rest of the Twig-specific surface.
  */
 
 var ir = require('@rhinostone/swig-core/lib/ir');

package/lib/tags/set.js

@@ -1,6 +1,5 @@
 /*!
- * Phase 3 Session 7 — Twig `{% set %}` tag.
- * Phase 3 Session 11 — extended with body-capture form.
+ * Twig `{% set %}` tag (assignment + body-capture forms).
  *
  * Twig `set` has two forms:
  *

package/lib/tags/verbatim.js

@@ -1,5 +1,5 @@
 /*!
- * Phase 3 Session 11 — Twig `{% verbatim %}…{% endverbatim %}` tag.
+ * Twig `{% verbatim %}…{% endverbatim %}` tag.
  *
  * Preserves arbitrary template-like content as literal output. Inside
  * a verbatim block, `{{ … }}`, `{% … %}` (other than `{% endverbatim %}`),

package/lib/tags/with.js

@@ -1,5 +1,5 @@
 /*!
- * Phase 3 Session 12 — Twig `{% with %}` tag.
+ * Twig `{% with %}` tag.
  *
  * Twig scoped-context region:
  *

package/lib/tokentypes.js

@@ -11,7 +11,7 @@
  * but the cognitive overhead of re-mapping IDs across flavors is not
  * worth the freedom.
  *
- * Twig-only IDs (30–37) are reserved here so Session 3 can add lexer
+ * Twig-only IDs (30–37) are reserved here so later commits can add lexer
  * rules without renumbering. Keeping the layout stable up front avoids
  * silent ID collisions across in-flight flavor work.
  *
@@ -70,7 +70,7 @@ module.exports = {
   /** Method call open — internal */
   METHODOPEN: 25,
 
-  /* ---- Twig-only token IDs (reserved; rules land in Session 3+) ---- */
+  /* ---- Twig-only token IDs (reserved; rules land later) ---- */
 
   /** Twig string-concatenation operator — `~` */
   TILDE: 30,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rhinostone/swig-twig",
-  "version": "2.4.2",
+  "version": "2.5.0",
   "description": "Twig-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.4.2"
+    "@rhinostone/swig-core": "2.5.0"
   },
   "publishConfig": {
     "access": "public"