@sillsdev/docu-notion 0.17.0-alpha.3 → 1.0.0-alpha.1

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/HeadingTranformer.spec.js

@@ -11,36 +11,116 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const pluginTestRun_1 = require("./pluginTestRun");
 const HeadingTransformer_1 = require("./HeadingTransformer");
+function makeHeadingBlock(headingBlockId, text, type = "heading_1") {
+    return {
+        object: "block",
+        id: headingBlockId,
+        type,
+        [type]: {
+            rich_text: [
+                {
+                    type: "text",
+                    text: { content: text, link: null },
+                    annotations: {
+                        bold: false,
+                        italic: false,
+                        strikethrough: false,
+                        underline: false,
+                        code: false,
+                        color: "default",
+                    },
+                    plain_text: text,
+                    href: null,
+                },
+            ],
+            is_toggleable: false,
+            color: "default",
+        },
+    };
+}
+function makeCodeBlock(text, language = "") {
+    return {
+        object: "block",
+        id: "33333333-3333-3333-3333-333333333333",
+        type: "code",
+        code: {
+            caption: [],
+            rich_text: [
+                {
+                    type: "text",
+                    text: { content: text, link: null },
+                    annotations: {
+                        bold: false,
+                        italic: false,
+                        strikethrough: false,
+                        underline: false,
+                        code: false,
+                        color: "default",
+                    },
+                    plain_text: text,
+                    href: null,
+                },
+            ],
+            language,
+        },
+    };
+}
 test("Adds anchor to headings", () => __awaiter(void 0, void 0, void 0, function* () {
     //setLogLevel("verbose");
     const headingBlockId = "86f746f4-1c79-4ba1-a2f6-a1d59c2f9d23";
     const config = { plugins: [HeadingTransformer_1.standardHeadingTransformer] };
     const result = yield (0, pluginTestRun_1.blocksToMarkdown)(config, [
-        {
-            object: "block",
-            id: headingBlockId,
-            type: "heading_1",
-            heading_1: {
-                rich_text: [
-                    {
-                        type: "text",
-                        text: { content: "Heading One", link: null },
-                        annotations: {
-                            bold: false,
-                            italic: false,
-                            strikethrough: false,
-                            underline: false,
-                            code: false,
-                            color: "default",
-                        },
-                        plain_text: "Heading One",
-                        href: null,
-                    },
-                ],
-                is_toggleable: false,
-                color: "default",
-            },
-        },
+        makeHeadingBlock(headingBlockId, "Heading One"),
     ]);
+    expect(result.trim()).toBe(`# Heading One {/* #${headingBlockId.replaceAll("-", "")} */}`);
+}));
+test("docusaurus-v2 flag keeps legacy heading id syntax", () => __awaiter(void 0, void 0, void 0, function* () {
+    const headingBlockId = "86f746f4-1c79-4ba1-a2f6-a1d59c2f9d23";
+    const config = { plugins: [HeadingTransformer_1.standardHeadingTransformer] };
+    const result = yield (0, pluginTestRun_1.blocksToMarkdown)(config, [makeHeadingBlock(headingBlockId, "Heading One")], undefined, undefined, undefined, { docusaurusV2: true });
     expect(result.trim()).toBe(`# Heading One {#${headingBlockId.replaceAll("-", "")}}`);
 }));
