@sillsdev/docu-notion 0.14.0-alpha.15 → 0.14.0-alpha.17

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

@@ -7,4 +7,4 @@ export declare function makeSamplePageObject(options: {
     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

@@ -226,7 +226,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 +258,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.14.0-alpha.15"
+  "version": "0.14.0-alpha.17"
 }