new _quarto.ast.walk_meta helper function, walk meta in ast normalization

Author: cscheid

src/resources/filters/ast/customnodes.lua

@@ -79,6 +79,7 @@ function run_emulated_filter(doc, filter)
         return node
       else
         -- luacov: disable
+        quarto.utils.dump(node)
         internal_error()
         -- luacov: enable
       end
@@ -259,6 +260,42 @@ function create_emulated_node(t, tbl, context, forwarder)
   return result, custom_node_data[id]
 end
 
+-- walk_meta walks a Pandoc Meta object, applying the filter to each node
+-- and recursing on lists and objects. It mutates the meta object in place
+-- and returns it.
+--
+-- It performs slightly more work than a regular walk filter because of the
+-- ambiguity around single-element lists and objects.
+function walk_meta(meta, filter)
+  local skip = {
+    ["nil"] = true,
+    number = true,
+    boolean = true,
+    string = true,
+    ["function"] = true,
+  }
+  local iterate = {
+    Meta = true,
+    List = true,
+  }
+  local function walk(obj)
+    local t = type(obj)
+    if skip[t] then
+      return obj
+    end
+    local pt = quarto.utils.type(obj)
+    if iterate[pt] then
+      for k, v in pairs(obj) do
+        obj[k] = walk(v)
+      end
+    else
+      return _quarto.ast.walk(obj, filter)
+    end
+    return obj
+  end
+  return walk(meta)
+end
+
 _quarto.ast = {
   vault = {
     _uuid = "3ade8a4a-fb1d-4a6c-8409-ac45482d5fc9",
@@ -495,6 +532,8 @@ _quarto.ast = {
 
   walk = run_emulated_filter,
 
+  walk_meta = walk_meta,
+
   writer_walk = function(doc, filter)
     local old_custom_walk = filter.Custom
     local function custom_walk(node)

src/resources/filters/normalize/extractquartodom.lua

@@ -27,20 +27,33 @@ function parse_md_in_html_rawblocks()
       end
     end,
     RawBlock = function(raw)
+      local result
       if raw.format == "pandoc-native" then
-        return pandoc.read(raw.text, "native").blocks
+        result = pandoc.read(raw.text, "native").blocks
       elseif raw.format == "pandoc-json" then
-        return pandoc.read(raw.text, "json").blocks
+        result = pandoc.read(raw.text, "json").blocks
+      else
+        return raw
       end
+      return result
     end,
     RawInline = function(raw)
+      local result
       if raw.format == "pandoc-native" then
-        return quarto.utils.as_inlines(pandoc.read(raw.text, "native").blocks)
+        result = quarto.utils.as_inlines(pandoc.read(raw.text, "native").blocks)
       elseif raw.format == "pandoc-json" then
         -- let's try to be minimally smart here, and handle lists differently from a single top-level element
-        return quarto.utils.as_inlines(pandoc.read(raw.text, "json").blocks)
+        result = quarto.utils.as_inlines(pandoc.read(raw.text, "json").blocks)
+      else
+        return raw
       end
-    end
+      return result
+    end,
+    -- Meta = function(meta)
+    --   local filter = parse_md_in_html_rawblocks()
+    --   local result = _quarto.ast.walk_meta(meta, filter)
+    --   return result
+    -- end,
   }
 end
 

tests/docs/ast/test-pandoc-native-raw-in-meta.qmd

@@ -0,0 +1,13 @@
+---
+format: html
+key-good: "`Str \"path-to-directory-with--two-dashes/file\"`{=pandoc-native}"
+key-bad: path-to-directory-with--two-dashes/file
+_quarto:
+  tests:
+    html:
+      ensureFileRegexMatches:
+        - ["--"]
+        - ["–"]
+---
+
+Hello {{< meta key-good >}}. (This would fail with `{{{< meta key-bad >}}}`)