@sillsdev/docu-notion 0.17.0-alpha.2 → 0.17.0-alpha.4

package/dist/NotionPage.d.ts

@@ -1,4 +1,4 @@
-import { GetPageResponse } from "@notionhq/client/build/src/api-endpoints";
+import { GetPageResponse } from "@notionhq/client";
 import { ListBlockChildrenResponseResults } from "notion-to-md/build/types";
 export declare enum PageType {
     DatabasePage = 0,

package/dist/NotionPage.js

@@ -20,6 +20,11 @@ var PageType;
     PageType[PageType["DatabasePage"] = 0] = "DatabasePage";
     PageType[PageType["Simple"] = 1] = "Simple";
 })(PageType || (exports.PageType = PageType = {}));
+function isDatabaseBackedPage(metadata) {
+    var _a;
+    const parentType = (_a = metadata.parent) === null || _a === void 0 ? void 0 : _a.type;
+    return parentType === "database_id" || parentType === "data_source_id";
+}
 class NotionPage {
     constructor(args) {
         this.layoutContext = args.layoutContext;
@@ -53,7 +58,7 @@ class NotionPage {
                 ...
             },
         */
-        return this.metadata.parent.type === "database_id"
+        return isDatabaseBackedPage(this.metadata)
             ? PageType.DatabasePage
             : PageType.Simple;
     }

package/dist/NotionPage.spec.js

@@ -140,4 +140,66 @@ describe("NotionPage", () => {
             expect(result).toBe("Default Value");
         });
     });
+    describe("page type detection", () => {
+        it("treats data_source_id pages as database pages", () => {
+            const page = new NotionPage_1.NotionPage({
+                layoutContext: "Test Context",
+                pageId: "123",
+                order: 1,
+                metadata: Object.assign(Object.assign({}, mockMetadata), { parent: {
+                        type: "data_source_id",
+                        data_source_id: "source-123",
+                        database_id: "database-123",
+                    }, properties: {
+                        Name: {
+                            id: "title",
+                            type: "title",
+                            title: [
+                                {
+                                    type: "text",
+                                    text: {
+                                        content: "Columns",
+                                        link: null,
+                                    },
+                                    annotations: {
+                                        bold: false,
+                                        italic: false,
+                                        strikethrough: false,
+                                        underline: false,
+                                        code: false,
+                                        color: "default",
+                                    },
+                                    plain_text: "Columns",
+                                    href: null,
+                                },
+                            ],
+                        },
+                        Status: {
+                            id: "status",
+                            type: "select",
+                            select: {
+                                id: "publish",
+                                name: "Publish",
+                                color: "green",
+                            },
+                        },
+                    } }),
+                foundDirectlyInOutline: false,
+            });
+            expect(page.type).toBe(NotionPage_1.PageType.DatabasePage);
+            expect(page.nameOrTitle).toBe("Columns");
+            expect(page.status).toBe("Publish");
+        });
+        it("keeps workspace pages as simple pages", () => {
+            const page = new NotionPage_1.NotionPage({
+                layoutContext: "Test Context",
+                pageId: "123",
+                order: 1,
+                metadata: mockMetadata,
+                foundDirectlyInOutline: true,
+            });
+            expect(page.type).toBe(NotionPage_1.PageType.Simple);
+            expect(page.nameOrTitle).toBe("FooBar");
+        });
+    });
 });

package/dist/latex.spec.js

