markdownly.js 1.1.1 → 1.2.0

package/dist/cli.js

@@ -137,43 +137,57 @@ function parse(markdown) {
 function parseList(lines, startIndex) {
   const items = [];
   let i = startIndex;
+  const firstMatch = lines[i].match(/^(\s*)/);
+  const baseIndent = firstMatch ? firstMatch[1].length : 0;
   while (i < lines.length) {
     const line = lines[i];
-    const match = line.match(/^(\s*)([*+-]|\d+\.)\s(.*)$/);
-    if (!match && line.trim() === "") {
+    if (line.trim() === "") {
       i++;
       continue;
     }
+    const match = line.match(/^(\s*)([*+-]|(\d+)\.)\s(.*)$/);
     if (!match)
       break;
-    const [, indent, marker, content] = match;
+    const [, indentStr, marker, startNum, content] = match;
+    const indent = indentStr.length;
+    if (indent < baseIndent)
+      break;
     const ordered = /\d+\./.test(marker);
+    const start = startNum ? parseInt(startNum, 10) : 1;
+    const depth = Math.floor(indent / 2);
     const checked = content.match(/^\[([ xX])\]\s*(.*)$/);
     let itemContent = checked ? checked[2] : content;
     const isChecked = checked ? checked[1].toLowerCase() === "x" : undefined;
     i++;
+    const nestedItems = [];
     while (i < lines.length) {
       const nextLine = lines[i];
       if (nextLine.trim() === "") {
         i++;
         continue;
       }
-      if (nextLine.match(/^(\s*)([*+-]|\d+\.)\s/))
-        break;
-      if (nextLine.match(/^\s{2,}/)) {
-        itemContent += `
-` + nextLine.trim();
-        i++;
-      } else {
+      const nextMatch = nextLine.match(/^(\s*)([*+-]|\d+\.)\s/);
+      if (!nextMatch)
         break;
+      const nextIndent = nextMatch[1].length;
+      if (nextIndent > indent) {
+        const nested = parseList(lines, i);
+        nestedItems.push(...nested.items);
+        i = nested.endIndex;
+        continue;
       }
+      break;
     }
-    items.push({
+    const item = {
       type: "list_item",
       content: itemContent,
       children: parseInline(itemContent),
-      meta: { ordered, checked: isChecked }
-    });
+      meta: { ordered, checked: isChecked, depth, start }
+    };
+    if (nestedItems.length > 0) {
+      item.meta.nested = nestedItems;
+    }
+    items.push(item);
   }
   return { items, endIndex: i };
 }
@@ -612,28 +626,42 @@ function renderCodeBlock(token, ctx) {
   }).join(`
 `);
 }
-function renderList(token, ctx) {
+function renderList(token, ctx, baseDepth = 0) {
   const items = token.children || [];
-  let orderedNum = 1;
-  return items.map((item) => {
+  const markers = ["•", "-", "‣"];
+  const result = [];
+  for (const item of items) {
     const ordered = item.meta?.ordered;
     const checked = item.meta?.checked;
+    const depth = (item.meta?.depth || 0) - baseDepth;
+    const start = item.meta?.start || 1;
+    const indentStr = " ".repeat(depth * 2);
     let bullet;
     if (checked !== undefined) {
       const check = checked ? green("✓") : " ";
       bullet = grey("[") + check + grey("]");
     } else if (ordered) {
-      bullet = blueBright(`${orderedNum++}.`);
+      bullet = blueBright(`${start}.`);
     } else {
-      bullet = redBright("•");
+      const markerIdx = depth % markers.length;
+      bullet = redBright(markers[markerIdx]);
     }
     const content = renderInline(item.children || []);
-    const wrapped = wrapText(content, ctx.width - 4);
+    const wrapped = wrapText(content, ctx.width - 4 - depth * 2);
     const indented = wrapped.split(`
-`).map((line, i) => i === 0 ? `${bullet} ${line}` : `    ${line}`).join(`
+`).map((line, i) => i === 0 ? `${indentStr}${bullet} ${line}` : `${indentStr}    ${line}`).join(`
 `);
-    return indented;
-  }).join(`
+    result.push(indented);
+    if (item.meta?.nested) {
+      const nestedToken = {
+        type: "list",
+        content: "",
+        children: item.meta.nested
+      };
+      result.push(renderList(nestedToken, ctx, baseDepth));
+    }
+  }
+  return result.join(`
 `);
 }
 function renderTable(token, ctx) {

package/dist/index.js

@@ -135,43 +135,57 @@ function parse(markdown) {
 function parseList(lines, startIndex) {
   const items = [];
   let i = startIndex;
+  const firstMatch = lines[i].match(/^(\s*)/);
+  const baseIndent = firstMatch ? firstMatch[1].length : 0;
   while (i < lines.length) {
     const line = lines[i];
-    const match = line.match(/^(\s*)([*+-]|\d+\.)\s(.*)$/);
-    if (!match && line.trim() === "") {
+    if (line.trim() === "") {
       i++;
       continue;
     }
+    const match = line.match(/^(\s*)([*+-]|(\d+)\.)\s(.*)$/);
     if (!match)
       break;
-    const [, indent, marker, content] = match;
+    const [, indentStr, marker, startNum, content] = match;
+    const indent = indentStr.length;
+    if (indent < baseIndent)
+      break;
     const ordered = /\d+\./.test(marker);
+    const start = startNum ? parseInt(startNum, 10) : 1;
+    const depth = Math.floor(indent / 2);
     const checked = content.match(/^\[([ xX])\]\s*(.*)$/);
     let itemContent = checked ? checked[2] : content;
     const isChecked = checked ? checked[1].toLowerCase() === "x" : undefined;
     i++;
+    const nestedItems = [];
     while (i < lines.length) {
       const nextLine = lines[i];
       if (nextLine.trim() === "") {
         i++;
         continue;
       }
-      if (nextLine.match(/^(\s*)([*+-]|\d+\.)\s/))
-        break;
-      if (nextLine.match(/^\s{2,}/)) {
-        itemContent += `
-` + nextLine.trim();
-        i++;
-      } else {
+      const nextMatch = nextLine.match(/^(\s*)([*+-]|\d+\.)\s/);
+      if (!nextMatch)
         break;
+      const nextIndent = nextMatch[1].length;
+      if (nextIndent > indent) {
+        const nested = parseList(lines, i);
+        nestedItems.push(...nested.items);
+        i = nested.endIndex;
+        continue;
       }
+      break;
     }
-    items.push({
+    const item = {
       type: "list_item",
       content: itemContent,
       children: parseInline(itemContent),
-      meta: { ordered, checked: isChecked }
-    });
+      meta: { ordered, checked: isChecked, depth, start }
+    };
+    if (nestedItems.length > 0) {
+      item.meta.nested = nestedItems;
+    }
+    items.push(item);
   }
   return { items, endIndex: i };
 }
@@ -610,28 +624,42 @@ function renderCodeBlock(token, ctx) {
   }).join(`
 `);
 }
-function renderList(token, ctx) {
+function renderList(token, ctx, baseDepth = 0) {
   const items = token.children || [];
-  let orderedNum = 1;
-  return items.map((item) => {
+  const markers = ["•", "-", "‣"];
+  const result = [];
+  for (const item of items) {
     const ordered = item.meta?.ordered;
     const checked = item.meta?.checked;
+    const depth = (item.meta?.depth || 0) - baseDepth;
+    const start = item.meta?.start || 1;
+    const indentStr = " ".repeat(depth * 2);
     let bullet;
     if (checked !== undefined) {
       const check = checked ? green("✓") : " ";
       bullet = grey("[") + check + grey("]");
     } else if (ordered) {
-      bullet = blueBright(`${orderedNum++}.`);
+      bullet = blueBright(`${start}.`);
     } else {
-      bullet = redBright("•");
+      const markerIdx = depth % markers.length;
+      bullet = redBright(markers[markerIdx]);
     }
     const content = renderInline(item.children || []);
-    const wrapped = wrapText(content, ctx.width - 4);
+    const wrapped = wrapText(content, ctx.width - 4 - depth * 2);
     const indented = wrapped.split(`
-`).map((line, i) => i === 0 ? `${bullet} ${line}` : `    ${line}`).join(`
+`).map((line, i) => i === 0 ? `${indentStr}${bullet} ${line}` : `${indentStr}    ${line}`).join(`
 `);
-    return indented;
-  }).join(`
+    result.push(indented);
+    if (item.meta?.nested) {
+      const nestedToken = {
+        type: "list",
+        content: "",
+        children: item.meta.nested
+      };
+      result.push(renderList(nestedToken, ctx, baseDepth));
+    }
+  }
+  return result.join(`
 `);
 }
 function renderTable(token, ctx) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "markdownly.js",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "type": "module",
   "description": "Render Markdown to Terminal - Zero Dependencies",
   "main": "dist/index.js",