chore: refactor map image and map page urls

Author: transitive-bullshit

packages/react-notion-x/src/map-image-url.ts

@@ -0,0 +1,60 @@
+import { Block } from 'notion-types'
+
+export const defaultMapImageUrl = (
+  url: string,
+  block: Block
+): string | null => {
+  if (!url) {
+    return null
+  }
+
+  if (url.startsWith('data:')) {
+    return url
+  }
+
+  // more recent versions of notion don't proxy unsplash images
+  if (url.startsWith('https://images.unsplash.com')) {
+    return url
+  }
+
+  try {
+    const u = new URL(url)
+
+    if (
+      u.pathname.startsWith('/secure.notion-static.com') &&
+      u.hostname.endsWith('.amazonaws.com')
+    ) {
+      if (
+        u.searchParams.has('X-Amz-Credential') &&
+        u.searchParams.has('X-Amz-Signature') &&
+        u.searchParams.has('X-Amz-Algorithm')
+      ) {
+        // if the URL is already signed, then use it as-is
+        return url
+      }
+    }
+  } catch {
+    // ignore invalid urls
+  }
+
+  if (url.startsWith('/images')) {
+    url = `https://www.notion.so${url}`
+  }
+
+  url = `https://www.notion.so${
+    url.startsWith('/image') ? url : `/image/${encodeURIComponent(url)}`
+  }`
+
+  const notionImageUrlV2 = new URL(url)
+  let table = block.parent_table === 'space' ? 'block' : block.parent_table
+  if (table === 'collection') {
+    table = 'block'
+  }
+  notionImageUrlV2.searchParams.set('table', table)
+  notionImageUrlV2.searchParams.set('id', block.id)
+  notionImageUrlV2.searchParams.set('cache', 'v2')
+
+  url = notionImageUrlV2.toString()
+
+  return url
+}

packages/react-notion-x/src/map-page-url.ts

@@ -0,0 +1,9 @@
+export const defaultMapPageUrl = (rootPageId?: string) => (pageId: string) => {
+  pageId = (pageId || '').replace(/-/g, '')
+
+  if (rootPageId && pageId === rootPageId) {
+    return '/'
+  } else {
+    return `/${pageId}`
+  }
+}

packages/react-notion-x/src/utils.ts

@@ -1,73 +1,8 @@
-import { Block, BlockMap } from 'notion-types'
-import { isUrl, formatDate, formatNotionDateTime } from 'notion-utils'
+import { BlockMap } from 'notion-types'
 
-export { isUrl, formatDate, formatNotionDateTime }
-
-export const defaultMapImageUrl = (url: string, block: Block) => {
-  if (!url) {
-    return null
-  }
-
-  if (url.startsWith('data:')) {
-    return url
-  }
-
-  // more recent versions of notion don't proxy unsplash images
-  if (url.startsWith('https://images.unsplash.com')) {
-    return url
-  }
-
-  try {
-    const u = new URL(url)
-
-    if (
-      u.pathname.startsWith('/secure.notion-static.com') &&
-      u.hostname.endsWith('.amazonaws.com')
-    ) {
-      if (
-        u.searchParams.has('X-Amz-Credential') &&
-        u.searchParams.has('X-Amz-Signature') &&
-        u.searchParams.has('X-Amz-Algorithm')
-      ) {
-        // if the URL is already signed, then use it as-is
-        return url
-      }
-    }
-  } catch {
-    // ignore invalid urls
-  }
-
-  if (url.startsWith('/images')) {
-    url = `https://www.notion.so${url}`
-  }
-
-  url = `https://www.notion.so${
-    url.startsWith('/image') ? url : `/image/${encodeURIComponent(url)}`
-  }`
-
-  const notionImageUrlV2 = new URL(url)
-  let table = block.parent_table === 'space' ? 'block' : block.parent_table
-  if (table === 'collection') {
-    table = 'block'
-  }
-  notionImageUrlV2.searchParams.set('table', table)
-  notionImageUrlV2.searchParams.set('id', block.id)
-  notionImageUrlV2.searchParams.set('cache', 'v2')
-
-  url = notionImageUrlV2.toString()
-
-  return url
-}
-
-export const defaultMapPageUrl = (rootPageId?: string) => (pageId: string) => {
-  pageId = (pageId || '').replace(/-/g, '')
-
-  if (rootPageId && pageId === rootPageId) {
-    return '/'
-  } else {
-    return `/${pageId}`
-  }
-}
+export { isUrl, formatDate, formatNotionDateTime } from 'notion-utils'
+export * from './map-image-url'
+export * from './map-page-url'
 
 export const cs = (...classes: Array<string | undefined | false>) =>
   classes.filter((a) => !!a).join(' ')