npm - @rhinostone/swig-core - Versions diffs - 2.0.0-alpha.4 → 2.0.0-alpha.5 - Mend

@rhinostone/swig-core 2.0.0-alpha.4 → 2.0.0-alpha.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/lib/backend.js CHANGED Viewed

@@ -503,6 +503,7 @@ function emitExpr(node, d) {
   switch (node.type) {
   case 'Literal':       return emitLiteral(node, d);
   case 'VarRef':        return emitVarRef(node, d);
+  case 'VarRefExists':  return emitVarRefExists(node, d);
   case 'Access':        return emitAccess(node, d);
   case 'BinaryOp':      return emitBinaryOp(node, d);
   case 'UnaryOp':       return emitUnaryOp(node, d);
@@ -559,6 +560,55 @@ function emitVarRef(node, d) {
   return checkMatchExpr(node.path);
 }
+/*!
+ * Emit an existence-only check for a dot-path variable. Result is a JS
+ * boolean expression — truthy when every segment of `node.path` resolves
+ * defined and non-null in either `_ctx` or the surrounding closure
+ * scope, falsy otherwise. Distinct from {@link emitVarRef}, which
+ * coerces a missing or null result to `""` and so loses the
+ * defined/undefined signal that Twig's `is defined` test and `??`
+ * undefined-fallback need to preserve. @private
+ */
+function emitVarRefExists(node, d) {
+  if (!utils.isArray(node.path) || node.path.length === 0) {
+    d.throwError('emitVarRefExists: path must be a non-empty array');
+  }
+  utils.each(node.path, function (segment) {
+    checkDangerousSegment(segment, d, node);
+  });
+  return '(' + checkDotExpr(node.path, '_ctx.') + ' || ' + checkDotExpr(node.path, '') + ')';
+}
+/*!
+ * Build a `(typeof <head> !== "undefined" && <head> !== null && ...)`
+ * expression that is truthy when every segment of `path` is defined and
+ * non-null under the given lookup prefix (`'_ctx.'` for the dotted-ctx
+ * walk, `''` for the bare-closure walk).
+ *
+ * Hoisted out of {@link checkMatchExpr}'s inline `checkDot` closure so
+ * {@link emitVarRefExists} can reuse the same shape for Twig's
+ * `is defined` / `is null` tests and `??` undefined-fallback. The output
+ * MUST stay byte-identical to the pre-extraction inline form, since
+ * {@link checkMatchExpr}'s downstream concatenation is what every
+ * compiled VarRef body relies on. @private
+ */
+function checkDotExpr(path, ctxPrefix) {
+  var c = ctxPrefix + path[0],
+    build = '';
+  build = '(typeof ' + c + ' !== "undefined" && ' + c + ' !== null';
+  utils.each(path, function (v, i) {
+    if (i === 0) {
+      return;
+    }
+    build += ' && ' + c + '.' + v + ' !== undefined && ' + c + '.' + v + ' !== null';
+    c += '.' + v;
+  });
+  build += ')';
+  return build;
+}
 /*!
  * Replica of `TokenParser.prototype.checkMatch`. Kept as a local private
  * helper rather than imported from tokenparser.js because (a) it is a
@@ -567,30 +617,12 @@ function emitVarRef(node, d) {
  * frontend concern, not a shared-backend one). @private
  */
 function checkMatchExpr(match) {
-  var temp = match[0], result;
-  function checkDot(ctx) {
-    var c = ctx + temp,
-      m = match,
-      build = '';
-    build = '(typeof ' + c + ' !== "undefined" && ' + c + ' !== null';
-    utils.each(m, function (v, i) {
-      if (i === 0) {
-        return;
-      }
-      build += ' && ' + c + '.' + v + ' !== undefined && ' + c + '.' + v + ' !== null';
-      c += '.' + v;
-    });
-    build += ')';
-    return build;
-  }
+  var result;
   function buildDot(ctx) {
-    return '(' + checkDot(ctx) + ' ? ' + ctx + match.join('.') + ' : "")';
+    return '(' + checkDotExpr(match, ctx) + ' ? ' + ctx + match.join('.') + ' : "")';
   }
-  result = '(' + checkDot('_ctx.') + ' ? ' + buildDot('_ctx.') + ' : ' + buildDot('') + ')';
+  result = '(' + checkDotExpr(match, '_ctx.') + ' ? ' + buildDot('_ctx.') + ' : ' + buildDot('') + ')';
   return '(' + result + ' !== null ? ' + result + ' : ' + '"" )';
 }
@@ -625,6 +657,22 @@ function emitBinaryOp(node, d) {
   if (node.op === 'in') {
     return left + ' in ' + right;
   }
+  // Twig/Jinja2 `~` is explicit string-concat: both sides coerce to
+  // string before `+` runs. A bare `<left>~<right>` emission would be
+  // JS unary bitwise-NOT and SyntaxError.
+  if (node.op === '~') {
+    return '(String(' + left + ') + String(' + right + '))';
+  }
+  // Twig `??` undefined-fallback: when LHS is a VarRef, route through
+  // IRVarRefExists to preserve the defined/undefined signal. emitVarRef
+  // coerces missing/null lookups to "", and "" is defined — a bare
+  // `<left>??<right>` emission would never take the fallback branch.
+  // Non-VarRef LHS (FnCall, FilterCall, Literal) doesn't coerce that
+  // way, so falling through to bare `left??right` is correct there.
+  if (node.op === '??' && node.left && node.left.type === 'VarRef') {
+    var existsNode = ir.varRefExists(node.left.path, node.left.loc);
+    return '(' + emitVarRefExists(existsNode, d) + ' ? ' + left + ' : ' + right + ')';
+  }
   return left + node.op + right;
 }

package/lib/ir.js CHANGED Viewed

@@ -309,6 +309,27 @@
  * @property {IRLoc} [loc]
  */
+/**
+ * Existence check for a dot-path variable. Emits an expression that
+ * evaluates truthy when every segment of the path is defined and non-null
+ * (in either `_ctx` or the surrounding closure scope), false otherwise.
+ *
+ * Distinct from {@link IRVarRef}: VarRef coerces a missing or null result
+ * to the empty string for safe interpolation, which loses the
+ * defined/undefined signal that backends like Twig's `is defined` test
+ * and `??` undefined-fallback need. IRVarRefExists preserves that signal
+ * by returning the raw boolean disjunction of the dot-walks rather than
+ * the value itself.
+ *
+ * Every path segment MUST pass the dangerousProps guard at backend emit
+ * time, same rule as IRVarRef.
+ *
+ * @typedef {Object} IRVarRefExists
+ * @property {'VarRefExists'} type
+ * @property {string[]} path
+ * @property {IRLoc} [loc]
+ */
 /**
  * Dynamic (bracket) property access: `obj[key]`. `key` is any expression.
  * When `key` is an {@link IRLiteral} of kind `'string'`, the backend
@@ -407,9 +428,9 @@
  * Any expression-position IR node.
  *
  * @typedef {(
- *   IRLiteral | IRVarRef | IRAccess | IRBinaryOp | IRUnaryOp |
- *   IRConditional | IRArrayLiteral | IRObjectLiteral | IRFnCall |
- *   IRFilterCallExpr
+ *   IRLiteral | IRVarRef | IRVarRefExists | IRAccess | IRBinaryOp |
+ *   IRUnaryOp | IRConditional | IRArrayLiteral | IRObjectLiteral |
+ *   IRFnCall | IRFilterCallExpr
  * )} IRExpr
  */
@@ -762,6 +783,17 @@ exports.varRef = function (path, loc) {
   return withLoc({ type: 'VarRef', path: path }, loc);
 };
+/**
+ * Build an {@link IRVarRefExists} existence check. Every path segment
+ * MUST pass the dangerousProps guard at backend emit time.
+ * @param  {string[]} path
+ * @param  {IRLoc}    [loc]
+ * @return {IRVarRefExists}
+ */
+exports.varRefExists = function (path, loc) {
+  return withLoc({ type: 'VarRefExists', path: path }, loc);
+};
 /**
  * Build an {@link IRAccess} dynamic-bracket property access.
  * @param  {IRExpr} object

package/lib/utils.js CHANGED Viewed

@@ -182,3 +182,39 @@ exports.throwError = function (message, line, file) {
   }
   throw new Error(message + '.');
 };
+/**
+ * Inclusive range generator. Mirrors Twig's `..` operator semantics and
+ * PHP's range(): numeric bounds produce [from, from±1, ..., to]; single-
+ * character string bounds produce a char array across the charCode span.
+ * Descending when `from > to`. Mismatched or unsupported argument shapes
+ * return an empty array so compiled templates degrade silently rather
+ * than throwing at render time.
+ *
+ * @param  {number|string} from
+ * @param  {number|string} to
+ * @return {Array}
+ */
+exports.range = function (from, to) {
+  var out = [], i, fc, tc;
+  if (typeof from === 'number' && typeof to === 'number') {
+    if (from <= to) {
+      for (i = from; i <= to; i += 1) { out.push(i); }
+    } else {
+      for (i = from; i >= to; i -= 1) { out.push(i); }
+    }
+    return out;
+  }
+  if (typeof from === 'string' && typeof to === 'string' &&
+      from.length === 1 && to.length === 1) {
+    fc = from.charCodeAt(0);
+    tc = to.charCodeAt(0);
+    if (fc <= tc) {
+      for (i = fc; i <= tc; i += 1) { out.push(String.fromCharCode(i)); }
+    } else {
+      for (i = fc; i >= tc; i -= 1) { out.push(String.fromCharCode(i)); }
+    }
+    return out;
+  }
+  return out;
+};

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@rhinostone/swig-core",
-  "version": "2.0.0-alpha.4",
+  "version": "2.0.0-alpha.5",
   "description": "Shared IR, backend, and runtime for the @rhinostone/swig family of template engines. First publish at 2.0.0-alpha.3 — see @rhinostone/swig #T14 (Phase 1 carve).",
   "keywords": [
     "template",