@im-nobsidian/core 0.1.2 → 0.1.3

package/dist/index.d.ts

@@ -340,6 +340,7 @@ declare class StateDB {
     updateStatus(id: string, status: SyncStatus): void;
     updateHash(id: string, hash: string, snapshot?: Buffer | null): void;
     setNotionLastEdited(id: string, lastEdited: string): void;
+    setNotionParentId(id: string, parentId: string): void;
     delete(id: string): void;
     resolveWikilink(text: string): WikilinkEntry | null;
     resolvePageId(pageId: string): WikilinkEntry | null;
@@ -394,6 +395,12 @@ declare class NotionClient {
     updatePageProperties(pageId: string, properties: Record<string, unknown>): Promise<PageObjectResponse>;
     getPageMarkdown(pageId: string): Promise<PageMarkdownResponse>;
     replacePageMarkdown(pageId: string, markdown: string): Promise<PageMarkdownResponse>;
+    updatePageMarkdownPartial(pageId: string, patches: Array<{
+        oldStr: string;
+        newStr: string;
+        replaceAll?: boolean;
+    }>): Promise<PageMarkdownResponse>;
+    movePage(pageId: string, newParentId: string, newParentType: "page" | "database"): Promise<PageObjectResponse>;
     getDatabaseSchema(databaseId: string): Promise<Record<string, {
         id: string;
         type: string;
@@ -607,6 +614,7 @@ declare class SyncOrchestrator {
     private pushCreate;
     private pushUpdate;
     private pushDelete;
+    private pushMove;
     private detectRemoteChanges;
     private pullCreate;
     private pullUpdate;
@@ -617,6 +625,7 @@ declare class SyncOrchestrator {
     private resolveParentPath;
     private pushCreatePage;
     private pushUpdatePage;
+    private computePatches;
     private fetchPageMarkdown;
     private extractParentId;
     private cleanupInterruptedSync;

package/dist/index.js

@@ -371,6 +371,11 @@ var StateDB = class _StateDB {
       "UPDATE sync_state SET notion_last_edited = ?, updated_at = datetime('now') WHERE id = ?"
     ).run(lastEdited, id);
   }
+  setNotionParentId(id, parentId) {
+    this.db.prepare(
+      "UPDATE sync_state SET notion_parent_id = ?, updated_at = datetime('now') WHERE id = ?"
+    ).run(parentId, id);
+  }
   delete(id) {
     this.db.prepare("DELETE FROM sync_state WHERE id = ?").run(id);
   }
@@ -568,6 +573,15 @@ var PropertyMapper = class {
         });
         return { files: filesArr };
       }
+      case "created_time":
+      case "last_edited_time":
+      case "created_by":
+      case "last_edited_by":
+      case "formula":
+      case "rollup":
+      case "unique_id":
+      case "verification":
+        return null;
       default:
         return { rich_text: [{ text: { content: String(value) } }] };
     }
@@ -760,6 +774,32 @@ var NotionClient = class {
       })
     );
   }
