gatsby-source-notion-churnotion 1.1.30 → 1.1.32

package/README.md

@@ -6,7 +6,22 @@ This plugin recursively collects categories from a single Notion database, which
 
 If you're considering Notion as your CMS for Gatsby, this plugin could be a great choice as it supports recursive category collection.
 
-## What's New in v1.1.29
+## What's New in v1.1.32
+
+- **Fixed Gatsby Schema Relationship Bug**:
+  - Fixed `childrenChurnotion` field relationship in NBook nodes
+  - Properly defined relationship between Book and Post nodes
+  - Fixed "Field 'childrenChurnotion' is not defined" error during Gatsby build
+
+## What's New in v1.1.31
+
+- **Fixed ES Module compatibility issues**:
+  - Removed dependency on external p-limit library
+  - Implemented custom parallel processing queue
+  - Fixed Gatsby build errors related to ESM imports
+  - Improved CommonJS compatibility
+
+## What's New in v1.1.30
 
 - **Added support for more Notion block types**: 
   - bookmark, breadcrumb, callout, code, column, column_list, divider, embed, equation, file, link_preview, pdf, table, table_of_contents, toggle, to_do, video, audio
@@ -19,7 +34,6 @@ If you're considering Notion as your CMS for Gatsby, this plugin could be a grea
   - Modular block processor architecture
   - Better error handling
   - Improved type safety
-  - Fixed ES Module import issue with p-limit
 
 ## Install
 

package/dist/api/service/notionService.d.ts

@@ -12,8 +12,6 @@ export declare class NotionService {
     private cache;
     private limiter;
     constructor(options: NotionServiceOptions);
-    private initLimiter;
-    private createSimpleLimiter;
     /**
      * 데이터베이스 쿼리
      */
@@ -35,5 +33,5 @@ export declare class NotionService {
     /**
      * 병렬 처리 제한 설정
      */
-    setParallelLimit(limit: number): Promise<void>;
+    setParallelLimit(limit: number): void;
 }

package/dist/api/service/notionService.js

@@ -1,40 +1,52 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NotionService = void 0;
 const fetchData_1 = require("../../util/fetchData");
+/**
+ * 간단한 병렬 제한 큐
+ */
+class ParallelLimiter {
+    running = 0;
+    queue = [];
+    limit;
+    constructor(limit) {
+        this.limit = limit;
+    }
+    async add(fn) {
+        return new Promise((resolve, reject) => {
+            const run = () => {
+                this.running++;
+                fn()
+                    .then(resolve)
+                    .catch(reject)
+                    .finally(() => {
+                    this.running--;
+                    this.next();
+                });
+            };
+            if (this.running < this.limit) {
+                run();
+            }
+            else {
+                this.queue.push(run);
+            }
+        });
+    }
+    next() {
+        if (this.queue.length > 0 && this.running < this.limit) {
+            const run = this.queue.shift();
+            if (run)
+                run();
+        }
+    }
+    setLimit(limit) {
+        this.limit = limit;
+        // 새 제한 설정 후 큐에서 가능한 작업 실행
+        while (this.running < this.limit && this.queue.length > 0) {
+            this.next();
+        }
+    }
+}
 class NotionService {
     reporter;
     parallelLimit;
@@ -46,44 +58,7 @@ class NotionService {
         this.parallelLimit = options.parallelLimit || 5; // 기본 동시 요청 수
         this.enableCaching = options.enableCaching !== false; // 기본값은 캐싱 활성화
         this.cache = new Map();
-        this.initLimiter();
-    }
-    async initLimiter() {
-        try {
-            const pLimitModule = await Promise.resolve().then(() => __importStar(require("p-limit")));
-            const pLimit = pLimitModule.default;
-            this.limiter = pLimit(this.parallelLimit);
-        }
-        catch (error) {
-            this.reporter.error(`Failed to initialize p-limit: ${error}`);
-            this.limiter = this.createSimpleLimiter(this.parallelLimit);
-        }
-    }
-    createSimpleLimiter(limit) {
-        let running = 0;
-        const queue = [];
-        const next = () => {
-            running--;
-            if (queue.length > 0) {
-                const run = queue.shift();
-                if (run)
-                    run();
-            }
-        };
-        return (fn) => {
-            return new Promise((resolve, reject) => {
-                const run = () => {
-                    running++;
-                    fn().then(resolve).catch(reject).finally(next);
-                };
-                if (running < limit) {
-                    run();
-                }
-                else {
-                    queue.push(run);
-                }
-            });
-        };
+        this.limiter = new ParallelLimiter(this.parallelLimit);
     }
     /**
      * 데이터베이스 쿼리
@@ -135,11 +110,8 @@ class NotionService {
      * 여러 페이지의 블록 병렬 처리
      */
     async getMultiplePagesBlocks(pageIds) {
-        if (!this.limiter) {
-            await this.initLimiter();
-        }
         this.reporter.info(`[NOTION] Fetching blocks for ${pageIds.length} pages in parallel (limit: ${this.parallelLimit})`);
-        const tasks = pageIds.map((pageId) => this.limiter(async () => {
+        const tasks = pageIds.map((pageId) => this.limiter.add(async () => {
             try {
                 const blocks = await this.getPageBlocks(pageId);
                 return { pageId, blocks };
@@ -165,10 +137,10 @@ class NotionService {
     /**
      * 병렬 처리 제한 설정
      */
-    async setParallelLimit(limit) {
-        this.parallelLimit = limit;
-        await this.initLimiter();
+    setParallelLimit(limit) {
         this.reporter.info(`[NOTION] Updated parallel request limit to ${limit}`);
+        this.parallelLimit = limit;
+        this.limiter.setLimit(limit);
     }
 }
 exports.NotionService = NotionService;

package/dist/createSchemaCustomization.js

@@ -52,7 +52,7 @@ const createSchemaCustomization = ({ actions }) => {
             create_date: Date! @dateformat
             update_date: Date! @dateformat
             children: [${constants_1.NODE_TYPE.Post}] @link(by: "book", from: "id")
-            childrenChurnotion: [${constants_1.NODE_TYPE.Post}]
+            childrenChurnotion: [${constants_1.NODE_TYPE.Post}] @link(by: "book", from: "id")
             url: String!
             book_category: ${constants_1.NODE_TYPE.Category} @link(by: "id", from: "book_category")
             book_image: File @link(by: "id", from: "book_image")

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.1.30",
+  "version": "1.1.32",
   "skipLibCheck": true,
   "license": "0BSD",
   "main": "./dist/gatsby-node.js",
@@ -51,7 +51,6 @@
     "natural": "^8.0.1",
     "notion-to-md": "^3.1.1",
     "notion-types": "^7.1.5",
-    "p-limit": "^6.2.0",
     "typescript": "^5.7.2"
   },
   "devDependencies": {