@@ -75,6 +75,7 @@ test("Latex Rendering", () => __awaiter(void 0, void 0, void 0, function* () {
             },
             has_children: false,
             archived: false,
+            in_trash: false,
             type: "paragraph",
             paragraph: {
                 rich_text: [
@@ -93,6 +94,7 @@ test("Latex Rendering", () => __awaiter(void 0, void 0, void 0, function* () {
                         href: null,
                     },
                 ],
+                icon: null,
                 color: "default",
             },
         },

package/dist/plugins/ColumnListTransformer.js

@@ -10,16 +10,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.standardColumnListTransformer = void 0;
+const ColumnTransformer_1 = require("./ColumnTransformer");
 function notionColumnListToMarkdown(notionToMarkdown, getBlockChildren, block) {
     return __awaiter(this, void 0, void 0, function* () {
-        // Enhance: The @notionhq/client, which uses the official API, cannot yet get at column formatting information (column_ratio)
-        // However https://github1s.com/NotionX/react-notion-x/blob/master/packages/react-notion-x/src/block.tsx#L528 can get it.
-        const { id, has_children } = block; // "any" because the notion api type system is complex with a union that don't know how to help TS to cope with
-        if (!has_children)
+        if (!(0, ColumnTransformer_1.isColumnListBlock)(block) || !block.has_children)
             return "";
-        const column_list_children = yield getBlockChildren(id);
-        const column_list_promise = column_list_children.map((column) => __awaiter(this, void 0, void 0, function* () { return yield notionToMarkdown.blockToMarkdown(column); }));
-        const columns = yield Promise.all(column_list_promise);
+        const column_list_children = yield getBlockChildren(block.id);
+        (0, ColumnTransformer_1.rememberColumnListChildren)(column_list_children);
+        const columnsToRender = column_list_children.filter((child) => child.type === "column");
+        const columns = [];
+        for (const column of columnsToRender) {
+            // Keep column rendering sequential. A column block can trigger more Notion
+            // reads downstream, so Promise.all() here would turn one page into a burst
+            // of concurrent API requests during stage 2.
+            columns.push(yield notionToMarkdown.blockToMarkdown(column));
+        }
         return `<div class='notion-row'>\n${columns.join("\n\n")}\n</div>`;
     });
 }

package/dist/plugins/ColumnTransformer.d.ts

@@ -1,2 +1,8 @@
+import { ColumnListBlockObjectResponse } from "@notionhq/client";
+import { ListBlockChildrenResponseResult } from "notion-to-md/build/types";
 import { IPlugin } from "./pluginTypes";
+import { NotionBlock } from "../types";
+export declare function isColumnListBlock(block: NotionBlock | ListBlockChildrenResponseResult): block is ColumnListBlockObjectResponse;
 export declare const standardColumnTransformer: IPlugin;
+export declare function rememberColumnListChildren(columnBlocks: NotionBlock[]): void;
+export declare function getColumnWidth(block: ListBlockChildrenResponseResult): string;

package/dist/plugins/ColumnTransformer.js

@@ -10,8 +10,31 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.standardColumnTransformer = void 0;
-const notion_client_1 = require("notion-client");
-const pull_1 = require("../pull");
+exports.isColumnListBlock = isColumnListBlock;
+exports.rememberColumnListChildren = rememberColumnListChildren;
+exports.getColumnWidth = getColumnWidth;
+const columnCountById = new Map();
+const normalizedColumnRatioById = new Map();
+function isColumnBlock(block) {
+    return "type" in block && block.type === "column";
+}
+function isColumnListBlock(block) {
+    return "type" in block && block.type === "column_list";
+}
+function getRawColumnRatio(block) {
+    if (!isColumnBlock(block))
+        return undefined;
+    const ratio = block.column.width_ratio;
+    return typeof ratio === "number" && Number.isFinite(ratio)
+        ? ratio
+        : undefined;
+}
+function approximatelyEqual(left, right, epsilon = 0.000001) {
+    return Math.abs(left - right) < epsilon;
+}
+function isDefinedNumber(value) {
+    return value !== undefined;
+}
 exports.standardColumnTransformer = {
     name: "standardColumnTransformer",
     notionToMarkdownTransforms: [
@@ -21,48 +44,54 @@ exports.standardColumnTransformer = {
         },
     ],
 };
+function rememberColumnListChildren(columnBlocks) {
+    const columns = columnBlocks.filter(isColumnBlock);
+    const columnCount = columns.length;
+    const explicitRatios = columns.map(getRawColumnRatio);
+    const allExplicit = explicitRatios.every(isDefinedNumber);
+    const explicitSum = explicitRatios.reduce((sum, ratio) => sum + (ratio !== null && ratio !== void 0 ? ratio : 0), 0);
+    const normalizedRatios = allExplicit && approximatelyEqual(explicitSum, 1)
+        ? explicitRatios
+        : (() => {
+            const weights = explicitRatios.map(ratio => ratio !== null && ratio !== void 0 ? ratio : 1);
+            const totalWeight = weights.reduce((sum, weight) => sum + weight, 0);
+            return totalWeight > 0
+                ? weights.map(weight => weight / totalWeight)
+                : weights.map(() => 1 / Math.max(columnCount, 1));
+        })();
+    for (const [index, columnBlock] of columns.entries()) {
+        columnCountById.set(columnBlock.id, columnCount);
+        normalizedColumnRatioById.set(columnBlock.id, normalizedRatios[index]);
+    }
+}
 // This runs when notion-to-md encounters a column block
 function notionColumnToMarkdown(notionToMarkdown, getBlockChildren, block) {
     return __awaiter(this, void 0, void 0, function* () {
-        //console.log(JSON.stringify(block));
-        const { id, has_children } = block; // "any" because the notion api type system is complex with a union that don't know how to help TS to cope with
-        if (!has_children)
+        if (!isColumnBlock(block) || !block.has_children)
             return "";
-        const columnChildren = yield getBlockChildren(id);
-        const childrenMdBlocksArray = yield Promise.all(columnChildren.map((child) => __awaiter(this, void 0, void 0, function* () { return yield notionToMarkdown.blocksToMarkdown([child]); })));
+        const columnChildren = yield getBlockChildren(block.id);
+        const childrenMdBlocksArray = [];
+        for (const child of columnChildren) {
+            // Intentionally serialize these subtree conversions. notion-to-md will fetch
+            // nested block children during blocksToMarkdown(), and parallelizing sibling
+            // columns creates bursts that can exceed Notion's per-integration rate limit.
+            childrenMdBlocksArray.push(yield notionToMarkdown.blocksToMarkdown([child]));
+        }
         const childrenMarkdown = childrenMdBlocksArray.map(mdBlockArray => notionToMarkdown.toMarkdownString(mdBlockArray).parent);
-        const columnWidth = yield getColumnWidth(block);
+        const columnWidth = getColumnWidth(block);
         return (`<div class='notion-column' style={{width: '${columnWidth}'}}>\n\n${childrenMarkdown.join("\n")}\n</div>` +
             // Spacer between columns. CSS takes care of hiding this for the last column
             // and when the screen is too narrow for multiple columns.
             `<div className='notion-spacer'></div>`);
     });
 }
-// The official API doesn't give us access to the format information, including column_ratio.
-// So we use 'notion-client' which uses the unofficial API.
-// Once the official API gives us access to the format information, we can remove this
-// and the 'notion-client' dependency.
-// This logic was mostly taken from react-notion-x (sister project of notion-client).
 function getColumnWidth(block) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
-        const unofficialNotionClient = new notion_client_1.NotionAPI();
-        const blockId = block.id;
-        const recordMap = yield (0, pull_1.executeWithRateLimitAndRetries)(`unofficialNotionClient.getPage(${blockId}) in getColumnWidth()`, () => {
-            // Yes, it is odd to call 'getPage' for a block, but that's how we access the format info.
-            return unofficialNotionClient.getPage(blockId);
-        });
-        const blockResult = recordMap.block[blockId];
-        // ENHANCE: could we use https://github.com/NotionX/react-notion-x/tree/master/packages/notion-types
-        // to get away from "any", which might be particularly helpful in the future
-        // since this is using the unofficial (reverse engineered?) API.
-        const columnFormat = (_a = blockResult === null || blockResult === void 0 ? void 0 : blockResult.value) === null || _a === void 0 ? void 0 : _a.format;
-        const columnRatio = (columnFormat === null || columnFormat === void 0 ? void 0 : columnFormat.column_ratio) || 0.5;
-        const parentBlock = (_c = recordMap.block[(_b = blockResult === null || blockResult === void 0 ? void 0 : blockResult.value) === null || _b === void 0 ? void 0 : _b.parent_id]) === null || _c === void 0 ? void 0 : _c.value;
-        // I'm not sure why we wouldn't get a parent, but the react-notion-x has
-        // this fallback to a guess based on the columnRatio.
-        const columnCount = ((_d = parentBlock === null || parentBlock === void 0 ? void 0 : parentBlock.content) === null || _d === void 0 ? void 0 : _d.length) || Math.max(2, Math.ceil(1.0 / columnRatio));
-        const spacerWidth = `min(32px, 4vw)`; // This matches the value in css for 'notion-spacer'.
-        return `calc((100% - (${spacerWidth} * ${columnCount - 1})) * ${columnRatio})`;
-    });
+    var _a, _b;
+    const columnRatio = (_b = (_a = normalizedColumnRatioById.get(block.id)) !== null && _a !== void 0 ? _a : getRawColumnRatio(block)) !== null && _b !== void 0 ? _b : 0.5;
+    // The spacer width depends on how many sibling columns are present. We record
+    // that when the parent column_list is converted, then fall back to the older
+    // estimate when a column is converted without that context.
+    const columnCount = columnCountById.get(block.id) || Math.max(2, Math.ceil(1.0 / columnRatio));
+    const spacerWidth = `min(32px, 4vw)`; // This matches the value in css for 'notion-spacer'.
+    return `calc((100% - (${spacerWidth} * ${columnCount - 1})) * ${columnRatio})`;
 }