+  async updatePageMarkdownPartial(pageId, patches) {
+    return this.withRateLimit(
+      () => this.client.pages.updateMarkdown({
+        page_id: pageId,
+        type: "update_content",
+        update_content: {
+          content_updates: patches.map((p) => ({
+            old_str: p.oldStr,
+            new_str: p.newStr,
+            replace_all_matches: p.replaceAll ?? false
+          })),
+          allow_deleting_content: true
+        }
+      })
+    );
+  }
+  // ─── Page Move ───
+  async movePage(pageId, newParentId, newParentType) {
+    const parent = newParentType === "database" ? { database_id: newParentId } : { page_id: newParentId };
+    return this.withRateLimit(
+      () => this.client.pages.update({
+        page_id: pageId,
+        parent
+      })
+    );
+  }
   // ─── Database / DataSource ───
   async getDatabaseSchema(databaseId) {
     const db = await this.withRateLimit(
@@ -1854,7 +1894,10 @@ var FrontmatterGenerator = class {
 function normalizeProperties(props) {
   const result = {};
   for (const [key, value] of Object.entries(props)) {
-    result[key] = normalizeValue(value);
+    const normalized = normalizeValue(value);
+    if (normalized !== void 0) {
+      result[key] = normalized;
+    }
   }
   return result;
 }
@@ -1862,6 +1905,10 @@ function normalizeValue(value) {
   if (typeof value === "string") {
     return normalizeDate(value);
   }
+  if (Array.isArray(value)) {
+    if (value.length === 0) return void 0;
+    return value;
+  }
   if (typeof value === "object" && value !== null && "start" in value) {
     const dateObj = value;
     const normalized = {
@@ -1872,12 +1919,10 @@ function normalizeValue(value) {
   }
   return value;
 }
+var MIDNIGHT_RE = /T00:00:00(?:\.\d{3})?(?:Z|[+-]\d{2}:\d{2})/;
 function normalizeDate(dateStr) {
   if (typeof dateStr !== "string") return dateStr;
-  if (dateStr.match(/T00:00:00\.000[Z+]/)) {
-    return dateStr.split("T")[0] ?? dateStr;
-  }
-  if (dateStr.match(/T00:00:00[Z+]/)) {
+  if (MIDNIGHT_RE.test(dateStr)) {
     return dateStr.split("T")[0] ?? dateStr;
   }
   return dateStr;
@@ -2855,7 +2900,13 @@ var NOTION_TOGGLE_RE = /<details>\s*<summary>([\s\S]*?)<\/summary>([\s\S]*?)<\/d
 var NOTION_PAGE_MENTION_RE = /<mention-page id="([^"]+)">([\s\S]*?)<\/mention-page>/g;
 var NOTION_USER_MENTION_RE = /<mention-user id="[^"]*">([^<]*)<\/mention-user>/g;
 var NOTION_DATE_MENTION_RE = /<mention-date start="([^"]*)"(?: end="([^"]*)")?[^>]*\/>/g;
-var NOTION_UNKNOWN_RE = /<unknown id="[^"]*"[^>]*\/>/g;
+var NOTION_UNKNOWN_RE = /<unknown id="([^"]*)"([^>]*)\/>/g;
+var NOTION_AUDIO_RE = /<audio src="([^"]*)">([\s\S]*?)<\/audio>/g;
+var NOTION_VIDEO_RE = /<video src="([^"]*)">([\s\S]*?)<\/video>/g;
+var NOTION_PDF_RE = /<pdf src="([^"]*)">([\s\S]*?)<\/pdf>/g;
+var NOTION_FILE_RE = /<file src="([^"]*)">([\s\S]*?)<\/file>/g;
+var NOTION_TAB_RE = /<tab title="([^"]*)">([\s\S]*?)<\/tab>/g;
+var NOTION_UNDERLINE_RE = /<span underline="true">([\s\S]*?)<\/span>/g;
 var TOGGLE_START2 = "%%im-nobsidian:toggle:start%%";
 var TOGGLE_END2 = "%%im-nobsidian:toggle:end%%";
 function notionEnhancedToObsidian(enhanced) {
@@ -2866,10 +2917,13 @@ function notionEnhancedToObsidian(enhanced) {
   result = convertPageLinks(result);
   result = convertUserMentions(result);
   result = convertDateMentions(result);
-  result = removeUnknownBlocks(result);
+  result = convertMediaTags(result);
+  result = convertTabBlocks(result);
+  result = preserveUnknownBlocks(result);
   result = convertNotionMath(result);
   result = convertNotionTables(result);
   result = convertColorSpans(result);
+  result = convertUnderlineSpans(result);
   result = removeEmptyBlocks(result);
   result = unescapePipes(result);
   return result;
@@ -2877,7 +2931,12 @@ function notionEnhancedToObsidian(enhanced) {
 function obsidianToNotionEnhanced(obsidian) {
   let result = obsidian;
   result = convertTogglesToHtml(result);
+  result = restoreTabBlocks(result);
   result = convertObsidianCallouts(result);
+  result = restoreMediaTags(result);
+  result = restoreUnknownBlocks(result);
+  result = restoreColorSpans(result);
+  result = restoreUnderlineSpans(result);
   return result;
 }
 function convertToggles(content) {
@@ -2922,8 +2981,46 @@ function convertDateMentions(content) {
     return end ? `${start} \u2192 ${end}` : start;
   });
 }
-function removeUnknownBlocks(content) {
-  return content.replace(NOTION_UNKNOWN_RE, "");
+function preserveUnknownBlocks(content) {
+  return content.replace(NOTION_UNKNOWN_RE, (_match, id, attrs) => {
+    const typeMatch = /type="([^"]*)"/.exec(attrs);
+    const altMatch = /alt="([^"]*)"/.exec(attrs);
+    const blockType = altMatch?.[1] ?? typeMatch?.[1] ?? "unknown";
+    return `%%im-nobsidian:unknown:id=${id}&type=${blockType}%%`;
+  });
+}
+function convertMediaTags(content) {
+  let result = content;
+  result = result.replace(NOTION_AUDIO_RE, (_match, src, caption) => {
+    const cap = caption.trim();
+    return cap ? `[\u{1F50A} ${cap}](${src})` : `[\u{1F50A} audio](${src})`;
+  });
+  result = result.replace(NOTION_VIDEO_RE, (_match, src, caption) => {
+    const cap = caption.trim();
+    return cap ? `[\u{1F3AC} ${cap}](${src})` : `[\u{1F3AC} video](${src})`;
+  });
+  result = result.replace(NOTION_PDF_RE, (_match, src, caption) => {
+    const cap = caption.trim();
+    return cap ? `[\u{1F4C4} ${cap}](${src})` : `[\u{1F4C4} pdf](${src})`;
+  });
+  result = result.replace(NOTION_FILE_RE, (_match, src, caption) => {
+    const cap = caption.trim();
+    return cap ? `[\u{1F4CE} ${cap}](${src})` : `[\u{1F4CE} file](${src})`;
+  });
+  return result;
+}
+function convertTabBlocks(content) {
+  return content.replace(NOTION_TAB_RE, (_match, title, body) => {
+    const trimmed = body.trim();
+    const indented = trimmed.split("\n").map((line) => `> ${line}`).join("\n");
+    return `> [!tab] ${title}
+${indented}`;
+  });
+}
+function convertUnderlineSpans(content) {
+  return content.replace(NOTION_UNDERLINE_RE, (_match, text) => {
+    return `%%im-nobsidian:underline%%${text}%%/underline%%`;
+  });
 }
 function convertTogglesToHtml(content) {
   const startRe = new RegExp(escapeRegex3(TOGGLE_START2), "g");
@@ -3033,7 +3130,10 @@ function convertPageLinks(content) {
   });
 }
 function convertColorSpans(content) {
-  return content.replace(NOTION_COLOR_SPAN_RE, (_match, _color, text) => text);
+  return content.replace(
+    NOTION_COLOR_SPAN_RE,
+    (_match, color, text) => `%%im-nobsidian:color:${color}%%${text}%%/color%%`
+  );
 }
 function removeEmptyBlocks(content) {
   return content.replace(NOTION_EMPTY_BLOCK_RE, "\n");
@@ -3080,6 +3180,51 @@ function convertNotionTables(content) {
     return lines.join("\n");
   });
 }
