@diplodoc/transform 4.34.0 → 4.35.0-beta1

package/lib/plugins/video/utils.js

@@ -20,6 +20,10 @@ const videoUrl = (service, videoID, options) => {
             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/watch/${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,uDAAuD,OAAO,EAAE,CAAC;QAC5E,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diplodoc/transform",
-  "version": "4.34.0",
+  "version": "4.35.0-beta1",
   "description": "A simple transformer of text in YFM (Yandex Flavored Markdown) to HTML",
   "keywords": [
     "markdown",

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/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,10 @@ function videoEmbed(md: MarkdownIt, _options: VideoFullOptions): ParserInline.Ru
         }
 
         theState.pos += theState.src.indexOf(')', theState.pos);
+
+        state.env.meta ??= {};
+        append(state.env.meta, 'csp', csp);
+
         return true;
     };
 }

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

@@ -1,4 +1,4 @@
-import {VideoService} from './const';
+import {Services} from './const';
 
 const ytRegex = /^.*((youtu.be\/)|(v\/)|(\/u\/\w\/)|(embed\/)|(watch\?))\??v?=?([^#&?]*).*/;
 export function youtubeParser(url: string) {
@@ -39,45 +39,80 @@ export function yandexParser(url: string) {
     return match ? match[1] : url;
 }
 
-const vkRegex = /^https:\/\/vk.com\/video_ext\.php?(oid=[-\d]+&id=[-\d]+)/;
+const vkRegex = /^https:\/\/vk\.com\/video_ext\.php\?(oid=[-\d]+&id=[-\d]+)/;
 export function vkParser(url: string) {
     const match = url.match(vkRegex);
     return match ? match[1] : url;
 }
 
-export function parseVideoUrl(service: string, url: string): string | false {
+const rutubeRegex = /^https:\/\/rutube\.ru\/video\/([a-zA-Z0-9]+)\/?/;
+export function rutubeParser(url: string) {
+    const match = url.match(rutubeRegex);
+    return match ? match[1] : url;
+}
+
+const dzenRegex = /^https:\/\/dzen\.ru\/video\/watch\/([a-zA-Z0-9]+)/;
+export function dzenParser(url: string) {
+    const match = url.match(dzenRegex);
+    return match ? match[1] : url;
+}
+
+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/',
+        },
+    },
+}) as Services;
+
+export function parseVideoUrl(service: string, url: string) {
     let videoID = '';
+    const normalizedService = service.toLowerCase();
+    const parsed = supportedServices.find(([name]) => name === normalizedService);
 
-    switch (service.toLowerCase()) {
-        case VideoService.YouTube:
-            videoID = youtubeParser(url);
-            break;
-        case VideoService.Vimeo:
-            videoID = vimeoParser(url);
-            break;
-        case VideoService.Vine:
-            videoID = vineParser(url);
-            break;
-        case VideoService.Prezi:
-            videoID = preziParser(url);
-            break;
-        case VideoService.Osf:
-            videoID = mfrParser(url);
-            break;
-        case VideoService.Yandex:
-            videoID = yandexParser(url);
-            break;
-        case VideoService.Vk:
-            videoID = vkParser(url);
-            break;
-        default:
-            return false;
+    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] as const;
 }

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

@@ -7,13 +7,14 @@ export type VideoToken = Token & {
 };
 
 export type VideoServicesOptions = {
-    [VideoService.YouTube]: {width: number; height: number};
-    [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};
+    [service in VideoService]: {
+        width: number | string;
+        height: number | string;
+    };
+} & {
+    vine: {
+        embed: 'simple' | (string & {});
+    };
 };
 
 export type VideoFullOptions = VideoServicesOptions & {

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

@@ -21,6 +21,10 @@ export const videoUrl: VideoUrlFn = (service, videoID, options) => {
             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/watch/${videoID}`;
         default:
             return service;
     }