package/dist/plugins/ColumnTransformer.spec.js

@@ -37,6 +37,90 @@ function getResults(children) {
 }
 const columnWrapperStart = "<div class='notion-column' style=\\{\\{width: '.*?'\\}\\}>\\n\\n";
 const columnWrapperEnd = "\\n\\n<\\/div><div className='notion-spacer'><\\/div>";
+test("getColumnWidth preserves docs-compliant normalized ratios", () => {
+    (0, ColumnTransformer_1.rememberColumnListChildren)([
+        {
+            id: "column-1",
+            type: "column",
+            column: {
+                width_ratio: 0.25,
+            },
+        },
+        {
+            id: "column-2",
+            type: "column",
+            column: {
+                width_ratio: 0.75,
+            },
+        },
+    ]);
+    const width = (0, ColumnTransformer_1.getColumnWidth)({
+        id: "column-1",
+        type: "column",
+        column: {
+            width_ratio: 0.25,
+        },
+    });
+    expect(width).toBe("calc((100% - (min(32px, 4vw) * 1)) * 0.25)");
+});
+test("getColumnWidth normalizes missing ratios as equal weights", () => {
+    (0, ColumnTransformer_1.rememberColumnListChildren)([
+        {
+            id: "column-1",
+            type: "column",
+            column: {},
+        },
+        {
+            id: "column-2",
+            type: "column",
+            column: {},
+        },
+        {
+            id: "column-3",
+            type: "column",
+            column: {},
+        },
+    ]);
+    const width = (0, ColumnTransformer_1.getColumnWidth)({
+        id: "column-2",
+        type: "column",
+        column: {},
+    });
+    expect(width).toBe("calc((100% - (min(32px, 4vw) * 2)) * 0.3333333333333333)");
+});
+test("getColumnWidth normalizes mixed explicit and missing ratios", () => {
+    (0, ColumnTransformer_1.rememberColumnListChildren)([
+        {
+            id: "column-1",
+            type: "column",
+            column: {
+                width_ratio: 1,
+            },
+        },
+        {
+            id: "column-2",
+            type: "column",
+            column: {
+                width_ratio: 0.375,
+            },
+        },
+        {
+            id: "column-3",
+            type: "column",
+            column: {
+                width_ratio: 1,
+            },
+        },
+    ]);
+    const width = (0, ColumnTransformer_1.getColumnWidth)({
+        id: "column-2",
+        type: "column",
+        column: {
+            width_ratio: 0.375,
+        },
+    });
+    expect(width).toBe("calc((100% - (min(32px, 4vw) * 2)) * 0.15789473684210525)");
+});
 if (runTestsWhichRequireAnyValidApiKey) {
     columnBlock.has_children = true;
     test("requires API key - column with paragraph", () => __awaiter(void 0, void 0, void 0, function* () {

package/dist/plugins/EscapeHtmlBlockModifier.spec.js

@@ -33,6 +33,7 @@ beforeEach(() => {
             },
             has_children: false,
             archived: false,
+            in_trash: false,
             type: "paragraph",
             paragraph: {
                 rich_text: [
@@ -51,6 +52,7 @@ beforeEach(() => {
                         href: null,
                     },
                 ],
+                icon: null,
                 color: "default",
             },
         },
@@ -73,6 +75,7 @@ beforeEach(() => {
             },
             has_children: false,
             archived: false,
+            in_trash: false,
             type: "paragraph",
             paragraph: {
                 rich_text: [
@@ -91,6 +94,7 @@ beforeEach(() => {
                         href: null,
                     },
                 ],
+                icon: null,
                 color: "default",
             },
         },
@@ -113,8 +117,9 @@ beforeEach(() => {
             },
             has_children: false,
             archived: false,
+            in_trash: false,
             type: "paragraph",
-            paragraph: { rich_text: [], color: "default" },
+            paragraph: { rich_text: [], icon: null, color: "default" },
         },
     ];
 });

package/dist/plugins/internalLinks.js

@@ -4,22 +4,47 @@ exports.standardInternalLinkConversion = void 0;
 exports.convertInternalUrl = convertInternalUrl;
 exports.parseLinkId = parseLinkId;
 const log_1 = require("../log");
+const kNotionUrlRegExp = /^https?:\/\/(?:www\.)?notion\.so\/|^https?:\/\/app\.notion\.com\//;
+function getLegacyTrailingSegment(pathOrId) {
+    const trimmedPath = pathOrId.replace(/^\/+|\/+$/g, "");
+    const lastPathSegment = trimmedPath.split("/").at(-1);
+    if (!lastPathSegment)
+        return undefined;
+    const trailingDashSegment = lastPathSegment.split("-").at(-1);
+    return trailingDashSegment || lastPathSegment;
+}
+function normalizeLinkBaseId(baseLinkId) {
+    const withoutQuery = baseLinkId.split("?")[0];
+    if (kNotionUrlRegExp.test(withoutQuery)) {
+        try {
+            const url = new URL(withoutQuery);
+            const trimmedPath = url.pathname.replace(/^\/+|\/+$/g, "");
+            const appPathWithoutPrefix = trimmedPath.startsWith("p/")
+                ? trimmedPath.substring(2)
+                : trimmedPath;
+            return (getLegacyTrailingSegment(appPathWithoutPrefix) || appPathWithoutPrefix);
+        }
+        catch (_a) {
+            return withoutQuery;
+        }
+    }
+    const withoutLeadingSlash = withoutQuery.replace(/^\/+/, "");
+    return withoutLeadingSlash;
+}
 // converts a url to a local link, if it is a link to a page in the Notion site
 // only here for plugins, notion won't normally be giving us raw urls (at least not that I've noticed)
 // If it finds a URL but can't find the page it points to, it will return undefined.
 // If it doesn't find a match at all, it returns undefined.
 function convertInternalUrl(context, url) {
-    const kGetIDFromNotionURL = /https:\/\/www\.notion\.so\S+-([a-z,0-9]+)+.*/;
-    const match = kGetIDFromNotionURL.exec(url);
-    if (match === null) {
+    const { baseLinkId } = parseLinkId(url);
+    if (baseLinkId === url) {
         (0, log_1.warning)(`[standardInternalLinkConversion] Could not parse link ${url} as a Notion URL`);
         return undefined;
     }
-    const id = match[1];
     const pages = context.pages;
     // find the page where pageId matches hrefFromNotion
     const targetPage = pages.find(p => {
-        return p.matchesLinkId(id);
+        return p.matchesLinkId(baseLinkId);
     });
     if (!targetPage) {
         // About this situation. See https://github.com/sillsdev/docu-notion/issues/9
@@ -30,8 +55,8 @@ function convertInternalUrl(context, url) {
 }
 // handles the whole markdown link, including the label
 function convertInternalLink(context, markdownLink) {
-    // match both [foo](/123) and [bar](https://www.notion.so/123) <-- the "mention" link style
-    const linkRegExp = /\[([^\]]+)?\]\((?:https?:\/\/www\.notion\.so\/|\/)?([^),^/]+)\)/g;
+    // match both [foo](/123) and [bar](https://app.notion.com/p/123) mention-style links
+    const linkRegExp = /\[([^\]]+)?\]\(([^)]+)\)/;
     const match = linkRegExp.exec(markdownLink);
     if (match === null) {
         (0, log_1.warning)(`[standardInternalLinkConversion] Could not parse link ${markdownLink}`);
@@ -84,11 +109,11 @@ function parseLinkId(fullLinkId) {
     const iHash = fullLinkId.indexOf("#");
     if (iHash >= 0) {
         return {
-            baseLinkId: fullLinkId.substring(0, iHash),
+            baseLinkId: normalizeLinkBaseId(fullLinkId.substring(0, iHash)),
             fragmentId: fullLinkId.substring(iHash),
         };
     }
-    return { baseLinkId: fullLinkId, fragmentId: "" };
+    return { baseLinkId: normalizeLinkBaseId(fullLinkId), fragmentId: "" };
 }
 exports.standardInternalLinkConversion = {
     name: "standard internal link conversion",
@@ -98,8 +123,9 @@ exports.standardInternalLinkConversion = {
         // Raw links come in without a leading slash, e.g. [link_to_page](4a6de8c0-b90b-444b-8a7b-d534d6ec71a4)
         // Inline links come in with a leading slash, e.g. [pointer to the introduction](/4a6de8c0b90b444b8a7bd534d6ec71a4)
         // "Mention" links come in as full URLs, e.g. [link_to_page](https://www.notion.so/62f1187010214b0883711a1abb277d31)
+        // Newer Notion links can also use app.notion.com, including /p/<page-id> URLs.
         // YOu can create them either with @+the name of a page, or by pasting a URL and then selecting the "Mention" option.
-        match: /\[([^\]]+)?\]\((?!mailto:)(https:\/\/www\.notion\.so\/[^),^/]+|\/?[^),^/]+)\)/,
+        match: /\[([^\]]+)?\]\((?!mailto:)(https?:\/\/(?:www\.)?notion\.so\/[^),^/]+|https?:\/\/app\.notion\.com\/(?:p\/)?[^),^/]+|\/?[^),^/]+)\)/,
         convert: convertInternalLink,
     },
 };

