boxwood 2.17.0 → 2.18.1

package/ui/prose/utilities/validate.js

@@ -0,0 +1,292 @@
+const {
+  SAFE_METHODS,
+  parseArgument,
+  parsePathSegments,
+  splitNullishCoalescing,
+  isArrayLiteral,
+  splitArrayElements,
+} = require("../../utilities/replaceVariables")
+
+// Matches the {#each} header accepted by processLoops
+const EACH_HEADER_REGEXP =
+  /^#each\s+([a-zA-Z0-9_.[\]]+)(?:\s+as\s+([a-zA-Z0-9_]+)(?:\s*,\s*([a-zA-Z0-9_]+))?)?$/
+
+// Matches the comparison conditions accepted by processConditionals
+const CONDITION_REGEXP = /^(.+?)\s*(>=|<=|>|<|==|!=)\s*(.+)$/
+
+const INLINE_CODE_REGEXP = /(`+)([^`]+)\1/g
+const BRACE_REGEXP = /\{([^{}]*)\}/g
+const COMPONENT_TAG_REGEXP = /^<\/?([A-Z][A-Za-z0-9-]*)/
+
+/**
+ * Validate a Prose template and report problems that the renderer
+ * would otherwise tolerate silently
+ * @param {string} text - The prose template text
+ * @param {Object} options - { data, components } - both optional
+ *   - data: when provided, unknown top-level variables are reported
+ *   - components: map of known components (including builtins)
+ * @returns {Array<{line: number, type: string, message: string}>} - Problems found
+ */
+function validate(text, options = {}) {
+  const issues = []
+
+  if (!text || typeof text !== "string") {
+    return issues
+  }
+
+  const { data, components } = options
+
+  // Track open {#if}/{#each} blocks; each frame: { type, line, vars }
+  const stack = []
+
+  const report = (line, type, message) => {
+    issues.push({ line, type, message })
+  }
+
+  const scopeVariables = () => {
+    const vars = new Set()
+    for (const frame of stack) {
+      if (frame.vars) {
+        for (const name of frame.vars) vars.add(name)
+      }
+    }
+    return vars
+  }
+
+  const validatePath = (path, line) => {
+    const segments = parsePathSegments(path)
+    if (!segments || segments.length === 0) {
+      report(line, "malformed-expression", `Malformed expression: {${path}}`)
+      return
+    }
+    for (const segment of segments) {
+      if (segment.type === "method" && !SAFE_METHODS.has(segment.name)) {
+        report(
+          line,
+          "unsafe-method",
+          `Method not allowed: ${segment.name}() - allowed methods: ${[...SAFE_METHODS].join(", ")}`,
+        )
+      }
+    }
+    const root = segments[0]
+    if (
+      data &&
+      typeof data === "object" &&
+      root.type === "property" &&
+      !/^\d+$/.test(root.name) &&
+      !(root.name in data) &&
+      !scopeVariables().has(root.name)
+    ) {
+      report(line, "unknown-variable", `Unknown variable: ${root.name}`)
+    }
+  }
+
+  const validateExpression = (expression, line) => {
+    const trimmed = expression.trim()
+    if (!trimmed) return
+
+    for (const operand of splitNullishCoalescing(trimmed)) {
+      const raw = operand.trim()
+      if (!raw) {
+        report(
+          line,
+          "malformed-expression",
+          `Malformed expression: {${trimmed}}`,
+        )
+        continue
+      }
+      if (parseArgument(raw)) {
+        continue
+      }
+      if (isArrayLiteral(raw)) {
+        for (const element of splitArrayElements(raw.substring(1, raw.length - 1))) {
+          validateExpression(element, line)
+        }
+        continue
+      }
+      validatePath(raw, line)
+    }
+  }
+
+  const validateCondition = (condition, line) => {
+    let expr = condition.trim()
+    if (expr.startsWith("!")) {
+      expr = expr.substring(1).trim()
+    }
+    const match = expr.match(CONDITION_REGEXP)
+    if (match) {
+      const [, left, , right] = match
+      validateExpression(left, line)
+      const rawRight = right.trim()
+      if (
+        !parseArgument(rawRight) &&
+        rawRight !== "true" &&
+        rawRight !== "false" &&
+        rawRight !== "null"
+      ) {
+        validateExpression(rawRight, line)
+      }
+    } else {
+      validateExpression(expr, line)
+    }
+  }
+
+  const handleControlTag = (content, line) => {
+    if (content.startsWith("#each")) {
+      const header = content.match(EACH_HEADER_REGEXP)
+      if (!header) {
+        report(line, "malformed-block", `Malformed block: {${content}}`)
+        // Push anyway so the matching {/each} does not report a false error
+        stack.push({ type: "each", line, vars: ["item"] })
+        return
+      }
+      const [, arrayPath, itemName, indexName] = header
+      const vars = [itemName || "item"]
+      if (indexName) vars.push(indexName)
+      validateExpression(arrayPath, line)
+      stack.push({ type: "each", line, vars })
+      return
+    }
+
+    if (content.startsWith("#elseif")) {
+      const top = stack[stack.length - 1]
+      if (!top || top.type !== "if") {
+        report(
+          line,
+          "unmatched-block",
+          "{#elseif} without a matching {#if}",
+        )
+      }
+      validateCondition(content.substring("#elseif".length), line)
+      return
+    }
+
+    if (content === "#else") {
+      if (stack.length === 0) {
+        report(
+          line,
+          "unmatched-block",
+          "{#else} without a matching {#if} or {#each}",
+        )
+      }
+      return
+    }
+
+    if (content.startsWith("#if")) {
+      stack.push({ type: "if", line })
+      validateCondition(content.substring("#if".length), line)
+      return
+    }
+
+    if (content === "/each" || content === "/if") {
+      const expected = content === "/each" ? "each" : "if"
+      const top = stack[stack.length - 1]
+      if (!top) {
+        report(line, "unmatched-block", `{${content}} without a matching {#${expected}}`)
+      } else if (top.type !== expected) {
+        report(
+          line,
+          "unmatched-block",
+          `{${content}} closes {#${top.type}} opened on line ${top.line}`,
+        )
+        stack.pop()
+      } else {
+        stack.pop()
+      }
+      return
+    }
+
+    report(line, "malformed-block", `Unknown block tag: {${content}}`)
+  }
+
+  const lines = text.split("\n")
+  let inFence = false
+  let fenceLine = 0
+  let inComment = false
+  let commentLine = 0
+
+  for (let i = 0; i < lines.length; i++) {
+    const lineNumber = i + 1
+    let line = lines[i]
+
+    // Fenced code blocks are literal content - skip them entirely
+    if (line.trim().startsWith("```")) {
+      inFence = !inFence
+      if (inFence) fenceLine = lineNumber
+      continue
+    }
+    if (inFence) continue
+
+    // Author comments - skip their content, track unclosed openings
+    if (inComment) {
+      const close = line.indexOf("--}")
+      if (close === -1) continue
+      line = line.substring(close + 3)
+      inComment = false
+    }
+    while (line.includes("{!--")) {
+      const open = line.indexOf("{!--")
+      const close = line.indexOf("--}", open + 4)
+      if (close === -1) {
+        line = line.substring(0, open)
+        inComment = true
+        commentLine = lineNumber
+        break
+      }
+      line = line.substring(0, open) + line.substring(close + 3)
+    }
+
+    // Inline code spans are literal content
+    line = line.replace(INLINE_CODE_REGEXP, "")
+
+    // Component tags
+    const trimmed = line.trim()
+    const componentMatch = trimmed.match(COMPONENT_TAG_REGEXP)
+    if (componentMatch && components && typeof components === "object") {
+      const tagName = componentMatch[1]
+      if (!components[tagName]) {
+        report(
+          lineNumber,
+          "unknown-component",
+          `Unknown component: <${tagName}>`,
+        )
+      }
+    }
+    // Braced tags and expressions - on component lines this also covers
+    // attribute expressions, both whole-value ({expr}) and partial (/p/{id})
+    let braceMatch
+    while ((braceMatch = BRACE_REGEXP.exec(line)) !== null) {
+      // Escaped braces are literal
+      if (braceMatch.index > 0 && line[braceMatch.index - 1] === "\\") {
+        continue
+      }
+      const content = braceMatch[1].trim()
+      if (!content) continue
+
+      if (content.startsWith("#") || content.startsWith("/")) {
+        handleControlTag(content, lineNumber)
+      } else {
+        validateExpression(content, lineNumber)
+      }
+    }
+  }
+
+  if (inFence) {
+    report(fenceLine, "unclosed-code-block", "Unclosed code block (```)")
+  }
+  if (inComment) {
+    report(commentLine, "unclosed-comment", "Unclosed comment ({!-- without --})")
+  }
+
+  for (const frame of stack) {
+    report(
+      frame.line,
+      "unclosed-block",
+      `Unclosed {#${frame.type}} opened on line ${frame.line}`,
+    )
+  }
+
+  return issues.sort((a, b) => a.line - b.line)
+}
+
+module.exports = { validate }

