gatsby-source-notion-churnotion 1.0.45 → 1.0.47

package/dist/api/getPages.js

@@ -9,7 +9,6 @@ const constants_1 = require("../constants");
 const fetchData_1 = require("../util/fetchData");
 const imageProcessor_1 = require("../util/imageProcessor");
 const slugify_1 = require("../util/slugify");
-const connector_1 = require("./connector");
 const getPages = async ({ databaseId, reporter, getCache, actions, createNode, createNodeId, createParentChildLink, getNode, }) => {
     /**
      * 데이터베이스 내에 페이지들을 읽어서 재귀적으로 추가하는 서브 메서드드
@@ -141,22 +140,14 @@ const getPages = async ({ databaseId, reporter, getCache, actions, createNode, c
                             });
                         }
                         const bookId = page.properties?.book?.relation?.[0]?.id || null;
-                        const markdownContent = await connector_1.n2m.pageToMarkdown(page.id);
-                        const imageNode = await (0, imageProcessor_1.processBlocks)(markdownContent, actions, getCache, createNodeId, reporter, createParentChildLink);
-                        const gatsbyImageData = {
-                            childImageSharp: {
-                                gatsbyImageData: imageNode
-                                    ? `childImageSharp___NODE___${imageNode}`
-                                    : null,
-                            },
-                        };
+                        const imageNode = await (0, imageProcessor_1.processBlocks)(pageData.results, actions, getCache, createNodeId, reporter);
                         const postNode = {
                             id: nodeId,
                             category: parentCategoryId,
                             book: getNode(`${bookId}-book`),
                             book_index: page.properties?.bookIndex?.number || 0,
                             title: title,
-                            content: markdownContent,
+                            content: pageData.results,
                             create_date: page.created_time,
                             update_date: page.last_edited_time,
                             version: page.properties?.version?.number || null,

package/dist/util/imageProcessor.d.ts

@@ -1,3 +1,3 @@
 import { Actions, GatsbyCache, Reporter } from "gatsby";
-import { MdBlock } from "notion-to-md/build/types";
-export declare const processBlocks: (blocks: MdBlock[], actions: Actions, getCache: (this: void, id: string) => GatsbyCache, createNodeId: (this: void, input: string) => string, reporter: Reporter, createParentChildLink: any) => Promise<string | null>;
+import { BaseContentBlock } from "notion-types";
+export declare const processBlocks: (blocks: BaseContentBlock[], actions: Actions, getCache: (this: void, id: string) => GatsbyCache, createNodeId: (this: void, input: string) => string, reporter: Reporter) => Promise<string | null>;

package/dist/util/imageProcessor.js

@@ -2,43 +2,28 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processBlocks = void 0;
 const gatsby_source_filesystem_1 = require("gatsby-source-filesystem");
-const processBlocks = async (blocks, actions, getCache, createNodeId, reporter, createParentChildLink) => {
+// Type Guard
+function isImageBlock(block) {
+    return block.type === "image" && "image" in block;
+}
+const processBlocks = async (blocks, actions, getCache, createNodeId, reporter) => {
     const { createNode } = actions;
     let thumbnail = null;
     for (const block of blocks) {
-        const blockNodeId = createNodeId(`${block.blockId}-MdBlock`);
-        const blockNode = {
-            ...block,
-            id: blockNodeId,
-            parent: null,
-            children: [],
-            internal: {
-                type: "MdBlock",
-                contentDigest: createNodeId(JSON.stringify(block)),
-            },
-        };
-        createNode(blockNode);
-        if (block.type === `image` &&
-            typeof block.parent === `string` &&
-            block.parent.includes(`http`)) {
-            const match = block.parent.match(/\((https?:\/\/.*?)\)/);
+        if (isImageBlock(block) && block?.image?.file?.url) {
+            const match = block.image.file.url.match(/\((https?:\/\/.*?)\)/);
             if (match) {
                 const imageUrl = match[1];
                 reporter.info(`[Image] got image > ${imageUrl}`);
                 try {
                     const fileNode = await (0, gatsby_source_filesystem_1.createRemoteFileNode)({
                         url: imageUrl,
-                        parentNodeId: blockNodeId,
+                        parentNodeId: block.id,
                         getCache,
                         createNode,
                         createNodeId,
                     });
                     if (fileNode) {
-                        createParentChildLink({
-                            parent: blockNode,
-                            child: fileNode,
-                        });
-                        block.parent = fileNode.id;
                         if (!thumbnail)
                             thumbnail = fileNode.id;
                         reporter.info(`[SUCCESS] Image processed: ${fileNode.id}`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gatsby-source-notion-churnotion",
   "description": "Gatsby plugin that can connect with One Notion Database RECURSIVELY using official API",
-  "version": "1.0.45",
+  "version": "1.0.47",
   "skipLibCheck": true,
   "license": "0BSD",
   "main": "./dist/gatsby-node.js",
@@ -42,6 +42,7 @@
     "gatsby-transformer-sharp": "^5.14.0",
     "node-fetch": "^3.3.2",
     "notion-to-md": "^3.1.1",
+    "notion-types": "^7.1.5",
     "typescript": "^5.7.2"
   },
   "devDependencies": {