@diplodoc/transform 4.50.4 → 4.51.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diplodoc/transform",
-  "version": "4.50.4",
+  "version": "4.51.1",
   "description": "A simple transformer of text in YFM (Yandex Flavored Markdown) to HTML",
   "keywords": [
     "markdown",
@@ -65,6 +65,7 @@
     "markdown-it-sup": "1.0.0",
     "markdownlint": "^0.32.1",
     "markdownlint-rule-helpers": "0.17.2",
+    "quick-lru": "^5.1.1",
     "sanitize-html": "^2.11.0",
     "slugify": "1.6.6",
     "svgo": "^3.2.0",

package/src/transform/md.ts

@@ -95,10 +95,15 @@ function initPlugins(md: MarkdownIt, options: OptionsType, pluginOptions: Markdo
         leftDelimiter = '{',
         rightDelimiter = '}',
         plugins = DefaultPlugins,
+        enableMarkdownAttrs,
     } = options;
 
-    // Need for ids of headers
-    md.use(attrs, {leftDelimiter, rightDelimiter});
+    // TODO: set enableMarkdownAttrs to false by default in next major
+    if (enableMarkdownAttrs !== false) {
+        // Need for ids of headers
+        md.use(attrs, {leftDelimiter, rightDelimiter});
+    }
+
     md.use(olAttrConversion);
 
     plugins.forEach((plugin) => md.use(plugin, pluginOptions));

package/src/transform/plugins/block-anchor/index.ts

@@ -3,7 +3,11 @@ import MarkdownIt from 'markdown-it';
 import {TOKEN_NAME, renderTokens, replaceTokens} from './block-anchor';
 
 const blockAnchor = (md: MarkdownIt) => {
-    md.core.ruler.before('curly_attributes', TOKEN_NAME, replaceTokens);
+    try {
+        md.core.ruler.before('curly_attributes', TOKEN_NAME, replaceTokens);
+    } catch (e) {
+        md.core.ruler.push(TOKEN_NAME, replaceTokens);
+    }
     md.renderer.rules[TOKEN_NAME] = renderTokens;
 
     return md;

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

@@ -76,6 +76,7 @@ function unfoldIncludes(md: MarkdownItIncluded, state: StateCore, path: string,
                 let includedTokens;
                 if (hash) {
                     // TODO: add warning about missed block
+                    // TODO: findBlockTokens requires markdown-it-attrs plugin for find block with id=hash
                     includedTokens = findBlockTokens(fileTokens, hash);
                 } else {
                     includedTokens = fileTokens;

package/src/transform/sanitize.ts

@@ -511,6 +511,12 @@ export const defaultOptions: SanitizeOptions = {
         ...sanitizeHtml.defaults.allowedAttributes,
         '*': allowedAttributes,
     },
+    allowedSchemesAppliedToAttributes: [
+        ...sanitizeHtml.defaults.allowedSchemesAppliedToAttributes,
+        'xlink:href',
+        'from',
+        'to',
+    ],
     allowVulnerableTags: true,
     parser: defaultParseOptions,
     cssWhiteList: defaultCssWhitelist,
@@ -593,7 +599,6 @@ function sanitizeStyles(html: string, options: SanitizeOptions) {
     const $ = cheerio.load(html);
 
     sanitizeStyleTags($, cssWhiteList);
-
     sanitizeStyleAttrs($, cssWhiteList);
 
     const styles = $('head').html() || '';

package/src/transform/typings.ts

@@ -59,6 +59,13 @@ export interface OptionsType {
     getPublicPath?: (options: OptionsType, href?: string) => string;
     renderInline?: boolean;
     cache?: CacheContext;
+    // TODO: set false by default in next major
+    /**
+     * `markdown-it-attrs` plugin is enabled by default
+     *
+     * Set value to `false` to disable it
+     */
+    enableMarkdownAttrs?: boolean;
     [x: string]: unknown;
 }
 

package/src/transform/utilsFS.ts

@@ -3,13 +3,14 @@ import type {Dictionary} from 'lodash';
 import {readFileSync, realpathSync, statSync} from 'fs';
 import escapeRegExp from 'lodash/escapeRegExp';
 import {join, parse, relative, resolve, sep} from 'path';
+import QuickLRU from 'quick-lru';
 
 import liquidSnippet from './liquid';
 import {StateCore} from './typings';
 import {defaultTransformLink} from './utils';
 import {preprocess} from './preprocessors';
 
-const filesCache: Record<string, string> = {};
+const filesCache = new QuickLRU<string, string>({maxSize: 1000});
 
 export function isFileExists(file: string) {
     try {
@@ -62,11 +63,11 @@ export function getFileTokens(
 
     // Read the content only if we dont have one in the args
     if (!content) {
-        if (filesCache[path]) {
-            content = filesCache[path];
+        if (filesCache.has(path)) {
+            content = filesCache.get(path) as string;
         } else {
             content = readFileSync(path, 'utf8');
-            filesCache[path] = content;
+            filesCache.set(path, content);
         }
     }
 

package/src/transform/yfmlint/index.ts

@@ -56,7 +56,9 @@ function yfmlint(opts: Options) {
         lintRules = union(lintRules, customLintRules);
     }
 
-    const plugins = customPlugins && [attrs, ...customPlugins];
+    // TODO: set to false in next major
+    const {enableMarkdownAttrs = true} = opts;
+    const plugins = customPlugins && [...(enableMarkdownAttrs ? [attrs] : []), ...customPlugins];
     const preparedPlugins = plugins && plugins.map((plugin) => [plugin, pluginOptions]);
 
     // Run preprocessor

package/src/transform/yfmlint/typings.ts

@@ -16,4 +16,7 @@ export interface Options {
     lintConfig?: LintConfig;
     customLintRules?: Rule[];
     sourceMap?: Dictionary<string>;
+    // TODO: set false in next major
+    /** @default true */
+    enableMarkdownAttrs?: boolean;
 }