@diplodoc/transform 4.35.0-beta5 → 4.35.0

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

@@ -1,4 +1,5 @@
-import {Services} from './const';
+import {VideoService} from './const';
+import {Services} from './types';
 
 const ytRegex = /^.*((youtu.be\/)|(v\/)|(\/u\/\w\/)|(embed\/)|(watch\?))\??v?=?([^#&?]*).*/;
 export function youtubeParser(url: string) {
@@ -51,15 +52,9 @@ export function rutubeParser(url: string) {
     return match ? match[1] : url;
 }
 
-export function dzenParser(url: string) {
-    /* 
-        dzen /embed/<id> and /video/watch/<id> are not the same 
-        so we can't extract something from url and should pass it next
-    */
-    return url;
-}
+const urlParser = (url: string) => url;
 
-const supportedServices = Object.entries({
+const supportedServices = {
     osf: {
         extract: mfrParser,
     },
@@ -81,40 +76,37 @@ const supportedServices = Object.entries({
     vk: {
         extract: vkParser,
         csp: {
-            'frame-src': 'https://vk.com/',
+            'frame-src': ['https://vk.com/'],
         },
     },
     rutube: {
         extract: rutubeParser,
         csp: {
-            'frame-src': 'https://rutube.ru/play/embed/',
+            'frame-src': ['https://rutube.ru/play/embed/'],
         },
     },
-    dzen: {
-        extract: dzenParser,
-        csp: {
-            'frame-src': ['https://dzen.ru/embed/', 'https://dzen.ru/video/'],
-        },
+    url: {
+        extract: urlParser,
     },
-}) as Services;
+} as Services;
 
 export function parseVideoUrl(service: string, url: string) {
     let videoID = '';
     const normalizedService = service.toLowerCase();
-    const parsed = supportedServices.find(([name]) => name === normalizedService);
+    const parsed = supportedServices[normalizedService as VideoService];
 
     if (!parsed) {
         return false;
     }
 
-    const [, videoParser] = parsed;
+    const {extract, csp} = parsed;
 
-    videoID = videoParser.extract(url);
+    videoID = extract(url);
 
     // If the videoID field is empty, regex currently make it the close parenthesis.
     if (videoID === ')') {
         videoID = '';
     }
 
-    return [videoID, videoParser.csp] as const;
+    return [videoID, csp] as const;
 }

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

@@ -17,8 +17,15 @@ export type VideoServicesOptions = {
     };
 };
 
+export type Service = {
+    csp?: Record<string, string[]>;
+    extract(url: string): string;
+};
+
+export type Services = Record<VideoService, Service>;
+
 export type VideoFullOptions = VideoServicesOptions & {
-    url: VideoUrlFn;
+    videoUrl: VideoUrlFn;
 };
 
 export type VideoPluginOptions = Partial<VideoFullOptions>;

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

@@ -23,11 +23,8 @@ export const videoUrl: VideoUrlFn = (service, videoID, options) => {
             return `https://vk.com/video_ext.php?${videoID}`;
         case 'rutube':
             return `https://rutube.ru/play/embed/${videoID}`;
-        case 'dzen':
-            if (videoID.startsWith('https')) {
-                return videoID;
-            }
-            return `https://dzen.ru/embed/${videoID}`;
+        case 'url':
+            return videoID;
         default:
             return service;
     }

package/lib/plugins/csp.d.ts

@@ -1,6 +0,0 @@
-export declare type CustomCSP = Record<string, string | string[]>;
-declare const requestCSP: (policy: CustomCSP) => void;
-declare const collect: () => {
-    [x: string]: string[];
-};
-export { requestCSP, collect };

package/lib/plugins/csp.js

@@ -1,26 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.collect = exports.requestCSP = void 0;
-let csp = {};
-const requestCSP = (policy) => {
-    for (const [field, content] of Object.entries(policy)) {
-        if (!csp[field]) {
-            csp[field] = [];
-        }
-        const flat = Array.isArray(content) ? content : [content];
-        for (const value of flat) {
-            if (csp[field].includes(value)) {
-                continue;
-            }
-            csp[field].push(value);
-        }
-    }
-};
-exports.requestCSP = requestCSP;
-const collect = () => {
-    const usedCSP = Object.assign({}, csp);
-    csp = {};
-    return usedCSP;
-};
-exports.collect = collect;
-//# sourceMappingURL=csp.js.map

package/lib/plugins/csp.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"csp.js","sourceRoot":"","sources":["../../src/transform/plugins/csp.ts"],"names":[],"mappings":";;;AAAA,IAAI,GAAG,GAA6B,EAAE,CAAC;AAIvC,MAAM,UAAU,GAAG,CAAC,MAAiB,EAAE,EAAE;IACrC,KAAK,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QACnD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;YACb,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;SACnB;QAED,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QAE1D,KAAK,MAAM,KAAK,IAAI,IAAI,EAAE;YACtB,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gBAC5B,SAAS;aACZ;YAED,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SAC1B;KACJ;AACL,CAAC,CAAC;AAUM,gCAAU;AARlB,MAAM,OAAO,GAAG,GAAG,EAAE;IACjB,MAAM,OAAO,qBAAO,GAAG,CAAC,CAAC;IAEzB,GAAG,GAAG,EAAE,CAAC;IAET,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC;AAEkB,0BAAO"}