miki-template 1.3.3 → 1.3.7

package/src/tags/extra.js

@@ -1,154 +1,154 @@
-/**
- * Additional utility template tags: now, set, ifchanged.
- */
-
-// Helper to resolve expression values (literals, numbers, booleans, or context lookups)
-function resolveValue(token, context) {
-  if (token === undefined || token === null) return '';
-  if (typeof token !== 'string') return token;
-  if (token === '') return '';
-  if ((token.startsWith('"') && token.endsWith('"')) || (token.startsWith('\'') && token.endsWith('\''))) {
-    return token.slice(1, -1);
-  }
-  if (token === 'true' || token === 'True') return true;
-  if (token === 'false' || token === 'False') return false;
-  if (token === 'none' || token === 'None' || token === 'null') return null;
-  if (/^-?\d+(\.\d+)?$/.test(token)) return Number(token);
-  return context.get(token);
-}
-
-// --- {% now %} tag ---
-
-class NowNode {
-  constructor(formatExpr) {
-    this.formatExpr = formatExpr;
-  }
-
-  render(context) {
-    const fmt = resolveValue(this.formatExpr, context);
-    const now = new Date();
-    if (!fmt) return now.toISOString();
-    const dateFilter = require('../filters');
-    return dateFilter.getFilter('date')(now, fmt);
-  }
-}
-
-function parseNow(tagContent, _parser) {
-  const fmt = tagContent.slice(3).trim();
-  return new NowNode(fmt || '"Y-m-d H:i:s"');
-}
-
-// --- {% set %} tag ---
-
-class SetNode {
-  constructor(nameExpr, valueExpr, body) {
-    this.nameExpr = nameExpr;
-    this.valueExpr = valueExpr;
-    this.body = body || [];
-  }
-
-  render(context) {
-    const name = String(this.nameExpr);
-    const value = this.valueExpr !== undefined ? resolveValue(this.valueExpr, context) : '';
-    if (name) {
-      context.scopes[0][name] = value;
-    }
-    return this.body.map(n => n.render(context)).join('');
-  }
-}
-
-function parseSet(tagContent, parser) {
-  // {% set var = expr %}
-  // {% set var %}...{% endset %}
-  const trimmed = tagContent.slice(3).trim();
-
-  // Block form: {% set var %}...{% endset %}
-  if (!trimmed.includes('=')) {
-    const varName = trimmed.trim();
-    const body = parser.parse(['endset']);
-    const next = parser.peek();
-    if (next && next.type === 'block' && next.content.split(/\s+/)[0] === 'endset') {
-      parser.advance();
-    }
-    return new SetNode(varName, undefined, body);
-  }
-
-  // Inline form: {% set var = expr %}
-  const eqIdx = trimmed.indexOf('=');
-  const nameExpr = trimmed.slice(0, eqIdx).trim();
-  const valueExpr = trimmed.slice(eqIdx + 1).trim();
-  return new SetNode(nameExpr, valueExpr, []);
-}
-
-// --- {% ifchanged %} tag ---
-
-class IfChangedNode {
-  constructor(conditionStr, body, elseBody) {
-    this.conditionStr = conditionStr;
-    this.body = body;
-    this.elseBody = elseBody;
-  }
-
-  render(context) {
-    const currentVal = this.conditionStr ? resolveValue(this.conditionStr, context) : undefined;
-
-    if (!context.ifChangedState) {
-      context.ifChangedState = new Map();
-    }
-
-    const lastVal = context.ifChangedState.get(this.conditionStr);
-
-    let changed = false;
-    if (lastVal === undefined) {
-      changed = true;
-    } else if (currentVal !== lastVal) {
-      changed = true;
-    }
-
-    if (changed) {
-      context.ifChangedState.set(this.conditionStr, currentVal);
-      return this.body.map(n => n.render(context)).join('');
-    }
-
-    if (this.elseBody) {
-      return this.elseBody.map(n => n.render(context)).join('');
-    }
-
-    return '';
-  }
-}
-
-function parseIfChanged(tagContent, parser) {
-  // {% ifchanged [value] %}
-  const conditionStr = tagContent.slice(9).trim();
-  const body = parser.parse(['else', 'endifchanged']);
-  let elseBody = null;
-
-  while (true) {
-    const next = parser.peek();
-    if (!next || next.type !== 'block') break;
-    const tagName = next.content.split(/\s+/)[0];
-    if (tagName === 'else') {
-      parser.advance();
-      elseBody = parser.parse(['endifchanged']);
-    } else if (tagName === 'endifchanged') {
-      parser.advance();
-      break;
-    } else {
-      break;
-    }
-  }
-
-  return new IfChangedNode(conditionStr, body, elseBody);
-}
-
-module.exports = {
-  NowNode,
-  SetNode,
-  IfChangedNode,
-  parsers: {
-    now: parseNow,
-    set: parseSet,
-    ifchanged: parseIfChanged
-  }
-};
+/**
+ * Additional utility template tags: now, set, ifchanged.
+ */
+
+// Helper to resolve expression values (literals, numbers, booleans, or context lookups)
+function resolveValue(token, context) {
+  if (token === undefined || token === null) return '';
+  if (typeof token !== 'string') return token;
+  if (token === '') return '';
+  if ((token.startsWith('"') && token.endsWith('"')) || (token.startsWith('\'') && token.endsWith('\''))) {
+    return token.slice(1, -1);
+  }
+  if (token === 'true' || token === 'True') return true;
+  if (token === 'false' || token === 'False') return false;
+  if (token === 'none' || token === 'None' || token === 'null') return null;
+  if (/^-?\d+(\.\d+)?$/.test(token)) return Number(token);
+  return context.get(token);
+}
+
+// --- {% now %} tag ---
+
+class NowNode {
+  constructor(formatExpr) {
+    this.formatExpr = formatExpr;
+  }
+
+  render(context) {
+    const fmt = resolveValue(this.formatExpr, context);
+    const now = new Date();
+    if (!fmt) return now.toISOString();
+    const dateFilter = require('../filters');
+    return dateFilter.getFilter('date')(now, fmt);
+  }
+}
+
+function parseNow(tagContent, _parser) {
+  const fmt = tagContent.slice(3).trim();
+  return new NowNode(fmt || '"Y-m-d H:i:s"');
+}
+
+// --- {% set %} tag ---
+
+class SetNode {
+  constructor(nameExpr, valueExpr, body) {
+    this.nameExpr = nameExpr;
+    this.valueExpr = valueExpr;
+    this.body = body || [];
+  }
+
+  render(context) {
+    const name = String(this.nameExpr);
+    const value = this.valueExpr !== undefined ? resolveValue(this.valueExpr, context) : '';
+    if (name) {
+      context.scopes[0][name] = value;
+    }
+    return this.body.map(n => n.render(context)).join('');
+  }
+}
+
+function parseSet(tagContent, parser) {
+  // {% set var = expr %}
+  // {% set var %}...{% endset %}
+  const trimmed = tagContent.slice(3).trim();
+
+  // Block form: {% set var %}...{% endset %}
+  if (!trimmed.includes('=')) {
+    const varName = trimmed.trim();
+    const body = parser.parse(['endset']);
+    const next = parser.peek();
+    if (next && next.type === 'block' && next.content.split(/\s+/)[0] === 'endset') {
+      parser.advance();
+    }
+    return new SetNode(varName, undefined, body);
+  }
+
+  // Inline form: {% set var = expr %}
+  const eqIdx = trimmed.indexOf('=');
+  const nameExpr = trimmed.slice(0, eqIdx).trim();
+  const valueExpr = trimmed.slice(eqIdx + 1).trim();
+  return new SetNode(nameExpr, valueExpr, []);
+}
+
+// --- {% ifchanged %} tag ---
+
+class IfChangedNode {
+  constructor(conditionStr, body, elseBody) {
+    this.conditionStr = conditionStr;
+    this.body = body;
+    this.elseBody = elseBody;
+  }
+
+  render(context) {
+    const currentVal = this.conditionStr ? resolveValue(this.conditionStr, context) : undefined;
+
+    if (!context.ifChangedState) {
+      context.ifChangedState = new Map();
+    }
+
+    const lastVal = context.ifChangedState.get(this.conditionStr);
+
+    let changed = false;
+    if (lastVal === undefined) {
+      changed = true;
+    } else if (currentVal !== lastVal) {
+      changed = true;
+    }
+
+    if (changed) {
+      context.ifChangedState.set(this.conditionStr, currentVal);
+      return this.body.map(n => n.render(context)).join('');
+    }
+
+    if (this.elseBody) {
+      return this.elseBody.map(n => n.render(context)).join('');
+    }
+
+    return '';
+  }
+}
+
+function parseIfChanged(tagContent, parser) {
+  // {% ifchanged [value] %}
+  const conditionStr = tagContent.slice(9).trim();
+  const body = parser.parse(['else', 'endifchanged']);
+  let elseBody = null;
+
+  while (true) {
+    const next = parser.peek();
+    if (!next || next.type !== 'block') break;
+    const tagName = next.content.split(/\s+/)[0];
+    if (tagName === 'else') {
+      parser.advance();
+      elseBody = parser.parse(['endifchanged']);
+    } else if (tagName === 'endifchanged') {
+      parser.advance();
+      break;
+    } else {
+      break;
+    }
+  }
+
+  return new IfChangedNode(conditionStr, body, elseBody);
+}
+
+module.exports = {
+  NowNode,
+  SetNode,
+  IfChangedNode,
+  parsers: {
+    now: parseNow,
+    set: parseSet,
+    ifchanged: parseIfChanged
+  }
+};

