@moxn/kb-migrate 0.4.2 → 0.4.3

package/dist/sources/notion-blocks.js

@@ -429,12 +429,9 @@ export function richTextToMarkdown(richText) {
             text = '*' + text + '*';
         if (rt.annotations.strikethrough)
             text = '~~' + text + '~~';
-        // Apply link
-        if (rt.href) {
-            text = `[${text}](${rt.href})`;
-        }
-        else if (rt.type === 'mention' && rt.mention) {
-            // Handle mention types
+        // Handle mentions BEFORE href — Notion sets href on mentions too
+        // (as a web URL), but we want notion:// protocol for resolution
+        if (rt.type === 'mention' && rt.mention) {
             if (rt.mention.type === 'user' && rt.mention.user?.name) {
                 text = `@${rt.mention.user.name}`;
             }
@@ -450,6 +447,9 @@ export function richTextToMarkdown(richText) {
                     text += ` → ${rt.mention.date.end}`;
             }
         }
+        else if (rt.href) {
+            text = `[${text}](${rt.href})`;
+        }
         else if (rt.type === 'equation' && rt.equation) {
             text = `$${rt.equation.expression}$`;
         }

package/dist/sources/notion-blocks.test.js

@@ -45,8 +45,8 @@ describe('richTextToMarkdown', () => {
             const result = richTextToMarkdown([rt]);
             expect(result).toBe('[My Database](notion://abc123de-f456-abc1-23de-f456abc123de)');
         });
-        it('renders database mention with href using the href (href takes precedence)', () => {
-            // When href is set on the rich text, line 641 handles it BEFORE the mention check
+        it('renders database mention with href using notion:// (mention takes precedence over href)', () => {
+            // Mentions should always use notion:// protocol, even when href is set
             const rt = {
                 type: 'mention',
                 plain_text: 'My Database',
@@ -65,8 +65,7 @@ describe('richTextToMarkdown', () => {
                 },
             };
             const result = richTextToMarkdown([rt]);
-            // href takes precedence — produces a notion.so link (resolved in post-processing)
-            expect(result).toBe('[My Database](https://www.notion.so/workspace/abc123de-f456-abc1-23de-f456abc123de)');
+            expect(result).toBe('[My Database](notion://abc123de-f456-abc1-23de-f456abc123de)');
         });
     });
     describe('page mentions', () => {
@@ -91,7 +90,7 @@ describe('richTextToMarkdown', () => {
             const result = richTextToMarkdown([rt]);
             expect(result).toBe('[My Page](notion://abc123de-f456-abc1-23de-f456abc123de)');
         });
-        it('renders page mention with href using the href', () => {
+        it('renders page mention with href using notion:// (mention takes precedence over href)', () => {
             const rt = {
                 type: 'mention',
                 plain_text: 'My Page',
@@ -110,7 +109,7 @@ describe('richTextToMarkdown', () => {
                 },
             };
             const result = richTextToMarkdown([rt]);
-            expect(result).toBe('[My Page](https://www.notion.so/workspace/abc123de-f456-abc1-23de-f456abc123de)');
+            expect(result).toBe('[My Page](notion://abc123de-f456-abc1-23de-f456abc123de)');
         });
     });
     describe('other mention types preserved', () => {

package/dist/sources/notion-references.js

@@ -18,6 +18,9 @@ const NOTION_PROTOCOL_RE = /\[([^\]]*)\]\(notion:\/\/([a-f0-9-]{32,36})\)/g;
 const NOTION_WEB_URL_RE = /\[([^\]]*)\]\(https?:\/\/(?:www\.)?notion\.so\/(?:[a-zA-Z0-9_-]+\/)*([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})(?:[?#][^)]*)?(?:\))/g;
 // Fallback for IDs without dashes embedded in slug URLs (e.g., ...Page-Title-abc123def456...)
 const NOTION_WEB_URL_SLUG_RE = /\[([^\]]*)\]\(https?:\/\/(?:www\.)?notion\.so\/(?:[a-zA-Z0-9_-]+\/)*[a-zA-Z0-9-]+-([a-f0-9]{32})(?:[?#][^)]*)?\)/g;
+// Bare 32-char hex on notion.so (e.g., https://www.notion.so/3004bf42cfeb818ebe8fe2f4befdad52)
+// Catches mention hrefs that leak through as web URLs
+const NOTION_WEB_URL_BARE_RE = /\[([^\]]*)\]\(https?:\/\/(?:www\.)?notion\.so\/(?:[a-zA-Z0-9_-]+\/)*([a-f0-9]{32})(?:[?#][^)]*)?\)/g;
 // 3. Unresolved placeholders from link_to_page conversion
 const LINK_PLACEHOLDER_RE = /\*\(Link to Notion page: ([a-f0-9-]{32,36})\)\*/g;
 // 4. Relation property markers
@@ -87,6 +90,21 @@ export function resolveNotionReferences(sections, mapping) {
                 }
                 return `[${displayText}](notion://${nid})`;
             });
+            // Pass 3b: Bare 32-char hex Notion URLs (safety net for mention hrefs)
+            text = text.replace(NOTION_WEB_URL_BARE_RE, (_match, displayText, rawId) => {
+                const nid = normalizeId(rawId);
+                const kbPath = mapping.notionIdToKbPath.get(nid);
+                if (kbPath) {
+                    references.push({
+                        sectionIndex,
+                        targetNotionId: nid,
+                        targetKbPath: kbPath,
+                        displayText: displayText || kbPath,
+                    });
+                    return `[${displayText || kbPath}](${kbPath})`;
+                }
+                return `[${displayText}](notion://${nid})`;
+            });
             // Pass 4: Unresolved link_to_page placeholders
             text = text.replace(LINK_PLACEHOLDER_RE, (_match, rawId) => {
                 const nid = normalizeId(rawId);

package/dist/sources/notion-references.test.js

@@ -120,6 +120,24 @@ describe('resolveNotionReferences', () => {
             const { sections: resolved } = resolveNotionReferences(sections, m);
             expect(getText(resolved[0])).toBe('See [link](/docs/my-page)');
         });
+        it('resolves bare 32-char hex Notion URLs (no slug prefix)', () => {
+            const sections = [
+                textSection('Intro', 'See [Dev Setup](https://www.notion.so/3004bf42cfeb818ebe8fe2f4befdad52)'),
+            ];
+            const m = mapping({ '3004bf42cfeb818ebe8fe2f4befdad52': '/docs/dev-setup' });
+            const { sections: resolved, references } = resolveNotionReferences(sections, m);
+            expect(getText(resolved[0])).toBe('See [Dev Setup](/docs/dev-setup)');
+            expect(references).toHaveLength(1);
+            expect(references[0].targetNotionId).toBe('3004bf42cfeb818ebe8fe2f4befdad52');
+        });
+        it('normalizes unresolved bare hex Notion URLs to notion://', () => {
+            const sections = [
+                textSection('Intro', 'See [page](https://www.notion.so/aabbccdd11223344aabbccdd11223344)'),
+            ];
+            const m = mapping({});
+            const { sections: resolved } = resolveNotionReferences(sections, m);
+            expect(getText(resolved[0])).toBe('See [page](notion://aabbccdd11223344aabbccdd11223344)');
+        });
     });
     describe('link_to_page placeholders', () => {
         it('resolves placeholders to KB path links', () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moxn/kb-migrate",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "Migration tool for importing documents into Moxn Knowledge Base from local files, Notion, Google Docs, and more",
   "type": "module",
   "main": "dist/index.js",