@sillsdev/docu-notion 0.16.0 → 0.16.2-alpha.1

package/dist/assets.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="node" />
+export declare enum AssetType {
+    Image = "image",
+    Video = "video"
+}
+export declare function writeAsset(path: string, buffer: Buffer): void;

package/dist/assets.js

@@ -0,0 +1,50 @@
+"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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.writeAsset = exports.AssetType = void 0;
+const fs = __importStar(require("fs-extra"));
+const Path = __importStar(require("path"));
+const log_1 = require("./log");
+var AssetType;
+(function (AssetType) {
+    AssetType["Image"] = "image";
+    AssetType["Video"] = "video";
+})(AssetType = exports.AssetType || (exports.AssetType = {}));
+function writeAsset(path, buffer) {
+    // Note: it's tempting to not spend time writing this out if we already have
+    // it from a previous run. But we don't really know it's the same. A) it
+    // could just have the same name, B) it could have been previously
+    // unlocalized and thus filled with a copy of the primary language image
+    // while and now is localized.
+    if (fs.pathExistsSync(path)) {
+        (0, log_1.verbose)("Replacing asset " + path);
+    }
+    else {
+        (0, log_1.verbose)("Adding asset " + path);
+        fs.mkdirsSync(Path.dirname(path));
+    }
+    fs.createWriteStream(path).write(buffer); // async but we're not waiting
+}
+exports.writeAsset = writeAsset;

package/dist/images.js

@@ -39,9 +39,9 @@ exports.cleanupOldImages = exports.parseImageBlock = exports.markdownToMDImageTr
 const fs = __importStar(require("fs-extra"));
 const file_type_1 = __importDefault(require("file-type"));
 const axios_1 = __importDefault(require("axios"));
-const Path = __importStar(require("path"));
 const MakeImagePersistencePlan_1 = require("./MakeImagePersistencePlan");
 const log_1 = require("./log");
+const assets_1 = require("./assets");
 // We handle several things here:
 // 1) copy images locally instead of leaving them in Notion
 // 2) change the links to point here
