@sillsdev/docu-notion 1.0.0-alpha.5 → 1.0.0-alpha.6

package/README.md

@@ -58,7 +58,7 @@ means that the ID is `0456aa5842946PRETEND4f37c97a0e5`.
 Try it out:
 
 ```
-npx @sillsdev/docu-notion -n secret_PRETEND123456789PRETEND123456789PRETEND6789 -r 0456aa5842946PRETEND4f37c97a0e5"
+npx @sillsdev/docu-notion -n secret_PRETEND123456789PRETEND123456789PRETEND6789 -r 0456aa5842946PRETEND4f37c97a0e5
 ```
 
 Likely, you will want to store these codes in your environment variables and then use them like this:

package/dist/plugins/internalLinks.js

@@ -29,7 +29,10 @@ function normalizeLinkBaseId(baseLinkId) {
         }
     }
     const withoutLeadingSlash = withoutQuery.replace(/^\/+/, "");
-    return withoutLeadingSlash;
+    // Newer Notion links can also use a relative "/p/<page-id>" form.
+    return withoutLeadingSlash.startsWith("p/")
+        ? withoutLeadingSlash.substring(2)
+        : 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)
@@ -125,7 +128,7 @@ exports.standardInternalLinkConversion = {
         // "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\/[^),^/]+|https?:\/\/app\.notion\.com\/(?:p\/)?[^),^/]+|\/?[^),^/]+)\)/,
+        match: /\[([^\]]+)?\]\((?!mailto:)(https?:\/\/(?:www\.)?notion\.so\/[^),^/]+|https?:\/\/app\.notion\.com\/(?:p\/)?[^),^/]+|\/?(?:p\/)?[^),^/]+)\)/,
         convert: convertInternalLink,
     },
 };

package/dist/plugins/internalLinks.spec.js

@@ -121,6 +121,16 @@ test("parseLinkId extracts the page id from app.notion.com URLs", () => {
         fragmentId: "",
     });
 });
+test("parseLinkId extracts the page id from relative /p/ links", () => {
+    expect((0, internalLinks_1.parseLinkId)("/p/123456781234123412341234567890ab")).toEqual({
+        baseLinkId: "123456781234123412341234567890ab",
+        fragmentId: "",
+    });
+    expect((0, internalLinks_1.parseLinkId)("/p/123456781234123412341234567890ab#heading")).toEqual({
+        baseLinkId: "123456781234123412341234567890ab",
+        fragmentId: "#heading",
+    });
+});
 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)({
@@ -183,6 +193,68 @@ test("link to an existing page on this site that has no slug", () => __awaiter(v
     }, targetPage);
     expect(results.trim()).toBe(`Inline [great page](/${targetPageId}) the end.`);
 }));
+test("inline link using the newer relative /p/ form", () => __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: "text",
+                    text: { content: "Inline ", link: null },
+                    annotations: {
+                        bold: false,
+                        italic: false,
+                        strikethrough: false,
+                        underline: false,
+                        code: false,
+                        color: "default",
+                    },
+                    plain_text: "Inline ",
+                    href: null,
+                },
+                {
+                    type: "text",
+                    text: {
+                        content: "great page",
+                        link: { url: `/p/${targetPageId}` },
+                    },
+                    annotations: {
+                        bold: false,
+                        italic: false,
+                        strikethrough: false,
+                        underline: false,
+                        code: false,
+                        color: "default",
+                    },
+                    plain_text: "great page",
+                    href: `/p/${targetPageId}`,
+                },
+                {
+                    type: "text",
+                    text: { content: " the end.", link: null },
+                    annotations: {
+                        bold: false,
+                        italic: false,
+                        strikethrough: false,
+                        underline: false,
+                        code: false,
+                        color: "default",
+                    },
+                    plain_text: " the end.",
+                    href: null,
+                },
+            ],
+            color: "default",
+        },
+    }, targetPage);
+    expect(results.trim()).toBe(`Inline [great page](/${targetPageId}) the end.`);
+}));
 test("link to a heading block on a page", () => __awaiter(void 0, void 0, void 0, function* () {
     const targetPageId = "123";
     const blocks = {

package/package.json

@@ -98,5 +98,5 @@
     "esbuild@0.17.17": true,
     "fsevents": false
   },
-  "version": "1.0.0-alpha.5"
+  "version": "1.0.0-alpha.6"
 }