markedin-parser 0.1.3 → 0.2.0

package/README.md

@@ -62,6 +62,7 @@ First note: {{notes[0]}}
 | `{{#each items}}...{{/each}}`      | Iterate an array                             |
 | `{{#if key}}...{{else}}...{{/if}}` | Conditional block                            |
 | `{{> key}}`                        | Inline a frontmatter string as raw text      |
+| `\{{key}}`                         | Render `{{key}}` literally (escape)          |
 
 ## Parsing and Rendering a Markedin File
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "markedin-parser",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "description": "Parse and render .mi (markedin) files — YAML frontmatter + templated Markdown",
   "main": "parse.js",
   "files": [

package/parse.js

@@ -12,6 +12,8 @@
  *       {{> partial_key}}             — inline another frontmatter string as markdown
  */
 
+const SPEC_VERSION = '0.4.0';
+
 const yaml = require('js-yaml');
 const { marked } = require('marked');
 
@@ -69,6 +71,32 @@ function formatValue(val) {
   return String(val);
 }
 
+// ─── Standalone tag detection ────────────────────────────────────────────────
+
+function isStandalone(str, tagStart, tagEnd) {
+  // Find start of line containing the tag
+  let lineStart = tagStart;
+  while (lineStart > 0 && str[lineStart - 1] !== '\n') lineStart--;
+
+  // Only whitespace allowed before tag on this line
+  for (let i = lineStart; i < tagStart; i++) {
+    if (str[i] !== ' ' && str[i] !== '\t') return null;
+  }
+
+  // Only whitespace allowed after tag until end of line
+  let pos = tagEnd;
+  while (pos < str.length && str[pos] !== '\n' && str[pos] !== '\r') {
+    if (str[pos] !== ' ' && str[pos] !== '\t') return null;
+    pos++;
+  }
+
+  // Consume \r\n or \n
+  if (pos < str.length && str[pos] === '\r') pos++;
+  if (pos < str.length && str[pos] === '\n') pos++;
+
+  return { lineStart, lineEnd: pos };
+}
+
 // ─── Block processing ────────────────────────────────────────────────────────
 
 function findClose(str, nestedOpenRe, closeTag, from) {
@@ -104,13 +132,34 @@ function processBlocks(str, openRe, nestedOpenRe, closeTag, fn) {
   let lastEnd = 0;
   let m;
   while ((m = openRe.exec(str)) !== null) {
+    const openStart = m.index;
     const openEnd = m.index + m[0].length;
     const closeIdx = findClose(str, nestedOpenRe, closeTag, openEnd);
     if (closeIdx === -1) continue;
-    const inner = str.slice(openEnd, closeIdx);
-    result += str.slice(lastEnd, m.index);
+    const closeEnd = closeIdx + closeTag.length;
+
+    let consumeFrom = openStart;
+    let consumeTo = closeEnd;
+    let innerStart = openEnd;
+    let innerEnd = closeIdx;
+
+    // Standalone open tag: consume the entire line
+    const openSA = isStandalone(str, openStart, openEnd);
+    if (openSA) {
+      consumeFrom = openSA.lineStart;
+      innerStart = openSA.lineEnd;
+    }
+
+    // Standalone close tag: consume the entire line
+    const closeSA = isStandalone(str, closeIdx, closeEnd);
+    if (closeSA) {
+      consumeTo = closeSA.lineEnd;
+    }
+
+    const inner = str.slice(innerStart, innerEnd);
+    result += str.slice(lastEnd, consumeFrom);
     result += fn(m[1], inner);
-    lastEnd = closeIdx + closeTag.length;
+    lastEnd = consumeTo;
     openRe.lastIndex = lastEnd;
   }
   return result + str.slice(lastEnd);
@@ -191,6 +240,9 @@ function renderTemplate(template, ctx) {
 
   let out = template;
 
+  // 0. \{{ → protect as literal {{
+  out = out.replace(/\\\{\{/g, () => protect('{{'));
+
   // 1. {{#each key}} ... {{/each}}
   out = processBlocks(out,
     /\{\{#each ([\w.[\]]+)\}\}/g,
@@ -215,8 +267,21 @@ function renderTemplate(template, ctx) {
     (key, inner) => {
       const val = resolvePath(ctx, key);
       const elseIdx = findTopLevelElse(inner);
-      const truthy = elseIdx === -1 ? inner : inner.slice(0, elseIdx);
-      const falsy  = elseIdx === -1 ? '' : inner.slice(elseIdx + '{{else}}'.length);
+      let truthy, falsy;
+      if (elseIdx === -1) {
+        truthy = inner;
+        falsy = '';
+      } else {
+        const elseEnd = elseIdx + '{{else}}'.length;
+        const elseSA = isStandalone(inner, elseIdx, elseEnd);
+        if (elseSA) {
+          truthy = inner.slice(0, elseSA.lineStart);
+          falsy = inner.slice(elseSA.lineEnd);
+        } else {
+          truthy = inner.slice(0, elseIdx);
+          falsy = inner.slice(elseEnd);
+        }
+      }
       return protect(renderTemplate(isTruthy(val) ? truthy : falsy, ctx));
     }
   );
@@ -237,4 +302,4 @@ function renderTemplate(template, ctx) {
   return restore(out);
 }
 
-module.exports = { parse, render, renderHtmlFrag, renderHtml, renderTemplate, resolvePath };
+module.exports = { SPEC_VERSION, parse, render, renderHtmlFrag, renderHtml, renderTemplate, resolvePath };