@kamilio/wire 0.1.2 → 0.1.4

package/node_modules/provider-notion/dist/notion-sync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"notion-sync.d.ts","sourceRoot":"","sources":["../src/notion-sync.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"notion-sync.d.ts","sourceRoot":"","sources":["../src/notion-sync.ts"],"names":[],"mappings":"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"}

package/node_modules/provider-notion/dist/notion-sync.js

@@ -20,7 +20,7 @@ function inlineCode(value) {
     return `${ticks}${value}${ticks}`;
 }
 function escapeInlineMarkdown(value) {
-    return value.replace(/\\/g, "\\\\").replace(/\*/g, "\\*").replace(/~/g, "\\~").replace(/\[/g, "\\[").replace(/\]/g, "\\]");
+    return value.replace(/\\/g, "\\\\").replace(/\*/g, "\\*").replace(/~/g, "\\~").replace(/`/g, "\\`").replace(/\[/g, "\\[").replace(/\]/g, "\\]");
 }
 function unescapeInlineMarkdown(value) {
     return value.replace(/\\([\\*~[\]()])/g, "$1");
@@ -60,6 +60,10 @@ function markdownLink(value) {
 function normalizeMarks(marks) {
     return marks.filter((mark) => Array.isArray(mark) && mark.length > 0 && array(mark)[0] !== "m").map((mark) => clone(mark)).sort((left, right) => compact(left).localeCompare(compact(right)));
 }
+function renderMarks(marks) {
+    const priority = new Map([["c", 0], ["_", 1], ["h", 2], ["e", 3], ["p", 4], ["u", 5], ["d", 6], ["s", 7], ["i", 8], ["b", 9], ["a", 10]]);
+    return [...marks].sort((left, right) => priority.get(array(left)[0]) - priority.get(array(right)[0]) || compact(left).localeCompare(compact(right)));
+}
 function normalizeRichText(value) {
     const output = [];
     for (const raw of value) {
@@ -132,6 +136,17 @@ function parseInline(value) {
             rest = rest.slice(mentionSpan[0].length);
             continue;
         }
+        if (rest.startsWith("***")) {
+            const end = closingDelimiter(rest, 3, "***");
+            if (end !== -1) {
+                for (const segment of parseInline(rest.slice(3, end))) {
+                    const marks = normalizeMarks([...(segment[1] ?? []), ["b"], ["i"]]);
+                    push(segment[0], marks);
+                }
+                rest = rest.slice(end + 3);
+                continue;
+            }
+        }
         if (rest.startsWith("**")) {
             const end = closingDelimiter(rest, 2, "**");
             if (end !== -1) {
@@ -197,7 +212,7 @@ function parseInline(value) {
 function renderSegment(content, marks) {
     let rendered = marks.some((raw) => raw[0] === "c") ? content : escapeInlineMarkdown(content);
     let link = null;
-    for (const raw of marks) {
+    for (const raw of renderMarks(marks)) {
         const mark = raw;
         if (mark[0] === "c")
             rendered = inlineCode(rendered);
@@ -277,6 +292,9 @@ function isTableSeparator(row) {
 function markdownBlockStart(stripped) {
     return /^(#{1,6})\s+|^[-*]\s+|^\d+\.\s+|^-\s+\[[ xX]\]\s+|^```|^---$|^!\[|^>|^\||^:::/.test(stripped);
 }
+function escapeBlockMarkdownLine(line) {
+    return markdownBlockStart(line) ? `\\${line}` : line;
+}
 function colonFenceBody(lines, index) {
     const body = [];
     let depth = 0;
@@ -373,8 +391,13 @@ function parseLines(lines, baseIndent = 0) {
             continue;
         }
         if (stripped.startsWith("> ")) {
-            blocks.push({ type: "quote", content: stripped.slice(2), properties: {}, rich_text: parseInline(stripped.slice(2)), indent });
+            const content = [stripped.slice(2)];
             index += 1;
+            while (index < lines.length && lines[index].trim() !== "" && baseIndent + lineIndent(lines[index]) === indent && stripIndent(lines[index]).startsWith("> ")) {
+                content.push(stripIndent(lines[index]).slice(2));
+                index += 1;
+            }
+            blocks.push({ type: "quote", content: content.join("\n"), properties: {}, rich_text: parseInline(content.join("\n")), indent });
             continue;
         }
         if (stripped.startsWith("|")) {
@@ -488,7 +511,26 @@ function parseLines(lines, baseIndent = 0) {
 export function parseNotionMarkdown(markdown) {
     return parseLines(markdown.replace(/^\ufeff/, "").split("\n"));
 }
-function parserBlockToNotionBlock(block, id, parentId, parentTable, spaceId, userId, currentTime) {
+function tableRowCells(block, columnOrder) {
+    const cells = object(block.properties["cells"]);
+    if (columnOrder === undefined)
+        return cells;
+    const localColumns = Object.keys(cells);
+    return Object.fromEntries(columnOrder.map((column, index) => [column, cells[localColumns[index]]]));
+}
+function tableColumnOrder(remote, local) {
+    const localColumns = local.properties["column_ids"];
+    if (remote === undefined)
+        return localColumns;
+    const remoteColumns = object(remote["format"])["table_block_column_order"];
+    const used = new Set();
+    return localColumns.map((column, index) => {
+        const value = index < remoteColumns.length ? remoteColumns[index] : used.has(column) ? `column_${index}_${randomUUID().replaceAll("-", "")}` : column;
+        used.add(value);
+        return value;
+    });
+}
+function parserBlockToNotionBlock(block, id, parentId, parentTable, spaceId, userId, currentTime, columnOrder) {
     const base = { id, type: block.type, space_id: spaceId, parent_id: parentId, parent_table: parentTable, alive: true, created_time: currentTime, created_by_table: "notion_user", created_by_id: userId, last_edited_time: currentTime, last_edited_by_table: "notion_user", last_edited_by_id: userId };
     if (block.properties["notion_opaque"] !== undefined)
         return { ...object(block.properties["notion_opaque"]), ...base };
@@ -503,9 +545,9 @@ function parserBlockToNotionBlock(block, id, parentId, parentTable, spaceId, use
     if (block.type === "image")
         return { ...base, properties: { source: [[block.properties["source"]]], alt_text: [[block.properties["alt_text"]]], ...(block.properties["caption"] === undefined ? {} : { caption: block.properties["caption"] }) } };
     if (block.type === "table")
-        return { ...base, properties: {}, format: { table_block_column_order: block.properties["column_ids"], table_block_column_header: block.properties["has_header"], table_block_row_header: block.properties["has_row_header"] } };
+        return { ...base, properties: {}, format: { table_block_column_order: columnOrder ?? block.properties["column_ids"], table_block_column_header: block.properties["has_header"], table_block_row_header: block.properties["has_row_header"] } };
     if (block.type === "table_row")
-        return { ...base, properties: block.properties["cells"] };
+        return { ...base, properties: tableRowCells(block, columnOrder) };
     if (block.type === "column_list" || block.type === "transclusion_container")
         return { ...base, properties: {} };
     if (block.type === "column")
@@ -516,12 +558,13 @@ function parserBlockToNotionBlock(block, id, parentId, parentTable, spaceId, use
         return { ...base, properties: { title: block.rich_text }, ...(block.properties["format"] === undefined ? {} : { format: block.properties["format"] }) };
     return { ...base, properties: { title: block.rich_text } };
 }
-export function buildNotionCreateOperations(blocks, pageId, spaceId, userId, currentTime, createId = () => randomUUID()) {
+export function buildNotionCreateOperations(blocks, pageId, spaceId, userId, currentTime, createId = () => randomUUID(), initialTableColumnOrder) {
     const operations = [];
     const topLevelIds = [];
     const lastAtIndent = new Map();
     const lastChildByParent = new Map();
     let lastTableId = null;
+    let tableColumnOrder = initialTableColumnOrder;
     for (const block of blocks) {
         const blockId = formatBlockId(createId().replaceAll("-", ""));
         let parentId = pageId;
@@ -536,14 +579,16 @@ export function buildNotionCreateOperations(blocks, pageId, spaceId, userId, cur
         if (block.type !== "table_row" && block.indent === 0)
             topLevelIds.push(blockId);
         const parentTable = "block";
-        operations.push({ pointer: pointer(blockId, spaceId), path: [], command: "set", args: parserBlockToNotionBlock(block, blockId, parentId, parentTable, spaceId, userId, currentTime) });
+        operations.push({ pointer: pointer(blockId, spaceId), path: [], command: "set", args: parserBlockToNotionBlock(block, blockId, parentId, parentTable, spaceId, userId, currentTime, block.type === "table_row" ? tableColumnOrder : undefined) });
         const after = lastChildByParent.get(parentId);
         operations.push({ pointer: pointer(parentId, spaceId), path: ["content"], command: after === undefined ? "listBefore" : "listAfter", args: after === undefined ? { id: blockId } : { id: blockId, after } });
         lastChildByParent.set(parentId, blockId);
         if (["bulleted_list", "numbered_list", "to_do", "quote", "callout", "toggle", "header", "sub_header", "sub_sub_header", "table", "page", "column_list", "column", "transclusion_container"].includes(block.type))
             lastAtIndent.set(block.indent, blockId);
-        if (block.type === "table")
+        if (block.type === "table") {
             lastTableId = blockId;
+            tableColumnOrder = block.properties["column_ids"];
+        }
     }
     if (operations.length > 0)
         operations.push({ pointer: pointer(pageId, spaceId), path: ["last_edited_time"], command: "set", args: currentTime });
@@ -560,7 +605,7 @@ function canonicalBlock(value, columnOrder) {
     if (type === "table")
         return { type, column_count: object(value["format"])["table_block_column_order"].length };
     if (type === "table_row")
-        return { type, cells: columnOrder.map((column) => normalizeRichText(object(value["properties"])[column])) };
+        return { type, cells: columnOrder.map((column) => normalizeRichText(object(value["properties"])[column] ?? [])) };
     if (type === "image")
         return { type, source: object(value["properties"])["source"], alt_text: object(value["properties"])["alt_text"], caption: object(value["properties"])["caption"] ?? null };
     if (["divider", "column_list", "transclusion_container"].includes(type))
@@ -584,10 +629,14 @@ function canonicalParserBlock(block, columnOrder) {
         return { type: "to_do", title: normalizeRichText(block.rich_text), checked: [[block.properties["checked"] === true ? "Yes" : "No"]] };
     if (block.type === "table")
         return { type: "table", column_count: block.properties["column_ids"].length };
-    if (block.type === "table_row")
-        return { type: "table_row", cells: columnOrder.map((column) => normalizeRichText(object(block.properties["cells"])[column])) };
+    if (block.type === "table_row") {
+        const cells = tableRowCells(block, columnOrder);
+        return { type: "table_row", cells: columnOrder.map((column) => normalizeRichText(cells[column] ?? [])) };
+    }
     if (block.type === "image")
         return { type: "image", source: [[block.properties["source"]]], alt_text: [[block.properties["alt_text"]]], caption: block.properties["caption"] ?? null };
+    if (block.type === "page" || block.type === "equation")
+        return { type: block.type, title: normalizeRichText(block.rich_text) };
     if (block.type === "column")
         return { type: "column", column_ratio: object(block.properties["format"] ?? {})["column_ratio"] ?? null };
     if (block.type === "column_list" || block.type === "transclusion_container")
@@ -621,18 +670,21 @@ function localTree(blocks) {
     }
     return roots;
 }
-function outputNode(node, remoteNode, parentId, remote, currentTime) {
+function outputNode(node, remoteNode, parentId, remote, currentTime, columnOrder) {
     const id = remoteNode?.id ?? formatBlockId(randomUUID().replaceAll("-", ""));
-    return { id, block: parserBlockToNotionBlock(node.block, id, parentId, "block", remote.spaceId, remote.userId, currentTime), children: node.children.map((child, index) => outputNode(child, remoteNode?.children[index], id, remote, currentTime)) };
+    const block = parserBlockToNotionBlock(node.block, id, parentId, "block", remote.spaceId, remote.userId, currentTime, node.block.type === "table" ? tableColumnOrder(remoteNode?.block, node.block) : node.block.type === "table_row" ? columnOrder : undefined);
+    const nextColumnOrder = block["type"] === "table" ? object(block["format"])["table_block_column_order"] : columnOrder;
+    return { id, block, children: node.children.map((child, index) => outputNode(child, remoteNode?.children[index], id, remote, currentTime, nextColumnOrder)) };
 }
-function emitUpdates(remote, local, blockId, spaceId) {
+function emitUpdates(remote, local, blockId, spaceId, columnOrder) {
     const operations = [];
     const remoteType = remote["type"] === "text" && object(remote["format"] ?? {})["toggleable"] === true ? "toggle" : remote["type"];
     const localType = local.type === "toggle" ? "text" : local.type;
     const typeChanged = remoteType !== local.type;
     if (typeChanged)
         operations.push({ pointer: pointer(blockId, spaceId), path: ["type"], command: "set", args: localType });
-    const args = parserBlockToNotionBlock(local, blockId, remote["parent_id"] ?? "", "block", spaceId, "", 0);
+    const effectiveColumnOrder = local.type === "table" ? tableColumnOrder(remote, local) : columnOrder;
+    const args = parserBlockToNotionBlock(local, blockId, remote["parent_id"] ?? "", "block", spaceId, "", 0, local.type === "table" || local.type === "table_row" ? effectiveColumnOrder : undefined);
     const remoteProperties = object(remote["properties"] ?? {});
     const nextProperties = object(args["properties"] ?? {});
     if (typeChanged) {
@@ -659,8 +711,8 @@ function flattenLocalSubtree(node) {
     walk(node, 0);
     return blocks;
 }
-function buildNotionCreateSubtreeOperations(node, parentId, ambient) {
-    return buildNotionCreateOperations(flattenLocalSubtree(node), parentId, ambient.spaceId, ambient.userId, ambient.currentTime);
+function buildNotionCreateSubtreeOperations(node, parentId, ambient, columnOrder) {
+    return buildNotionCreateOperations(flattenLocalSubtree(node), parentId, ambient.spaceId, ambient.userId, ambient.currentTime, undefined, columnOrder);
 }
 function positionRootCreateOperations(operations, parentId, spaceId, previousId) {
     return operations.map((operation) => {
@@ -682,10 +734,10 @@ function deleteRemoteSubtreeOperations(node, parentId, spaceId) {
         { pointer: pointer(parentId, spaceId), path: ["content"], command: "listRemove", args: { id: node.id } },
     ];
 }
-function diffNotionChildLists(remoteParent, localChildren, ambient, summary, columnOrder) {
+function diffNotionChildLists(remoteParent, localChildren, ambient, summary, columnOrder, localParent) {
     const operations = [];
     const remoteChildren = [...remoteParent.children];
-    const nextColumnOrder = remoteParent.block["type"] === "table" ? object(remoteParent.block["format"])["table_block_column_order"] : columnOrder;
+    const nextColumnOrder = remoteParent.block["type"] === "table" ? tableColumnOrder(remoteParent.block, localParent) : columnOrder;
     const remoteHash = (index) => notionBlockContentHash(remoteChildren[index].block, nextColumnOrder);
     const localHash = (index) => notionBlockContentHash(localChildren[index].block, nextColumnOrder);
     let remoteIndex = 0;
@@ -695,7 +747,7 @@ function diffNotionChildLists(remoteParent, localChildren, ambient, summary, col
         const remoteNode = remoteChildren[remoteIndex];
         const localNode = localChildren[localIndex];
         if (remoteHash(remoteIndex) === localHash(localIndex)) {
-            operations.push(...diffNotionChildLists(remoteNode, localNode.children, ambient, summary, nextColumnOrder));
+            operations.push(...diffNotionChildLists(remoteNode, localNode.children, ambient, summary, nextColumnOrder, localNode.block));
             previousId = remoteNode.id;
             remoteIndex += 1;
             localIndex += 1;
@@ -712,7 +764,7 @@ function diffNotionChildLists(remoteParent, localChildren, ambient, summary, col
             continue;
         }
         if (localIndex + 1 < localChildren.length && remoteHash(remoteIndex) === localHash(localIndex + 1)) {
-            const built = buildNotionCreateSubtreeOperations(localNode, remoteParent.id, ambient);
+            const built = buildNotionCreateSubtreeOperations(localNode, remoteParent.id, ambient, nextColumnOrder);
             operations.push(...positionRootCreateOperations(built.operations, remoteParent.id, ambient.spaceId, previousId));
             summary.inserted += localSubtreeSize(localNode);
             previousId = built.topLevelIds[0];
@@ -726,8 +778,8 @@ function diffNotionChildLists(remoteParent, localChildren, ambient, summary, col
             continue;
         }
         const before = operations.length;
-        operations.push(...emitUpdates(remoteNode.block, localNode.block, remoteNode.id, ambient.spaceId));
-        operations.push(...diffNotionChildLists(remoteNode, localNode.children, ambient, summary, nextColumnOrder));
+        operations.push(...emitUpdates(remoteNode.block, localNode.block, remoteNode.id, ambient.spaceId, nextColumnOrder));
+        operations.push(...diffNotionChildLists(remoteNode, localNode.children, ambient, summary, nextColumnOrder, localNode.block));
         if (operations.length > before)
             summary.updated += 1;
         previousId = remoteNode.id;
@@ -736,7 +788,7 @@ function diffNotionChildLists(remoteParent, localChildren, ambient, summary, col
     }
     while (localIndex < localChildren.length) {
         const localNode = localChildren[localIndex];
-        const built = buildNotionCreateSubtreeOperations(localNode, remoteParent.id, ambient);
+        const built = buildNotionCreateSubtreeOperations(localNode, remoteParent.id, ambient, nextColumnOrder);
         operations.push(...positionRootCreateOperations(built.operations, remoteParent.id, ambient.spaceId, previousId ?? remoteChildren[remoteChildren.length - 1]?.id));
         summary.inserted += localSubtreeSize(localNode);
         previousId = built.topLevelIds[0];
@@ -770,21 +822,21 @@ function renderNode(tree, indent, parentType = "") {
     }
     if (type === "bulleted_list") {
         const lines = title.split("\n");
-        return [`${prefix}- ${lines[0]}`, ...lines.slice(1).map((line) => `${prefix}  ${line}`), ...tree.children.flatMap((child) => renderNode(child, indent + 1, type))];
+        return [`${prefix}- ${lines[0]}`, ...lines.slice(1).map((line) => `${prefix}  ${escapeBlockMarkdownLine(line)}`), ...tree.children.flatMap((child) => renderNode(child, indent + 1, type))];
     }
     if (type === "numbered_list") {
         const lines = title.split("\n");
-        return [`${prefix}1. ${lines[0]}`, ...lines.slice(1).map((line) => `${prefix}   ${line}`), ...tree.children.flatMap((child) => renderNode(child, indent + 1, type))];
+        return [`${prefix}1. ${lines[0]}`, ...lines.slice(1).map((line) => `${prefix}   ${escapeBlockMarkdownLine(line)}`), ...tree.children.flatMap((child) => renderNode(child, indent + 1, type))];
     }
     if (type === "to_do") {
         const checked = richTextText(properties["checked"] ?? [["No"]]) === "Yes";
         if (title === "")
             return [`${prefix}:::to-do`, `${prefix}:::checked ${JSON.stringify(checked)}`, prefix, ...tree.children.flatMap((child) => renderNode(child, indent + 1, type)), `${prefix}:::`];
         const lines = title.split("\n");
-        return [`${prefix}- [${checked ? "x" : " "}] ${lines[0]}`, ...lines.slice(1).map((line) => `${prefix}  ${line}`), ...tree.children.flatMap((child) => renderNode(child, indent + 1, type))];
+        return [`${prefix}- [${checked ? "x" : " "}] ${lines[0]}`, ...lines.slice(1).map((line) => `${prefix}  ${escapeBlockMarkdownLine(line)}`), ...tree.children.flatMap((child) => renderNode(child, indent + 1, type))];
     }
     if (type === "quote")
-        return [`${prefix}> ${title}`, ...tree.children.flatMap((child) => renderNode(child, indent + 1, type))];
+        return [...title.split("\n").map((line) => `${prefix}> ${escapeBlockMarkdownLine(line)}`), ...tree.children.flatMap((child) => renderNode(child, indent + 1, type))];
     if (type === "divider")
         return [`${prefix}---`];
     if (type === "code") {
@@ -823,7 +875,7 @@ function renderNode(tree, indent, parentType = "") {
         return [`${prefix}:::text`, `${prefix}:::`];
     if (["bulleted_list", "numbered_list", "to_do"].includes(parentType))
         return [`${prefix}:::text`, ...title.split("\n").map((line) => `${prefix}${line}`), `${prefix}:::`];
-    return [`${prefix}${title}`];
+    return title.split("\n").map((line) => `${prefix}${escapeBlockMarkdownLine(line)}`);
 }
 export function renderNotionTreeToMarkdown(tree, mentions) {
     const title = renderRichText(object(tree.block["properties"])["title"]);
@@ -851,9 +903,9 @@ async function fetchTree(runtime, url, source) {
     await runtime.http.request(url, { headers: { cookie } });
     const spaces = await notionPost(runtime, "getSpaces", cookie, {}, {});
     const spaceView = object(object(spaces[userId])["space_view"]);
-    const spaceId = object(spaceView[Object.keys(spaceView)[0]])["spaceId"];
+    const initialSpaceId = object(spaceView[Object.keys(spaceView)[0]])["spaceId"];
     const pageId = formatBlockId(source.identifier);
-    const headers = { "x-notion-active-user-header": userId, "x-notion-space-id": spaceId, referer: url, ...(csrf === undefined ? {} : { "x-csrf-token": csrf }) };
+    let headers = { "x-notion-active-user-header": userId, "x-notion-space-id": initialSpaceId, referer: url, ...(csrf === undefined ? {} : { "x-csrf-token": csrf }) };
     const blocks = new Map();
     let stack = [];
     let chunkNumber = 0;
@@ -865,6 +917,8 @@ async function fetchTree(runtime, url, source) {
         stack = cursors.length === 0 ? [] : cursors[0]["stack"];
         chunkNumber += 1;
     } while (stack.length > 0);
+    const spaceId = blocks.get(pageId)["space_id"];
+    headers = { ...headers, "x-notion-space-id": spaceId };
     while (true) {
         const missing = new Set();
         const pending = [pageId];
@@ -918,6 +972,8 @@ export async function uploadNotionDocument(runtime, markdown, _markdownPath) {
     const csrf = cookies.find((value) => value.name === "csrf")?.value;
     const spaces = await notionPost(runtime, "getSpaces", cookie, {}, {});
     const spaceView = object(object(spaces[userId])["space_view"]);
+    if (Object.keys(spaceView).length !== 1)
+        throw new Error("Notion upload requires an explicit target workspace.");
     const spaceId = object(spaceView[Object.keys(spaceView)[0]])["spaceId"];
     const pageId = randomUUID();
     const compactPageId = pageId.replaceAll("-", "");
@@ -964,8 +1020,7 @@ function splitTitle(markdown) {
         return { title: first.replace(/^#+\s+/, "").trim(), body: lines.slice(1).join("\n") };
     return { title: "", body: markdown };
 }
-export async function synchronizeNotionDocument(runtime, url, base, markdown, _markdownPath) {
-    const source = { service: "notion", identifier: /([a-f0-9]{32})/.exec(url)[1], type: "document" };
+export async function synchronizeNotionDocument(runtime, url, source, base, markdown, _markdownPath) {
     const remote = await fetchTree(runtime, url, source);
     const baseObject = object(base);
     const mentions = baseUserMentions(baseObject);
@@ -980,10 +1035,6 @@ export async function synchronizeNotionDocument(runtime, url, base, markdown, _m
         const remoteTitleChanged = baseSplit.title !== currentSplit.title;
         const localBodyChanged = baseSplit.body !== split.body;
         const remoteBodyChanged = baseSplit.body !== currentSplit.body;
-        if (localTitleChanged && remoteTitleChanged && split.title !== currentSplit.title)
-            throw new Error("Markdown and Notion changed since last sync");
-        if (localBodyChanged && remoteBodyChanged && split.body !== currentSplit.body)
-            throw new Error("Markdown and Notion changed since last sync");
         if ((localTitleChanged || localBodyChanged) && (remoteTitleChanged || remoteBodyChanged)) {
             split = { title: localTitleChanged ? split.title : currentSplit.title, body: localBodyChanged ? split.body : currentSplit.body };
             fieldMerged = true;