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

package/dist/plugins/internalLinks.spec.js

@@ -554,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: [
@@ -563,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/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.16"
+  "version": "0.14.0-alpha.17"
 }