@sillsdev/docu-notion 0.13.3 → 0.14.0-alpha.2

package/dist/config/default.docunotion.config.js

@@ -10,6 +10,7 @@ const EscapeHtmlBlockModifier_1 = require("../plugins/EscapeHtmlBlockModifier");
 const HeadingTransformer_1 = require("../plugins/HeadingTransformer");
 const NumberedListTransformer_1 = require("../plugins/NumberedListTransformer");
 const TableTransformer_1 = require("../plugins/TableTransformer");
+const VideoTransformer_1 = require("../plugins/VideoTransformer");
 const externalLinks_1 = require("../plugins/externalLinks");
 const defaultConfig = {
     plugins: [
@@ -24,14 +25,13 @@ const defaultConfig = {
         CalloutTransformer_1.standardCalloutTransformer,
         TableTransformer_1.standardTableTransformer,
         NumberedListTransformer_1.standardNumberedListTransformer,
+        VideoTransformer_1.standardVideoTransformer,
         // Link modifiers, which are special because they can read metadata from all the pages in order to figure out the correct url
         internalLinks_1.standardInternalLinkConversion,
         externalLinks_1.standardExternalLinkConversion,
         // Regexps plus javascript `import`s that operate on the Markdown output
         embedTweaks_1.imgurGifEmbed,
         embedTweaks_1.gifEmbed,
-        embedTweaks_1.youtubeEmbed,
-        embedTweaks_1.vimeoEmbed,
     ],
 };
 exports.default = defaultConfig;

package/dist/plugins/ColumnTransformer.js

@@ -37,7 +37,7 @@ function notionColumnToMarkdown(notionToMarkdown, getBlockChildren, block) {
         return (`<div class='notion-column' style={{width: '${columnWidth}'}}>\n\n${childrenStrings.join("\n\n")}\n\n</div>` +
             // Spacer between columns. CSS takes care of hiding this for the last column
             // and when the screen is too narrow for multiple columns.
-            `<div className='notion-spacer' />`);
+            `<div className='notion-spacer'></div>`);
     });
 }
 // The official API doesn't give us access to the format information, including column_ratio.

package/dist/plugins/VideoTransformer.d.ts

@@ -0,0 +1,2 @@
+import { IPlugin } from "./pluginTypes";
+export declare const standardVideoTransformer: IPlugin;

package/dist/plugins/VideoTransformer.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.standardVideoTransformer = void 0;
+const log_1 = require("../log");
+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}" />`;
+            },
+        },
+    ],
+};

package/dist/plugins/VideoTransformer.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/plugins/VideoTransformer.spec.js

@@ -0,0 +1,112 @@
+"use strict";
+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 });
+const log_1 = require("../log");
+const VideoTransformer_1 = require("./VideoTransformer");
+const pluginTestRun_1 = require("./pluginTestRun");
+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, [
+        {
+            object: "block",
+            type: "video",
+            video: {
+                caption: [
+                    {
+                        type: "text",
+                        text: {
+                            content: "A video about editing in Notion",
+                            link: null,
+                        },
+                        plain_text: "A video about editing in Notion",
+                        href: null,
+                    },
+                ],
+                type: "external",
+                external: { url: "https://www.youtube.com/watch?v=FXIrojSK3Jo" },
+            },
+        },
+    ]);
+    expect(result).toContain(`import ReactPlayer from "react-player";`);
+    expect(result).toContain(`<ReactPlayer controls url="https://www.youtube.com/watch?v=FXIrojSK3Jo" />`);
+}));
+test("vimeo embedded", () => __awaiter(void 0, void 0, void 0, function* () {
+    (0, log_1.setLogLevel)("verbose");
+    const config = { plugins: [VideoTransformer_1.standardVideoTransformer] };
+    const result = yield (0, pluginTestRun_1.blocksToMarkdown)(config, [
+        {
+            object: "block",
+            type: "video",
+            video: {
+                caption: [],
+                type: "external",
+                external: { url: "https://vimeo.com/4613611xx" },
+            },
+        },
+    ]);
+    expect(result).toContain(`import ReactPlayer from "react-player";`);
+    expect(result).toContain(`<ReactPlayer controls url="https://vimeo.com/4613611xx" />`);
+}));
+test("video link, not embedded", () => __awaiter(void 0, void 0, void 0, function* () {
+    (0, log_1.setLogLevel)("verbose");
+    const config = { plugins: [VideoTransformer_1.standardVideoTransformer] };
+    const result = yield (0, pluginTestRun_1.blocksToMarkdown)(config, [
+        {
+            object: "block",
+            type: "paragraph",
+            paragraph: {
+                rich_text: [
+                    {
+                        type: "text",
+                        text: {
+                            content: "https://vimeo.com/4613611xx",
+                            link: {
+                                url: "https://vimeo.com/4613611xx",
+                            },
+                        },
+                        annotations: {
+                            code: false,
+                        },
+                        plain_text: "https://vimeo.com/4613611xx",
+                        href: "https://vimeo.com/4613611xx",
+                    },
+                ],
+                color: "default",
+            },
+        },
+    ]);
+    expect(result).toContain("[https://vimeo.com/4613611xx](https://vimeo.com/4613611xx)");
+    expect(result).not.toContain(`import`);
+}));
+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 result = yield (0, pluginTestRun_1.blocksToMarkdown)(config, [
+        {
+            object: "block",
+            id: "12f7db3b-4412-4be9-a3f7-6ac423fee94a",
+            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/people_fre_motionAsset_p3.mp4?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" />`);
+}));

