@rhinostone/swig 2.2.0 → 2.4.0

package/HISTORY.md

@@ -1,3 +1,17 @@
+[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
+-----------------------------------------------------------------
+
+* **Changed** Drop `yargs` and `terser` from production `dependencies`. CLI argument parsing now uses a small built-in zero-dependency parser; `terser` (used only by `swig compile --minify`) is loaded lazily and moves to `devDependencies`. A library install of `@rhinostone/swig` now pulls in only `@rhinostone/swig-core`.
+
 [2.2.0](https://github.com/gina-io/swig/tree/v2.2.0) / 2026-05-11
 -----------------------------------------------------------------
 

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.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.
+
 ### v2.2.0 (May 2026)
 
 - `renderFile(path, locals, cb)` and `compileFile(path, options, cb)` now automatically route to the async-codegen path when the configured loader signals async support via `loader.async === true`. The async path defers template resolution from parse time to render time via a new `_swig.getTemplate(path, options)` runtime helper that returns `Promise<TemplateFn>`; `extends`, `include`, `import`, and `from` emit deferred IR shapes and the shared backend wraps the compiled body in an `AsyncFunction`. Block overrides thread through the inheritance chain via a sixth `_blocks` positional argument; macro imports pick up exports via a `Promise<{output, exports}>` template-fn return shape. Both `@rhinostone/swig` and `@rhinostone/swig-twig` flavors — parity across the two surfaces. Static template targets (string literals in `extends` / `include` / `import` / `from`) work end-to-end against async loaders; dynamic targets surface a clear runtime error and are tracked as a follow-up. The sync render path is unchanged — loaders without `loader.async === true` continue to use the established sync `_swig.compileFile(...)` resolution, including the built-in `loaders.fs` and `loaders.memory` which remain dual-mode.

package/bin/swig.js

@@ -2,109 +2,73 @@
 /*jslint es5: true */
 
 var swig = require('../index'),
-  yargs = require('yargs'),
   fs = require('fs'),
   path = require('path'),
   filters = require('../lib/filters'),
-  utils = require('../lib/utils'),
-  terser = require('terser');
-
-var command,
-  wrapstart = 'var tpl = ',
-  wrapend = ';',
-  argv = yargs
-    .usage('\n Usage:\n' +
-      '    $0 compile [files] [options]\n' +
-      '    $0 compile --recursive <dir> [options]\n' +
-      '    $0 run [files] [options]\n' +
-      '    $0 render [files] [options]\n'
-      )
-    .describe({
-      v: 'Show the Swig version number.',
-      o: 'Output location.',
-      h: 'Show this help screen.',
-      j: 'Variable context as a JSON file.',
-      c: 'Variable context as a CommonJS-style file. Used only if option `j` is not provided.',
-      m: 'Minify compiled functions with terser',
-      r: 'Recursively compile every template in <dir> into a single AOT bundle module.',
-      'ext': 'Comma-separated list of file extensions to include when using --recursive (e.g. ".html,.swig"). Defaults to no filter.',
-      'filters': 'Custom filters as a CommonJS-style file',
-      'tags': 'Custom tags as a CommonJS-style file',
-      'options': 'Customize Swig\'s Options from a CommonJS-style file',
-      'wrap-start': 'Template wrapper beginning for "compile".',
-      'wrap-end': 'Template wrapper end for "compile".',
-      'method-name': 'Method name to set template to and run from.'
-    })
-    .alias('v', 'version')
-    .alias('o', 'output')
-    .default('o', 'stdout')
-    .alias('h', 'help')
-    .alias('j', 'json')
-    .alias('c', 'context')
-    .alias('m', 'minify')
-    .alias('r', 'recursive')
-    .default('wrap-start', wrapstart)
-    .default('wrap-end', wrapend)
-    .default('method-name', 'tpl')
-    .check(function (argv) {
-      if (argv.v) {
-        return true;
-      }
-
-      if (!argv._.length) {
-        throw new Error('');
-      }
+  utils = require('../lib/utils');
 
-      command = argv._.shift();
-      if (command !== 'compile' && command !== 'render' && command !== 'run') {
-        throw new Error('Unrecognized command "' + command + '". Use -h for help.');
-      }
+var wrapstart = 'var tpl = ',
+  wrapend = ';';
 
-      if (argv['method-name'] !== 'tpl' && argv['wrap-start'] !== wrapstart) {
-        throw new Error('Cannot use arguments "--method-name" and "--wrap-start" together.');
-      }
-
-      if (argv['method-name'] !== 'tpl') {
-        argv['wrap-start'] = 'var ' + argv['method-name'] + ' = ';
-      }
-
-      if (argv.r) {
-        if (command !== 'compile') {
-          throw new Error('--recursive can only be used with "compile".');
-        }
-        if (argv._.length) {
-          throw new Error('--recursive does not accept positional file arguments; pass a single directory via --recursive <dir>.');
-        }
-        if (argv['method-name'] !== 'tpl') {
-          throw new Error('--recursive cannot be combined with --method-name; the bundle exports a map of templates, not a single named function.');
-        }
-        if (argv['wrap-start'] !== wrapstart || argv['wrap-end'] !== wrapend) {
-          throw new Error('--recursive cannot be combined with --wrap-start / --wrap-end; the bundle wrapper is fixed.');
-        }
-      }
-
-      if (argv.ext && !argv.r) {
-        throw new Error('--ext is only meaningful with --recursive.');
-      }
-
-      return true;
-    })
-    .argv,
+/**
+ * CLI flag table. Each entry is keyed by the canonical name the rest of this
+ * file reads. <code>alias</code> is the long-form name folded onto that key,
+ * <code>boolean</code> marks flags that never consume the following token,
+ * and <code>default</code> seeds a value when the flag is absent.
+ *
+ * @private
+ */
+var FLAGS = {
+  'v': { alias: 'version', boolean: true },
+  'o': { alias: 'output', default: 'stdout' },
+  'h': { alias: 'help', boolean: true },
+  'j': { alias: 'json' },
+  'c': { alias: 'context' },
+  'm': { alias: 'minify', boolean: true },
+  'r': { alias: 'recursive' },
+  'ext': {},
+  'filters': {},
+  'tags': {},
+  'options': {},
+  'wrap-start': { default: wrapstart },
+  'wrap-end': { default: wrapend },
+  'method-name': { default: 'tpl' }
+};
+
+var argv = parseArgs(process.argv.slice(2)),
+  command,
   ctx = {},
   out = function (file, str) {
     console.log(str);
   },
   efn = function () {},
-  anonymous,
-  files,
   fn;
 
+// Show this help screen.
+if (argv.h) {
+  console.log(usage());
+  process.exit(0);
+}
+
 // What version?
 if (argv.v) {
   console.log(require('../package').version);
   process.exit(0);
 }
 
+// Validate the parsed arguments and resolve the subcommand. On any invalid
+// combination, print the message (when there is one) plus the usage screen
+// and exit non-zero — the behaviour the former yargs `.check()` gate had.
+try {
+  command = validate(argv);
+} catch (e) {
+  if (e.message) {
+    console.error(e.message);
+  }
+  console.error(usage());
+  process.exit(1);
+}
+
 // Pull in any context data provided
 if (argv.j) {
   ctx = JSON.parse(fs.readFileSync(argv.j, 'utf8'));
@@ -119,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;
     }
   }
@@ -158,7 +124,7 @@ case 'compile':
     r = argv['wrap-start'] + r + argv['wrap-end'];
 
     if (argv.m) {
-      r = terser.minify_sync(r).code;
+      r = loadTerser().minify_sync(r).code;
     }
 
     out(file, r);
@@ -191,6 +157,227 @@ if (argv.r) {
   });
 }
 
