@b4moss/hyogen-md 0.13.0 → 0.14.0

package/README.md

@@ -140,11 +140,11 @@ Open `http://localhost:3000` (docs) and `/playground`. Uses `../app` via Vite al
 ## Status
 
 This is **0.x**. APIs and output may change until `1.0.0`.  
-Published: **`@b4moss/hyogen-md@0.13.0`** (git tag `v0.13.0`).
+Published: **`@b4moss/hyogen-md@0.14.0`** (git tag `v0.14.0`).
 
 Playground UX ships with the documentation site and is **not** included in the npm tarball.
 
-The coverage badge reflects approximate **statement coverage for `app/`** (library) from Vitest (~84%). Initial release goal is ≥50%. Coverage is uploaded to Codecov from `.github/workflows/quality.yml` on pushes to `main`.
+The coverage badge reflects **statement coverage for `app/`** (library) from Vitest (**≥90%** target; enforced by Vitest thresholds). Coverage is uploaded to Codecov from `.github/workflows/quality.yml` on pushes to `main`.
 
 ---
 

package/README_ja.md

@@ -140,11 +140,11 @@ make dev-docs
 ## ステータス
 
 **0.x** です。`1.0.0` まで API・出力は変わりえます。  
-公開済み: **`@b4moss/hyogen-md@0.13.0`**（git tag `v0.13.0`）。
+公開済み: **`@b4moss/hyogen-md@0.14.0`**（git tag `v0.14.0`）。
 
 Playground UX はドキュメントサイトに含まれ、**npm の tarball には入りません**。
 
-coverage バッジはライブラリ（`app/`）の Vitest **statement カバレッジ概算（約 84%）**です。初期リリース目標は 50% 以上。カバレッジは `main` への push 時に `.github/workflows/quality.yml` から Codecov へアップロードされます。
+coverage バッジはライブラリ（`app/`）の Vitest **statement カバレッジ（目標 ≥90%、Vitest thresholds で強制）**です。カバレッジは `main` への push 時に `.github/workflows/quality.yml` から Codecov へアップロードされます。
 
 ---
 

package/dist/cli.js

@@ -1774,6 +1774,145 @@ async function interpolateExpressions(source, context, options = {}) {
   }
   return result;
 }