+var OBSIDIAN_MEDIA_AUDIO_RE = /\[🔊\s*([^\]]*)\]\(([^)]+)\)/g;
+var OBSIDIAN_MEDIA_VIDEO_RE = /\[🎬\s*([^\]]*)\]\(([^)]+)\)/g;
+var OBSIDIAN_MEDIA_PDF_RE = /\[📄\s*([^\]]*)\]\(([^)]+)\)/g;
+var OBSIDIAN_MEDIA_FILE_RE = /\[📎\s*([^\]]*)\]\(([^)]+)\)/g;
+function restoreMediaTags(content) {
+  let result = content;
+  result = result.replace(OBSIDIAN_MEDIA_AUDIO_RE, (_match, caption, src) => {
+    return `<audio src="${src}">${caption}</audio>`;
+  });
+  result = result.replace(OBSIDIAN_MEDIA_VIDEO_RE, (_match, caption, src) => {
+    return `<video src="${src}">${caption}</video>`;
+  });
+  result = result.replace(OBSIDIAN_MEDIA_PDF_RE, (_match, caption, src) => {
+    return `<pdf src="${src}">${caption}</pdf>`;
+  });
+  result = result.replace(OBSIDIAN_MEDIA_FILE_RE, (_match, caption, src) => {
+    return `<file src="${src}">${caption}</file>`;
+  });
+  return result;
+}
+var OBSIDIAN_TAB_RE = /^> \[!tab\]\s*(.+)\n((?:> .*\n?)*)/gm;
+function restoreTabBlocks(content) {
+  return content.replace(OBSIDIAN_TAB_RE, (_match, title, body) => {
+    const unquoted = body.split("\n").map((line) => line.replace(/^> /, "")).join("\n").trim();
+    return `<tab title="${title}">${unquoted}</tab>`;
+  });
+}
+var OBSIDIAN_UNKNOWN_RE = /%%im-nobsidian:unknown:id=([^&]+)&type=([^%]+)%%/g;
+function restoreUnknownBlocks(content) {
+  return content.replace(OBSIDIAN_UNKNOWN_RE, (_match, id, type) => {
+    return `<unknown id="${id}" type="${type}"/>`;
+  });
+}
+var OBSIDIAN_COLOR_RE = /%%im-nobsidian:color:([^%]+)%%([\s\S]*?)%%\/color%%/g;
+function restoreColorSpans(content) {
+  return content.replace(OBSIDIAN_COLOR_RE, (_match, color, text) => {
+    return `<span color="${color}">${text}</span>`;
+  });
+}
+var OBSIDIAN_UNDERLINE_RE = /%%im-nobsidian:underline%%([\s\S]*?)%%\/underline%%/g;
+function restoreUnderlineSpans(content) {
+  return content.replace(OBSIDIAN_UNDERLINE_RE, (_match, text) => {
+    return `<span underline="true">${text}</span>`;
+  });
+}
 function unescapePipes(content) {
   const lines = content.split("\n");
   const result = [];
@@ -3189,10 +3334,13 @@ var SyncOrchestrator = class {
             created++;
             break;
           case "modified":
-          case "moved":
             await this.pushUpdate(change.path);
             updated++;
             break;
+          case "moved":
+            await this.pushMove(change.path);
+            updated++;
+            break;
           case "deleted":
             await this.pushDelete(change.path);
             deleted++;
@@ -3369,13 +3517,20 @@ var SyncOrchestrator = class {
         localContent = await this.vaultFs.readFile(record.obsidianPath);
       } catch {
       }
+      let remoteContent = "";
+      if (record.notionPageId) {
+        try {
+          remoteContent = await this.fetchPageMarkdown(record.notionPageId);
+        } catch {
+        }
+      }
       conflicts.push({
         syncRecord: record,
         localChange,
         remoteChange,
         baseContent: record.baseSnapshot?.toString("utf-8") ?? null,
         localContent,
-        remoteContent: ""
+        remoteContent
       });
     }
     return conflicts;
@@ -3465,7 +3620,7 @@ var SyncOrchestrator = class {
       filePath: path,
       parentMode: this.config.notion.parentMode
     });