+test("warns when more than one H1 is generated for a page", () => __awaiter(void 0, void 0, void 0, function* () {
+    const consoleLogSpy = vi
+        .spyOn(console, "log")
+        .mockImplementation(() => undefined);
+    try {
+        yield (0, pluginTestRun_1.blocksToMarkdown)({ plugins: [HeadingTransformer_1.standardHeadingTransformer] }, [
+            makeHeadingBlock("11111111-1111-1111-1111-111111111111", "Heading One"),
+            makeHeadingBlock("22222222-2222-2222-2222-222222222222", "Heading Two"),
+        ]);
+    }
+    finally {
+        expect(consoleLogSpy.mock.calls.some(call => String(call[0]).includes('contains 2 H1 headings. Docusaurus pages should have at most one H1. H1 headings: "Heading One", "Heading Two".'))).toBe(true);
+        consoleLogSpy.mockRestore();
+    }
+}));
+test("does not warn when multiple markdown-style H1 lines appear inside a code block", () => __awaiter(void 0, void 0, void 0, function* () {
+    const consoleLogSpy = vi
+        .spyOn(console, "log")
+        .mockImplementation(() => undefined);
+    try {
+        yield (0, pluginTestRun_1.blocksToMarkdown)({ plugins: [HeadingTransformer_1.standardHeadingTransformer] }, [
+            makeCodeBlock("# Not a heading\n# Still not a heading", "markdown"),
+        ]);
+    }
+    finally {
+        expect(consoleLogSpy.mock.calls.some(call => String(call[0]).includes("H1 headings"))).toBe(false);
+        consoleLogSpy.mockRestore();
+    }
+}));
+test("does not count markdown-style H1 lines inside code blocks toward the page H1 warning", () => __awaiter(void 0, void 0, void 0, function* () {
+    const consoleLogSpy = vi
+        .spyOn(console, "log")
+        .mockImplementation(() => undefined);
+    try {
+        yield (0, pluginTestRun_1.blocksToMarkdown)({ plugins: [HeadingTransformer_1.standardHeadingTransformer] }, [
+            makeHeadingBlock("11111111-1111-1111-1111-111111111111", "Heading One"),
+            makeCodeBlock("# Not a heading", "markdown"),
+        ]);
+    }
+    finally {
+        expect(consoleLogSpy.mock.calls.some(call => String(call[0]).includes("H1 headings"))).toBe(false);
+        consoleLogSpy.mockRestore();
+    }
+}));

package/dist/plugins/HeadingTransformer.js

@@ -13,21 +13,23 @@ exports.standardHeadingTransformer = void 0;
 const log_1 = require("../log");
 // Makes links to headings work in docusaurus
 // https://github.com/sillsdev/docu-notion/issues/20