@@ -142,10 +142,12 @@ function readPrimaryImage(imageSet) {
 }
 function saveImage(imageSet) {
     return __awaiter(this, void 0, void 0, function* () {
-        writeImageIfNew(imageSet.primaryFileOutputPath, imageSet.primaryBuffer);
+        const path = imageSet.primaryFileOutputPath;
+        imageWasSeen(path);
+        (0, assets_1.writeAsset)(path, imageSet.primaryBuffer);
         for (const localizedImage of imageSet.localizedUrls) {
             let buffer = imageSet.primaryBuffer;
-            // if we have a urls for the localized screenshot, download it
+            // if we have a url for the localized screenshot, download it
             if ((localizedImage === null || localizedImage === void 0 ? void 0 : localizedImage.url.length) > 0) {
                 (0, log_1.verbose)(`Retrieving ${localizedImage.iso632Code} version...`);
                 const response = yield fetch(localizedImage.url);
@@ -157,26 +159,12 @@ function saveImage(imageSet) {
                 // otherwise, we're going to fall back to outputting the primary image here
             }
             const directory = `./i18n/${localizedImage.iso632Code}/docusaurus-plugin-content-docs/current/${imageSet.pageInfo.relativeFilePathToFolderContainingPage}`;
-            writeImageIfNew((directory + "/" + imageSet.outputFileName).replaceAll("//", "/"), buffer);
+            const newPath = (directory + "/" + imageSet.outputFileName).replaceAll("//", "/");
+            imageWasSeen(newPath);
+            (0, assets_1.writeAsset)(newPath, buffer);
         }
     });
 }
-function writeImageIfNew(path, buffer) {
-    imageWasSeen(path);
-    // Note: it's tempting to not spend time writing this out if we already have
-    // it from a previous run. But we don't really know it's the same. A) it
-    // could just have the same name, B) it could have been previously
-    // unlocalized and thus filled with a copy of the primary language image
-    // while and now is localized.
-    if (fs.pathExistsSync(path)) {
-        (0, log_1.verbose)("Replacing image " + path);
-    }
-    else {
-        (0, log_1.verbose)("Adding image " + path);
-        fs.mkdirsSync(Path.dirname(path));
-    }
-    fs.createWriteStream(path).write(buffer); // async but we're not waiting
-}
 function parseImageBlock(image) {
     var _a;
     if (!locales)

package/dist/plugins/VideoTransformer.js

@@ -1,33 +1,103 @@
 "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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.standardVideoTransformer = void 0;
+const Path = __importStar(require("path"));
 const log_1 = require("../log");
+const assets_1 = require("../assets");
 exports.standardVideoTransformer = {
     name: "video",
     notionToMarkdownTransforms: [
         {
             type: "video",
-            getStringFromBlock: (context, block) => {
-                const video = block.video;
-                let url = "";
-                switch (video.type) {
-                    case "external":
-                        url = video.external.url;
-                        break;
-                    case "file":
-                        url = video.file.url;
-                        break;
-                    default:
-                        // video.type can only be "external" or "file" as of the writing of this code, so typescript
-                        // isn't happy trying to turn video.type into a string. But this default in our switch is
-                        // just attempting some future-proofing. Thus the strange typing/stringifying below.
-                        (0, log_1.warning)(`[standardVideoTransformer] Found Notion "video" block with type ${JSON.stringify(video.type)}. The best docu-notion can do for now is ignore it.`);
-                        return "";
-                        break;
-                }
-                context.imports.push(`import ReactPlayer from "react-player";`);
-                return `<ReactPlayer controls url="${url}" />`;
-            },
+            getStringFromBlock: (context, block) => markdownToMDVideoTransformer(block, context),
         },
     ],
 };
+function markdownToMDVideoTransformer(block, context) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const videoBlock = block;
+        const video = videoBlock.video;
+        let url = "";
+        switch (video.type) {
+            case "external":
+                url = `"${video.external.url}"`;
+                break;
+            case "file":
+                // The url we get for a Notion-hosted asset expires after an hour, so we have to download it locally.
+                url = yield downloadVideoAndConvertUrl(context, video.file.url, videoBlock.id);
+                break;
+            default:
+                // video.type can only be "external" or "file" as of the writing of this code, so typescript
+                // isn't happy trying to turn video.type into a string. But this default in our switch is
+                // just attempting some future-proofing. Thus the strange typing/stringifying below.
+                (0, log_1.warning)(`[standardVideoTransformer] Found Notion "video" block with type ${JSON.stringify(video.type)}. The best docu-notion can do for now is ignore it.`);
+                return "";
+        }
+        context.imports.push(`import ReactPlayer from "react-player";`);
+        return `<ReactPlayer controls url=${url} />`;
+    });
+}
+// ENHANCE: One day, we may want to allow for options of where to place the files, how
+// to name them, etc. Or we could at least follow the image options.
+// But for now, I'm just trying to fix the bug that Notion-hosted videos don't work at all.
+function downloadVideoAndConvertUrl(context, notionVideoUrl, blockId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        // Get the file name from the url. Ignore query parameters and fragments.
+        let newFileName = notionVideoUrl.split("?")[0].split("#")[0].split("/").pop();
+        if (!newFileName) {
+            // If something went wrong, fall back to the block ID.
+            // But at least try to get the extension from the url.
+            const extension = notionVideoUrl
+                .split("?")[0]
+                .split("#")[0]
+                .split(".")
+                .pop();
+            newFileName = blockId + (extension ? "." + extension : "");
+        }
+        const newPath = Path.posix.join(context.pageInfo.directoryContainingMarkdown, newFileName);
+        const response = yield fetch(notionVideoUrl);
+        const arrayBuffer = yield response.arrayBuffer();
+        const buffer = Buffer.from(arrayBuffer);
+        (0, assets_1.writeAsset)(newPath, buffer);
+        // Add an import statement for the video file.
+        // Otherwise, the docusaurus build won't include the video file in the build.
+        const countVideoImports = context.imports.filter(i => {
+            return /import video\d+/.exec(i);
+        }).length;
+        const importName = `video${countVideoImports + 1}`;
+        context.imports.push(`import ${importName} from "./${newFileName}";`);
+        return `{${importName}}`;
+    });
+}

package/dist/plugins/VideoTransformer.spec.js

@@ -1,4 +1,27 @@
 "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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -9,9 +32,31 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const fs = __importStar(require("fs-extra"));
 const log_1 = require("../log");
 const VideoTransformer_1 = require("./VideoTransformer");
 const pluginTestRun_1 = require("./pluginTestRun");
