@zvndev/darkmown 2.6.1-next.11.g82bb8d7 → 2.7.0

package/src/compiler/body.js

@@ -33,13 +33,45 @@ import {
   handleTheme,
   renderDemoDirective
 } from "./directives.js";
-import { handleLoop } from "./loops.js";
+import { handleLoop, spliceTables } from "./loops.js";
 import { renderProse } from "./markdown.js";
 
 /**
  * @typedef {import("./context.js").Ctx} Ctx
  */
 
+// The directives that REQUIRE arguments, mapped to the handler that owns their
+// `Use:` hint. Each entry is called with the bare line and an empty body, and
+// every one of them throws — the block openers included, because their argument
+// check runs before they ever look at a body. `:theme` and `:carousel` are
+// deliberately absent: both are valid bare, and both dispatchers already accept
+// `(?:\s|$)`.
+/** @type {Record<string, (line: string, ctx: Ctx, index: number) => unknown>} */
+const BARE_DIRECTIVE = {
+  "@include": (line, ctx, i) => handleInclude(line, ctx, i),
+  "@loop": (line, ctx, i) => handleLoop(line, [], null, ctx, i),
+  ":state": (line, ctx, i) => handleState(line, ctx, i),
+  ":store": (line, ctx, i) => handleStore(line, ctx, i),
+  ":fetch": (line, ctx, i) => handleFetch(line, ctx, i),
+  ":computed": (line, ctx, i) => handleComputed(line, ctx, i),
+  ":effect": (line, ctx, i) => handleEffect(line, ctx, i),
+  ":every": (line, ctx, i) => handleEvery(line, ctx, i),
+  ":video": (line, ctx, i) => handleMedia(line, "video", ctx, i),
+  ":audio": (line, ctx, i) => handleMedia(line, "audio", ctx, i),
+  ":embed": (line, ctx, i) => handleEmbed(line, ctx, i),
+  ":form": (line, ctx, i) => handleForm(line, [], ctx, i),
+  ":input": (line, ctx, i) => handleInput(line, ctx, i),
+  ":textarea": (line, ctx, i) => handleTextarea(line, ctx, i),
+  ":select": (line, ctx, i) => handleSelect(line, [], ctx, i),
+  ":checkbox": (line, ctx, i) => handleChoiceGroup(line, [], ctx, "checkbox", i),
+  ":radio": (line, ctx, i) => handleChoiceGroup(line, [], ctx, "radio", i),
+  ":bind": (line, ctx, i) => handleBind(line, ctx, i),
+  ":slider": (line, ctx, i) => handleSlider(line, ctx, i),
+  ":submit": (line, ctx, i) => handleSubmit(line, ctx, i),
+  ":button": (line, ctx, i) => handleButton(line, ctx, i),
+  ":if": (line, ctx, i) => handleIf(line, [], [], ctx, i)
+};
+
 /**
  * Parse a `.wd` body line-by-line into HTML, mixing directives and prose.
  * @param {string[]} lines
@@ -51,17 +83,37 @@ export function compileBody(lines, ctx) {
   const out = [];
   /** @type {string[]} */
   let prose = [];
+  // The slice index the pending prose run starts at, so a warning raised while
+  // rendering it (an unbindable value in a link destination or in raw HTML)
+  // reports the offending line and not the top of the file.
+  let proseStart = 0;
   let fence = null;
 