package/dist/plugins/embedTweaks.d.ts

@@ -1,5 +1,3 @@
 import { IPlugin } from "./pluginTypes";
 export declare const gifEmbed: IPlugin;
 export declare const imgurGifEmbed: IPlugin;
-export declare const youtubeEmbed: IPlugin;
-export declare const vimeoEmbed: IPlugin;

package/dist/plugins/embedTweaks.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.vimeoEmbed = exports.youtubeEmbed = exports.imgurGifEmbed = exports.gifEmbed = void 0;
+exports.imgurGifEmbed = exports.gifEmbed = void 0;
 exports.gifEmbed = {
     name: "gif",
     regexMarkdownModifications: [
@@ -22,25 +22,3 @@ exports.imgurGifEmbed = {
         },
     ],
 };
-exports.youtubeEmbed = {
-    name: "youtube",
-    regexMarkdownModifications: [
-        {
-            regex: /\[.*\]\((.*youtube\.com\/watch.*)\)/,
-            imports: [`import ReactPlayer from "react-player";`],
-            replacementPattern: `<ReactPlayer controls url="$1" />`,
-        },
-    ],
-};
-exports.vimeoEmbed = {
-    name: "vimeo",
-    regexMarkdownModifications: [
-        {
-            regex: /\[.*\]\((https:\/\/.*vimeo.*)\)/,
-            // we use to have the following, but the above should handle both the player an not-player urls.
-            //regex: /\[.*\]\((.*player\.vimeo.*)\)/gm, // player.vimeo
-            imports: [`import ReactPlayer from "react-player";`],
-            replacementPattern: `<ReactPlayer controls url="$1" />`,
-        },
-    ],
-};

package/dist/plugins/embedTweaks.spec.js

@@ -12,53 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const log_1 = require("../log");
 const pluginTestRun_1 = require("./pluginTestRun");
 const embedTweaks_1 = require("./embedTweaks");
-test("youtube", () => __awaiter(void 0, void 0, void 0, function* () {
-    const config = { plugins: [embedTweaks_1.youtubeEmbed] };
-    const result = yield (0, pluginTestRun_1.blocksToMarkdown)(config, [
-        {
-            object: "block",
-            id: "e6ddd1d4-36d4-4925-94c1-5dff4662c1f3",
-            has_children: false,
-            archived: false,
-            type: "video",
-            video: {
-                caption: [
-                    {
-                        type: "text",
-                        text: {
-                            content: "A video about editing in Notion",
-                            link: null,
-                        },
-                        plain_text: "A video about editing in Notion",
-                        href: null,
-                    },
-                ],
-                type: "external",
-                external: { url: "https://www.youtube.com/watch?v=FXIrojSK3Jo" },
-            },
-        },
-    ]);
-    expect(result).toContain(`import ReactPlayer from "react-player";`);
-    expect(result).toContain(`<ReactPlayer controls url="https://www.youtube.com/watch?v=FXIrojSK3Jo" />`);
-}));
-test("vimeo", () => __awaiter(void 0, void 0, void 0, function* () {
-    (0, log_1.setLogLevel)("verbose");
-    const config = { plugins: [embedTweaks_1.vimeoEmbed] };
-    const result = yield (0, pluginTestRun_1.blocksToMarkdown)(config, [
-        {
-            object: "block",
-            id: "39ff83a3-2fb5-4411-a715-960656a177ff",
-            type: "video",
-            video: {
-                caption: [],
-                type: "external",
-                external: { url: "https://vimeo.com/4613611xx" },
-            },
-        },
-    ]);
-    expect(result).toContain(`import ReactPlayer from "react-player";`);
-    expect(result).toContain(`<ReactPlayer controls url="https://vimeo.com/4613611xx" />`);
-}));
 test("imgur", () => __awaiter(void 0, void 0, void 0, function* () {
     (0, log_1.setLogLevel)("verbose");
     const config = { plugins: [embedTweaks_1.imgurGifEmbed] };

package/dist/plugins/externalLinks.spec.js

@@ -23,6 +23,19 @@ test("links turned into bookmarks", () => __awaiter(void 0, void 0, void 0, func
     });
     expect(results.trim()).toBe("[https://github.com](https://github.com)");
 }));
