merge: resolve conflicts with main

Author: seonglae

packages/cli/src/main.ts

@@ -18,3 +18,5 @@ export * from './notion/export'
 export * from './notion/index'
 export * from './treemap'
 export * from './stats'
+export * from './treemap'
+export * from './stats'

packages/cli/src/notion/export.ts

@@ -1,6 +1,24 @@
 import { Option, Command } from 'clipanion'
 import { NotionExporter } from './index'
 import { generateTreemaps, PageNode } from '../treemap'
+import { computeStats, writeStats } from '../stats'
+  treemap = Option.Boolean('--treemap', {
+    description: 'Generate HTML treemap after export'
+  })
+  stats = Option.Boolean('--stats', {
+    description: 'Generate statistics JSON after export'
+  })
+
+    if (this.treemap || this.stats) if (!exporter.pageTree) await exporter.loadRaw()
+
+    const tree = exporter.pageTree as unknown as PageNode
+    if (this.treemap && tree) await generateTreemaps(this.folder, tree)
+
+    if (this.stats && tree) {
+      const stats = computeStats(tree)
+      await writeStats(`${this.folder}/stats.json`, stats)
+    }
+import { generateTreemaps, PageNode } from '../treemap'
 import { computeStats, writeStats } from '../stats'
 
 export class NotionExportCommand extends Command {

packages/cli/src/treemap.ts

@@ -1,28 +1,21 @@
 import fs from 'fs'
 import { promisify } from 'util'
-
 export interface PageNode {
-  id: string
-  blocks: number
   pages: number
   title: string
   children?: PageNode[]
 }
 
 const writeFile = promisify(fs.writeFile)
-
 export async function generateTreemaps(folder: string, pageTree: PageNode) {
   const treemapDataPages = computeMetrics(pageTree, 'pages')
   const titlePages = 'Texonom PageTree'
   const outputPathPages = `${folder}/pagetree.html`
   await generateTreemapHTML(treemapDataPages, titlePages, outputPathPages)
 
-  const treemapDataBlocks = computeMetrics(pageTree, 'blocks')
   const titleBlocks = 'Texonom BlockMap'
   const outputPathBlocks = `${folder}/blocktree.html`
   await generateTreemapHTML(treemapDataBlocks, titleBlocks, outputPathBlocks)
-}
-
 interface TreemapNode {
   id: string
   name: string

packages/nclient/readme.md

@@ -42,6 +42,19 @@ const backlinks = await api.getBacklinks({
 const pageBacklinks = await api.getPageBacklinks('page-id')
 ```
 
+### Fetch backlinks
+
+Backlinks require an auth token.
+
+```ts
+const backlinks = await api.getBacklinks({
+  block: { id: 'page-id', spaceId: 'space-id' }
+})
+
+// or simply pass the page id
+const pageBacklinks = await api.getPageBacklinks('page-id')
+```
+
 ### Fetch a database's content
 
 You can pass a database ID to the `getPage` method. The response is an object which contains several important properties:

packages/nclient/src/notion-api.test.ts

@@ -65,6 +65,12 @@ test(`Page Backlink`, { timeout: 10000, concurrent: true }, async () => {
   expect(backlinks.backlinks.length > 0)
 })
 
+test(`Page Backlink`, { timeout: 10000, concurrent: true }, async () => {
+  const api = new NotionAPI({ authToken: process.env.NOTION_TOKEN })
+  const backlinks = await api.getPageBacklinks('441d5ce2-b781-46d0-9354-54042b4f06d9')
+  expect(backlinks.backlinks.length > 0)
+})
+
 test(`Get block`, { timeout: 10000, concurrent: true }, async () => {
   const id = '3f9e0d86-c643-4672-aa0c-78d63fa80598'
   const api = new NotionAPI()

packages/nclient/src/notion-api.ts

@@ -591,6 +591,23 @@ export class NotionAPI {
     return this.getBacklinks({ block: { id, spaceId } }, fetchOption)
   }
 
+  /**
+   * Fetch backlinks for a page by automatically resolving its space id.
+   * Requires an authToken since backlinks are a private API.
+   *
+   * @param pageId page id or url
+   * @param fetchOption additional fetch options
+   */
+  public async getPageBacklinks(pageId: string, fetchOption?: FetchOption) {
+    const id = parsePageId(pageId)
+    const res = await this.getBlocks([id], fetchOption)
+    const block = res.recordMap.block[id]?.value
+    if (!block) throw new Error(`Block not found "${uuidToId(id)}"`)
+    const spaceId = block.space_id
+
+    return this.getBacklinks({ block: { id, spaceId } }, fetchOption)
+  }
+
   public async fetch<T>({
     endpoint,
     body,

packages/nreact/src/components/search-dialog.tsx

@@ -1,6 +1,4 @@
 import React from 'react'
-import { getBlockParentPage, getBlockTitle } from '@texonom/nutils'
-
 import { NotionContextConsumer, NotionContextProvider } from '../context'
 import { ClearIcon } from '../icons/clear-icon'
 import { LoadingIcon } from '../icons/loading-icon'
@@ -19,6 +17,16 @@ const debounce = (func: (...args: any[]) => void, wait: number) => {
   }
 }
 
+    // debounce search calls so the expensive query only runs after typing stops
+    this._search = debounce(this._searchImpl.bind(this), 500)
+                    onInput={this._onChangeQuery}
+  let timeout: ReturnType<typeof setTimeout> | undefined
+  return (...args: any[]) => {
+    if (timeout) clearTimeout(timeout)
+    timeout = setTimeout(() => func(...args), wait)
+  }
+}
+
 export class SearchDialog extends React.Component<{
   isOpen: boolean
   rootBlockId: string

packages/nreact/src/context.tsx

@@ -185,10 +185,15 @@ export const NotionContextProvider: React.FC<PartialNotionContext> = ({
     if (components.nextLink) {
       const nextLink = wrapNextLink(components.nextLink)
       components.nextLink = nextLink
-
       if (!components.PageLink) components.PageLink = nextLink
       if (!components.Link) components.Link = nextLink
     }
+    // ensure the user can't override default components with falsy values
+    // since it would result in very difficult-to-debug react errors
+    for (const key of Object.keys(components)) if (!components[key]) delete components[key]
+
+    return components
+  }, [themeComponents])
 
     // ensure the user can't override default components with falsy values
     // since it would result in very difficult-to-debug react errors