flex-md 4.2.1 → 4.2.5

package/dist/extract/extract.js

@@ -3,7 +3,25 @@ import { parseHeadingsAndSections, extractBullets, normalizeName } from "../md/p
  * Extracts sections, lists, and tables from Markdown based on the OFS.
  */
 export function extractFromMarkdown(md, spec) {
-    const parsed = parseHeadingsAndSections(md);
+    // 0. Robustness: check for fenced block that might contain the target content
+    // Highly relevant for LLM responses where the model occasionally wraps everything in a container
+    // even if not strictly asked, or if the user provided unframed content but we have L2+ expectations elsewhere.
+    const rxFence = /```(?:markdown|flexmd)?\s*\n([\s\S]*?)\n```/gi;
+    const matches = Array.from(md.matchAll(rxFence));
+    let workingContent = md;
+    if (matches.length === 1) {
+        const content = matches[0][1];
+        // If the content inside the fence has more required sections than outside, use it
+        const parsedOutside = parseHeadingsAndSections(md);
+        const parsedInside = parseHeadingsAndSections(content);
+        const specNorms = new Set(spec.sections.map(s => normalizeName(s.name)));
+        const countOutside = parsedOutside.filter(p => specNorms.has(normalizeName(p.heading.name))).length;
+        const countInside = parsedInside.filter(p => specNorms.has(normalizeName(p.heading.name))).length;
+        if (countInside >= countOutside && countInside > 0) {
+            workingContent = content;
+        }
+    }
+    const parsed = parseHeadingsAndSections(workingContent);
     const sectionsByName = {};
     const tables = [];
     const specMap = new Map(spec.sections.map(s => [normalizeName(s.name), s]));

package/dist/md/parse.js

@@ -29,8 +29,10 @@ export function extractFencedBlocks(text) {
     return blocks;
 }
 export function parseHeadingsAndSections(md) {
-    // Standard headings #... and alternative ===key
-    const rx = /^((?:#{1,6})\s+(.+?)\s*|===(.+?)\s*)$/gm;
+    // Standard headings #... and alternative ===key.
+    // Use [ \t]* instead of \s for the trailing space to avoid matching newlines incorrectly with certain configurations.
+    // Also include \r? to handle CRLF if needed, although m and g should handle ^\$ correctly.
+    const rx = /^((?:#{1,6})[ \t]+(.+?)[ \t]*|===(.+?)[ \t]*)$/gm;
     const headings = [];
     let m;
     while ((m = rx.exec(md)) !== null) {
@@ -42,7 +44,8 @@ export function parseHeadingsAndSections(md) {
             name = (m[3] ?? "").trim();
         }
         else {
-            const hashes = (full.match(/^#+/) ?? [""])[0];
+            const hashesMatch = full.match(/^#+/);
+            const hashes = hashesMatch ? hashesMatch[0] : "";
             level = hashes.length;
             name = (m[2] ?? "").trim();
         }

package/dist/ofs/parser.js

@@ -1,3 +1,4 @@
+import { normalizeName } from "../md/parse.js";
 /**
  * Validate a format specification.
  * Returns detailed validation results.
@@ -138,6 +139,18 @@ export function parseOutputFormatSpec(md, opts = {}) {
             }
             continue;
         }
+        // heading items (e.g. ### Short Answer)
+        const headingMatch = line.match(/^#{1,6}\s+(.+)$/);
+        if (headingMatch) {
+            const name = headingMatch[1].trim();
+            // Don't re-parse "Output format" itself if it somehow gets in here
+            if (normalizeName(name) !== "output format") {
+                const s = { name, kind: "text" };
+                sections.push(s);
+                currentSection = s;
+            }
+            continue;
+        }
         // If not a bullet and we have a current section, it's an instruction
         if (currentSection && line.length > 0) {
             // Support "Columns: A, B, C" in instructions for tables

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flex-md",
-  "version": "4.2.1",
+  "version": "4.2.5",
   "description": "Parse and stringify FlexMD: semi-structured Markdown with three powerful layers - Frames, Output Format Spec (OFS), and Detection/Extraction.",
   "license": "MIT",
   "author": "",
@@ -50,6 +50,6 @@
   "dependencies": {
     "nd": "^1.2.0",
     "nx-helpers": "^1.5.0",
-    "nx-md-parser": "^1.4.0"
+    "nx-md-parser": "^2.0.1"
   }
 }