@rhinostone/swig 2.3.0 → 2.4.1

package/HISTORY.md

@@ -1,3 +1,17 @@
+[2.4.1](https://github.com/gina-io/swig/tree/v2.4.1) / 2026-05-22
+-----------------------------------------------------------------
+
+* **Fixed** Macros now resolve macros that were imported at the top of their own defining file. Previously such a call compiled to a reference that was never set up in the caller scope, so it rendered empty instead of erroring. Resolves recursively across import depth. gh-2
+
+[2.4.0](https://github.com/gina-io/swig/tree/v2.4.0) / 2026-05-15
+-----------------------------------------------------------------
+
+* **Added** Ternary (`a ? b : c`) and Elvis (`a ?: b`) operator support in template expressions, usable in `{{ }}` output and in tag arguments such as `{% if %}`, `{% set %}`, and `{% for %}`.
+
+* **Fixed** `make coverage` now invokes mocha directly via `node node_modules/mocha/bin/_mocha` instead of the `node_modules/.bin/mocha` shim, which exits silently with no output on Node >= 18 — the 95% line-coverage gate is enforced again rather than silently passing.
+
+* **Fixed** `swig compile -o <dir>` no longer re-throws `EEXIST` when the output directory already exists. The mkdir guard matched the legacy numeric errno 47, which no longer identifies EEXIST on modern Node; it now matches `e.code === 'EEXIST'`, the stable cross-version identifier.
+
 [2.3.0](https://github.com/gina-io/swig/tree/v2.3.0) / 2026-05-14
 -----------------------------------------------------------------
 

package/ROADMAP.md

@@ -22,6 +22,16 @@ _No near-term scheduled items. See [Future (post-2.0)](#future-post-20) for upco
 
 ## Completed
 
+### v2.4.1 (May 2026)
+
+- Fixed macros rendering empty when they call a macro that was imported at the top of their own defining file. The `import` tag now carries the imported file's own `{% import %}` statements through, so those macros resolve at call time. Resolves recursively across import depth.
+
+### v2.4.0 (May 2026)
+
+- Native ternary (`a ? b : c`) and Elvis (`a ?: b`) operator support across `@rhinostone/swig` template expressions. Usable in `{{ }}` output and in tag arguments such as `{% if %}`, `{% set %}`, and `{% for %}`. The ternary's `else` branch is required — `{{ x ? "a" }}` throws `Expected colon in ternary expression`. Backend support already existed via `IRConditional` (exercised by `@rhinostone/swig-twig`); this release wires the native parser to produce it.
+- Fixed `swig compile -o <dir>` re-throwing `EEXIST` when the output directory already exists. The mkdir guard matched the legacy numeric `errno 47`, which no longer identifies `EEXIST` on modern Node; the guard now matches `e.code === 'EEXIST'`, the stable cross-version identifier.
+- Fixed `make coverage cov-reporter=travis-cov` silently no-opping the 95% line-coverage gate on Node >= 18. The `coverage:` target invoked the broken `node_modules/.bin/mocha` shim (which exits 0 with no output regardless of pass/fail); it now invokes mocha directly via `node node_modules/mocha/bin/_mocha`, matching the `test:` target.
+
 ### v2.3.0 (May 2026)
 
 - Reduced `@rhinostone/swig`'s production dependency footprint to a single package. `yargs` and `terser` were CLI-only — the library entry point never loaded them — but sat in production `dependencies`, so every library install pulled in their full dependency trees. The CLI's argument parsing is now handled by a small built-in zero-dependency parser; `terser` (used only by `swig compile --minify`) is loaded lazily and ships as a `devDependency`, with `--minify` printing an install hint instead of crashing if it is absent. A library install of `@rhinostone/swig` now pulls in only `@rhinostone/swig-core`. No change to the CLI surface or rendering behavior.

package/bin/swig.js

@@ -83,7 +83,9 @@ if (argv.o !== 'stdout' && !argv.r) {
   try {
     fs.mkdirSync(argv.o);
   } catch (e) {
-    if (e.errno !== 47) {
+    // EEXIST (output dir already exists) is expected. Match on e.code; the
+    // legacy numeric errno 47 no longer identifies EEXIST on modern Node.
+    if (e.code !== 'EEXIST') {
       throw e;
     }
   }

package/dist/swig.js

@@ -1,4 +1,4 @@
-/*! Swig v2.3.0 | https://github.com/gina-io/swig | @license https://github.com/gina-io/swig/blob/master/LICENSE */
+/*! Swig v2.4.1 | https://github.com/gina-io/swig | @license https://github.com/gina-io/swig/blob/master/LICENSE */
 /*! DateZ (c) 2011 Tomo Universalis | @license https://github.com/ocrybit/DateZ/blob/master/LISENCE */
 (() => {
   var __getOwnPropNames = Object.getOwnPropertyNames;
@@ -498,6 +498,8 @@
         /** End of a method
          * Currently unused
         METHODEND: 26, */
+        /** Ternary question mark (?) */
+        QMARK: 27,
         /** Unknown type */
         UNKNOWN: 100
       };
@@ -2002,6 +2004,12 @@
             /^\d+(\.\d+)?/
           ]
         },
+        {
+          type: TYPES.QMARK,
+          regex: [
+            /^\?/
+          ]
+        },
         {
           type: TYPES.OPERATOR,
           regex: [
@@ -2265,12 +2273,25 @@
               self.out.push("{");
               self.filterApplyIdx.push(self.out.length - 1);
               break;
+            case _t.QMARK:
+              self.out.push(" ? ");
+              self.state.push(token.type);
+              self.filterApplyIdx.pop();
+              break;
             case _t.COLON:
-              if (lastState !== _t.CURLYOPEN) {
+              if (lastState === _t.CURLYOPEN) {
+                self.state.push(token.type);
+                self.out.push(":");
+              } else if (lastState === _t.QMARK) {
+                self.state.pop();
+                if (self.out[self.out.length - 1] === " ? ") {
+                  self.out[self.out.length - 1] = " || ";
+                } else {
+                  self.out.push(" : ");
+                }
+              } else {
                 utils.throwError("Unexpected colon", self.line, self.filename);
               }
-              self.state.push(token.type);
-              self.out.push(":");
               self.filterApplyIdx.pop();
               break;
             case _t.CURLYCLOSE:
@@ -2610,6 +2631,27 @@
               var right = parseExpression(info.prec + 1);
               left = ir.binaryOp(info.op, left, right);
             }
+            if (minPrec === 0) {
+              var qtok = peek();
+              if (qtok && qtok.type === _t.QMARK) {
+                consume();
+                var afterQ = peek();
+                var elseBranch;
+                if (afterQ && afterQ.type === _t.COLON) {
+                  consume();
+                  elseBranch = parseExpression(0);
+                  left = ir.conditional(left, left, elseBranch);
+                } else {
+                  var thenBranch = parseExpression(0);
+                  var colon = consume();
+                  if (!colon || colon.type !== _t.COLON) {
+                    bail("Expected colon in ternary expression");
+                  }
+                  elseBranch = parseExpression(0);
+                  left = ir.conditional(left, thenBranch, elseBranch);
+                }
+              }
+            }
             return left;
           }
           var result = parseExpression(0);
@@ -2670,7 +2712,7 @@
           if (typeof self.escape === "string") {
             return legacyFallback();
           }
-          var depth = 0, hasTopOp = false, hasTopFilter = false, firstTopFilterIdx = -1;
+          var depth = 0, hasTopOp = false, hasTopFilter = false, hasTopTernary = false, firstTopFilterIdx = -1;
           for (i = 0; i < tokens.length; i += 1) {
             t = tokens[i];
             if (depth === 0) {
@@ -2683,6 +2725,9 @@
                   firstTopFilterIdx = i;
                 }
               }
+              if (t.type === _t.QMARK) {
+                hasTopTernary = true;
+              }
             }
             if (t.type === _t.PARENOPEN || t.type === _t.FUNCTION || t.type === _t.BRACKETOPEN || t.type === _t.CURLYOPEN || t.type === _t.FILTER) {
               depth += 1;
@@ -2715,7 +2760,7 @@
                 }
               }
             }
-            if (hasTopOp && hasTopFilter) {
+            if (hasTopTernary || hasTopOp && hasTopFilter) {
               var exprPO = self.parseExpr(tokens);
               var fcallsPO = escape ? [ir.filterCall("e")] : [];
               return ir.output(exprPO, fcallsPO.length > 0 ? fcallsPO : void 0);
@@ -2814,6 +2859,9 @@
             }
             return ir.output(expr, filterCalls.length > 0 ? filterCalls : void 0);
           } catch (e) {
+            if (hasTopTernary) {
+              throw e;
+            }
             return legacyFallback();
           }
         },
@@ -3014,15 +3062,22 @@
             options.filename || ""
           );
         }
