improve(splash): improve splash with frontmatter block scalar syntax

Author: mpstaton

splash/src/loaders/frontmatter.ts

@@ -17,6 +17,44 @@
  * defeat the loader's "respect what's there" stance.
  */
 
+/**
+ * YAML block scalar header: `|`, `>`, with optional chomping (`-`/`+`) and an
+ * optional explicit indent digit — e.g. `>-`, `|2`, `>2-`.
+ */
+const BLOCK_SCALAR_RE = /^([|>])([0-9]*)([-+]?)$/;
+
+/**
+ * Read an indented text block beneath a block-scalar header and fold it per the
+ * YAML rules we actually use.
+ *
+ *   `|`  literal — newlines preserved
+ *   `>`  folded  — lines joined with a single space
+ *   `-`  strip   — no trailing newline (what every lede/summary in this tree uses)
+ *
+ * Returns null when there is no indented body, so the caller can fall through.
+ */
+function readIndentedBlock(
+  lines: string[],
+  start: number,
+  style: string,
+  chomp: string,
+): { text: string | null; consumed: number } {
+  const collected: string[] = [];
+  let i = start;
+  while (i < lines.length) {
+    const line = lines[i];
+    if (line.trim() === '') { collected.push(''); i++; continue; }
+    if (!/^[ \t]/.test(line)) break;   // dedent ends the block
+    collected.push(line.replace(/^[ \t]+/, ''));
+    i++;
+  }
+  while (collected.length && collected[collected.length - 1] === '') collected.pop();
+  if (collected.length === 0) return { text: null, consumed: 0 };
+  let text = style === '|' ? collected.join('\n') : collected.join(' ').replace(/\s+/g, ' ').trim();
+  if (chomp === '+') text += '\n';
+  return { text, consumed: i - start };
+}
+
 const FENCE_RE = /^---\s*\r?\n([\s\S]*?)\r?\n---\s*\r?\n?([\s\S]*)$/;
 
 export interface ParsedFrontmatter {
@@ -47,13 +85,24 @@ function parseYamlSubset(text: string): Record<string, unknown> {
     const key = line.slice(0, colonIdx).trim();
     const rest = line.slice(colonIdx + 1).trim();
 
-    if (rest === '' || rest === '|' || rest === '>') {
+    if (rest === '' || BLOCK_SCALAR_RE.test(rest)) {
       const { items, consumed } = readIndentedArray(lines, i + 1);
       if (items !== null) {
         data[key] = items;
         i += 1 + consumed;
         continue;
       }
+      // Not a list. If a block-scalar header was given, the indented body is
+      // text — fold it rather than dropping the value on the floor.
+      const bs = rest.match(BLOCK_SCALAR_RE);
+      if (bs) {
+        const { text, consumed: used } = readIndentedBlock(lines, i + 1, bs[1], bs[3]);
+        if (text !== null) {
+          data[key] = text;
+          i += 1 + used;
+          continue;
+        }
+      }
       data[key] = null;
       i++;
       continue;

splash/src/pages/context-v/[...slug].astro

@@ -16,9 +16,9 @@ export async function getStaticPaths() {
 const { entry } = Astro.props;
 const { Content } = await render(entry);
 
-const d = toDate(entry.data.date_modified ?? entry.data.date_updated ?? entry.data.date_created);
-const created = toDate(entry.data.date_created);
-const modified = toDate(entry.data.date_modified ?? entry.data.date_updated);
+const d = toDate(entry.data.date_modified ?? entry.data.date_updated ?? entry.data.date_created ?? entry.data.date_authored_current_draft ?? entry.data.date_authored_initial_draft ?? entry.data.date_authored_current_draft ?? entry.data.date_authored_initial_draft ?? entry.data.date_authored_current_draft ?? entry.data.date_authored_initial_draft);
+const created = toDate(entry.data.date_created ?? entry.data.date_authored_initial_draft);
+const modified = toDate(entry.data.date_modified ?? entry.data.date_updated ?? entry.data.date_authored_current_draft);
 
 const segments = entry.id.split('/');
 const group = segments.length > 1 ? segments[0] : 'general';

splash/src/pages/context-v/index.astro

@@ -18,8 +18,8 @@ for (const entry of entries) {
 
 for (const arr of groups.values()) {
   arr.sort((a, b) => {
-    const am = toDate(a.data.date_modified ?? a.data.date_updated ?? a.data.date_created);
-    const bm = toDate(b.data.date_modified ?? b.data.date_updated ?? b.data.date_created);
+    const am = toDate(a.data.date_modified ?? a.data.date_updated ?? a.data.date_created ?? a.data.date_authored_current_draft ?? a.data.date_authored_initial_draft ?? a.data.date_authored_current_draft ?? a.data.date_authored_initial_draft ?? a.data.date_authored_current_draft ?? a.data.date_authored_initial_draft);
+    const bm = toDate(b.data.date_modified ?? b.data.date_updated ?? b.data.date_created ?? b.data.date_authored_current_draft ?? b.data.date_authored_initial_draft ?? b.data.date_authored_current_draft ?? b.data.date_authored_initial_draft ?? b.data.date_authored_current_draft ?? b.data.date_authored_initial_draft);
     const ta = am ? am.getTime() : 0;
     const tb = bm ? bm.getTime() : 0;
     if (tb !== ta) return tb - ta;
@@ -80,8 +80,8 @@ const base = import.meta.env.BASE_URL;
               <h2 class="ctx-group__title">{group}</h2>
               <ul class="entry-list" data-pagefind-ignore="all" data-sort-target="context-v">
                 {items.map((entry) => {
-                  const created = toDate(entry.data.date_created);
-                  const modified = toDate(entry.data.date_modified ?? entry.data.date_updated);
+                  const created = toDate(entry.data.date_created ?? entry.data.date_authored_initial_draft);
+                  const modified = toDate(entry.data.date_modified ?? entry.data.date_updated ?? entry.data.date_authored_current_draft);
                   const published = toDate(entry.data.date_first_published);
                   const d = modified ?? created;
                   const title = (entry.data.title ?? entry.id).toString().toLowerCase();