+  // Append one chunk, splicing it into the previous one when the seam between
+  // them is a table split in half. Markdown only sees a table when a header row
+  // is followed by a `|---|` separator, so `| Name | N |` + `|---|---|` in the
+  // prose ABOVE a loop compiles to a header-only table, and the loop's rows
+  // compile separately: the two halves have to be stitched back together here,
+  // where prose output and handler output meet. Every other seam falls through
+  // to the plain newline join, so all other output is byte-identical.
+  const push = (/** @type {string} */ html) => {
+    const last = out.length - 1;
+    const merged = last >= 0 ? spliceTables(out[last], html) : null;
+    if (merged === null) out.push(html);
+    else out[last] = merged;
+  };
+
   const flush = () => {
     if (!prose.length) return;
     const text = prose.join("\n");
+    const start = proseStart;
     prose = [];
-    if (text.trim()) out.push(renderProse(text, ctx));
+    if (text.trim()) push(renderProse(text, ctx, start));
   };
 
   for (let i = 0; i < lines.length; i++) {
     const line = lines[i];
+    if (!prose.length) proseStart = i;
     const fenceMatch = line.match(/^(```+|~~~+)/);
     if (fence) {
       prose.push(line);
@@ -75,9 +127,23 @@ export function compileBody(lines, ctx) {
       continue;
     }
 
+    // A directive name ALONE on a line is a mistake with one obvious fix: it is
+    // missing its arguments. Every dispatcher below requires a space after the
+    // keyword, so such a line used to fall through to prose — and because
+    // `KNOWN_DIRECTIVE` accepted `(?:\s|$)`, even the "looks like a directive"
+    // warning was suppressed. `:state` on its own rendered as the literal text
+    // `:state` with nothing said about it. Hand the line to the directive's OWN
+    // handler with an empty body: it throws its own coded malformed error with
+    // its own `Use:` hint, so there is exactly one place that owns each hint.
+    const bare = line.match(/^([@:][a-z]+)\s*$/);
+    if (bare && Object.hasOwn(BARE_DIRECTIVE, bare[1])) {
+      flush();
+      BARE_DIRECTIVE[bare[1]](line, ctx, i);
+    }
+
     if (/^@include\s/.test(line)) {
       flush();
-      out.push(handleInclude(line, ctx, i));
+      push(handleInclude(line, ctx, i));
       continue;
     }
     if (/^@loop\s/.test(line)) {
@@ -85,7 +151,7 @@ export function compileBody(lines, ctx) {
       const block = scanBlock(lines, i, /^@loop\s/, "@endloop", ctx);
       const split = splitEmptyBranch(block.body);
       const loopAt = ctx.comp.symbols.length;
-      out.push(handleLoop(line, split.body, split.empty, ctx, i, split.emptyStart));
+      push(handleLoop(line, split.body, split.empty, ctx, i, split.emptyStart));
       stampBlockEnd(ctx, loopAt, block.end);
       i = block.end;
       continue;
@@ -99,84 +165,84 @@ export function compileBody(lines, ctx) {
           file: ctx.file
         });
       const block = scanContainer(lines, i, ctx);
-      out.push(handleContainer(container[1].trim(), block.body, ctx, i));
+      push(handleContainer(container[1].trim(), block.body, ctx, i));
       i = block.end;
       continue;
     }
     if (/^:state\s/.test(line)) {
       flush();
       const v = joinValueDirective(lines, i);
-      out.push(handleState(v.line, ctx, i));
+      push(handleState(v.line, ctx, i));
       i = v.end;
       continue;
     }
     if (/^:store\s/.test(line)) {
       flush();
       const v = joinValueDirective(lines, i);
-      out.push(handleStore(v.line, ctx, i));
+      push(handleStore(v.line, ctx, i));
       i = v.end;
       continue;
     }
     if (/^:fetch\s/.test(line)) {
       flush();
-      out.push(handleFetch(line, ctx, i));
+      push(handleFetch(line, ctx, i));
       continue;
     }
     if (/^:computed\s/.test(line)) {
       flush();
-      out.push(handleComputed(line, ctx, i));
+      push(handleComputed(line, ctx, i));
       continue;
     }
     if (/^:effect\s/.test(line)) {
       flush();
-      out.push(handleEffect(line, ctx, i));
+      push(handleEffect(line, ctx, i));
       continue;
     }
     if (/^:every\s/.test(line)) {
       flush();
-      out.push(handleEvery(line, ctx, i));
+      push(handleEvery(line, ctx, i));
       continue;
     }
     if (/^:theme(?:\s|$)/.test(line)) {
       flush();
       const v = joinValueDirective(lines, i);
-      out.push(handleTheme(v.line, ctx, i));
+      push(handleTheme(v.line, ctx, i));
       i = v.end;
       continue;
     }
     const media = line.match(/^:(video|audio)\s/);
     if (media) {
       flush();
-      out.push(handleMedia(line, /** @type {"video" | "audio"} */ (media[1]), ctx, i));
+      push(handleMedia(line, /** @type {"video" | "audio"} */ (media[1]), ctx, i));
       continue;
     }
     if (/^:embed\s/.test(line)) {
       flush();
-      out.push(handleEmbed(line, ctx, i));
+      push(handleEmbed(line, ctx, i));
       continue;
     }
     if (/^:form\s/.test(line)) {
       flush();
       const block = scanBlock(lines, i, /^:form\s/, ":endform", ctx);
-      out.push(handleForm(line, block.body, ctx, i));
+      push(handleForm(line, block.body, ctx, i));
       i = block.end;
       continue;
     }
     if (/^:carousel(?:\s|$)/.test(line)) {
       flush();
       const block = scanBlock(lines, i, /^:carousel(?:\s|$)/, ":endcarousel", ctx);
-      out.push(handleCarousel(line, block.body, ctx, i));
+      push(handleCarousel(line, block.body, ctx, i));
       i = block.end;
       continue;
     }
     if (/^:input\s/.test(line)) {
       flush();
-      out.push(handleInput(line, ctx, i));
+      push(handleInput(line, ctx, i));
       continue;
     }
     if (/^:textarea\s/.test(line)) {
       flush();
-      out.push(handleTextarea(line, ctx, i));
+      push(handleTextarea(line, ctx, i));
       continue;
     }
     if (/^:select\s/.test(line)) {
@@ -187,7 +253,7 @@ export function compileBody(lines, ctx) {
         opts.push(lines[j]);
         j++;
       }
-      out.push(handleSelect(line, opts, ctx, i));
+      push(handleSelect(line, opts, ctx, i));
       i = j - 1;
       continue;
     }
@@ -200,7 +266,7 @@ export function compileBody(lines, ctx) {
         opts.push(lines[j]);
         j++;
       }
-      out.push(
+      push(
         handleChoiceGroup(line, opts, ctx, /** @type {"checkbox" | "radio"} */ (choiceMatch[1]), i)
       );
       i = j - 1;
@@ -208,29 +274,29 @@ export function compileBody(lines, ctx) {
     }
     if (/^:bind\s/.test(line)) {
       flush();
-      out.push(handleBind(line, ctx, i));
+      push(handleBind(line, ctx, i));
       continue;
     }
     if (/^:slider\s/.test(line)) {
       flush();
-      out.push(handleSlider(line, ctx, i));
+      push(handleSlider(line, ctx, i));
       continue;
     }
     if (/^:submit\s/.test(line)) {
       flush();
-      out.push(handleSubmit(line, ctx, i));
+      push(handleSubmit(line, ctx, i));
       continue;
     }
     if (/^:button\s/.test(line)) {
       flush();
-      out.push(handleButton(line, ctx, i));
+      push(handleButton(line, ctx, i));
       continue;
     }
     if (/^:if\s/.test(line)) {
       flush();
       const block = scanConditional(lines, i, ctx);
       const ifAt = ctx.comp.symbols.length;
-      out.push(handleIf(line, block.truthy, block.falsy, ctx, i, block.falsyStart));
+      push(handleIf(line, block.truthy, block.falsy, ctx, i, block.falsyStart));
       stampBlockEnd(ctx, ifAt, block.end);
       i = block.end;
       continue;
@@ -238,7 +304,7 @@ export function compileBody(lines, ctx) {
     const demo = renderDemoDirective(line, ctx);
     if (demo) {
       flush();
-      out.push(demo);
+      push(demo);
       continue;
     }
     if (/^@repeat\b/.test(line)) {
@@ -253,7 +319,13 @@ export function compileBody(lines, ctx) {
         { code: "WD009", file: ctx.file, hint: "@loop items into item ... @endloop" }
       );
     }
-    if (/^(@endloop|:endif|:endfor|:endform|:else)\s*$/.test(line)) {
+    // `:endcarousel` joins the family: a closer with no opener is a mistake with
+    // one obvious fix, and the vague "matches none" warning it used to get named
+    // the wrong problem ("check the spelling") for a token spelled correctly.
+    // `@empty` too: it is a MID-block marker, consumed by `splitEmptyBranch` when
+    // it sits inside a `@loop`, so one reaching here has no loop to belong to and
+    // used to render as the literal text `@empty` with nothing said about it.
+    if (/^(@endloop|@empty|:endif|:endfor|:endform|:endcarousel|:else)\s*$/.test(line)) {
       throw wdError(`Stray "${line.trim()}" with no matching opener in ${ctx.file}`, {
         code: "WD010",
         file: ctx.file
@@ -273,8 +345,12 @@ export function compileBody(lines, ctx) {
 // throw: prose legitimately contains `@` and `:`, so the match is deliberately
 // narrow (lowercase token + boundary; emoji shortcodes, times, and `@user`
 // followed by punctuation do not match).
+// Keep this in step with the dispatch above: a name listed here but no longer
+// handled is the worst outcome — the line renders as literal text AND the
+// warning that would have said so is suppressed. (`:note`/`:sprint` were deleted
+// from the demo handler and are gone from here for exactly that reason.)
 const KNOWN_DIRECTIVE =
-  /^(?:@(?:include|loop|empty|endloop)|:(?:state|store|fetch|computed|effect|every|theme|video|audio|embed|form|endform|input|textarea|select|checkbox|radio|bind|submit|button|if|endif|else|try|note|sprint))(?:\s|$)/;
+  /^(?:(?:@(?:include|loop|empty|endloop)|:(?:state|store|fetch|computed|effect|every|theme|video|audio|embed|form|endform|input|textarea|select|checkbox|radio|bind|slider|submit|button|carousel|endcarousel|if|endif|else))(?:\s|$)|:try\s)/;
 /**
  * @param {string} line
  * @param {Ctx} ctx

package/src/compiler/collections.js

@@ -95,26 +95,42 @@ function collectionNameOf(route) {
  */
 function rowFor(route, reader) {
   const slug = path.basename(route.file, path.extname(route.file));
+  // The router's `route.meta` stays the source of truth for the VALUES (it is
+  // parsed once, there), but it cannot carry which of them the author quoted —
+  // and that flag is the whole difference between the text "007" and the number
+  // 7. Read the entry once here for `quotedKeys` plus the excerpt body; the
+  // `.md` excerpt fallback already cost this read.
+  const { quotedKeys, body } = parseFrontmatter(reader.readText(route.file), route.file);
   /** @type {Record<string, unknown>} */
   const fields = {};
-  for (const [key, value] of Object.entries(route.meta)) fields[key] = coerceScalar(value);
+  for (const [key, value] of Object.entries(route.meta))
+    fields[key] = quotedKeys.has(key) ? value : coerceScalar(value);
   return {
     ...fields,
     url: route.route,
     slug: slug === "index" ? path.basename(path.dirname(route.file)) : slug,
-    excerpt: excerptFor(route, reader)
+    excerpt: excerptFor(route, body)
   };
 }
 
 /**
- * Coerce a frontmatter scalar to its natural type for querying. The frontmatter
- * parser yields scalars as STRINGS (`true`, `42` arrive as `"true"`, `"42"`), but
- * a collection loop should behave like a JSON loop, where `where p.featured ==
- * true` and numeric `sort`/comparisons just work. So a bare `true`/`false` becomes
- * a boolean and a numeric string becomes a number; quoted/other strings and
- * arrays pass through untouched. This coercion is scoped to collection rows only —
- * it never touches the global frontmatter parser (a `:state`/`{ meta.x }` value
- * keeps its existing string form).
+ * Coerce an UNQUOTED frontmatter scalar to its natural type for querying. The
+ * frontmatter parser yields scalars as STRINGS (`true`, `42` arrive as `"true"`,
+ * `"42"`), but a collection loop should behave like a JSON loop, where
+ * `where p.featured == true` and numeric `sort`/comparisons just work. So a bare
+ * `true`/`false` becomes a boolean and a numeric string becomes a number; other
+ * strings and arrays pass through untouched.
+ *
+ * QUOTED values never reach here — {@link rowFor} skips them by `quotedKeys`.
+ * They used to, because the parser strips quotes before anything downstream can
+ * see them, and the result was silent data loss with no escape hatch: `"007"`
+ * became 7, `"1.10"` became 1.1, `"01234"` became 1234, and a `_schema.wd`
+ * declaring `sku: string` then failed the whole build with a WD124 blaming the
+ * author for a string they had in fact written. Zero-padded ids, ISBNs, zip
+ * codes, SKUs and `x.y0` versions all live in that gap.
+ *
+ * This coercion is scoped to collection rows only — it never touches the global
+ * frontmatter parser (a `:state`/`{ meta.x }` value keeps its string form).
  * @param {unknown} value
  * @returns {unknown}
  */
@@ -130,14 +146,14 @@ function coerceScalar(value) {
  * (plain `.md` only) the first paragraph of its body, else "". Mirrors the RSS
  * description fallback so a collection card and the feed read the same snippet.
  * @param {Route} route
- * @param {import("./reader.js").Reader} reader Source reader for the `.md` body.
+ * @param {string} body The entry's body, already split from its frontmatter by
+ *   {@link rowFor} (which reads the file once for both this and `quotedKeys`).
  * @returns {string}
  */
-function excerptFor(route, reader) {
+function excerptFor(route, body) {
   const fromMeta = route.meta.excerpt;
   if (typeof fromMeta === "string" && fromMeta.trim()) return fromMeta.trim();
   if (path.extname(route.file) !== ".md") return "";
-  const { body } = parseFrontmatter(reader.readText(route.file), route.file);
   return firstParagraph(body);
 }
 

package/src/compiler/context.js

@@ -266,14 +266,21 @@ export const pageIncludeExtensions = [".md", ".wd"];
 
 // Reserved per-row meta variables, mapped to their runtime marker token. Shared
 // by the body parser, the `:if` handler, and prose interpolation.
+//
+// PROTOTYPE-FREE ON PURPOSE. Every consumer asks `LOOP_META[head]` where `head`
+// is an author-supplied identifier, so a plain object literal would answer for
+// every `Object.prototype` member: `{ toString }` and `:if __proto__` resolved
+// as loop meta variables and emitted a `data-wd-each-meta="…"` marker for a
+// name nobody declared. A null-prototype object closes that at the source, so
+// every consumer (body parser, `:if`, prose interpolation) is fixed at once.
 /** @type {Record<string, string>} */
-export const LOOP_META = {
+export const LOOP_META = Object.assign(Object.create(null), {
   $index: "index",
   $number: "number",
   $first: "first",
   $last: "last",
   $count: "count"
-};
+});
 
 /**
  * @param {import("./reader.js").Reader} reader The source reader for this

package/src/compiler/expr-ast.js

@@ -169,6 +169,20 @@ export function astOf(code) {
   const readNumber = () => {
     let j = i;
     while (j < n && /[0-9.]/.test(code[j])) j++;
+    // Exponent notation. The compilers fold a build-known operand with
+    // `JSON.stringify`, and JS prints a number outside 1e-7…1e21 in exponent
+    // form (`1e+21`, `1e-7`), so the fragment this module re-parses can carry
+    // one even though no author ever typed it. The exponent is only consumed
+    // when `e`/`E` is actually followed by digits (with an optional sign), so a
+    // bare trailing `e` still falls through to the closed grammar's hard error.
+    if (code[j] === "e" || code[j] === "E") {
+      let k = j + 1;
+      if (code[k] === "+" || code[k] === "-") k++;
+      if (k < n && code[k] >= "0" && code[k] <= "9") {
+        while (k < n && code[k] >= "0" && code[k] <= "9") k++;
+        j = k;
+      }
+    }
     const num = Number(code.slice(i, j));
     i = j;
     return num;

package/src/compiler/fetch.js

@@ -15,7 +15,7 @@ import {
   stripQuotes,
   validatePath
 } from "./interpolation.js";
-import { declareState } from "./state.js";
+import { declareErrorState, declareState } from "./state.js";
 
 /**
  * @typedef {import("./context.js").Ctx} Ctx
@@ -119,15 +119,19 @@ export function handleFetch(line, ctx, index) {
     if (!deps.includes(headKey)) deps.push(headKey);
   }
 
-  // Auto-declare the four lifecycle keys. `name` is declared via declareState
-  // (collision-checked); the derived keys are seeded directly.
+  // Auto-declare the lifecycle keys. `name` is declared via declareState
+  // (collision-checked); the derived keys are seeded directly, and the error
+  // pair goes through the shared helper so `:fetch` and `:form` declare the
+  // same two keys.
   const key = declareState(name, null, ctx);
   ctx.comp.fetchKeys.add(key);
+  declareErrorState(key, ctx);
   recordSymbol(ctx, index, { kind: "fetch", name: key, detail: `${key} from "${url}"` });
   /** @type {Record<string, unknown>} */
   const seeds = { [key]: null };
   for (const [suffix, seed] of [
     ["_error", null],
+    ["_error_body", null],
     ["_loading", false],
     ["_empty", false]
   ]) {
@@ -140,7 +144,7 @@ export function handleFetch(line, ctx, index) {
   const attr = (n, v) =>
     v != null && v !== false && v !== "" ? ` data-wd-fetch-${n}="${escapeHtml(v)}"` : "";
   const marker =
-    `<span data-wd-fetch data-wd-fetch-key="${key}" data-wd-fetch-url="${escapeHtml(url)}"` +
+    `<span data-wd-fetch data-wd-fetch-key="${escapeHtml(key)}" data-wd-fetch-url="${escapeHtml(url)}"` +
     attr("method", opts.method && opts.method.toUpperCase()) +
     attr("when", opts.when === "visible" ? "visible" : "") +
     attr("timeout", opts.timeout) +