@diplodoc/transform 4.34.2-beta1 → 4.35.0-beta2

package/lib/plugins/video/index.js

@@ -6,6 +6,9 @@
 // Process @[osf](guid)
 // Process @[yandex](videoID)
 // Process @[vk](videoID)
+// Process @[dzen](videoID)
+// Process @[rutube](videoID)
+const utils_1 = require("../utils");
 const parsers_1 = require("./parsers");
 const const_1 = require("./const");
 // eslint-disable-next-line valid-jsdoc
@@ -60,9 +63,10 @@ function tokenizeVideo(md, options) {
     };
 }
 const EMBED_REGEX = /@\[([a-zA-Z].+)]\([\s]*(.*?)[\s]*[)]/im;
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 function videoEmbed(md, _options) {
     return (state, silent) => {
+        var _a;
+        var _b;
         const theState = state;
         const oldPos = state.pos;
         if (state.src.charCodeAt(oldPos) !== 0x40 /* @ */ ||
@@ -74,10 +78,11 @@ function videoEmbed(md, _options) {
             return false;
         }
         const service = match[1];
-        const videoID = (0, parsers_1.parseVideoUrl)(service, match[2]);
-        if (videoID === false) {
+        const parsed = (0, parsers_1.parseVideoUrl)(service, match[2]);
+        if (parsed === false) {
             return false;
         }
+        const [videoID, csp] = parsed;
         const serviceStart = oldPos + 2;
         const serviceEnd = md.helpers.parseLinkLabel(state, oldPos + 1, false);
         //
@@ -96,6 +101,10 @@ function videoEmbed(md, _options) {
             token.level = theState.level;
         }
         theState.pos += theState.src.indexOf(')', theState.pos);
+        if (csp) {
+            (_a = (_b = state.env).meta) !== null && _a !== void 0 ? _a : (_b.meta = {});
+            (0, utils_1.append)(state.env.meta, 'csp', csp);
+        }
         return true;
     };
 }

package/lib/plugins/video/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transform/plugins/video/index.ts"],"names":[],"mappings":";AAAA,qCAAqC;AACrC,iCAAiC;AACjC,+BAA+B;AAC/B,4BAA4B;AAC5B,uBAAuB;AACvB,6BAA6B;AAC7B,yBAAyB;AASzB,uCAAwC;AACxC,mCAA+C;AAE/C,uCAAuC;AACvC;;;GAGG;AACH,MAAM,KAAK,GAA0C,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE;IACjE,MAAM,UAAU,mCAAyB,gBAAQ,GAAK,OAAO,CAAC,CAAC;IAC/D,MAAM,KAAK,GAAG,EAAE,CAAC;IAEjB,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,GAAG,aAAa,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;IAC9D,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,UAAU,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC;AAClF,CAAC,CAAC;AAEF,SAAS,aAAa,CAAC,EAAc,EAAE,OAAyB;IAC5D,OAAO,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;QACnB,MAAM,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC,UAAU,CAAE,MAAM,CAAC,GAAG,CAAgB,CAAC,OAAO,CAAC,CAAC;QACzE,MAAM,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC,UAAU,CAAE,MAAM,CAAC,GAAG,CAAgB,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC;QACvF,MAAM,QAAQ,GACV,iKAAiK,CAAC;QACtK,IAAI,GAAG,CAAC;QAER,IAAI,OAAO,KAAK,oBAAY,CAAC,GAAG,IAAI,OAAO,EAAE;YACzC,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,OAAO,CAAC;YAE9B,IAAI,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;gBACzB,OAAO,CACH,WAAW;oBACX,GAAG;oBACH,uCAAuC;oBACvC,iDAAiD;oBACjD,GAAG;oBACH,MAAM;oBACN,OAAO;oBACP,KAAK;oBACL,mBAAmB,CACtB,CAAC;aACL;YACD,OAAO,CACH,WAAW;gBACX,GAAG;gBACH,uCAAuC;gBACvC,iDAAiD;gBACjD,GAAG;gBACH,yBAAyB;gBACzB,4BAA4B;gBAC5B,OAAO;gBACP,oCAAoC;gBACpC,mBAAmB,CACtB,CAAC;SACL;QAED,MAAM,EAAC,KAAK,EAAE,MAAM,EAAC,GAAG,OAAO,CAAC,OAAuB,CAAC,CAAC;QAEzD,OAAO,OAAO,KAAK,EAAE;YACjB,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,8DAA8D;gBAC1D,iCAAiC,OAAO,UAAU;gBAClD,4BAA4B,KAAK,aAAa,MAAM,GAAG;gBACvD,SAAS,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG;gBAClD,2FAA2F,CAAC;IAC1G,CAAC,CAAC;AACN,CAAC;AAED,MAAM,WAAW,GAAG,wCAAwC,CAAC;AAC7D,6DAA6D;AAC7D,SAAS,UAAU,CAAC,EAAc,EAAE,QAA0B;IAC1D,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;QACrB,MAAM,QAAQ,GAAG,KAAK,CAAC;QACvB,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC;QAEzB,IACI,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,OAAO;YAC7C,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,IAAI,CAAC,OAAO,EACnD;YACE,OAAO,KAAK,CAAC;SAChB;QAED,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;QAE7E,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;YAC5B,OAAO,KAAK,CAAC;SAChB;QAED,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACzB,MAAM,OAAO,GAAG,IAAA,uBAAa,EAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAEjD,IAAI,OAAO,KAAK,KAAK,EAAE;YACnB,OAAO,KAAK,CAAC;SAChB;QAED,MAAM,YAAY,GAAG,MAAM,GAAG,CAAC,CAAC;QAChC,MAAM,UAAU,GAAG,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC;QAEvE,EAAE;QACF,uEAAuE;QACvE,iDAAiD;QACjD,EAAE;QACF,IAAI,CAAC,MAAM,EAAE;YACT,QAAQ,CAAC,GAAG,GAAG,YAAY,CAAC;YAC5B,mBAAmB;YACnB,QAAQ,CAAC,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;YAChE,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YACtF,QAAQ,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAEtC,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;YAC3C,KAAoB,CAAC,OAAO,GAAG,OAAO,CAAC;YACvC,KAAoB,CAAC,OAAO,GAAG,OAAO,CAAC;YACxC,KAAK,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;SAChC;QAED,QAAQ,CAAC,GAAG,IAAI,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC;IAChB,CAAC,CAAC;AACN,CAAC;AAED,iBAAS,KAAK,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transform/plugins/video/index.ts"],"names":[],"mappings":"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"}

package/lib/plugins/video/parsers.d.ts

@@ -5,4 +5,6 @@ export declare function preziParser(url: string): string;
 export declare function mfrParser(url: string): string;
 export declare function yandexParser(url: string): string;
 export declare function vkParser(url: string): string;
-export declare function parseVideoUrl(service: string, url: string): string | false;
+export declare function rutubeParser(url: string): string;
+export declare function dzenParser(url: string): string;
+export declare function parseVideoUrl(service: string, url: string): false | readonly [string, Record<string, string[]> | undefined];

package/lib/plugins/video/parsers.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseVideoUrl = exports.vkParser = exports.yandexParser = exports.mfrParser = exports.preziParser = exports.vineParser = exports.vimeoParser = exports.youtubeParser = void 0;
-const const_1 = require("./const");
+exports.parseVideoUrl = exports.dzenParser = exports.rutubeParser = exports.vkParser = exports.yandexParser = exports.mfrParser = exports.preziParser = exports.vineParser = exports.vimeoParser = exports.youtubeParser = void 0;
 const ytRegex = /^.*((youtu.be\/)|(v\/)|(\/u\/\w\/)|(embed\/)|(watch\?))\??v?=?([^#&?]*).*/;
 function youtubeParser(url) {
     const match = url.match(ytRegex);
@@ -39,44 +38,76 @@ function yandexParser(url) {
     return match ? match[1] : url;
 }
 exports.yandexParser = yandexParser;
-const vkRegex = /^https:\/\/vk.com\/video_ext\.php?(oid=[-\d]+&id=[-\d]+)/;
+const vkRegex = /^https:\/\/vk\.com\/video_ext\.php\?(oid=[-\d]+&id=[-\d]+)/;
 function vkParser(url) {
     const match = url.match(vkRegex);
     return match ? match[1] : url;
 }
 exports.vkParser = vkParser;
+const rutubeRegex = /^https:\/\/rutube\.ru\/video\/([a-zA-Z0-9]+)\/?/;
+function rutubeParser(url) {
+    const match = url.match(rutubeRegex);
+    return match ? match[1] : url;
+}
+exports.rutubeParser = rutubeParser;
+const dzenRegex = /^https:\/\/dzen\.ru\/video\/watch\/([a-zA-Z0-9]+)/;
+function dzenParser(url) {
+    const match = url.match(dzenRegex);
+    return match ? match[1] : url;
+}
+exports.dzenParser = dzenParser;
+const supportedServices = Object.entries({
+    osf: {
+        extract: mfrParser,
+    },
+    prezi: {
+        extract: preziParser,
+    },
+    vimeo: {
+        extract: vimeoParser,
+    },
+    vine: {
+        extract: vineParser,
+    },
+    yandex: {
+        extract: yandexParser,
+    },
+    youtube: {
+        extract: youtubeParser,
+    },
+    vk: {
+        extract: vkParser,
+        csp: {
+            'frame-src': 'https://vk.com/',
+        },
+    },
+    rutube: {
+        extract: rutubeParser,
+        csp: {
+            'frame-src': 'https://rutube.ru/play/embed/',
+        },
+    },
+    dzen: {
+        extract: dzenParser,
+        csp: {
+            'frame-src': 'https://dzen.ru/embed/',
+        },
+    },
+});
 function parseVideoUrl(service, url) {
     let videoID = '';
-    switch (service.toLowerCase()) {
-        case const_1.VideoService.YouTube:
-            videoID = youtubeParser(url);
-            break;
-        case const_1.VideoService.Vimeo:
-            videoID = vimeoParser(url);
-            break;
-        case const_1.VideoService.Vine:
-            videoID = vineParser(url);
-            break;
-        case const_1.VideoService.Prezi:
-            videoID = preziParser(url);
-            break;
-        case const_1.VideoService.Osf:
-            videoID = mfrParser(url);
-            break;
-        case const_1.VideoService.Yandex:
-            videoID = yandexParser(url);
-            break;
-        case const_1.VideoService.Vk:
-            videoID = vkParser(url);
-            break;
-        default:
-            return false;
+    const normalizedService = service.toLowerCase();
+    const parsed = supportedServices.find(([name]) => name === normalizedService);
+    if (!parsed) {
+        return false;
     }
+    const [, videoParser] = parsed;
+    videoID = videoParser.extract(url);
     // If the videoID field is empty, regex currently make it the close parenthesis.
     if (videoID === ')') {
         videoID = '';
     }
-    return videoID;
+    return [videoID, videoParser.csp];
 }
 exports.parseVideoUrl = parseVideoUrl;
 //# sourceMappingURL=parsers.js.map

package/lib/plugins/video/parsers.js.map

@@ -1 +1 @@
-{"version":3,"file":"parsers.js","sourceRoot":"","sources":["../../../src/transform/plugins/video/parsers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"parsers.js","sourceRoot":"","sources":["../../../src/transform/plugins/video/parsers.ts"],"names":[],"mappings":"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"}

package/lib/plugins/video/types.d.ts

@@ -5,34 +5,13 @@ export declare type VideoToken = Token & {
     videoID: string;
 };
 export declare type VideoServicesOptions = {
-    [VideoService.YouTube]: {
-        width: number;
-        height: number;
+    [service in VideoService]: {
+        width: number | string;
+        height: number | string;
     };
-    [VideoService.Vimeo]: {
-        width: number;
-        height: number;
-    };
-    [VideoService.Vine]: {
-        width: number;
-        height: number;
-        embed: 'simple' | string;
-    };
-    [VideoService.Prezi]: {
-        width: number;
-        height: number;
-    };
-    [VideoService.Osf]: {
-        width: string;
-        height: string;
-    };
-    [VideoService.Yandex]: {
-        width: number;
-        height: number;
-    };
-    [VideoService.Vk]: {
-        width: number;
-        height: number;
+} & {
+    vine: {
+        embed: 'simple' | (string & {});
     };
 };
 export declare type VideoFullOptions = VideoServicesOptions & {

package/lib/plugins/video/utils.js

@@ -17,9 +17,13 @@ const videoUrl = (service, videoID, options) => {
         case 'osf':
             return `https://mfr.osf.io/render?url=https://osf.io/${videoID}/?action=download`;
         case 'yandex':
-            return `https://runtime.video.cloud.yandex.net/player/${videoID}`;
+            return `https://runtime.video.cloud.yandex.net/player/video/${videoID}`;
         case 'vk':
             return `https://vk.com/video_ext.php?${videoID}`;
+        case 'rutube':
+            return `https://rutube.ru/play/embed/${videoID}`;
+        case 'dzen':
+            return `https://dzen.ru/video/embed/${videoID}`;
         default:
             return service;
     }

package/lib/plugins/video/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/transform/plugins/video/utils.ts"],"names":[],"mappings":";;;AAEO,MAAM,QAAQ,GAAe,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IAC9D,QAAQ,OAAO,EAAE;QACb,KAAK,SAAS;YACV,OAAO,iCAAiC,OAAO,EAAE,CAAC;QACtD,KAAK,OAAO;YACR,OAAO,kCAAkC,OAAO,EAAE,CAAC;QACvD,KAAK,MAAM;YACP,OAAO,qBAAqB,OAAO,UAAU,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QACtE,KAAK,OAAO;YACR,OAAO,CACH,2BAA2B,OAAO,EAAE;gBACpC,8EAA8E;gBAC9E,+GAA+G;gBAC/G,0DAA0D,CAC7D,CAAC;QACN,KAAK,KAAK;YACN,OAAO,gDAAgD,OAAO,mBAAmB,CAAC;QACtF,KAAK,QAAQ;YACT,OAAO,iDAAiD,OAAO,EAAE,CAAC;QACtE,KAAK,IAAI;YACL,OAAO,gCAAgC,OAAO,EAAE,CAAC;QACrD;YACI,OAAO,OAAO,CAAC;KACtB;AACL,CAAC,CAAC;AAxBW,QAAA,QAAQ,YAwBnB"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/transform/plugins/video/utils.ts"],"names":[],"mappings":";;;AAEO,MAAM,QAAQ,GAAe,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IAC9D,QAAQ,OAAO,EAAE;QACb,KAAK,SAAS;YACV,OAAO,iCAAiC,OAAO,EAAE,CAAC;QACtD,KAAK,OAAO;YACR,OAAO,kCAAkC,OAAO,EAAE,CAAC;QACvD,KAAK,MAAM;YACP,OAAO,qBAAqB,OAAO,UAAU,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QACtE,KAAK,OAAO;YACR,OAAO,CACH,2BAA2B,OAAO,EAAE;gBACpC,8EAA8E;gBAC9E,+GAA+G;gBAC/G,0DAA0D,CAC7D,CAAC;QACN,KAAK,KAAK;YACN,OAAO,gDAAgD,OAAO,mBAAmB,CAAC;QACtF,KAAK,QAAQ;YACT,OAAO,uDAAuD,OAAO,EAAE,CAAC;QAC5E,KAAK,IAAI;YACL,OAAO,gCAAgC,OAAO,EAAE,CAAC;QACrD,KAAK,QAAQ;YACT,OAAO,gCAAgC,OAAO,EAAE,CAAC;QACrD,KAAK,MAAM;YACP,OAAO,+BAA+B,OAAO,EAAE,CAAC;QACpD;YACI,OAAO,OAAO,CAAC;KACtB;AACL,CAAC,CAAC;AA5BW,QAAA,QAAQ,YA4BnB"}

package/lib/preprocessors/included/index.js

@@ -47,7 +47,7 @@ const index = (input, options, md) => {
     const { included, path, root } = options;
     // To reduce file reading we can include the file content into the generated content
     if (included) {
-        const lines = input.split('\n') || [];
+        const lines = (input === null || input === void 0 ? void 0 : input.split('\n')) || [];
         // The finction reads the files from bottom to top(!). It stops the loop if it does not have anything to swap.
         // If the function finds something to process then it restarts the loop because the position of the last element has been moved.
         // eslint-disable-next-line no-unmodified-loop-condition

package/lib/preprocessors/included/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transform/preprocessors/included/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transform/preprocessors/included/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diplodoc/transform",
-  "version": "4.34.2-beta1",
+  "version": "4.35.0-beta2",
   "description": "A simple transformer of text in YFM (Yandex Flavored Markdown) to HTML",
   "keywords": [
     "markdown",
@@ -42,7 +42,7 @@
   },
   "dependencies": {
     "@diplodoc/cut-extension": "^0.3.0",
-    "@diplodoc/tabs-extension": "^3.5.0-beta1",
+    "@diplodoc/tabs-extension": "^3.5.0",
     "chalk": "^4.1.2",
     "cheerio": "^1.0.0",
     "css": "^3.0.0",

package/src/js/_yfm-only.ts

@@ -0,0 +1 @@
+import './term';

package/src/js/base.ts

@@ -0,0 +1,2 @@
+import './polyfill';
+import './code';

package/src/js/index.ts

@@ -1,8 +1,7 @@
 import '@diplodoc/cut-extension/runtime';
 import '@diplodoc/tabs-extension/runtime';
 
-import './polyfill';
-import './code';
-import './term';
+import './base';
+import './_yfm-only';
 import './wide-mode';
 import './patch';

package/src/scss/_yfm-only.scss

@@ -0,0 +1,12 @@
+/**
+    Note: This file excludes "cut" and "tabs" as they are handled separately
+    in dedicated extensions (packages). In the future, "note", "file", "term"
+    and "table" will also be excluded from this file and moved to yfm.scss,
+    once they are moved to separate packages. Direct usage is not recommended,
+    as the file is subject to changes without prior notice.
+ */
+
+@import 'note';
+@import 'file';
+@import 'table';
+@import 'term';

package/src/scss/base.scss

@@ -0,0 +1,4 @@
+@import 'common';
+@import 'anchor';
+@import 'highlight';
+@import 'code';

package/src/scss/yfm.scss

@@ -1,12 +1,5 @@
-@import 'common';
-@import 'note';
-@import 'anchor';
-@import 'highlight';
-@import 'code';
-@import 'file';
-@import 'term';
-@import 'table';
+@import 'base';
+@import 'yfm-only';
 @import 'modal';
-
 @import '@diplodoc/cut-extension/runtime';
 @import '@diplodoc/tabs-extension/runtime';

package/src/transform/index.ts

@@ -4,7 +4,7 @@ import {bold} from 'chalk';
 
 import {log} from './log';
 import liquidSnippet from './liquid';
-import initMarkdownit from './md';
+import initMarkdownIt from './md';
 
 function applyLiquid(input: string, options: OptionsType) {
     const {
@@ -36,7 +36,7 @@ function emitResult(html: string, env: EnvType): OutputType {
 // eslint-disable-next-line consistent-return
 function transform(originInput: string, options: OptionsType = {}) {
     const input = applyLiquid(originInput, options);
-    const {parse, compile, env} = initMarkdownit(options);
+    const {parse, compile, env} = initMarkdownIt(options);
 
     try {
         return emitResult(compile(parse(input)), env);

package/src/transform/md.ts

@@ -12,7 +12,7 @@ import extractTitle from './title';
 import getHeadings from './headings';
 import sanitizeHtml from './sanitize';
 
-function initMarkdownit(options: OptionsType) {
+function initMarkdownIt(options: OptionsType) {
     const {
         allowHTML = false,
         linkify = false,
@@ -172,4 +172,4 @@ function initCompiler(md: MarkdownIt, options: OptionsType, env: EnvType) {
     };
 }
 
-export = initMarkdownit;
+export = initMarkdownIt;

package/src/transform/plugins/changelog/collect.ts

@@ -1,6 +1,6 @@
 import {bold} from 'chalk';
 
-import initMarkdownit from '../../md';
+import initMarkdownIt from '../../md';
 import imsize from '../imsize';
 import {MarkdownItPluginOpts} from '../typings';
 
@@ -12,7 +12,7 @@ const BLOCK_START = '{% changelog %}';
 const BLOCK_END = '{% endchangelog %}';
 
 function parseChangelogs(str: string, path?: string) {
-    const {parse, compile, env} = initMarkdownit({
+    const {parse, compile, env} = initMarkdownIt({
         plugins: [changelogPlugin, imsize],
         extractChangelogs: true,
         path,

package/src/transform/plugins/includes/collect.ts

@@ -12,7 +12,6 @@ function processRecursive(
     includePath: string,
     targetDestPath: string,
     options: IncludeCollectOpts,
-    appendix: Map<string, string>,
 ) {
     const {path, log, copyFile, includedParentPath: includedParentPathNullable, included} = options;
     const includedParentPath = includedParentPathNullable || path;
@@ -34,20 +33,16 @@ function processRecursive(
                 const includedRelativePath = getRelativePath(includedParentPath, includePath);
 
                 // The appendix is the map that protects from multiple include files
-                if (!appendix.has(includedRelativePath)) {
+                if (!options.appendix?.has(includedRelativePath)) {
                     // Recursive function to include the depth structure
-                    const includeContent = collectRecursive(
-                        content,
-                        {
-                            ...options,
-                            path: includePath,
-                            includedParentPath,
-                        },
-                        appendix,
-                    );
+                    const includeContent = collectRecursive(content, {
+                        ...options,
+                        path: includePath,
+                        includedParentPath,
+                    });
 
                     // Add to appendix set structure
-                    appendix.set(
+                    options.appendix?.set(
                         includedRelativePath,
                         `{% included (${includedRelativePath}) %}\n${includeContent}\n{% endincluded %}`,
                     );
@@ -59,11 +54,7 @@ function processRecursive(
     }
 }
 
-function collectRecursive(
-    result: string,
-    options: IncludeCollectOpts,
-    appendix: Map<string, string>,
-) {
+function collectRecursive(result: string, options: IncludeCollectOpts) {
     const {root, path, destPath = '', log, singlePage} = options;
 
     const INCLUDE_REGEXP = /{%\s*include\s*(notitle)?\s*\[(.+?)]\((.+?)\)\s*%}/g;
@@ -100,7 +91,7 @@ function collectRecursive(
 
         includesPaths.push(includePath);
 
-        processRecursive(includePath, targetDestPath, options, appendix);
+        processRecursive(includePath, targetDestPath, options);
 
         includesPaths.pop();
     }
@@ -109,13 +100,17 @@ function collectRecursive(
 }
 
 function collect(input: string, options: IncludeCollectOpts) {
-    const appendix: Map<string, string> = new Map();
+    const shouldWriteAppendix = !options.appendix;
 
-    input = collectRecursive(input, options, appendix);
+    options.appendix = options.appendix ?? new Map();
 
-    // Appendix should be appended to the end of the file (it supports depth structure, so the included files will have included as well)
-    if (appendix.size > 0) {
-        input += '\n' + [...appendix.values()].join('\n');
+    input = collectRecursive(input, options);
+
+    if (shouldWriteAppendix) {
+        // Appendix should be appended to the end of the file (it supports depth structure, so the included files will have included as well)
+        if (options.appendix.size > 0) {
+            input += '\n' + [...options.appendix.values()].join('\n');
+        }
     }
 
     return input;

package/src/transform/plugins/includes/types.ts

@@ -14,4 +14,5 @@ export type IncludeCollectOpts = MarkdownItPluginOpts & {
     included: Boolean;
     includedParentPath?: string;
     additionalIncludedList?: string[];
+    appendix?: Map<string, string>;
 };

package/src/transform/plugins/tabs.ts

@@ -1,3 +1,13 @@
 import {transform} from '@diplodoc/tabs-extension';
 
-export = transform({bundle: false});
+export = transform({
+    bundle: false,
+    features: {
+        enabledVariants: {
+            radio: true,
+            regular: true,
+            dropdown: true,
+            accordion: true,
+        },
+    },
+});

package/src/transform/plugins/utils.ts

@@ -37,3 +37,19 @@ export const сarriage = platform === 'win32' ? '\r\n' : '\n';
 export function generateID() {
     return Math.random().toString(36).substr(2, 8);
 }
+
+export function append<T extends Record<string, []>, Key extends keyof T>(
+    target: T,
+    key: Key,
+    ...values: T[Key]
+) {
+    if (!target[key]) {
+        target[key] = values;
+
+        return;
+    }
+
+    values.forEach((value) => target[key].push(value));
+
+    return target;
+}

package/src/transform/plugins/video/const.ts

@@ -11,8 +11,17 @@ export enum VideoService {
     Osf = 'osf',
     Yandex = 'yandex',
     Vk = 'vk',
+    Rutube = 'rutube',
+    Dzen = 'dzen',
 }
 
+export type Service = {
+    csp?: Record<string, string[]>;
+    extract(url: string): string;
+};
+
+export type Services = [VideoService, Service][];
+
 export const defaults: VideoFullOptions = {
     url: videoUrl,
     youtube: {width: 640, height: 390},
@@ -22,4 +31,6 @@ export const defaults: VideoFullOptions = {
     osf: {width: '100%', height: '100%'},
     yandex: {width: 640, height: 390},
     vk: {width: 640, height: 390},
+    dzen: {width: 640, height: 390},
+    rutube: {width: 640, height: 390},
 };

package/src/transform/plugins/video/index.ts

@@ -5,6 +5,8 @@
 // Process @[osf](guid)
 // Process @[yandex](videoID)
 // Process @[vk](videoID)
+// Process @[dzen](videoID)
+// Process @[rutube](videoID)
 
 import type MarkdownIt from 'markdown-it';
 // eslint-disable-next-line no-duplicate-imports
@@ -13,6 +15,8 @@ import type ParserInline from 'markdown-it/lib/parser_inline';
 import type Renderer from 'markdown-it/lib/renderer';
 import type {VideoFullOptions, VideoPluginOptions, VideoToken} from './types';
 
+import {append} from '../utils';
+
 import {parseVideoUrl} from './parsers';
 import {VideoService, defaults} from './const';
 
@@ -80,7 +84,7 @@ function tokenizeVideo(md: MarkdownIt, options: VideoFullOptions): Renderer.Rend
 }
 
 const EMBED_REGEX = /@\[([a-zA-Z].+)]\([\s]*(.*?)[\s]*[)]/im;
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
+
 function videoEmbed(md: MarkdownIt, _options: VideoFullOptions): ParserInline.RuleInline {
     return (state, silent) => {
         const theState = state;
@@ -100,12 +104,14 @@ function videoEmbed(md: MarkdownIt, _options: VideoFullOptions): ParserInline.Ru
         }
 
         const service = match[1];
-        const videoID = parseVideoUrl(service, match[2]);
+        const parsed = parseVideoUrl(service, match[2]);
 
-        if (videoID === false) {
+        if (parsed === false) {
             return false;
         }
 
+        const [videoID, csp] = parsed;
+
         const serviceStart = oldPos + 2;
         const serviceEnd = md.helpers.parseLinkLabel(state, oldPos + 1, false);
 
@@ -127,6 +133,12 @@ function videoEmbed(md: MarkdownIt, _options: VideoFullOptions): ParserInline.Ru
         }
 
         theState.pos += theState.src.indexOf(')', theState.pos);
+
+        if (csp) {
+            state.env.meta ??= {};
+            append(state.env.meta, 'csp', csp);
+        }
+
         return true;
     };
 }