+beforeAll(() => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        if (yield fs.pathExists(pluginTestRun_1.kTemporaryTestDirectory)) {
+            yield fs.emptyDir(pluginTestRun_1.kTemporaryTestDirectory);
+        }
+        else {
+            yield fs.mkdirp(pluginTestRun_1.kTemporaryTestDirectory);
+        }
+    }
+    catch (err) {
+        console.error("Error in beforeAll:", err);
+    }
+}));
+afterAll(() => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        yield fs.remove(pluginTestRun_1.kTemporaryTestDirectory);
+    }
+    catch (err) {
+        console.error("Error in afterAll:", err);
+    }
+}));
 test("youtube embedded", () => __awaiter(void 0, void 0, void 0, function* () {
     const config = { plugins: [VideoTransformer_1.standardVideoTransformer] };
     const result = yield (0, pluginTestRun_1.blocksToMarkdown)(config, [
@@ -89,6 +134,8 @@ test("video link, not embedded", () => __awaiter(void 0, void 0, void 0, functio
 test("direct upload to to Notion (embedded)", () => __awaiter(void 0, void 0, void 0, function* () {
     (0, log_1.setLogLevel)("verbose");
     const config = { plugins: [VideoTransformer_1.standardVideoTransformer] };
+    const fileName1 = "first_video.mp4";
+    const fileName2 = "second_video.mp4";
     const result = yield (0, pluginTestRun_1.blocksToMarkdown)(config, [
         {
             object: "block",
@@ -102,11 +149,35 @@ test("direct upload to to Notion (embedded)", () => __awaiter(void 0, void 0, vo
                 caption: [],
                 type: "file",
                 file: {
-                    url: "https://s3.us-west-2.amazonaws.com/secure.notion-static.com/f6bc4746-011e-2124-86ca-ed4337d70891/people_fre_motionAsset_p3.mp4?X-Blah-blah",
+                    url: `https://s3.us-west-2.amazonaws.com/secure.notion-static.com/f6bc4746-011e-2124-86ca-ed4337d70891/${fileName1}?X-Blah-blah`,
+                },
+            },
+        },
+        {
+            object: "block",
+            id: "12f7db3b-4412-4be9-a3f7-6ac423fee94b",
+            parent: {
+                type: "page_id",
+                page_id: "edaffeb2-ece8-4d44-976f-351e6b5757bb",
+            },
+            type: "video",
+            video: {
+                caption: [],
+                type: "file",
+                file: {
+                    url: `https://s3.us-west-2.amazonaws.com/secure.notion-static.com/f6bc4746-011e-2124-86ca-ed4337d70891/${fileName2}?X-Blah-blah`,
                 },
             },
         },
     ]);
     expect(result).toContain(`import ReactPlayer from "react-player";`);
-    expect(result).toContain(`<ReactPlayer controls url="https://s3.us-west-2.amazonaws.com/secure.notion-static.com/f6bc4746-011e-2124-86ca-ed4337d70891/people_fre_motionAsset_p3.mp4?X-Blah-blah" />`);
+    expect(result).toContain(`import video1 from "./${fileName1}";`);
+    expect(result).toContain(`import video2 from "./${fileName2}";`);
+    expect(result).toContain(`<ReactPlayer controls url={video1} />`);
+    expect(result).toContain(`<ReactPlayer controls url={video2} />`);
+    // Wait half a second for the files to be written
+    yield new Promise(resolve => setTimeout(resolve, 500));
+    // We should have actually created files in "tempTestFileDir/"
+    expect(yield fs.pathExists("tempTestFileDir/" + fileName1)).toBe(true);
+    expect(yield fs.pathExists("tempTestFileDir/" + fileName2)).toBe(true);
 }));

package/dist/plugins/internalLinks.js

@@ -29,7 +29,8 @@ function convertInternalUrl(context, url) {
 exports.convertInternalUrl = convertInternalUrl;
 // handles the whole markdown link, including the label
 function convertInternalLink(context, markdownLink) {
-    const linkRegExp = /\[([^\]]+)?\]\(\/?([^),^/]+)\)/g;
+    // match both [foo](/123) and [bar](https://www.notion.so/123) <-- the "mention" link style
+    const linkRegExp = /\[([^\]]+)?\]\((?:https?:\/\/www\.notion\.so\/|\/)?([^),^/]+)\)/g;
     const match = linkRegExp.exec(markdownLink);
     if (match === null) {
         (0, log_1.warning)(`[standardInternalLinkConversion] Could not parse link ${markdownLink}`);
@@ -96,7 +97,9 @@ exports.standardInternalLinkConversion = {
         // (has some other text that's been turned into a link) or "raw".
         // 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)
-        match: /\[([^\]]+)?\]\((?!mailto:)(\/?[^),^/]+)\)/,
+        // "Mention" links come in as full URLs, e.g. [link_to_page](https://www.notion.so/62f1187010214b0883711a1abb277d31)
+        // 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\/[^),^/]+|\/?[^),^/]+)\)/,
         convert: convertInternalLink,
     },
 };

package/dist/plugins/internalLinks.spec.js

@@ -38,6 +38,43 @@ test("urls that show up as raw text get left that way", () => __awaiter(void 0,
     });
     expect(results.trim()).toBe("https://github.com");
 }));
+// See https://github.com/sillsdev/docu-notion/issues/97
+test("mention-style link to an existing page", () => __awaiter(void 0, void 0, void 0, function* () {
+    const targetPageId = "123";
+    const targetPage = (0, pluginTestRun_1.makeSamplePageObject)({
+        slug: undefined,
+        name: "Hello World",
+        id: targetPageId,
+    });
+    const results = yield getMarkdown({
+        type: "paragraph",
+        paragraph: {
+            rich_text: [
+                {
+                    type: "mention",
+                    mention: {
+                        type: "page",
+                        page: {
+                            id: `${targetPageId}`,
+                        },
+                    },
+                    annotations: {
+                        bold: false,
+                        italic: false,
+                        strikethrough: false,
+                        underline: false,
+                        code: false,
+                        color: "default",
+                    },
+                    plain_text: "foo",
+                    href: `https://www.notion.so/${targetPageId}`,
+                },
+            ],
+            color: "default",
+        },
+    }, targetPage);
+    expect(results.trim()).toBe(`[foo](/${targetPageId})`);
+}));
 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)({
@@ -517,7 +554,78 @@ test("internal link inside codeblock ignored", () => __awaiter(void 0, void 0, v
     }, targetPage);
     expect(results.trim()).toContain("this should not change [link](https://www.notion.so/native/metapages/mypage)");
 }));