+function splitPreservingEol(source) {
+  const parts = [];
+  let i = 0;
+  while (i < source.length) {
+    const nl = source.indexOf("\n", i);
+    if (nl === -1) {
+      parts.push({ content: source.slice(i), eol: "" });
+      break;
+    }
+    let content = source.slice(i, nl);
+    let eol = "\n";
+    if (content.endsWith("\r")) {
+      content = content.slice(0, -1);
+      eol = "\r\n";
+    }
+    parts.push({ content, eol });
+    i = nl + 1;
+  }
+  return parts;
+}
+function readTemplateExpression(source, start, path2) {
+  let depth = 1;
+  let index = start;
+  let inString = null;
+  while (index < source.length) {
+    const ch = source[index];
+    if (inString) {
+      if (ch === "\\") {
+        index += 2;
+        continue;
+      }
+      if (ch === inString) {
+        inString = null;
+      }
+      index++;
+      continue;
+    }
+    if (ch === '"' || ch === "'" || ch === "`") {
+      inString = ch;
+      index++;
+      continue;
+    }
+    if (ch === "{") {
+      depth++;
+      index++;
+      continue;
+    }
+    if (ch === "}") {
+      depth--;
+      if (depth === 0) {
+        return {
+          expr: source.slice(start, index),
+          end: index + 1
+        };
+      }
+      index++;
+      continue;
+    }
+    index++;
+  }
+  throw createHyogenError({
+    code: "parse_error",
+    path: path2,
+    details: { message: "unclosed template expression" }
+  });
+}
+function isEscapedDollar(source, dollarIndex) {
+  let backslashes = 0;
+  let j = dollarIndex - 1;
+  while (j >= 0 && source[j] === "\\") {
+    backslashes++;
+    j--;
+  }
+  return backslashes % 2 === 1;
+}
+async function interpolateDollarExpressions(text, context, options) {
+  const path2 = options.path;
+  let result = "";
+  let i = 0;
+  while (i < text.length) {
+    const dollar = text.indexOf("${", i);
+    if (dollar === -1) {
+      result += text.slice(i);
+      break;
+    }
+    if (isEscapedDollar(text, dollar)) {
+      result += text.slice(i, dollar - 1);
+      result += "${";
+      i = dollar + 2;
+      continue;
+    }
+    result += text.slice(i, dollar);
+    const { expr, end } = readTemplateExpression(text, dollar + 2, path2);
+    const node = parseExpression(expr.trim(), path2, { allowCalls: false });
+    const value = await evaluateExpression(node, {
+      ...options,
+      context,
+      path: path2,
+      parentContext: options.parentContext ?? context
+    });
+    result += value === void 0 || value === null ? "" : String(value);
+    i = end;
+  }
+  return result;
+}
+async function interpolateFenceExpressions(source, context, options = {}) {
+  const lines = splitPreservingEol(source);
+  if (lines.length === 0) {
+    return source;
+  }
+  const fence = createFenceState();
+  let result = "";
+  let insideBuffer = "";
+  let bufferingInside = false;
+  const flushInside = async () => {
+    if (!bufferingInside) {
+      return;
+    }
+    result += await interpolateDollarExpressions(insideBuffer, context, options);
+    insideBuffer = "";
+    bufferingInside = false;
+  };
+  for (const { content, eol } of lines) {
+    const inside = consumeFenceLine(fence, content);
+    const chunk = content + eol;
+    if (inside) {
+      if (!bufferingInside) {
+        bufferingInside = true;
+        insideBuffer = "";
+      }
+      insideBuffer += chunk;
+    } else {
+      await flushInside();
+      result += chunk;
+    }
+  }
+  await flushInside();
+  return result;
+}
 function countOccurrences(haystack, needle) {
   let count = 0;
   let pos = 0;
@@ -2373,7 +2512,7 @@ async function expandEach(node, options, tracker, warnings2) {
       if (!preserve) {
         bodyText = chompLeadingNewline(bodyText);
       }
-      const interpolated = await interpolateExpressions(bodyText, scopedContext, {
+      const interpolateOpts = {
         path: options.path,
         registry: options.registry,
         loader: options.loader,
@@ -2383,7 +2522,17 @@ async function expandEach(node, options, tracker, warnings2) {
         parentContext: options.parentContext ?? options.context,
         preserveHgComments: options.preserveHgComments,
         constrainToRoot: options.constrainToRoot
-      });
+      };
+      let interpolated = await interpolateExpressions(
+        bodyText,
+        scopedContext,
+        interpolateOpts
+      );
+      interpolated = await interpolateFenceExpressions(
+        interpolated,
+        scopedContext,
+        interpolateOpts
+      );
       result += interpolated;
       if (preserve) {
         result += node.closer.raw;
@@ -4263,7 +4412,7 @@ async function renderDocumentBody(body, options) {
     preserveHgComments: options.preserveHgComments,
     constrainToRoot: options.constrainToRoot
   });
-  markdown = await interpolateExpressions(markdown, mergedContext, {
+  const interpolateOpts = {
     path: path2,
     registry,
     loader,
@@ -4273,7 +4422,13 @@ async function renderDocumentBody(body, options) {
     parentContext: mergedContext,
     preserveHgComments: options.preserveHgComments,
     constrainToRoot: options.constrainToRoot
-  });
+  };
+  markdown = await interpolateExpressions(markdown, mergedContext, interpolateOpts);
+  markdown = await interpolateFenceExpressions(
+    markdown,
+    mergedContext,
+    interpolateOpts
+  );
   markdown = expandToc(markdown, { path: path2 });
   markdown = stripHgComments(markdown, options.preserveHgComments);
   return markdown;
@@ -4817,7 +4972,7 @@ function packageJsonContents(packageName) {
         build: "hyogen-md build"
       },
       dependencies: {
-        "@b4moss/hyogen-md": "^0.13.0"
+        "@b4moss/hyogen-md": "^0.14.0"
       }
     },
     null,
@@ -5572,7 +5727,7 @@ cli.command("dev", "Start writing preview server with HMR").option("--config <fi
   }
 );
 cli.help();
-cli.version("0.13.0");
+cli.version("0.14.0");
 async function main() {
   try {
     cli.parse(process.argv, { run: false });