@remigius42/morg 0.10.0 → 0.10.1

package/dist/presets/logseqOutline.js

@@ -4,7 +4,7 @@ import { positionParser, tryParse } from "../core/render.js";
 import { ZERO_WIDTH_SPACE } from "../core/markupBoundary.js";
 import { mapOutsideCode } from "../core/outsideCode.js";
 import { isDrawerStart, isOrgBlockStart, orgElementEnd } from "../core/passthroughSource.js";
-import { readVanillaMarkdownOutline } from "./logseqVanillaMarkdown.js";
+import { columns, dedent as dedentColumns, readVanillaMarkdownOutline } from "./logseqVanillaMarkdown.js";
 // Logseq stores a page as an outline of blocks, each block a content
 // string it parses on its own: org writes a block as its level's stars,
 // a space and the content (an empty block as the bare stars), Markdown
@@ -710,14 +710,14 @@ function queryCodeToBlocks(content) {
     }
     return result;
 }
-// Logseq Markdown: spaces after a bullet the whole content shares, which
-// a Vanilla list item would read as its content's column
+// Logseq Markdown: indentation after a bullet the whole content shares,
+// which a Vanilla list item would read as its content's column
 function dedentCommon(content) {
     const indent = Math.min(...content
         .filter(line => line.trim())
-        .map(line => /^ */.exec(line)?.[0].length ?? 0));
+        .map(line => columns(/^[ \t]*/.exec(line)?.[0] ?? "")));
     return Number.isFinite(indent) && indent
-        ? content.map(line => line.slice(Math.min(indent, line.length)))
+        ? content.map(line => dedentColumns(line, indent))
         : content;
 }
 // a translation's page links, but in code

package/dist/presets/logseqVanillaMarkdown.d.ts

@@ -1,5 +1,7 @@
 import type { Outline } from "./logseqOutline.js";
 import type { ConversionContext } from "./types.js";
+export declare function dedent(line: string, column: number): string;
+export declare function columns(text: string, start?: number): number;
 /**
  * Reads a Vanilla Markdown page into Logseq's outline.
  * @param markdown The Markdown page.

package/dist/presets/logseqVanillaMarkdown.js

@@ -70,10 +70,29 @@ function readMeta(lines, context) {
     }
     return meta;
 }
-// a lazy continuation line sits anywhere left of the column
-function dedent(line, column) {
-    const indent = /^ */.exec(line)?.[0].length ?? 0;
-    return line.slice(Math.min(indent, column));
+// a lazy continuation line sits anywhere left of the column; a tab
+// reaches the next tab stop (4), the part of it right of the column
+// stays as spaces
+export function dedent(line, column) {
+    let width = 0;
+    let i = 0;
+    while (width < column && (line[i] === " " || line[i] === "\t")) {
+        width = columns(line[i++] ?? "", width);
+    }
+    return " ".repeat(Math.max(0, width - column)) + line.slice(i);
+}
+// the column text ends at, from a start column, a tab reaching the next
+// tab stop
+export function columns(text, start = 0) {
+    let width = start;
+    for (const char of text) {
+        width += char === "\t" ? 4 - (width % 4) : 1;
+    }
+    return width;
+}
+// the column a list item's content starts at
+function contentColumn(line) {
+    return columns(BULLET_RE.exec(line)?.[0] ?? "");
 }
 function leadingProperties(lines) {
     const count = lines.findIndex(line => !PROPERTY_RE.test(line));
@@ -83,9 +102,9 @@ function leadingProperties(lines) {
 // its checkbox read, continuation lines moved left past the bullet
 function itemSource(item, end, lines) {
     const [first = "", ...rest] = lines.slice(span(item)[0], end + 1);
-    const column = BULLET_RE.exec(first)?.[0].length ?? 0;
+    const column = contentColumn(first);
     return [
-        taskTitle(item, first.slice(column)),
+        taskTitle(item, first.slice(BULLET_RE.exec(first)?.[0].length ?? 0)),
         ...rest.map(line => dedent(line, column))
     ];
 }
@@ -123,7 +142,7 @@ function readItem(item, level, ordered, reader) {
     reader.blocks.push(block);
     // what follows the first nested list: more lists, and text, which a
     // block's content cannot hold after its children, as child blocks
-    const column = BULLET_RE.exec(reader.lines[span(item)[0]] ?? "")?.[0].length;
+    const column = contentColumn(reader.lines[span(item)[0]] ?? "");
     const rest = nested[0]
         ? item.children.slice(item.children.indexOf(nested[0]))
         : [];
@@ -140,7 +159,7 @@ function readItem(item, level, ordered, reader) {
             meta: [],
             content: reader.lines
                 .slice(start, end + 1)
-                .map(line => dedent(line, column ?? 0))
+                .map(line => dedent(line, column))
         });
     }
 }
@@ -279,7 +298,7 @@ function readText(node, level, body, reader) {
     const [start, end] = span(node);
     // a rule's source may be bulleted (`- ---`), a list in a block
     // read from its own column, as an item's content is
-    const column = (node.position?.start.column ?? 1) - 1;
+    const column = columns(reader.lines[start]?.slice(0, (node.position?.start.column ?? 1) - 1) ?? "");
     const source = node.type === "thematicBreak"
         ? ["---"]
         : reader.lines.slice(start, end + 1).map(line => dedent(line, column));

package/dist/presets/obsidian.js

@@ -23,7 +23,8 @@ export function obsidian() {
         translateMarkdown: (markdown, context) => context.side === "input" ? toVanilla(markdown) : markdown
     };
 }
-const ALIASED_WIKILINK_RE = /\[\[([^\][|]+)\|([^\][]+)\]\]/g;
+// not an embed, whose `|300` is a size
+const ALIASED_WIKILINK_RE = /(?<!!)\[\[([^\][|]+)\|([^\][]+)\]\]/g;
 // in Markdown text: not an embed, whose `|300` is a size, and with a
 // table cell's escaped pipe (`[[Page\|alias]]`)
 const ALIASED_PAGE_LINK_RE = /(?<!!)\[\[([^\][|\\]+)\\?\|([^\][]+)\]\]/g;
@@ -44,11 +45,17 @@ function fuzzyLinksToWikilinks(uniorgAst) {
             return undefined;
         }
         const description = node.children.length ? toString(node) : "";
+        // an embed's `!` goes with it, else Markdown escapes it before `[`
+        const previous = parent.children[index - 1];
+        const embed = previous?.type === "text" && previous.value.endsWith("!");
+        if (embed) {
+            previous.value = previous.value.slice(0, -1);
+        }
         parent.children[index] = {
             type: "verbatim-inline",
-            value: description
+            value: `${embed ? "!" : ""}${description
                 ? `[[${node.rawLink}|${description}]]`
-                : `[[${node.rawLink}]]`
+                : `[[${node.rawLink}]]`}`
         };
         return undefined;
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remigius42/morg",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "Bidirectional Markdown ↔ Org-mode converter with round-trip convergence",
   "keywords": [
     "org-mode",