-function getMarkdown(block, targetPage) {
+test("multiple internal links in a paragraph", () => __awaiter(void 0, void 0, void 0, function* () {
+    const targetPageAId = "123";
+    const targetPageA = (0, pluginTestRun_1.makeSamplePageObject)({
+        slug: undefined,
+        name: "Hello World A",
+        id: targetPageAId,
+    });
+    const targetPageBId = "456";
+    const targetPageB = (0, pluginTestRun_1.makeSamplePageObject)({
+        slug: undefined,
+        name: "Hello World B",
+        id: targetPageBId,
+    });
+    const results = yield getMarkdown({
+        type: "paragraph",
+        paragraph: {
+            rich_text: [
+                {
+                    type: "text",
+                    text: {
+                        content: "A",
+                        link: { url: `/${targetPageAId}` },
+                    },
+                    annotations: {
+                        bold: false,
+                        italic: false,
+                        strikethrough: false,
+                        underline: false,
+                        code: false,
+                        color: "default",
+                    },
+                    plain_text: "A",
+                    href: `/${targetPageAId}`,
+                },
+                {
+                    type: "text",
+                    text: { content: " ", link: null },
+                    annotations: {
+                        bold: false,
+                        italic: false,
+                        strikethrough: false,
+                        underline: false,
+                        code: false,
+                        color: "default",
+                    },
+                    plain_text: " ",
+                    href: null,
+                },
+                {
+                    type: "text",
+                    text: {
+                        content: "B",
+                        link: { url: `/${targetPageBId}` },
+                    },
+                    annotations: {
+                        bold: false,
+                        italic: false,
+                        strikethrough: false,
+                        underline: false,
+                        code: false,
+                        color: "default",
+                    },
+                    plain_text: "B",
+                    href: `/${targetPageBId}`,
+                },
+            ],
+            color: "default",
+        },
+    }, targetPageA, targetPageB);
+    expect(results.trim()).toBe(`[A](/${targetPageAId}) [B](/${targetPageBId})`);
+}));
+function getMarkdown(block, targetPage, targetPage2) {
     return __awaiter(this, void 0, void 0, function* () {
         const config = {
             plugins: [
@@ -526,6 +634,6 @@ function getMarkdown(block, targetPage) {
                 externalLinks_1.standardExternalLinkConversion,
             ],
         };
-        return yield (0, pluginTestRun_1.oneBlockToMarkdown)(config, block, targetPage);
+        return yield (0, pluginTestRun_1.oneBlockToMarkdown)(config, block, targetPage, targetPage2);
     });
 }

package/dist/plugins/pluginTestRun.d.ts

@@ -1,10 +1,11 @@
 import { NotionPage } from "../NotionPage";
 import { IDocuNotionConfig } from "../config/configuration";
 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 makeSamplePageObject(options: {
     slug?: string;
     name?: string;
     id?: string;
 }): NotionPage;
-export declare function oneBlockToMarkdown(config: IDocuNotionConfig, block: Record<string, unknown>, targetPage?: NotionPage): Promise<string>;
+export declare function oneBlockToMarkdown(config: IDocuNotionConfig, block: Record<string, unknown>, targetPage?: NotionPage, targetPage2?: NotionPage): Promise<string>;

package/dist/plugins/pluginTestRun.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.oneBlockToMarkdown = exports.makeSamplePageObject = exports.blocksToMarkdown = void 0;
+exports.oneBlockToMarkdown = exports.makeSamplePageObject = exports.blocksToMarkdown = exports.kTemporaryTestDirectory = void 0;
 const client_1 = require("@notionhq/client");
 const notion_to_md_1 = require("notion-to-md");
 const HierarchicalNamedLayoutStrategy_1 = require("../HierarchicalNamedLayoutStrategy");
@@ -17,6 +17,7 @@ const NotionPage_1 = require("../NotionPage");
 const transform_1 = require("../transform");
 const internalLinks_1 = require("./internalLinks");
 const pull_1 = require("../pull");
+exports.kTemporaryTestDirectory = "tempTestFileDir";
 function blocksToMarkdown(config, blocks, pages, 
 // Notes on children:
 //   - These children will apply to each block in blocks. (could enhance but not needed yet)
@@ -50,7 +51,7 @@ children, validApiKey) {
             imports: [],
             //TODO might be needed for some tests, e.g. the image transformer...
             pageInfo: {
-                directoryContainingMarkdown: "not yet",
+                directoryContainingMarkdown: exports.kTemporaryTestDirectory,
                 relativeFilePathToFolderContainingPage: "not yet",
                 slug: "not yet",
             },
@@ -226,7 +227,7 @@ function makeSamplePageObject(options) {
     return p;
 }
 exports.makeSamplePageObject = makeSamplePageObject;
-function oneBlockToMarkdown(config, block, targetPage) {
+function oneBlockToMarkdown(config, block, targetPage, targetPage2) {
     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
@@ -258,7 +259,7 @@ function oneBlockToMarkdown(config, block, targetPage) {
             slug: "dummy2",
             name: "Dummy2",
         });
-        return yield blocksToMarkdown(config, [fullBlock], targetPage ? [dummyPage1, targetPage, dummyPage2] : undefined);
+        return yield blocksToMarkdown(config, [fullBlock], targetPage ? [dummyPage1, targetPage, targetPage2 !== null && targetPage2 !== void 0 ? targetPage2 : dummyPage2] : undefined);
     });
 }
 exports.oneBlockToMarkdown = oneBlockToMarkdown;

package/dist/pull.js

@@ -163,7 +163,7 @@ function getPagesRecursively(options, incomingContext, pageIdOfThisParent, order
         if (!rootLevel &&
             pageInfo.hasParagraphs &&
             pageInfo.childPageIdsAndOrder.length) {
-            (0, log_1.error)(`Skipping "${pageInTheOutline.nameOrTitle}"  and its children. docu-notion does not support pages that are both levels and have content at the same time.`);
+            (0, log_1.error)(`Skipping "${pageInTheOutline.nameOrTitle}"  and its children. docu-notion does not support pages that are both levels and have text content (paragraphs) at the same time. Normally outline pages should just be composed of 1) links to other pages and 2) child pages (other levels of the outline). Note that @-mention style links appear as text paragraphs to docu-notion so must not be used to form the outline.`);
             ++counts.skipped_because_level_cannot_have_content;
             return;
         }

package/dist/transform.js

@@ -149,7 +149,7 @@ function doNotionToMarkdown(docunotionContext, blocks) {
 // 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)
 function doLinkFixes(context, markdown, config) {
-    const linkRegExp = /\[.*\]\([^\)]*\)/g;
+    const linkRegExp = /\[.*?\]\([^\)]*?\)/g;
     (0, log_1.logDebug)("markdown before link fixes", markdown);
     let match;
     // since we're going to make changes to the markdown,

package/package.json

@@ -91,5 +91,5 @@
   "volta": {
     "node": "18.16.0"
   },
-  "version": "0.16.0"
+  "version": "0.16.2-alpha.1"
 }