madr-lint 0.4.0 → 0.4.2

package/dist/index.d.ts

@@ -429,9 +429,10 @@ interface ParsedFile {
     /** Parsed YAML frontmatter (v3/v4), or null if absent. */
     frontmatter: Record<string, unknown> | null;
     /**
-     * v2 body-list metadata extracted from the leading list, or null if absent.
-     * Covers both the bold-key (`- **Status**:`) and the canonical MADR v2.1.2
-     * plain-key (`* Status:`) shapes. See ADR-0006.
+     * v2 body-list metadata extracted from the leading metadata block, or null if
+     * absent. The block is the leading RUN of lists, joined across HTML comments
+     * (which render as nothing). Covers both the bold-key (`- **Status**:`) and
+     * the canonical MADR v2.1.2 plain-key (`* Status:`) shapes. See ADR-0006.
      */
     listMetadata: Record<string, unknown> | null;
     /**
@@ -477,25 +478,33 @@ declare function frontmatterOffset(content: string): number;
  * Parse a Markdown file: extract YAML frontmatter via gray-matter, then
  * feed the body into mdast-util-from-markdown directly (per ADR-0002,
  * we skip the unified+remark pipeline overhead). Additionally, extract
- * v2-style list metadata from the body's first list — both bold-key and
- * canonical plain-key shapes (see ADR-0006).
+ * v2-style list metadata from the body's leading metadata block — both
+ * bold-key and canonical plain-key shapes (see ADR-0006).
  */
 declare function parseFile(content: string): ParsedFile;
 /**
- * Extract v2-style list metadata from an mdast Root. The metadata block is
- * the leading list — the first block after the H1 title (only headings may
- * precede it; an intervening paragraph means the list is body content, not
- * metadata). Each `listItem` is read as one `Key: value` pair in either of
- * two shapes:
+ * Extract v2-style list metadata from an mdast Root. The metadata block leads
+ * the body: only H1 headings and HTML nodes may precede it — an H2-or-deeper
+ * heading, or any other block before the first list, means there is no
+ * metadata block. The block itself is the leading RUN of lists, joined across
+ * HTML comments — a comment ends the CommonMark list yet renders as nothing,
+ * so a field below it is still metadata (#73). A second list with nothing
+ * between it and the first (a bullet-marker change, or an ordered list) joins
+ * the run when EVERY one of its items reads as a `Key: value` pair (#115); a
+ * list carrying any other item is prose and ends the block. Once the run has
+ * started, visible HTML, a paragraph, a code fence, a thematic break, a
+ * blockquote, and a heading of ANY depth all end the block. Each `listItem` is
+ * read as one `Key: value` pair in either of two shapes:
  *
  *   - Bold key:  `- **Status**: accepted`  (some MADR v2 authors)
  *   - Plain key: `* Status: accepted`      (official MADR v2.1.2 template)
  *
  * Key normalization: trim → lowercase → spaces become hyphens
  * (matches v4 frontmatter convention, e.g. "Decision Makers" →
- * "decision-makers"). On duplicate keys, first occurrence wins.
+ * "decision-makers"). On duplicate keys, first occurrence wins — across
+ * segments too, so an earlier segment always shadows a later one.
  *
- * Returns null unless the list carries a recognized MADR key, so ordinary
+ * Returns null unless the block carries a recognized MADR key, so ordinary
  * leading prose lists are not mistaken for metadata. (A leading list keyed by
  * a recognized field is still treated as metadata even if its value reads
  * prose-like, e.g. `Status: under discussion` — that position + key is

package/dist/index.js

@@ -8,11 +8,19 @@ var __export = (target, all) => {
 import { fromMarkdown } from "mdast-util-from-markdown";
 import { toString } from "mdast-util-to-string";
 import grayMatter from "gray-matter";
+
+// src/core/null-proto-map.ts
+function nullProtoMap() {
+  return /* @__PURE__ */ Object.create(null);
+}
+
+// src/core/parser.ts
+var GRAY_MATTER_OPTIONS = Object.freeze({});
 function frontmatterOffset(content) {
-  return content.length - grayMatter(content).content.length;
+  return content.length - grayMatter(content, GRAY_MATTER_OPTIONS).content.length;
 }
 function parseFile(content) {
-  const matter = grayMatter(content);
+  const matter = grayMatter(content, GRAY_MATTER_OPTIONS);
   const data = matter.data;
   const frontmatter = Object.keys(data).length > 0 ? data : null;
   const ast = fromMarkdown(matter.content);
@@ -22,7 +30,7 @@ function parseFile(content) {
   let metadataLoc = listResult && Object.keys(listResult.loc).length > 0 ? { ...listResult.loc } : null;
   let metadataValueLoc = listResult && Object.keys(listResult.valueOffsets).length > 0 ? { ...listResult.valueOffsets } : null;
   if (frontmatter && listMetadata) {
-    const frontmatterDefined = {};
+    const frontmatterDefined = nullProtoMap();
     for (const [k, v] of Object.entries(frontmatter)) {
       if (v !== null && v !== void 0) frontmatterDefined[k] = v;
     }
@@ -61,39 +69,65 @@ var RECOGNIZED_METADATA_KEYS = /* @__PURE__ */ new Set([
 function extractListMetadata(ast) {
   return extractListMetadataWithLoc(ast)?.values ?? null;
 }
+function isHtmlComment(value) {
+  let rest = value.trim();
+  if (rest.length === 0) return false;
+  while (rest.length > 0) {
+    if (!rest.startsWith("<!--")) return false;
+    const end = rest.indexOf("-->", 2);
+    if (end === -1) return false;
+    rest = rest.slice(end + 3).trim();
+  }
+  return true;
+}
 function extractListMetadataWithLoc(ast, body) {
-  let firstList = null;
+  const segments = [];
+  let bridged = false;
   for (const child of ast.children) {
-    if (child.type === "heading") {
-      if (child.depth >= 2) break;
+    if (segments.length === 0) {
+      if (child.type === "heading") {
+        if (child.depth >= 2) break;
+        continue;
+      }
+      if (child.type === "html") continue;
+      if (child.type === "list") {
+        segments.push(child);
+        continue;
+      }
+      break;
+    }
+    if (child.type === "html" && isHtmlComment(child.value)) {
+      bridged = true;
       continue;
     }
-    if (child.type === "html") continue;
-    if (child.type === "list") {
-      firstList = child;
-      break;
+    if (child.type === "list" && (bridged || child.children.length > 0 && child.children.every((item) => extractListItemKV(item)))) {
+      segments.push(child);
+      bridged = false;
+      continue;
     }
     break;
   }
-  if (!firstList) return null;
-  const values = {};
-  const loc = {};
-  const valueOffsets = {};
-  for (const item of firstList.children) {
-    const pair = extractListItemKV(item);
-    if (pair && !(pair.key in values)) {
-      values[pair.key] = pair.value;
-      const start = item.position?.start;
-      if (start) loc[pair.key] = { line: start.line, column: start.column };
-      if (body !== void 0 && pair.valueOffset && body.slice(pair.valueOffset.start, pair.valueOffset.end) === pair.value) {
-        valueOffsets[pair.key] = pair.valueOffset;
+  if (segments.length === 0) return null;
+  const values = nullProtoMap();
+  const loc = nullProtoMap();
+  const valueOffsets = nullProtoMap();
+  for (const list of segments) {
+    for (const item of list.children) {
+      const pair = extractListItemKV(item);
+      if (pair && !Object.hasOwn(values, pair.key)) {
+        values[pair.key] = pair.value;
+        const start = item.position?.start;
+        if (start) loc[pair.key] = { line: start.line, column: start.column };
+        if (body !== void 0 && pair.valueOffset && body.slice(pair.valueOffset.start, pair.valueOffset.end) === pair.value) {
+          valueOffsets[pair.key] = pair.valueOffset;
+        }
       }
     }
   }
   const hasRecognizedKey = Object.keys(values).some(
     (k) => RECOGNIZED_METADATA_KEYS.has(k)
   );
-  return hasRecognizedKey ? { values, loc, valueOffsets } : null;
+  return hasRecognizedKey ? { values: { ...values }, loc, valueOffsets } : null;
 }
 var KEY_PATTERN = /^[A-Za-z][A-Za-z0-9 \-_]*$/;
 var SEPARATOR_PATTERN = /^\s*:\s*/;
@@ -354,7 +388,7 @@ var DIRECTIVE_KINDS = /* @__PURE__ */ new Set([
   "disable-next-line"
 ]);
 var DIRECTIVE_PREFIX = "madr-lint-";
-function parseDirective(value, line) {
+function parseDirective(value, line, endLine) {
   const trimmed = value.trim();
   if (!trimmed.startsWith("<!--") || !trimmed.endsWith("-->")) return null;
   const inner = trimmed.slice(4, -3).trim();
@@ -365,7 +399,12 @@ function parseDirective(value, line) {
   const keyword = wsIndex === -1 ? afterPrefix : afterPrefix.slice(0, wsIndex);
   if (!DIRECTIVE_KINDS.has(keyword)) return null;
   const rest = wsIndex === -1 ? "" : afterPrefix.slice(wsIndex);
-  return { kind: keyword, rules: parseRuleList(rest), line };
+  return {
+    kind: keyword,
+    rules: parseRuleList(rest),
+    line,
+    endLine
+  };
 }
 function parseRuleList(rest) {
   const trimmed = rest.trim();
@@ -376,8 +415,9 @@ function parseRuleList(rest) {
 function walkHtml(node, out) {
   if (node.type === "html") {
     const line = node.position?.start.line;
-    if (typeof line === "number") {
-      const directive = parseDirective(node.value, line);
+    const endLine = node.position?.end.line;
+    if (typeof line === "number" && typeof endLine === "number") {
+      const directive = parseDirective(node.value, line, endLine);
       if (directive) out.push(directive);
     }
   }
@@ -416,7 +456,7 @@ function collectDirectives(ast, body) {
         break;
       }
       case "disable-next-line": {
-        const target = nextNonBlankLine(directive.line);
+        const target = nextNonBlankLine(directive.endLine);
         if (target === null) break;
         let entry = index.nextLine.get(target);
         if (!entry) {
@@ -1542,9 +1582,6 @@ var BASELINE_VERSION = 1;
 function baselinePath(cwd) {
   return join(cwd, ".madr-lint", "baseline.json");
 }
-function nullProtoMap() {
-  return /* @__PURE__ */ Object.create(null);
-}
 function buildBaseline(diagnostics) {
   const entries = nullProtoMap();
   for (const d of diagnostics) {