+test("video links turned into bookmarks", () => __awaiter(void 0, void 0, void 0, function* () {
+    (0, log_1.setLogLevel)("debug");
+    const results = yield getMarkdown({
+        object: "block",
+        type: "bookmark",
+        bookmark: {
+            caption: [],
+            url: "https://vimeo.com/4613611xx",
+        },
+    });
+    expect(results).toContain("[https://vimeo.com/4613611xx](https://vimeo.com/4613611xx)");
+    expect(results).not.toContain(`import`);
+}));
 test("external link inside callout", () => __awaiter(void 0, void 0, void 0, function* () {
     const results = yield getMarkdown({
         type: "callout",

package/dist/plugins/pluginTestRun.js

@@ -39,6 +39,7 @@ function blocksToMarkdown(config, blocks, pages) {
             convertNotionLinkToLocalDocusaurusLink: (url) => {
                 return (0, internalLinks_1.convertInternalUrl)(docunotionContext, url);
             },
+            imports: [],
             //TODO might be needed for some tests, e.g. the image transformer...
             directoryContainingMarkdown: "not yet",
             relativeFilePathToFolderContainingPage: "not yet",

package/dist/plugins/pluginTypes.d.ts

@@ -40,5 +40,6 @@ export type IDocuNotionContext = {
     convertNotionLinkToLocalDocusaurusLink: (url: string) => string | undefined;
     pages: NotionPage[];
     counts: ICounts;
+    imports: string[];
 };
 export {};

package/dist/pull.js

@@ -99,6 +99,7 @@ function outputPages(options, config, pages) {
             options: options,
             pages: pages,
             counts: counts,
+            imports: [],
             convertNotionLinkToLocalDocusaurusLink: (url) => (0, internalLinks_1.convertInternalUrl)(context, url),
         };
         for (const page of pages) {

package/dist/transform.js

@@ -44,9 +44,12 @@ function getMarkdownFromNotionBlocks(context, config, blocks) {
         markdown = doLinkFixes(context, markdown, config);
         //console.log("markdown after link fixes", markdown);
         // simple regex-based tweaks. These are usually related to docusaurus
-        const { imports, body } = yield doTransformsOnMarkdown(context, config, markdown);
+        const body = yield doTransformsOnMarkdown(context, config, markdown);
         // console.log("markdown after regex fixes", markdown);
         // console.log("body after regex", body);
+        const uniqueImports = [...new Set(context.imports)];
+        const imports = uniqueImports.join("\n");
+        context.imports = []; // reset for next page
         return `${imports}\n${body}`;
     });
 }
@@ -65,7 +68,6 @@ function doNotionBlockTransforms(blocks, config) {
     }
 }
 function doTransformsOnMarkdown(context, config, input) {
-    var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const regexMods = config.plugins
             .filter(plugin => !!plugin.regexMarkdownModifications)
@@ -81,7 +83,6 @@ function doTransformsOnMarkdown(context, config, input) {
         let body = input;
         //console.log("body before regex: " + body);
         let match;
-        const imports = new Set();
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         for (const mod of regexMods) {
             let replacement = undefined;
@@ -113,14 +114,15 @@ function doTransformsOnMarkdown(context, config, input) {
                             precedingPart +
                                 partStartingFromThisMatch.replace(original, replacement);
                         // add any library imports
-                        (_a = mod.imports) === null || _a === void 0 ? void 0 : _a.forEach(imp => imports.add(imp));
+                        if (!context.imports)
+                            context.imports = [];
+                        context.imports.push(...(mod.imports || []));
                     }
                 }
             }
         }
         (0, log_1.logDebug)("doTransformsOnMarkdown", "body after regex: " + body);
-        const uniqueImports = [...new Set(imports)];
-        return { body, imports: [...uniqueImports].join("\n") };
+        return body;
     });
 }
 function doNotionToMarkdown(docunotionContext, blocks) {

package/package.json

@@ -90,5 +90,5 @@
   "volta": {
     "node": "18.16.0"
   },
-  "version": "0.13.3"
+  "version": "0.14.0-alpha.2"
 }