@diplodoc/transform 4.35.0 → 4.37.0

package/src/transform/preprocessors/included/index.ts

@@ -26,13 +26,15 @@ const preprocessLine = (
         return false;
     }
 
-    const includePathRelative = match[1];
+    const includePathKey = match[1];
 
     // Protect from empty path
-    if (!includePathRelative) {
+    if (!includePathKey) {
         return false;
     }
 
+    const includePaths = includePathKey.split(':');
+
     // Read all content from top to bottom(!) char of the included block
     const data = [];
     let line = start;
@@ -55,7 +57,11 @@ const preprocessLine = (
         }
 
         // Normalize the path to absolute
-        const includePath = getFullIncludePath(includePathRelative, root, path);
+        let includePath = getFullIncludePath(includePaths[0], root, path);
+        for (let index = 1; index < includePaths.length; index++) {
+            const pathname = includePaths[index];
+            includePath = getFullIncludePath(pathname, root, includePath);
+        }
 
         // Store the included content
         md.included[includePath] = data.join('\n');

package/src/transform/preprocessors/index.ts

@@ -0,0 +1,25 @@
+import type {MarkdownIt, MarkdownItPluginOpts, MarkdownItPreprocessorCb} from '../plugins/typings';
+import type {PluginOptions} from '../yfmlint';
+
+import included from './included';
+
+const defaultPreprocessors = [included] as MarkdownItPreprocessorCb[];
+
+export default defaultPreprocessors;
+
+export function preprocess(
+    content: string,
+    pluginOptions: MarkdownItPluginOpts | PluginOptions | unknown,
+    options?: Partial<MarkdownItPluginOpts> & {
+        preprocessors?: MarkdownItPreprocessorCb[];
+    },
+    md?: MarkdownIt,
+) {
+    const {preprocessors = defaultPreprocessors} = options ?? {};
+
+    for (const preprocessor of preprocessors) {
+        content = preprocessor(content, pluginOptions as MarkdownItPluginOpts, md);
+    }
+
+    return content;
+}

package/src/transform/sanitize.ts

@@ -4,6 +4,8 @@ import cssfilter from 'cssfilter';
 import * as cheerio from 'cheerio';
 import css from 'css';
 
+import {CssWhiteList} from './typings';
+
 const htmlTags = [
     'a',
     'abbr',
@@ -492,8 +494,6 @@ const allowedTags = Array.from(
 );
 const allowedAttributes = Array.from(new Set([...htmlAttrs, ...svgAttrs, ...yfmHtmlAttrs]));
 
-export type CssWhiteList = {[property: string]: boolean};
-
 export interface SanitizeOptions extends sanitizeHtml.IOptions {
     cssWhiteList?: CssWhiteList;
     disableStyleSanitizer?: boolean;
@@ -598,9 +598,20 @@ function sanitizeStyles(html: string, options: SanitizeOptions) {
     return styles + content;
 }
 
-export default function sanitize(html: string, options?: SanitizeOptions) {
+export default function sanitize(
+    html: string,
+    options?: SanitizeOptions,
+    additionalOptions?: SanitizeOptions,
+) {
     const sanitizeOptions = options || defaultOptions;
 
+    if (additionalOptions?.cssWhiteList) {
+        sanitizeOptions.cssWhiteList = {
+            ...sanitizeOptions.cssWhiteList,
+            ...additionalOptions.cssWhiteList,
+        };
+    }
+
     const needToSanitizeStyles = !(sanitizeOptions.disableStyleSanitizer ?? false);
 
     const modifiedHtml = needToSanitizeStyles ? sanitizeStyles(html, sanitizeOptions) : html;

package/src/transform/typings.ts

@@ -74,6 +74,7 @@ export type EnvType<Extras extends {} = {}> = {
     assets?: unknown[];
     meta?: object;
     changelogs?: ChangelogItem[];
+    additionalOptionsCssWhiteList?: CssWhiteList;
 } & Extras;
 
 export interface MarkdownItPluginOpts {
@@ -98,3 +99,5 @@ export type MarkdownItPluginCb<T extends {} = {}> = {
 export type MarkdownItPreprocessorCb<T extends unknown = {}> = {
     (input: string, opts: T & Partial<MarkdownItPluginOpts>, md?: MarkdownIt): string;
 };
+
+export type CssWhiteList = {[property: string]: boolean};

package/src/transform/utilsFS.ts

@@ -7,6 +7,7 @@ import {join, parse, relative, resolve, sep} from 'path';
 import liquidSnippet from './liquid';
 import {StateCore} from './typings';
 import {defaultTransformLink} from './utils';
+import {preprocess} from './preprocessors';
 
 const filesCache: Record<string, string> = {};
 
@@ -39,7 +40,12 @@ export type GetFileTokensOpts = {
     content?: string;
 };
 
-export function getFileTokens(path: string, state: StateCore, options: GetFileTokensOpts) {
+export function getFileTokens(
+    path: string,
+    state: StateCore,
+    options: GetFileTokensOpts,
+    content?: string,
+) {
     const {
         getVarsPerFile,
         vars,
@@ -51,7 +57,6 @@ export function getFileTokens(path: string, state: StateCore, options: GetFileTo
         inheritVars = true,
         conditionsInCode,
     } = options;
-    let {content} = options;
 
     const builtVars = (getVarsPerFile && !inheritVars ? getVarsPerFile(path) : vars) || {};
 
@@ -77,6 +82,9 @@ export function getFileTokens(path: string, state: StateCore, options: GetFileTo
         sourceMap = liquidResult.sourceMap;
     }
 
+    // Run preprocessor
+    content = preprocess(content, options);
+
     if (!disableLint && lintMarkdown) {
         lintMarkdown({
             input: content,

package/src/transform/yfmlint/index.ts

@@ -6,7 +6,7 @@ import union from 'lodash/union';
 import attrs from 'markdown-it-attrs';
 
 import {LogLevels, Logger} from '../log';
-import defaultPreprocessors from '../preprocessors';
+import {preprocess} from '../preprocessors';
 
 import baseDefaultLintConfig from './yfmlint';
 import {
@@ -29,13 +29,7 @@ const lintCache = new Set();
 
 function yfmlint(opts: Options) {
     let {input} = opts;
-    const {
-        plugins: customPlugins,
-        preprocessors = defaultPreprocessors,
-        pluginOptions,
-        customLintRules,
-        sourceMap,
-    } = opts;
+    const {plugins: customPlugins, pluginOptions, customLintRules, sourceMap} = opts;
     const {path = 'input', log} = pluginOptions;
 
     pluginOptions.isLintRun = true;
@@ -65,9 +59,8 @@ function yfmlint(opts: Options) {
     const plugins = customPlugins && [attrs, ...customPlugins];
     const preparedPlugins = plugins && plugins.map((plugin) => [plugin, pluginOptions]);
 
-    for (const preprocessor of preprocessors) {
-        input = preprocessor(input, pluginOptions);
-    }
+    // Run preprocessor
+    input = preprocess(input, pluginOptions, opts);
 
     let result;
     try {

package/lib/preprocessors.d.ts

@@ -1,3 +0,0 @@
-import type { MarkdownItPreprocessorCb } from './plugins/typings';
-declare const defaultPreprocessors: MarkdownItPreprocessorCb<{}>[];
-export = defaultPreprocessors;

package/lib/preprocessors.js

@@ -1,8 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-const included_1 = __importDefault(require("./preprocessors/included"));
-const defaultPreprocessors = [included_1.default];
-module.exports = defaultPreprocessors;
-//# sourceMappingURL=preprocessors.js.map

package/lib/preprocessors.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"preprocessors.js","sourceRoot":"","sources":["../src/transform/preprocessors.ts"],"names":[],"mappings":";;;;AAEA,wEAAgD;AAEhD,MAAM,oBAAoB,GAAG,CAAC,kBAAQ,CAA+B,CAAC;AAEtE,iBAAS,oBAAoB,CAAC"}

package/src/scss/_cut.scss

@@ -1,55 +0,0 @@
-.yfm-cut {
-    $class: &;
-    margin-bottom: 15px;
-
-    &-title {
-        list-style: none;
-        cursor: pointer;
-        position: relative;
-        user-select: none;
-        padding: 5px 0 5px 30px;
-
-        &::-webkit-details-marker {
-            display: none;
-        }
-
-        &:focus {
-            outline-color: var(--yfm-color-accent);
-        }
-
-        &:before {
-            content: '';
-            z-index: 1;
-            left: 0;
-            top: 50%;
-            background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxNiAxNiI+CiAgICA8cGF0aCBzdHJva2U9ImN1cnJlbnRDb2xvciIgZmlsbD0ibm9uZSIgZD0iTTMgNmw1IDUgNS01Ii8+Cjwvc3ZnPgo=');
-            transform: translateY(-50%) rotate(-90deg);
-            transition: transform 0.3s ease;
-            height: 20px;
-            width: 20px;
-            position: absolute;
-        }
-    }
-
-    &-content {
-        padding: 5px 0 15px 30px;
-    }
-
-    &.open {
-        > #{$class}-title:before {
-            transform: translateY(-50%);
-        }
-    }
-
-    .yfm:not(.yfm_no-list-reset) & ol {
-        counter-reset: cut-list;
-
-        & > li {
-            counter-increment: cut-list;
-
-            &::before {
-                content: counters(cut-list, '.') '. ';
-            }
-        }
-    }
-}

package/src/transform/preprocessors.ts

@@ -1,7 +0,0 @@
-import type {MarkdownItPreprocessorCb} from './plugins/typings';
-
-import included from './preprocessors/included';
-
-const defaultPreprocessors = [included] as MarkdownItPreprocessorCb[];
-
-export = defaultPreprocessors;