tina4-nodejs 3.13.149 → 3.13.151

package/packages/frond/dist/index.js

@@ -166,6 +166,14 @@ var FILTER_WITH_ARGS_RE = /^(\w+)\s*\(([\s\S]*)\)$/;
 var FILTER_COMPARISON_RE = /^(\w+)\s*(!=|==|>=|<=|>|<)\s*(.+)$/;
 var TITLE_WORD_RE = /\b\w/g;
 var STRIP_TAGS_RE = /<[^>]+>/g;
+function stripTags(input) {
+  let s = input, prev;
+  do {
+    prev = s;
+    s = s.replace(STRIP_TAGS_RE, "");
+  } while (s !== prev);
+  return s;
+}
 var FAST_FILTERS = {
   upper: (value) => String(value).toUpperCase(),
   lower: (value) => String(value).toLowerCase(),
@@ -180,7 +188,7 @@ var FAST_FILTERS = {
   int: (value) => value ? parseInt(String(value), 10) || 0 : 0,
   float: (value) => value ? parseFloat(String(value)) || 0 : 0,
   abs: (value) => typeof value === "number" ? Math.abs(value) : value,
-  striptags: (value) => String(value).replace(STRIP_TAGS_RE, ""),
+  striptags: (value) => stripTags(String(value)),
   first: (value) => Array.isArray(value) ? value[0] ?? null : null,
   last: (value) => Array.isArray(value) ? value[value.length - 1] ?? null : null,
   keys: (value) => typeof value === "object" && value !== null && !Array.isArray(value) ? Object.keys(value) : [],
@@ -194,14 +202,12 @@ var FAST_FILTERS = {
   filter: (value) => Array.isArray(value) ? value.filter(Boolean) : value
 };
 var FORMAT_RE = /%%|%([-+ 0]*)(\d+)?(?:\.(\d+))?([sdifFeEgGxXob])/g;
-var LEADING_WS_RE = /^\s+/;
-var TRAILING_WS_RE = /\s+$/;
 var THOUSANDS_RE = /\B(?=(\d{3})+(?!\d))/g;
 var LIVE_RE = /^live\s+["']([^"']+)["']([\s\S]*)$/;
 var LIVE_WS_RE = /ws\s+["']([^"']+)["']/;
 var LIVE_SRC_RE = /src\s+["']([^"']+)["']/;
-var EXTENDS_RE = /\{%[-\s]*extends\s+["'](.+?)["']\s*[-]?%\}/;
-var EXTENDS_RE_GLOBAL = /\{%[-\s]*extends\s+["'](.+?)["']\s*[-]?%\}/g;
+var EXTENDS_RE = /\{%[-\s]*extends\s+["']([^"']+)["']\s*[-]?%\}/;
+var EXTENDS_RE_GLOBAL = /\{%[-\s]*extends\s+["']([^"']+)["']\s*[-]?%\}/g;
 function liveAttr(value) {
   return String(value).replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
@@ -223,37 +229,65 @@ function sweepExpiredCache(cache) {
     if (expiresAt <= now) cache.delete(key);
   }
 }
-var TOKEN_RE = /(\{%-?\s*[\s\S]*?\s*-?%\})|(\{\{-?\s*[\s\S]*?\s*-?\}\})|(\{#[\s\S]*?#\})/g;
-var RAW_BLOCK_RE = /\{%-?\s*raw\s*-?%\}([\s\S]*?)\{%-?\s*endraw\s*-?%\}/g;
-function tokenize(source) {
+var RAW_OPEN_RE = /\{%-?\s*raw\s*-?%\}/g;
+var RAW_CLOSE_RE = /\{%-?\s*endraw\s*-?%\}/g;
+function extractRawBlocks(source) {
   const rawBlocks = [];
-  source = source.replace(RAW_BLOCK_RE, (_match, content) => {
+  let out = "";
+  let pos = 0;
+  RAW_OPEN_RE.lastIndex = 0;
+  let om;
+  while ((om = RAW_OPEN_RE.exec(source)) !== null) {
+    const openStart = om.index;
+    const openEnd = RAW_OPEN_RE.lastIndex;
+    RAW_CLOSE_RE.lastIndex = openEnd;
+    const cm = RAW_CLOSE_RE.exec(source);
+    if (cm === null) break;
     const idx = rawBlocks.length;
-    rawBlocks.push(content);
-    return `\0RAW_${idx}\0`;
-  });
+    rawBlocks.push(source.slice(openEnd, cm.index));
+    out += source.slice(pos, openStart) + `\0RAW_${idx}\0`;
+    pos = RAW_CLOSE_RE.lastIndex;
+    RAW_OPEN_RE.lastIndex = pos;
+  }
+  out += source.slice(pos);
+  return { source: out, rawBlocks };
+}
+var TAG_KINDS = {
+  "%": { close: "%}", type: "BLOCK" },
+  "{": { close: "}}", type: "VAR" },
+  "#": { close: "#}", type: "COMMENT" }
+};
+function tokenize(rawSource) {
+  const { source, rawBlocks } = extractRawBlocks(rawSource);
   const tokens = [];
+  const n = source.length;
   let pos = 0;
-  TOKEN_RE.lastIndex = 0;
-  let m;
-  while ((m = TOKEN_RE.exec(source)) !== null) {
-    const start = m.index;
-    if (start > pos) {
-      tokens.push(["TEXT", source.slice(pos, start)]);
-    }
-    const raw = m[0];
-    if (raw.startsWith("{#")) {
-      tokens.push(["COMMENT", raw]);
-    } else if (raw.startsWith("{{")) {
-      tokens.push(["VAR", raw]);
-    } else if (raw.startsWith("{%")) {
-      tokens.push(["BLOCK", raw]);
-    }
-    pos = m.index + raw.length;
-  }
-  if (pos < source.length) {
-    tokens.push(["TEXT", source.slice(pos)]);
+  let scan = 0;
+  const exhausted = { "%}": false, "}}": false, "#}": false };
+  while (scan < n) {
+    const brace = source.indexOf("{", scan);
+    if (brace === -1) break;
+    const kind = TAG_KINDS[source[brace + 1]];
+    if (!kind) {
+      scan = brace + 1;
+      continue;
+    }
+    if (exhausted[kind.close]) {
+      scan = brace + 1;
+      continue;
+    }
+    const close = source.indexOf(kind.close, brace + 2);
+    if (close === -1) {
+      exhausted[kind.close] = true;
+      scan = brace + 1;
+      continue;
+    }
+    if (brace > pos) tokens.push(["TEXT", source.slice(pos, brace)]);
+    tokens.push([kind.type, source.slice(brace, close + 2)]);
+    pos = close + 2;
+    scan = close + 2;
   }
+  if (pos < n) tokens.push(["TEXT", source.slice(pos)]);
   if (rawBlocks.length > 0) {
     for (let i = 0; i < tokens.length; i++) {
       if (tokens[i][0] === "TEXT" && tokens[i][1].includes("\0RAW_")) {
@@ -589,26 +623,125 @@ var ARITHMETIC_OPERATIONS = {
   "%": (left, right) => right !== 0 ? left % right : 0,
   "**": (left, right) => left ** right
 };
+var ARITHMETIC_LEVELS = [["+", "-"], ["*", "//", "/", "%"], ["**"]];
+function topLevelPositions(expr) {
+  const positions = [];
+  let inQuote = null;
+  let depth = 0;
+  for (let pos = 0; pos < expr.length; pos++) {
+    const ch = expr[pos];
+    if (inQuote) {
+      if (ch === inQuote) inQuote = null;
+    } else if (ch === '"' || ch === "'") {
+      inQuote = ch;
+    } else if ("([{".includes(ch)) {
+      depth++;
+    } else if (")]}".includes(ch)) {
+      depth--;
+    } else if (depth === 0) {
+      positions.push(pos);
+    }
+  }
+  return positions;
+}
+function followsOperand(expr, pos) {
+  return /[\w)\]'"]$/.test(expr.slice(0, pos).trimEnd());
+}
+function topLevelArithmeticOperators(expr) {
+  const operators = [];
+  let skipUntil = -1;
+  for (const pos of topLevelPositions(expr)) {
+    if (pos < skipUntil || !"+-*/%".includes(expr[pos])) continue;
+    const pair = expr.slice(pos, pos + 2);
+    const op = pair === "**" || pair === "//" ? pair : expr[pos];
+    skipUntil = pos + op.length;
+    if (followsOperand(expr, pos)) operators.push([pos, op]);
+  }
+  return operators;
+}
+function splitArithmetic(expr) {
+  const operators = topLevelArithmeticOperators(expr);
+  for (const level of ARITHMETIC_LEVELS) {
+    const matches = operators.filter(([, op]) => level.includes(op));
+    if (matches.length > 0) return level[0] === "**" ? matches[0] : matches[matches.length - 1];
+  }
+  return null;
+}
 function evalArithmeticExpression(expr, context) {
-  for (const op of [" + ", " - ", " * ", " // ", " / ", " % ", " ** "]) {
-    const pos = findOutsideQuotes(expr, op);
-    if (pos >= 0) {
-      const left = expr.slice(0, pos).trim();
-      const right = expr.slice(pos + op.length).trim();
-      const lVal = evalExpr(left, context);
-      const rVal = evalExpr(right, context);
-      try {
-        let lNum = lVal != null ? Number(lVal) : 0;
-        let rNum = rVal != null ? Number(rVal) : 0;
-        if (isNaN(lNum)) lNum = 0;
-        if (isNaN(rNum)) rNum = 0;
-        return ARITHMETIC_OPERATIONS[op.trim()](lNum, rNum);
-      } catch {
-        return null;
-      }
+  const split = splitArithmetic(expr);
+  if (!split) return EXPR_NOT_MATCHED;
+  const [pos, op] = split;
+  const lVal = evalExpr(expr.slice(0, pos).trim(), context);
+  const rVal = evalExpr(expr.slice(pos + op.length).trim(), context);
+  let lNum = lVal != null ? Number(lVal) : 0;
+  let rNum = rVal != null ? Number(rVal) : 0;
+  if (isNaN(lNum)) lNum = 0;
+  if (isNaN(rNum)) rNum = 0;
+  return ARITHMETIC_OPERATIONS[op](lNum, rNum);
+}
+function frondRange(start, end, step = 1) {
+  const numeric = (value) => typeof value === "number" || typeof value === "string" && NUMERIC_RE.test(value);
+  if (!numeric(start) || !numeric(end) || !numeric(step)) return [];
+  const first = Math.trunc(Number(start));
+  const last = Math.trunc(Number(end));
+  const stride = Math.abs(Math.trunc(Number(step)));
+  if (stride === 0) return [];
+  const values = [];
+  if (first <= last) for (let value = first; value <= last; value += stride) values.push(value);
+  else for (let value = first; value >= last; value -= stride) values.push(value);
+  return values;
+}
+function findRangeOperator(expr) {
+  let pos = findOutsideQuotes(expr, "..");
+  while (pos >= 0) {
+    const partOfEllipsis = expr.startsWith("...", pos) || pos > 0 && expr[pos - 1] === ".";
+    if (pos > 0 && !partOfEllipsis) return findOutsideQuotes(expr.slice(pos + 2), "|") >= 0 ? -1 : pos;
+    const next = findOutsideQuotes(expr.slice(pos + 2), "..");
+    pos = next >= 0 ? pos + 2 + next : -1;
+  }
+  return -1;
+}
+function evalRangeExpression(expr, context) {
+  const pos = findRangeOperator(expr);
+  if (pos < 0) return EXPR_NOT_MATCHED;
+  return frondRange(evalExpr(expr.slice(0, pos).trim(), context), evalExpr(expr.slice(pos + 2).trim(), context));
+}
+function closingBracketIndex(expr) {
+  let depth = 0;
+  let inQuote = null;
+  for (let i = 0; i < expr.length; i++) {
+    const ch = expr[i];
+    if (inQuote) {
+      if (ch === inQuote) inQuote = null;
+    } else if (ch === '"' || ch === "'") {
+      inQuote = ch;
+    } else if ("([{".includes(ch)) {
+      depth++;
+    } else if (")]}".includes(ch) && --depth === 0) {
+      return i;
     }
   }
-  return EXPR_NOT_MATCHED;
+  return -1;
+}
+var BARE_KEY_RE = /^[A-Za-z_]\w*$/;
+function mapLiteralKey(rawKey, context) {
+  const quoted = rawKey.length >= 2 && (rawKey[0] === '"' || rawKey[0] === "'") && rawKey.endsWith(rawKey[0]);
+  if (quoted) return rawKey.slice(1, -1);
+  return BARE_KEY_RE.test(rawKey) ? rawKey : String(evalExpr(rawKey, context));
+}
+function evalMapLiteral(inner, context) {
+  const map = {};
+  for (const pair of inner === "" ? [] : splitArgs(inner)) {
+    const colon = findOutsideQuotes(pair, ":");
+    if (colon > 0) map[mapLiteralKey(pair.slice(0, colon).trim(), context)] = evalExpr(pair.slice(colon + 1).trim(), context);
+  }
+  return map;
+}
+function evalCollectionLiteral(expr, context) {
+  if (expr[0] !== "[" && expr[0] !== "{" || closingBracketIndex(expr) !== expr.length - 1) return EXPR_NOT_MATCHED;
+  const inner = expr.slice(1, -1).trim();
+  if (expr[0] === "{") return evalMapLiteral(inner, context);
+  return inner === "" ? [] : splitArgs(inner).map((item) => evalExpr(item.trim(), context));
 }
 function evalFilterExpression(expr, context) {
   if (findOutsideQuotes(expr, "|") >= 0) {
@@ -655,9 +788,11 @@ function evalFunctionExpression(expr, context) {
   return EXPR_NOT_MATCHED;
 }
 var EXPR_EVALUATORS = [
+  evalCollectionLiteral,
   evalPrimary,
   evalConditional,
   evalConcatOrComparison,
+  evalRangeExpression,
   evalArithmeticExpression,
   evalFilterExpression,
   evalFunctionExpression
@@ -1045,12 +1180,12 @@ function splitArgs(raw) {
       current += ch;
       continue;
     }
-    if (ch === "(" || ch === "[") {
+    if (ch === "(" || ch === "[" || ch === "{") {
       depth++;
       current += ch;
       continue;
     }
-    if (ch === ")" || ch === "]") {
+    if (ch === ")" || ch === "]" || ch === "}") {
       depth--;
       current += ch;
       continue;
@@ -1258,8 +1393,8 @@ var BUILTIN_FILTERS = {
   },
   title: (v) => String(v).replace(TITLE_WORD_RE, (c) => c.toUpperCase()),
   trim: (v) => String(v).trim(),
-  ltrim: (v) => String(v).replace(LEADING_WS_RE, ""),
-  rtrim: (v) => String(v).replace(TRAILING_WS_RE, ""),
+  ltrim: (v) => String(v).trimStart(),
+  rtrim: (v) => String(v).trimEnd(),
   length: (v) => {
     if (Array.isArray(v)) return v.length;
     if (typeof v === "string") return v.length;
@@ -1300,7 +1435,7 @@ var BUILTIN_FILTERS = {
   safe: (v) => v,
   escape: (v, ...a) => escapeStrategy(v, a[0] ?? "html"),
   e: (v, ...a) => escapeStrategy(v, a[0] ?? "html"),
-  striptags: (v) => String(v).replace(STRIP_TAGS_RE, ""),
+  striptags: (v) => stripTags(String(v)),
   nl2br: (v) => new SafeString(htmlEscape(String(v)).replace(/\n/g, "<br />\n")),
   abs: (v) => typeof v === "number" ? Math.abs(v) : v,
   round: (v, decimals) => {
@@ -1413,9 +1548,13 @@ var BUILTIN_FILTERS = {
   js_escape: (v) => new SafeString(jsEscape(v))
 };
 function _b64url(data) {
-  return data.toString("base64").replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
+  return data.toString("base64").replace(/\+/g, "-").replace(/\//g, "_").replace(/={1,2}$/, "");
 }
 var _formTokenSessionId = "";
+var _formTokenSessionProvider = () => "";
+function setFormTokenSessionProvider(fn) {
+  _formTokenSessionProvider = fn;
+}
 var _cspNonceProvider = () => "";
 function setCspNonceProvider(fn) {
   _cspNonceProvider = fn;
@@ -1441,8 +1580,9 @@ function _buildFormTokenJwt(descriptor = "") {
       payload.context = descriptor;
     }
   }
-  if (_formTokenSessionId) {
-    payload.session_id = _formTokenSessionId;
+  const sessionId = _formTokenSessionProvider() || _formTokenSessionId;
+  if (sessionId) {
+    payload.session_id = sessionId;
   }
   const h = _b64url(Buffer.from(JSON.stringify(header)));
   const p = _b64url(Buffer.from(JSON.stringify(payload)));
@@ -1610,6 +1750,7 @@ var Frond = class _Frond {
     this.globals.form_token = (descriptor) => _generateFormToken(descriptor || "");
     this.globals.formTokenValue = (descriptor) => _generateFormTokenValue(descriptor || "");
     this.globals.form_token_value = (descriptor) => _generateFormTokenValue(descriptor || "");
+    this.globals.range = frondRange;
     this.globals.dump = (value) => renderDump(value);
     this.globals.csp_nonce = () => _cspNonceProvider();
     for (const [k, v] of _Frond.classFilters) this.filters[k] = v;
@@ -1946,20 +2087,20 @@ var Frond = class _Frond {
   }
   renderVarToken(tokens, index, context, output) {
     const [content, stripB, stripA] = stripTag(tokens[index][1]);
-    if (stripB && output.length > 0) output[output.length - 1] = output[output.length - 1].replace(TRAILING_WS_RE, "");
+    if (stripB && output.length > 0) output[output.length - 1] = output[output.length - 1].trimEnd();
     const result = this.evalVar(content, context);
     output.push(result !== null && result !== void 0 ? String(result) : "");
     if (stripA && index + 1 < tokens.length && tokens[index + 1][0] === "TEXT") {
-      tokens[index + 1] = ["TEXT", tokens[index + 1][1].replace(LEADING_WS_RE, "")];
+      tokens[index + 1] = ["TEXT", tokens[index + 1][1].trimStart()];
     }
     return index + 1;
   }
   renderBlockToken(tokens, index, context, output) {
     const [content, stripB, stripA] = stripTag(tokens[index][1]);
-    if (stripB && output.length > 0) output[output.length - 1] = output[output.length - 1].replace(TRAILING_WS_RE, "");
+    if (stripB && output.length > 0) output[output.length - 1] = output[output.length - 1].trimEnd();
     const tag = content.split(/\s+/)[0] || "";
     if (stripA && index + 1 < tokens.length && tokens[index + 1][0] === "TEXT") {
-      tokens[index + 1] = ["TEXT", tokens[index + 1][1].replace(LEADING_WS_RE, "")];
+      tokens[index + 1] = ["TEXT", tokens[index + 1][1].trimStart()];
     }
     let next;
     if (tag === "if" && this.tagPermitted(tag)) {
@@ -1976,7 +2117,7 @@ var Frond = class _Frond {
       next = block.next;
     }
     if (stripA && next < tokens.length && tokens[next][0] === "TEXT") {
-      tokens[next] = ["TEXT", tokens[next][1].replace(LEADING_WS_RE, "")];
+      tokens[next] = ["TEXT", tokens[next][1].trimStart()];
     }
     return next;
   }
@@ -2235,7 +2376,7 @@ var Frond = class _Frond {
   pushIfBranch(branches, condition, branchTokens, stripBefore) {
     if (stripBefore && branchTokens.length > 0 && branchTokens[branchTokens.length - 1][0] === "TEXT") {
       const last = branchTokens[branchTokens.length - 1];
-      branchTokens[branchTokens.length - 1] = ["TEXT", last[1].replace(TRAILING_WS_RE, "")];
+      branchTokens[branchTokens.length - 1] = ["TEXT", last[1].trimEnd()];
     }
     branches.push([condition, branchTokens]);
   }
@@ -2263,7 +2404,7 @@ var Frond = class _Frond {
       } else if (tag === "endif") {
         this.pushIfBranch(branches, currentCond, currentTokens, tagStripB);
         if (tagStripA && i + 1 < tokens.length && tokens[i + 1][0] === "TEXT") {
-          tokens[i + 1] = ["TEXT", tokens[i + 1][1].replace(LEADING_WS_RE, "")];
+          tokens[i + 1] = ["TEXT", tokens[i + 1][1].trimStart()];
         }
         return { branches, next: i + 1 };
       } else if ((tag === "elseif" || tag === "elif") && depth === 0) {
@@ -2839,5 +2980,6 @@ var Frond = class _Frond {
 export {
   Frond,
   escapeHtml,
-  setCspNonceProvider
+  setCspNonceProvider,
+  setFormTokenSessionProvider
 };