package/src/tags/helpers.js

@@ -1,27 +1,27 @@
-// Custom Tag Helpers module
-
-const { registerTag } = require('../tags/registry');
-
-class HelperNode {
-  constructor(name, fn, body) {
-    this.name = name;
-    this.fn = fn;
-    this.body = body;
-  }
-
-  render(context) {
-    const inner = this.body.map(n => n.render(context)).join('');
-    const result = this.fn(inner, context);
-    return result instanceof Promise ? result : result;
-  }
-}
-
-function registerHelper(name, fn) {
-  const parserFn = (tagContent, parser) => {
-    const body = parser.parseUntilTag(`end${name}`);
-    return new HelperNode(name, fn, body);
-  };
-  registerTag(name, parserFn);
-}
-
+// Custom Tag Helpers module
+
+const { registerTag } = require('../tags/registry');
+
+class HelperNode {
+  constructor(name, fn, body) {
+    this.name = name;
+    this.fn = fn;
+    this.body = body;
+  }
+
+  render(context) {
+    const inner = this.body.map(n => n.render(context)).join('');
+    const result = this.fn(inner, context);
+    return result instanceof Promise ? result : result;
+  }
+}
+
+function registerHelper(name, fn) {
+  const parserFn = (tagContent, parser) => {
+    const body = parser.parseUntilTag(`end${name}`);
+    return new HelperNode(name, fn, body);
+  };
+  registerTag(name, parserFn);
+}
+
 module.exports = { registerHelper };