package/ui/{prose/utilities → utilities}/parseCustomTag.js

@@ -1,4 +1,7 @@
-const { resolvePath } = require("./replaceVariables")
+const {
+  resolveExpression,
+  replaceVariables,
+} = require("./replaceVariables")
 
 /**
  * Parse a custom component tag from markdown
@@ -160,18 +163,24 @@ function parseAttributes(attributesStr) {
         }
       }
       
-      // Check if the entire quoted value is a variable reference: "{variable}"
-      if (value.startsWith("{") && value.endsWith("}")) {
-        const variableName = value.substring(1, value.length - 1).trim()
-        if (variableName) {
-          attributes[name] = { __variable: variableName }
-        } else {
-          attributes[name] = value
-        }
+      // Whole-value variable reference: "{variable}" - resolves to the raw
+      // value (array, object, number), not a string
+      const inner = value.substring(1, value.length - 1)
+      if (
+        value.startsWith("{") &&
+        value.endsWith("}") &&
+        inner.trim() &&
+        !inner.includes("{") &&
+        !inner.includes("}")
+      ) {
+        attributes[name] = { __variable: inner.trim() }
+      } else if (/\{[^{}]+\}/.test(value)) {
+        // Partial interpolation: "/products/{id}" or "Photo of {name}"
+        attributes[name] = { __interpolate: value }
       } else {
         attributes[name] = value
       }
-      
+
       if (i < str.length) i++ // Skip closing quote
     } else if (str[i] === "{") {
       // Variable reference
@@ -211,10 +220,14 @@ function resolveAttributes(attributes, data) {
   const resolved = {}
   for (const [key, value] of Object.entries(attributes)) {
     if (value && typeof value === "object" && value.__variable) {
-      // Resolve variable using resolvePath to support complex paths
+      // Resolve variable using resolveExpression to support complex paths
+      // and array literals like "[images[0], images[2]]"
       const variablePath = value.__variable
-      const resolvedValue = resolvePath(data, variablePath)
+      const resolvedValue = resolveExpression(data, variablePath)
       resolved[key] = resolvedValue
+    } else if (value && typeof value === "object" && value.__interpolate) {
+      // Partial interpolation always produces a string
+      resolved[key] = replaceVariables(value.__interpolate, data)
     } else {
       resolved[key] = value
     }

package/ui/{prose/utilities → utilities}/replaceVariables.js

@@ -193,6 +193,170 @@ function resolvePath(data, path) {
   return current
 }
 
+/**
+ * Check if an expression is an array literal like "[images[0], images[2]]"
+ * The opening bracket must be closed at the very end of the expression
+ * Pure numeric indexes like "[0]" keep their index-access meaning
+ * @param {string} expression - The expression to check
+ * @returns {boolean} - True if the expression is an array literal
+ */
+function isArrayLiteral(expression) {
+  if (!expression.startsWith("[") || !expression.endsWith("]")) {
+    return false
+  }
+  const inner = expression.substring(1, expression.length - 1).trim()
+  if (/^\d+$/.test(inner)) {
+    return false
+  }
+  let depth = 0
+  let quote = null
+  for (let i = 0; i < expression.length; i++) {
+    const char = expression[i]
+    if (quote) {
+      if (char === quote) quote = null
+      continue
+    }
+    if (char === '"' || char === "'") {
+      quote = char
+      continue
+    }
+    if (char === "[") depth++
+    if (char === "]") {
+      depth--
+      if (depth === 0) {
+        return i === expression.length - 1
+      }
+    }
+  }
+  return false
+}
+
+/**
+ * Split the inner part of an array literal into elements on top-level commas
+ * Respects nested brackets, parentheses and quoted strings
+ * @param {string} inner - The content between the outer brackets
+ * @returns {Array<string>} - Raw element expressions
+ */
+function splitArrayElements(inner) {
+  const elements = []
+  let current = ""
+  let depth = 0
+  let quote = null
+
+  for (const char of inner) {
+    if (quote) {
+      current += char
+      if (char === quote) quote = null
+      continue
+    }
+    if (char === '"' || char === "'") {
+      quote = char
+      current += char
+      continue
+    }
+    if (char === "[" || char === "(") depth++
+    if (char === "]" || char === ")") depth--
+    if (char === "," && depth === 0) {
+      elements.push(current)
+      current = ""
+      continue
+    }
+    current += char
+  }
+
+  if (current.trim()) {
+    elements.push(current)
+  }
+
+  return elements
+}
+
+/**
+ * Split an expression on top-level ?? operators
+ * Respects quoted strings, brackets and parentheses
+ * @param {string} expression - The expression to split
+ * @returns {Array<string>} - Operands (a single element when there is no ??)
+ */
+function splitNullishCoalescing(expression) {
+  const operands = []
+  let current = ""
+  let depth = 0
+  let quote = null
+  let i = 0
+
+  while (i < expression.length) {
+    const char = expression[i]
+    if (quote) {
+      current += char
+      if (char === quote) quote = null
+      i++
+      continue
+    }
+    if (char === '"' || char === "'") {
+      quote = char
+      current += char
+      i++
+      continue
+    }
+    if (char === "[" || char === "(") depth++
+    if (char === "]" || char === ")") depth--
+    if (depth === 0 && char === "?" && expression[i + 1] === "?") {
+      operands.push(current)
+      current = ""
+      i += 2
+      continue
+    }
+    current += char
+    i++
+  }
+
+  operands.push(current)
+  return operands
+}
+
+/**
+ * Resolve an expression from a data object
+ * Supports everything resolvePath does, plus:
+ * - array literals whose elements are paths or literals,
+ *   e.g. "[images[0], images[2]]" or "['a', user.name]"
+ * - nullish coalescing with JS semantics (fallback only for null/undefined),
+ *   e.g. "name ?? 'Guest'" or "nickname ?? name ?? 'Guest'"
+ * @param {Object} data - The data object to resolve the expression from
+ * @param {string} expression - The expression to resolve
+ * @returns {*} - The resolved value or undefined
+ */
+function resolveExpression(data, expression) {
+  const trimmed = expression.trim()
+
+  const operands = splitNullishCoalescing(trimmed)
+  if (operands.length > 1) {
+    let value
+    for (const operand of operands) {
+      const raw = operand.trim()
+      const literal = parseArgument(raw)
+      value = literal ? literal.value : resolveExpression(data, raw)
+      if (value !== undefined && value !== null) {
+        return value
+      }
+    }
+    return value
+  }
+
+  if (isArrayLiteral(trimmed)) {
+    const inner = trimmed.substring(1, trimmed.length - 1)
+    return splitArrayElements(inner).map((element) => {
+      const raw = element.trim()
+      const literal = parseArgument(raw)
+      if (literal) {
+        return literal.value
+      }
+      return resolveExpression(data, raw)
+    })
+  }
+
+  return resolvePath(data, trimmed)
+}
+
 /**
  * Replace {variableName} placeholders in text with actual values from data
  * Supports:
@@ -200,6 +364,7 @@ function resolvePath(data, path) {
  * - Array indexing: {images[0]}
  * - Property access: {user.name}
  * - Combined: {images[0].src}
+ * - Fallbacks: {name ?? "Guest"}
  * @param {string} text - Text containing variable placeholders
  * @param {Object} data - Data object with variable values
  * @returns {string|Array} - Text with variables replaced, or array if mixed content
@@ -245,8 +410,9 @@ function replaceVariables(text, data) {
             result.push(text.substring(lastIndex, i))
           }
 
-          // Resolve the variable value (supports paths like "images[0].src")
-          const value = resolvePath(data, variablePath)
+          // Resolve the expression (supports paths like "images[0].src",
+          // safe method calls, array literals and ?? fallbacks)
+          const value = resolveExpression(data, variablePath)
           if (value !== undefined && value !== null) {
             result.push(String(value))
           } else {
@@ -277,4 +443,15 @@ function replaceVariables(text, data) {
   return result.join("")
 }
 
-module.exports = { replaceVariables, resolvePath }
+module.exports = {
+  replaceVariables,
+  resolvePath,
+  resolveExpression,
+  // Parsing internals, exported for the Prose validator
+  SAFE_METHODS,
+  parseArgument,
+  parsePathSegments,
+  splitNullishCoalescing,
+  isArrayLiteral,
+  splitArrayElements,
+}