-    await this.pushUpdatePage(record.notionPageId, conversionResult.content);
+    await this.pushUpdatePage(record.notionPageId, conversionResult.content, record.baseSnapshot);
     await this.imageHandler.uploadAndAppendImages(record.notionPageId, conversionResult.images);
     let propsToUpdate = conversionResult.properties;
     if (this.isDatabaseMode && propsToUpdate && Object.keys(propsToUpdate).length > 0) {
@@ -3503,6 +3658,22 @@ var SyncOrchestrator = class {
       this.stateDb.updateStatus(record.id, "pending");
     }
   }
+  async pushMove(path) {
+    const record = this.stateDb.getByPath(path);
+    if (!record?.notionPageId) return;
+    const newParentId = await this.resolveNotionParent(path);
+    const currentParentId = record.notionParentId;
+    if (currentParentId && !notionIdsEqual(newParentId, currentParentId)) {
+      try {
+        const parentType = this.isDatabaseMode ? "database" : "page";
+        await this.notionClient.movePage(record.notionPageId, newParentId, parentType);
+        this.stateDb.setNotionParentId(record.id, newParentId);
+      } catch {
+        getLogger().warn(`[Im-Nobsidian] Move API \uC2E4\uD328 \u2014 "${path}" \uB0B4\uC6A9\uB9CC \uC5C5\uB370\uC774\uD2B8\uD569\uB2C8\uB2E4`);
+      }
+    }
+    await this.pushUpdate(path);
+  }
   async detectRemoteChanges() {
     const changes = [];
     const lastPull = this.stateDb.getMeta("last_pull_at");
@@ -3838,10 +4009,18 @@ var SyncOrchestrator = class {
     }
     return page;
   }
