feat: update @notionhq/client to 2.2.15 and migrate code (#68)

Author: kaspernowak

package-lock.json

@@ -28,7 +28,7 @@
   "author": "Richard Robinson",
   "license": "ISC",
   "dependencies": {
-    "@notionhq/client": "^1.0.4",
+    "@notionhq/client": "^2.2.15",
     "remark-gfm": "^1.0.0",
     "remark-math": "^4.0.0",
     "remark-parse": "^9.0.0",

package.json

@@ -1,4 +1,4 @@
-import {richText, supportedCodeLang} from './common';
+import {richText, supportedCodeLang, TableRowBlock} from './common';
 import {AppendBlockChildrenParameters} from '@notionhq/client/build/src/api-endpoints';
 
 export type Block = AppendBlockChildrenParameters['children'][number];
@@ -155,10 +155,7 @@ export function toDo(
   };
 }
 
-export function table(
-  children: BlockWithoutChildren[],
-  tableWidth: number
-): Block {
+export function table(children: TableRowBlock[], tableWidth: number): Block {
   return {
     object: 'block',
     type: 'table',
@@ -170,7 +167,7 @@ export function table(
   };
 }
 
-export function tableRow(cells: RichText[][] = []): BlockWithoutChildren {
+export function tableRow(cells: RichText[][] = []): TableRowBlock {
   return {
     object: 'block',
     type: 'table_row',

src/notion/blocks.ts

@@ -154,3 +154,11 @@ export type supportedCodeLang = typeof SUPPORTED_CODE_BLOCK_LANGUAGES[number];
 export function isSupportedCodeLang(lang: string): lang is supportedCodeLang {
   return (SUPPORTED_CODE_BLOCK_LANGUAGES as readonly string[]).includes(lang);
 }
+
+export interface TableRowBlock {
+  type: 'table_row';
+  table_row: {
+    cells: Array<Array<RichText>>;
+  };
+  object?: 'block';
+}

src/notion/common.ts

@@ -191,13 +191,13 @@ function parseList(element: md.List, options: BlocksOptions): notion.Block[] {
   });
 }
 
-function parseTableCell(node: md.TableCell): notion.RichText[][] {
-  return [node.children.flatMap(child => parseInline(child))];
+function parseTableCell(node: md.TableCell): notion.RichText[] {
+  return node.children.flatMap(child => parseInline(child));
 }
 
-function parseTableRow(node: md.TableRow): notion.BlockWithoutChildren[] {
-  const tableCells = node.children.flatMap(child => parseTableCell(child));
-  return [notion.tableRow(tableCells)];
+function parseTableRow(node: md.TableRow): notion.TableRowBlock {
+  const cells = node.children.map(child => parseTableCell(child));
+  return notion.tableRow(cells);
 }
 
 function parseTable(node: md.Table): notion.Block[] {
@@ -206,7 +206,7 @@ function parseTable(node: md.Table): notion.Block[] {
     ? node.children[0].children.length
     : 0;
 
-  const tableRows = node.children.flatMap(child => parseTableRow(child));
+  const tableRows = node.children.map(child => parseTableRow(child));
   return [notion.table(tableRows, tableWidth)];
 }