package/dist/plugins/internalLinks.spec.js

@@ -75,6 +75,52 @@ test("mention-style link to an existing page", () => __awaiter(void 0, void 0, v
     }, targetPage);
     expect(results.trim()).toBe(`[foo](/${targetPageId})`);
 }));
+test("mention-style link using app.notion.com/p resolves to a local page", () => __awaiter(void 0, void 0, void 0, function* () {
+    const targetPageId = "123456781234123412341234567890ab";
+    const targetPage = (0, pluginTestRun_1.makeSamplePageObject)({
+        slug: undefined,
+        name: "Hello World",
+        id: "12345678-1234-1234-1234-1234567890ab",
+    });
+    const results = yield getMarkdown({
+        type: "paragraph",
+        paragraph: {
+            rich_text: [
+                {
+                    type: "mention",
+                    mention: {
+                        type: "page",
+                        page: {
+                            id: targetPage.pageId,
+                        },
+                    },
+                    annotations: {
+                        bold: false,
+                        italic: false,
+                        strikethrough: false,
+                        underline: false,
+                        code: false,
+                        color: "default",
+                    },
+                    plain_text: "foo",
+                    href: `https://app.notion.com/p/${targetPageId}`,
+                },
+            ],
+            color: "default",
+        },
+    }, targetPage);
+    expect(results.trim()).toBe(`[foo](/12345678-1234-1234-1234-1234567890ab)`);
+}));
+test("parseLinkId extracts the page id from app.notion.com URLs", () => {
+    expect((0, internalLinks_1.parseLinkId)("https://app.notion.com/p/123456781234123412341234567890ab#heading")).toEqual({
+        baseLinkId: "123456781234123412341234567890ab",
+        fragmentId: "#heading",
+    });
+    expect((0, internalLinks_1.parseLinkId)("https://app.notion.com/Interesting-page-123456781234123412341234567890ab")).toEqual({
+        baseLinkId: "123456781234123412341234567890ab",
+        fragmentId: "",
+    });
+});
 test("link to an existing page on this site that has no slug", () => __awaiter(void 0, void 0, void 0, function* () {
     const targetPageId = "123";
     const targetPage = (0, pluginTestRun_1.makeSamplePageObject)({

package/dist/pull.js

@@ -54,11 +54,12 @@ const images_1 = require("./images");
 const Path = __importStar(require("path"));
 const log_1 = require("./log");
 const transform_1 = require("./transform");
-const limiter_1 = require("limiter");
 const client_1 = require("@notionhq/client");
+const limiter_1 = require("limiter");
 const process_1 = require("process");
 const configuration_1 = require("./config/configuration");
 const internalLinks_1 = require("./plugins/internalLinks");
+const kNotionApiVersion = "2026-03-11";
 let layoutStrategy;
 let notionToMarkdown;
 const pages = new Array();
@@ -89,9 +90,7 @@ function notionPull(options) {
         (0, log_1.info)("Connecting to Notion...");
         // Do a  quick test to see if we can connect to the root so that we can give a better error than just a generic "could not find page" one.
         try {
-            yield executeWithRateLimitAndRetries("retrieving root page", () => __awaiter(this, void 0, void 0, function* () {
-                yield notionClient.pages.retrieve({ page_id: options.rootPage });
-            }));
+            yield notionClient.pages.retrieve({ page_id: options.rootPage });
         }
         catch (e) {
             (0, log_1.error)(`docu-notion could not retrieve the root page from Notion. \r\na) Check that the root page id really is "${options.rootPage}".\r\nb) Check that your Notion API token (the "Integration Secret") is correct. It starts with "${optionsForLogging.notionToken}".\r\nc) Check that your root page includes your "integration" in its "connections".\r\nThis internal error message may help:\r\n    ${e.message}`);
@@ -223,13 +222,31 @@ const notionLimiter = new limiter_1.RateLimiter({
 let notionClient;
 function getPageMetadata(id) {
     return __awaiter(this, void 0, void 0, function* () {
-        return yield executeWithRateLimitAndRetries(`pages.retrieve(${id})`, () => {
-            return notionClient.pages.retrieve({
-                page_id: id,
-            });
+        return yield notionClient.pages.retrieve({
+            page_id: id,
         });
     });
 }
+function isRetryableNotionError(error) {
+    const message = String((error === null || error === void 0 ? void 0 : error.message) || "");
+    return ((error === null || error === void 0 ? void 0 : error.code) === "notionhq_client_request_timeout" ||
+        (error === null || error === void 0 ? void 0 : error.code) === "notionhq_client_response_error" ||
+        (error === null || error === void 0 ? void 0 : error.code) === "service_unavailable" ||
+        (error === null || error === void 0 ? void 0 : error.code) === client_1.APIErrorCode.RateLimited ||
+        message.includes("timeout") ||
+        message.includes("Timeout") ||
+        message.includes("limit") ||
+        message.includes("Limit"));
+}
+function getRetryDelayMilliseconds(error, retryIndex) {
+    var _a, _b;
+    const retryAfterHeader = (_b = (_a = error === null || error === void 0 ? void 0 : error.headers) === null || _a === void 0 ? void 0 : _a.get) === null || _b === void 0 ? void 0 : _b.call(_a, "retry-after");
+    const retryAfterSeconds = Number.parseInt(retryAfterHeader || "", 10);
+    if (Number.isFinite(retryAfterSeconds) && retryAfterSeconds > 0) {
+        return retryAfterSeconds * 1000;
+    }
+    return (retryIndex + 1) * 1000;
+}
 // While everything works fine locally, on Github Actions we are getting a lot of timeouts, so
 // we're trying this extra retry-able wrapper.
 function executeWithRateLimitAndRetries(label, asyncFunction) {
@@ -243,16 +260,10 @@ function executeWithRateLimitAndRetries(label, asyncFunction) {
             }
             catch (e) {
                 lastException = e;
-                if ((e === null || e === void 0 ? void 0 : e.code) === "notionhq_client_request_timeout" ||
-                    e.message.includes("timeout") ||
-                    e.message.includes("Timeout") ||
-                    e.message.includes("limit") ||
-                    e.message.includes("Limit") ||
-                    (e === null || e === void 0 ? void 0 : e.code) === "notionhq_client_response_error" ||
-                    (e === null || e === void 0 ? void 0 : e.code) === "service_unavailable") {
-                    const secondsToWait = i + 1;
-                    (0, log_1.warning)(`While doing "${label}", got error "${e.message}". Will retry after ${secondsToWait}s...`);
-                    yield new Promise(resolve => setTimeout(resolve, 1000 * secondsToWait));
+                if (isRetryableNotionError(e)) {
+                    const millisecondsToWait = getRetryDelayMilliseconds(e, i);
+                    (0, log_1.warning)(`While doing "${label}", got error "${e.message}". Will retry after ${millisecondsToWait / 1000}s...`);
+                    yield new Promise(resolve => setTimeout(resolve, millisecondsToWait));
                 }
                 else {
                     throw e;
@@ -271,9 +282,12 @@ function rateLimit() {
         yield notionLimiter.removeTokens(1);
     });
 }
+function isFullBlockFromChildrenList(block) {
+    return "type" in block;
+}
 function getBlockChildren(id) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a;
         // we can only get so many responses per call, so we set this to
         // the first response we get, then keep adding to its array of blocks
         // with each subsequent response
@@ -282,11 +296,9 @@ function getBlockChildren(id) {
         // Note: there is a now a collectPaginatedAPI() in the notion client, so
         // we could switch to using that (I don't know if it does rate limiting?)
         do {
-            const response = yield executeWithRateLimitAndRetries(`getBlockChildren(${id})`, () => {
-                return notionClient.blocks.children.list({
-                    start_cursor: start_cursor,
-                    block_id: id,
-                });
+            const response = yield notionClient.blocks.children.list({
+                start_cursor,
+                block_id: id,
             });
             if (!overallResult) {
                 overallResult = response;
@@ -296,18 +308,33 @@ function getBlockChildren(id) {
             }
             start_cursor = response === null || response === void 0 ? void 0 : response.next_cursor;
         } while (start_cursor != null);
-        if ((_a = overallResult === null || overallResult === void 0 ? void 0 : overallResult.results) === null || _a === void 0 ? void 0 : _a.some(b => !(0, client_1.isFullBlock)(b))) {
+        if ((_a = overallResult === null || overallResult === void 0 ? void 0 : overallResult.results) === null || _a === void 0 ? void 0 : _a.some(b => !isFullBlockFromChildrenList(b))) {
             (0, log_1.error)(`The Notion API returned some blocks that were not full blocks. docu-notion does not handle this yet. Please report it.`);
             (0, process_1.exit)(1);
         }
-        const result = (_b = overallResult === null || overallResult === void 0 ? void 0 : overallResult.results) !== null && _b !== void 0 ? _b : [];
+        const result = [];
+        if (overallResult) {
+            const blocks = overallResult.results;
+            for (const block of blocks) {
+                if (isFullBlockFromChildrenList(block)) {
+                    result.push(block);
+                }
+            }
+        }
         numberChildrenIfNumberedList(result);
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return result;
     });
 }
 function initNotionClient(notionToken) {
     notionClient = new client_1.Client({
         auth: notionToken,
+        // width_ratio on column blocks is available in newer Notion API versions.
+        notionVersion: kNotionApiVersion,
+    });
+    const originalRequest = notionClient.request.bind(notionClient);
+    notionClient.request = (args) => __awaiter(this, void 0, void 0, function* () {
+        return yield executeWithRateLimitAndRetries(`${args.method.toUpperCase()} ${args.path}`, () => originalRequest(args));
     });
     return notionClient;
 }

package/dist/transform.js

@@ -16,7 +16,6 @@ exports.getMarkdownForPage = getMarkdownForPage;
 exports.getMarkdownFromNotionBlocks = getMarkdownFromNotionBlocks;
 const chalk_1 = __importDefault(require("chalk"));
 const log_1 = require("./log");
-const pull_1 = require("./pull");
 function getMarkdownForPage(config, context, page) {
     return __awaiter(this, void 0, void 0, function* () {
         (0, log_1.info)(`Reading & converting page ${page.layoutContext}/${page.nameOrTitle} (${chalk_1.default.blue(page.hasExplicitSlug
@@ -127,17 +126,10 @@ function doTransformsOnMarkdown(context, config, input) {
 }
 function doNotionToMarkdown(docunotionContext, blocks) {
     return __awaiter(this, void 0, void 0, function* () {
-        let mdBlocks;
-        yield (0, pull_1.executeWithRateLimitAndRetries)("notionToMarkdown.blocksToMarkdown", () => __awaiter(this, void 0, void 0, function* () {
-            mdBlocks = yield docunotionContext.notionToMarkdown.blocksToMarkdown(
-            // We need to provide a copy of blocks.
-            // Calling blocksToMarkdown can modify the values in the blocks. If it does, and then
-            // we have to retry, we end up retrying with the modified values, which
-            // causes various issues (like using the transformed image url instead of the original one).
-            // Note, currently, we don't do anything else with blocks after this.
-            // If that changes, we'll need to figure out a more sophisticated approach.
-            JSON.parse(JSON.stringify(blocks)));
-        }));
+        const mdBlocks = yield docunotionContext.notionToMarkdown.blocksToMarkdown(
+        // We need to provide a copy of blocks.
+        // Calling blocksToMarkdown can modify the values in the blocks.
+        JSON.parse(JSON.stringify(blocks)));
         const markdown = docunotionContext.notionToMarkdown.toMarkdownString(mdBlocks).parent || "";
         return markdown;
     });

package/dist/types.d.ts

@@ -1,4 +1,4 @@
-import { BlockObjectResponse } from "@notionhq/client/build/src/api-endpoints";
+import { BlockObjectResponse } from "@notionhq/client";
 export type NotionBlock = BlockObjectResponse;
 export type ICounts = {
     output_normally: number;

package/package.json

@@ -22,10 +22,9 @@
   },
   "//file-type": "have to use this version before they switched to ESM, which gives a compile error related to require()",
   "//chalk@4": "also ESM related problem",
-  "//notion-client@4": "also ESM related problem",
   "//note: ts-node": "really is a runtime dependency",
   "dependencies": {
-    "@notionhq/client": "2.2.3",
+    "@notionhq/client": "5.18.0",
     "chalk": "^4.1.2",
     "commander": "^9.2.0",
     "cosmiconfig": "^8.0.0",
@@ -34,7 +33,6 @@
     "fs-extra": "^10.1.0",
     "limiter": "^2.1.0",
     "markdown-table": "^2.0.0",
-    "notion-client": "^4",
     "notion-to-md": "3.1.1",
     "path": "^0.12.7",
     "sanitize-filename": "^1.6.3",
@@ -43,7 +41,7 @@
   "devDependencies": {
     "@types/fs-extra": "^9.0.13",
     "@types/markdown-table": "^2.0.0",
-    "@types/node": "^18.15.11",
+    "@types/node": "^22.15.21",
     "@typescript-eslint/eslint-plugin": "^4.22.0",
     "@typescript-eslint/parser": "^4.22.0",
     "@vitest/ui": "^0.30.1",
@@ -92,5 +90,5 @@
   "volta": {
     "node": "22.21.0"
   },
-  "version": "0.17.0-alpha.2"
+  "version": "0.17.0-alpha.4"
 }