-        var ctx = args.pop(), allMacros = utils.map(args, function(arg) {
+        var ctx = args.pop(), macros = [], nestedImports = [];
+        utils.each(args, function(arg) {
+          (arg.isImport ? nestedImports : macros).push(arg);
+        });
+        var allMacros = utils.map(macros, function(arg) {
           return arg.name;
-        }).join("|"), out = "_ctx." + ctx + ' = {};\n  var _output = "";\n', replacements = utils.map(args, function(arg) {
+        }).join("|"), out = "_ctx." + ctx + ' = {};\n  var _output = "";\n', replacements = utils.map(macros, function(arg) {
           return {
             ex: new RegExp("_ctx." + arg.name + "(\\W)(?!" + allMacros + ")", "g"),
             re: "_ctx." + ctx + "." + arg.name + "$1"
           };
         });
-        utils.each(args, function(arg) {
+        utils.each(nestedImports, function(arg) {
+          out += arg.compiled;
+        });
+        utils.each(macros, function(arg) {
           var c = arg.compiled;
           utils.each(replacements, function(re) {
             c = c.replace(re.ex, re.re);
@@ -3046,7 +3101,17 @@
           var tokens = swig2.parseFile(importPath, parseOpts).tokens;
           utils.each(tokens, function(token2) {
             var out = "", macroName;
-            if (!token2 || token2.name !== "macro" || !token2.compile) {
+            if (!token2 || !token2.compile) {
+              return;
+            }
+            if (token2.name === "import") {
+              self.out.push({
+                compiled: token2.compile(compiler, token2.args.slice(), token2.content, [], compileOpts) + "\n",
+                isImport: true
+              });
+              return;
+            }
+            if (token2.name !== "macro") {
               return;
             }
             macroName = token2.args[0];
@@ -4513,7 +4578,7 @@
       var loaders = require_loaders2();
       var preWalker = require_pre_walker();
       var engine = require_engine();
-      exports.version = "2.3.0";
+      exports.version = "2.4.1";
       var defaultOptions = {
         autoescape: true,
         varControls: ["{{", "}}"],