+/**
+ * Parse a <code>process.argv</code> tail into a flag / positional map.
+ * Supports <code>--name</code>, <code>--name=value</code>,
+ * <code>--name value</code>, <code>-x</code>, <code>-x value</code>,
+ * <code>-x=value</code>, and a <code>--</code> terminator after which every
+ * token is positional. Long-form aliases are folded onto their canonical
+ * {@link FLAGS} key; boolean flags never consume the following token. Bare
+ * tokens collect into <code>argv._</code>. Unknown flags are tolerated and
+ * kept verbatim, matching the former non-strict yargs behaviour.
+ *
+ * @param  {string[]} args  <code>process.argv.slice(2)</code>.
+ * @return {object}         <code>{ _: [positionals], &lt;flag&gt;: value }</code>.
+ * @private
+ */
+function parseArgs(args) {
+  var argv = { _: [] },
+    i,
+    token,
+    body,
+    eq,
+    name,
+    canonical,
+    value,
+    key;
+
+  for (i = 0; i < args.length; i += 1) {
+    token = args[i];
+
+    if (token === '--') {
+      argv._ = argv._.concat(args.slice(i + 1));
+      break;
+    }
+
+    if (token.slice(0, 2) === '--') {
+      body = token.slice(2);
+    } else if (token.charAt(0) === '-' && token.length > 1) {
+      body = token.slice(1);
+    } else {
+      argv._.push(token);
+      continue;
+    }
+
+    eq = body.indexOf('=');
+    if (eq !== -1) {
+      name = body.slice(0, eq);
+      value = body.slice(eq + 1);
+    } else {
+      name = body;
+      value = undefined;
+    }
+
+    canonical = aliasToCanonical(name);
+
+    if (value === undefined) {
+      if (FLAGS[canonical] && FLAGS[canonical].boolean) {
+        value = true;
+      } else if (i + 1 < args.length && !isFlagToken(args[i + 1])) {
+        i += 1;
+        value = args[i];
+      } else {
+        value = true;
+      }
+    }
+
+    argv[canonical] = value;
+  }
+
+  // Seed defaults for any flag the caller did not pass.
+  for (key in FLAGS) {
+    if (FLAGS.hasOwnProperty(key) && FLAGS[key].hasOwnProperty('default') && !argv.hasOwnProperty(key)) {
+      argv[key] = FLAGS[key].default;
+    }
+  }
+
+  return argv;
+}
+
+/**
+ * Resolve a flag name to its canonical {@link FLAGS} key. A name that is
+ * already canonical, or that matches no known alias, is returned unchanged.
+ *
+ * @param  {string} name  Flag name as written on the command line.
+ * @return {string}       Canonical key.
+ * @private
+ */
+function aliasToCanonical(name) {
+  var key;
+  if (FLAGS.hasOwnProperty(name)) {
+    return name;
+  }
+  for (key in FLAGS) {
+    if (FLAGS.hasOwnProperty(key) && FLAGS[key].alias === name) {
+      return key;
+    }
+  }
+  return name;
+}
+
+/**
+ * Is <var>token</var> a flag rather than a value? Used to decide whether a
+ * value-taking flag should consume the next token.
+ *
+ * @param  {string}  token  Candidate token.
+ * @return {boolean}        True when the token looks like a flag.
+ * @private
+ */
+function isFlagToken(token) {
+  return token.charAt(0) === '-' && token.length > 1;
+}
+
+/**
+ * Validate the parsed arguments and resolve the subcommand. Mirrors the gate
+ * the former yargs <code>.check()</code> chain enforced — same checks, same
+ * messages, same <code>--method-name</code> &rarr; <code>--wrap-start</code>
+ * rewrite. Throws on any invalid combination; the caller prints the message
+ * plus the usage screen and exits non-zero.
+ *
+ * @param  {object} argv  Parsed argv from {@link parseArgs}.
+ * @return {string}       The resolved subcommand: compile, render, or run.
+ * @private
+ */
+function validate(argv) {
+  var cmd;
+
+  if (!argv._.length) {
+    throw new Error('');
+  }
+
+  cmd = argv._.shift();
+  if (cmd !== 'compile' && cmd !== 'render' && cmd !== 'run') {
+    throw new Error('Unrecognized command "' + cmd + '". Use -h for help.');
+  }
+
+  if (argv['method-name'] !== 'tpl' && argv['wrap-start'] !== wrapstart) {
+    throw new Error('Cannot use arguments "--method-name" and "--wrap-start" together.');
+  }
+
+  if (argv['method-name'] !== 'tpl') {
+    argv['wrap-start'] = 'var ' + argv['method-name'] + ' = ';
+  }
+
+  if (argv.r) {
+    if (cmd !== 'compile') {
+      throw new Error('--recursive can only be used with "compile".');
+    }
+    if (argv._.length) {
+      throw new Error('--recursive does not accept positional file arguments; pass a single directory via --recursive <dir>.');
+    }
+    if (argv['method-name'] !== 'tpl') {
+      throw new Error('--recursive cannot be combined with --method-name; the bundle exports a map of templates, not a single named function.');
+    }
+    if (argv['wrap-start'] !== wrapstart || argv['wrap-end'] !== wrapend) {
+      throw new Error('--recursive cannot be combined with --wrap-start / --wrap-end; the bundle wrapper is fixed.');
+    }
+  }
+
+  if (argv.ext && !argv.r) {
+    throw new Error('--ext is only meaningful with --recursive.');
+  }
+
+  return cmd;
+}
+
+/**
+ * Build the CLI usage screen — the command synopsis plus the option table.
+ *
+ * @return {string}  The full usage text.
+ * @private
+ */
+function usage() {
+  return [
+    '',
+    ' Usage:',
+    '    swig compile [files] [options]',
+    '    swig compile --recursive <dir> [options]',
+    '    swig run [files] [options]',
+    '    swig render [files] [options]',
+    '',
+    ' Options:',
+    '    -v, --version       Show the Swig version number.',
+    '    -o, --output        Output location.',
+    '    -h, --help          Show this help screen.',
+    '    -j, --json          Variable context as a JSON file.',
+    '    -c, --context       Variable context as a CommonJS-style file. Used only if option `j` is not provided.',
+    '    -m, --minify        Minify compiled functions with terser',
+    '    -r, --recursive     Recursively compile every template in <dir> into a single AOT bundle module.',
+    '    --ext               Comma-separated list of file extensions to include when using --recursive (e.g. ".html,.swig"). Defaults to no filter.',
+    '    --filters           Custom filters as a CommonJS-style file',
+    '    --tags              Custom tags as a CommonJS-style file',
+    '    --options           Customize Swig\'s Options from a CommonJS-style file',
+    '    --wrap-start        Template wrapper beginning for "compile".',
+    '    --wrap-end          Template wrapper end for "compile".',
+    '    --method-name       Method name to set template to and run from.',
+    ''
+  ].join('\n');
+}
+
+/**
+ * Lazily load the optional <code>terser</code> package, used only by the
+ * <code>--minify</code> flag. terser is a CLI-only dependency — the library
+ * entry point never needs it — so it ships as a devDependency rather than a
+ * runtime one, and a plain <code>npm install @rhinostone/swig</code> does not
+ * pull it in. Print a friendly install hint and exit non-zero if a CLI user
+ * reaches <code>--minify</code> without it.
+ *
+ * @return {object}  The terser module.
+ * @private
+ */
+function loadTerser() {
+  try {
+    return require('terser');
+  } catch (e) {
+    if (e.code !== 'MODULE_NOT_FOUND') {
+      throw e;
+    }
+    console.error('The --minify flag needs the "terser" package, which is not installed.');
+    console.error('Install it with:  npm install terser');
+    process.exit(1);
+  }
+}
+
 /**
  * Walk a directory recursively, returning every regular-file path found.
  * Skips dotfile entries and dot-directories so platform metadata such as
@@ -268,7 +455,7 @@ function bundleRecursive(dir) {
   output = 'module.exports = {\n' + parts.join(',\n') + '\n};\n';
 
   if (argv.m) {
-    output = terser.minify_sync(output).code;
+    output = loadTerser().minify_sync(output).code;
   }
 
   if (argv.o === 'stdout') {

package/dist/swig.js

@@ -1,4 +1,4 @@
-/*! Swig v2.2.0 | https://github.com/gina-io/swig | @license https://github.com/gina-io/swig/blob/master/LICENSE */
+/*! Swig v2.4.0 | 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();
           }
         },
@@ -4513,7 +4561,7 @@
       var loaders = require_loaders2();
       var preWalker = require_pre_walker();
       var engine = require_engine();
-      exports.version = "2.2.0";
+      exports.version = "2.4.0";
       var defaultOptions = {
         autoescape: true,
         varControls: ["{{", "}}"],