-  async pushUpdatePage(pageId, markdownContent) {
+  async pushUpdatePage(pageId, markdownContent, baseSnapshot) {
     if (this.config.conversion.preferMarkdownApi !== false) {
       try {
         const enhanced = obsidianToNotionEnhanced(markdownContent);
+        if (baseSnapshot) {
+          const baseEnhanced = obsidianToNotionEnhanced(baseSnapshot.toString("utf-8"));
+          const patches = this.computePatches(baseEnhanced, enhanced);
+          if (patches.length > 0 && patches.length <= 20) {
+            await this.notionClient.updatePageMarkdownPartial(pageId, patches);
+            return;
+          }
+        }
         await this.notionClient.replacePageMarkdown(pageId, enhanced);
         return;
       } catch {
@@ -3864,6 +4043,51 @@ var SyncOrchestrator = class {
       })
     );
   }
+  computePatches(oldContent, newContent) {
+    const oldLines = oldContent.split("\n");
+    const newLines = newContent.split("\n");
+    const patches = [];
+    let i = 0;
+    let j = 0;
+    while (i < oldLines.length && j < newLines.length) {
+      if (oldLines[i] === newLines[j]) {
+        i++;
+        j++;
+        continue;
+      }
+      let oldEnd = i + 1;
+      let newEnd = j + 1;
+      const lookahead = Math.min(10, oldLines.length - i, newLines.length - j);
+      for (let k = 1; k <= lookahead; k++) {
+        if (i + k < oldLines.length && newLines[j] === oldLines[i + k]) {
+          oldEnd = i + k;
+          newEnd = j;
+          break;
+        }
+        if (j + k < newLines.length && oldLines[i] === newLines[j + k]) {
+          oldEnd = i;
+          newEnd = j + k;
+          break;
+        }
+        oldEnd = i + k;
+        newEnd = j + k;
+      }
+      const oldChunk = oldLines.slice(i, oldEnd).join("\n");
+      const newChunk = newLines.slice(j, newEnd).join("\n");
+      if (oldChunk || newChunk) {
+        patches.push({ oldStr: oldChunk, newStr: newChunk });
+      }
+      i = oldEnd;
+      j = newEnd;
+    }
+    if (i < oldLines.length || j < newLines.length) {
+      patches.push({
+        oldStr: oldLines.slice(i).join("\n"),
+        newStr: newLines.slice(j).join("\n")
+      });
+    }
+    return patches;
+  }
   async fetchPageMarkdown(pageId) {
     if (this.config.conversion.preferMarkdownApi !== false) {
       try {