-function headingTransformer(notionToMarkdown, block) {
+function headingTransformer(context, block) {
     return __awaiter(this, void 0, void 0, function* () {
         // First, remove the prefix we added to the heading type
         block.type = block.type.replace("DN_", "");
-        const markdown = yield notionToMarkdown.blockToMarkdown(block);
+        const markdown = yield context.notionToMarkdown.blockToMarkdown(block);
         (0, log_1.logDebug)("headingTransformer, markdown of a heading before adding id", markdown);
-        // To make heading links work in docusaurus, we append an id. E.g.
-        //  ### Hello World {#my-explicit-id}
-        // See https://docusaurus.io/docs/markdown-features/toc#heading-ids.
+        // To make heading links work in Docusaurus, we add a stable block-id anchor.
+        // Docusaurus v2 uses explicit heading IDs, while the v3 default can use the
+        // MDX comment syntax at the end of the heading.
         // For some reason, inline links come in without the dashes, so we have to strip
         // dashes here to match them.
         //console.log("block.id", block.id)
         const blockIdWithoutDashes = block.id.replaceAll("-", "");
         // Finally, append the block id so that it can be the target of a link.
-        return `${markdown} {#${blockIdWithoutDashes}}`;
+        if (context.options.docusaurusV2)
+            return `${markdown} {#${blockIdWithoutDashes}}`;
+        return `${markdown} {/* #${blockIdWithoutDashes} */}`;
     });
 }
 exports.standardHeadingTransformer = {
@@ -49,15 +51,15 @@ exports.standardHeadingTransformer = {
     notionToMarkdownTransforms: [
         {
             type: "DN_heading_1",
-            getStringFromBlock: (context, block) => headingTransformer(context.notionToMarkdown, block),
+            getStringFromBlock: (context, block) => headingTransformer(context, block),
         },
         {
             type: "DN_heading_2",
-            getStringFromBlock: (context, block) => headingTransformer(context.notionToMarkdown, block),
+            getStringFromBlock: (context, block) => headingTransformer(context, block),
         },
         {
             type: "DN_heading_3",
-            getStringFromBlock: (context, block) => headingTransformer(context.notionToMarkdown, block),
+            getStringFromBlock: (context, block) => headingTransformer(context, block),
         },
     ],
 };

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)({
@@ -513,7 +559,7 @@ test("internal link inside callout", () => __awaiter(void 0, void 0, void 0, fun
             color: "gray_background",
         },
     }, targetPage);
-    expect(results.trim()).toBe(`:::caution
+    expect(results.trim()).toBe(`:::warning[Caution]
 
 Callouts inline [great page](/hello-world).
 

package/dist/plugins/pluginTestRun.d.ts

@@ -1,11 +1,12 @@
 import { NotionPage } from "../NotionPage";
 import { IDocuNotionConfig } from "../config/configuration";
+import { DocuNotionOptions } from "../pull";
 import { NotionBlock } from "../types";
 export declare const kTemporaryTestDirectory = "tempTestFileDir";
-export declare function blocksToMarkdown(config: IDocuNotionConfig, blocks: NotionBlock[], pages?: NotionPage[], children?: NotionBlock[], validApiKey?: string): Promise<string>;
+export declare function blocksToMarkdown(config: IDocuNotionConfig, blocks: NotionBlock[], pages?: NotionPage[], children?: NotionBlock[], validApiKey?: string, optionsOverrides?: Partial<DocuNotionOptions>): Promise<string>;
 export declare function makeSamplePageObject(options: {
     slug?: string;
     name?: string;
     id?: string;
 }): NotionPage;
-export declare function oneBlockToMarkdown(config: IDocuNotionConfig, block: Record<string, unknown>, targetPage?: NotionPage, targetPage2?: NotionPage): Promise<string>;
+export declare function oneBlockToMarkdown(config: IDocuNotionConfig, block: Record<string, unknown>, targetPage?: NotionPage, targetPage2?: NotionPage, optionsOverrides?: Partial<DocuNotionOptions>): Promise<string>;

package/dist/plugins/pluginTestRun.js

@@ -26,7 +26,7 @@ function blocksToMarkdown(config, blocks, pages,
 //   - These children will apply to each block in blocks. (could enhance but not needed yet)
 //   - If you are passing in children, it is probably because your parent block has has_children=true.
 //     In that case, notion-to-md will make an API call... you'll need to set any validApiKey.
-children, validApiKey) {
+children, validApiKey, optionsOverrides) {
     return __awaiter(this, void 0, void 0, function* () {
         const notionClient = new client_1.Client({
             auth: validApiKey || "unused",
@@ -59,15 +59,7 @@ children, validApiKey) {
                 slug: "not yet",
             },
             layoutStrategy: new HierarchicalNamedLayoutStrategy_1.HierarchicalNamedLayoutStrategy(),
-            options: {
-                notionToken: "",
-                rootPage: "",
-                locales: [],
-                markdownOutputPath: "",
-                imgOutputPath: "",
-                imgPrefixInMarkdown: "",
-                statusTag: "",
-            },
+            options: Object.assign({ notionToken: "", rootPage: "", locales: [], markdownOutputPath: "", imgOutputPath: "", imgPrefixInMarkdown: "", statusTag: "", docusaurusV2: false }, optionsOverrides),
             pages: pages !== null && pages !== void 0 ? pages : [],
             counts: {
                 output_normally: 0,
@@ -228,7 +220,7 @@ function makeSamplePageObject(options) {
     // console.log(p.matchesLinkId);
     return p;
 }
-function oneBlockToMarkdown(config, block, targetPage, targetPage2) {
+function oneBlockToMarkdown(config, block, targetPage, targetPage2, optionsOverrides) {
     return __awaiter(this, void 0, void 0, function* () {
         // just in case someone expects these other properties that aren't normally relevant,
         // we merge the given block properties into an actual, full block
@@ -260,6 +252,8 @@ function oneBlockToMarkdown(config, block, targetPage, targetPage2) {
             slug: "dummy2",
             name: "Dummy2",
         });
-        return yield blocksToMarkdown(config, [fullBlock], targetPage ? [dummyPage1, targetPage, targetPage2 !== null && targetPage2 !== void 0 ? targetPage2 : dummyPage2] : undefined);
+        return yield blocksToMarkdown(config, [fullBlock], targetPage
+            ? [dummyPage1, targetPage, targetPage2 !== null && targetPage2 !== void 0 ? targetPage2 : dummyPage2]
+            : undefined, undefined, undefined, optionsOverrides);
     });
 }

package/dist/pull.d.ts

@@ -11,7 +11,11 @@ export type DocuNotionOptions = {
     statusTag: string;
     requireSlugs?: boolean;
     imageFileNameFormat?: ImageFileNameFormat;
+    docusaurusV2?: boolean;
 };
+export declare function getOptionsForLogging<T extends {
+    notionToken: string;
+}>(options: T): T;
 export declare function notionPull(options: DocuNotionOptions): Promise<void>;
 export declare function executeWithRateLimitAndRetries<T>(label: string, asyncFunction: () => Promise<T>): Promise<T>;
 export declare function initNotionClient(notionToken: string): Client;

package/dist/pull.js

@@ -42,6 +42,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getOptionsForLogging = getOptionsForLogging;
 exports.notionPull = notionPull;
 exports.executeWithRateLimitAndRetries = executeWithRateLimitAndRetries;
 exports.initNotionClient = initNotionClient;
@@ -54,11 +55,15 @@ 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");
+function getOptionsForLogging(options) {
+    return Object.assign(Object.assign({}, options), { notionToken: options.notionToken.substring(0, 10) + "..." });
+}
+const kNotionApiVersion = "2026-03-11";
 let layoutStrategy;
 let notionToMarkdown;
 const pages = new Array();
@@ -72,11 +77,7 @@ const counts = {
 function notionPull(options) {
     return __awaiter(this, void 0, void 0, function* () {
         // It's helpful when troubleshooting CI secrets and environment variables to see what options actually made it to docu-notion.
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-        const optionsForLogging = Object.assign({}, options);
-        // Just show the first few letters of the notion token, which start with "secret" anyhow.
-        optionsForLogging.notionToken =
-            optionsForLogging.notionToken.substring(0, 10) + "...";
+        const optionsForLogging = getOptionsForLogging(options);
         const config = yield (0, configuration_1.loadConfigAsync)();
         (0, log_1.verbose)(`Options:${JSON.stringify(optionsForLogging, null, 2)}`);
         yield (0, images_1.initImageHandling)(options.imgPrefixInMarkdown || options.imgOutputPath || "", options.imgOutputPath || "", options.locales);
@@ -281,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
@@ -293,7 +297,7 @@ function getBlockChildren(id) {
         // we could switch to using that (I don't know if it does rate limiting?)
         do {
             const response = yield notionClient.blocks.children.list({
-                start_cursor: start_cursor,
+                start_cursor,
                 block_id: id,
             });
             if (!overallResult) {
@@ -304,18 +308,29 @@ 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* () {

package/dist/run.js

@@ -73,13 +73,15 @@ function run() {
             .option("-i, --img-output-path  <string>", "Path to directory where images will be stored. If this is not included, images will be placed in the same directory as the document that uses them, which then allows for localization of screenshots.")
             .option("-p, --img-prefix-in-markdown <string>", "When referencing an image from markdown, prefix with this path instead of the full img-output-path. Should be used only in conjunction with --img-output-path.")
             .option("--require-slugs", "If set, docu-notion will fail if any pages it would otherwise publish are missing a slug in Notion.", false)
+            .option("--docusaurus-v2", "Emit Docusaurus v2-compatible markdown. By default docu-notion emits Docusaurus v3-compatible output.", false)
             .addOption(new commander_1.Option("--image-file-name-format <format>", "format:\n- default: {page slug (if any)}.{image block ID}\n- content-hash: Use a hash of the image content.\n- legacy: Use the legacy (before v0.16) method of determining file names. Set this to maintain backward compatibility.\nAll formats will use the original file extension.")
             .choices(["default", "content-hash", "legacy"])
             .default("default"));
         commander_1.program.showHelpAfterError();
         commander_1.program.parse();
-        (0, log_1.setLogLevel)(commander_1.program.opts().logLevel);
-        console.log(JSON.stringify(commander_1.program.opts()));
+        const parsedOptions = commander_1.program.opts();
+        (0, log_1.setLogLevel)(parsedOptions.logLevel);
+        console.log(JSON.stringify((0, pull_1.getOptionsForLogging)(parsedOptions)));
         // copy in the this version of the css needed to make columns (and maybe other things?) work
         let pathToCss = "";
         try {
@@ -90,10 +92,10 @@ function run() {
             pathToCss = "./src/css/docu-notion-styles.css";
         }
         // make any missing parts of the path exist
-        fs.ensureDirSync(commander_1.program.opts().cssOutputDirectory);
-        fs.copyFileSync(pathToCss, path_1.default.join(commander_1.program.opts().cssOutputDirectory, "docu-notion-styles.css"));
+        fs.ensureDirSync(parsedOptions.cssOutputDirectory);
+        fs.copyFileSync(pathToCss, path_1.default.join(parsedOptions.cssOutputDirectory, "docu-notion-styles.css"));
         // pull and convert
-        yield (0, pull_1.notionPull)(commander_1.program.opts()).then(() => console.log("docu-notion Finished."));
+        yield (0, pull_1.notionPull)(parsedOptions).then(() => console.log("docu-notion Finished."));
     });
 }
 function parseLocales(value) {

package/dist/transform.js

@@ -45,6 +45,13 @@ function getMarkdownFromNotionBlocks(context, config, blocks) {
         //console.log("markdown after link fixes", markdown);
         // simple regex-based tweaks. These are usually related to docusaurus
         const body = yield doTransformsOnMarkdown(context, config, markdown);
+        const h1Headings = getMarkdownH1Headings(body);
+        if (h1Headings.length > 1) {
+            const pageLabel = context.pageInfo.slug || "(unknown page)";
+            (0, log_1.warning)(`[docu-notion] Generated page "${pageLabel}" contains ${h1Headings.length} H1 headings. Docusaurus pages should have at most one H1. H1 headings: ${h1Headings
+                .map(heading => `"${heading}"`)
+                .join(", ")}.`);
+        }
         // console.log("markdown after regex fixes", markdown);
         // console.log("body after regex", body);
         const uniqueImports = [...new Set(context.imports)];
@@ -53,6 +60,30 @@ function getMarkdownFromNotionBlocks(context, config, blocks) {
         return `${imports}\n${body}`;
     });
 }
+function getMarkdownH1Headings(body) {
+    const headings = [];
+    let activeFenceMarker;
+    for (const line of body.split(/\r?\n/)) {
+        const trimmedLine = line.trimStart();
+        if (trimmedLine.startsWith("```")) {
+            activeFenceMarker = activeFenceMarker === "```" ? undefined : "```";
+            continue;
+        }
+        if (trimmedLine.startsWith("~~~")) {
+            activeFenceMarker = activeFenceMarker === "~~~" ? undefined : "~~~";
+            continue;
+        }
+        if (activeFenceMarker || !/^#\s+/.test(line)) {
+            continue;
+        }
+        headings.push(line
+            .replace(/^#\s+/, "")
+            .replace(/\s+\{\/\*\s*#.*?\*\/\}\s*$/, "")
+            .replace(/\s+\{#.*?\}\s*$/, "")
+            .trim());
+    }
+    return headings;
+}
 // operations on notion blocks before they are converted to markdown
 function doNotionBlockTransforms(blocks, config) {
     for (const block of blocks) {

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;