@diplodoc/transform 4.51.1 → 4.53.0

package/src/js/term/utils.ts

@@ -6,19 +6,6 @@ export const openClass = 'open';
 export const openDefinitionClass = Selector.CONTENT.replace(/\./g, '') + ' ' + openClass;
 let isListenerNeeded = true;
 
-export function createDefinitionElement(termElement: HTMLElement) {
-    const termKey = termElement.getAttribute('term-key');
-    const definitionTemplate = document.getElementById(
-        `${termKey}_template`,
-    ) as HTMLTemplateElement;
-    const definitionElement = definitionTemplate?.content.cloneNode(true).firstChild as HTMLElement;
-
-    definitionTemplate?.parentElement?.appendChild(definitionElement);
-    definitionTemplate.remove();
-
-    return definitionElement;
-}
-
 export function setDefinitionId(definitionElement: HTMLElement, termElement: HTMLElement): void {
     const termId = termElement.getAttribute('id') || Math.random().toString(36).substr(2, 8);
     definitionElement?.setAttribute('term-id', termId);
@@ -143,11 +130,7 @@ export function openDefinition(target: HTMLElement) {
 
     const termId = target.getAttribute('id');
     const termKey = target.getAttribute('term-key');
-    let definitionElement = document.getElementById(termKey + '_element');
-
-    if (termKey && !definitionElement) {
-        definitionElement = createDefinitionElement(target);
-    }
+    const definitionElement = document.getElementById(termKey + '_element');
 
     const isSameTerm = openedDefinition && termId === openedDefinition.getAttribute('term-id');
     if (isSameTerm) {

package/src/scss/_lists.scss

@@ -62,10 +62,16 @@
     @include hier-list(5);
 
     &.yfm_no-list-reset ol,
-    ol.yfm_no-list-reset {
-        // No direct ancestor (>) combinator to preserve legacy behavior
-        & > li::marker {
-            content: unset;
+    ol.yfm_no-list-reset,
+    .yfm_no-list-reset ol {
+        counter-reset: list-item;
+
+        & li {
+            counter-increment: unset;
+
+            &::marker {
+                content: unset;
+            }
         }
     }
 }

package/src/transform/md.ts

@@ -160,7 +160,7 @@ function initParser(
 }
 
 function initCompiler(md: MarkdownIt, options: OptionsType, env: EnvType) {
-    const {needToSanitizeHtml = true, renderInline = false, sanitizeOptions} = options;
+    const {needToSanitizeHtml = true, renderInline = false, sanitizeOptions, sanitize} = options;
 
     return (tokens: Token[]) => {
         // Remove inline tokens if inline mode is activated
@@ -171,10 +171,16 @@ function initCompiler(md: MarkdownIt, options: OptionsType, env: EnvType) {
         // Generate HTML
         const html = md.renderer.render(tokens, md.options, env);
 
+        if (!needToSanitizeHtml) {
+            return html;
+        }
+
         // Sanitize the page
-        return needToSanitizeHtml
-            ? sanitizeHtml(html, sanitizeOptions, {cssWhiteList: env.additionalOptionsCssWhiteList})
-            : html;
+        return sanitize
+            ? sanitize(html, sanitizeOptions)
+            : sanitizeHtml(html, sanitizeOptions, {
+                  cssWhiteList: env.additionalOptionsCssWhiteList,
+              });
     };
 }
 

package/src/transform/plugins/term/termDefinitions.ts

@@ -132,13 +132,6 @@ function processTermDefinition(
         state.env.terms[':' + label] = title;
     }
 
-    token = new state.Token('template_open', 'template', 1);
-    token.map = [startLine, currentLine + 1];
-    token.attrSet('id', ':' + label + '_template');
-    token.attrSet('label', label);
-
-    state.tokens.push(token);
-
     token = new state.Token('dfn_open', 'dfn', 1);
     token.attrSet('class', 'yfm yfm-term_dfn');
     token.attrSet('id', ':' + label + '_element');
@@ -170,10 +163,6 @@ function processTermDefinition(
 
     state.tokens.push(token);
 
-    token = new state.Token('template_close', 'template', -1);
-
-    state.tokens.push(token);
-
     /** current line links to end of term definition */
     state.line = currentLine + 1;
 

package/src/transform/sanitize.ts

@@ -7,6 +7,12 @@ import css from 'css';
 import {CssWhiteList} from './typings';
 import log from './log';
 
+export type SanitizeFunction = (
+    html: string,
+    options?: SanitizeOptions,
+    additionalOptions?: SanitizeOptions,
+) => string;
+
 const htmlTags = [
     'a',
     'abbr',

package/src/transform/typings.ts

@@ -2,7 +2,7 @@ import {LanguageFn} from 'highlight.js';
 import DefaultMarkdownIt, {Token} from 'markdown-it';
 import DefaultStateCore from 'markdown-it/lib/rules_core/state_core';
 
-import {SanitizeOptions} from './sanitize';
+import {SanitizeFunction, SanitizeOptions} from './sanitize';
 import {LogLevels, Logger} from './log';
 import {ChangelogItem} from './plugins/changelog/types';
 
@@ -46,6 +46,7 @@ export interface OptionsType {
     isLiquided?: boolean;
     needToSanitizeHtml?: boolean;
     sanitizeOptions?: SanitizeOptions;
+    sanitize?: SanitizeFunction;
     needFlatListHeadings?: boolean;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     plugins?: ExtendedPluginWithCollect<any, any>[];

package/src/transform/yfmlint/markdownlint-custom-rule/yfm009.ts

@@ -14,11 +14,11 @@ export const yfm009: Rule = {
         const size = params.tokens.length;
 
         for (let i = 0; i < size; i++) {
-            if (params.tokens[i].type === 'template_close') {
+            if (params.tokens[i].type === 'dfn_close') {
                 lastCloseIndex = i;
             }
 
-            if (params.tokens[i].type !== 'template_close') {
+            if (params.tokens[i].type !== 'dfn_close') {
                 continue;
             }
 
@@ -26,11 +26,11 @@ export const yfm009: Rule = {
                 continue;
             }
 
-            if (params.tokens[i + 1].type === 'template_open') {
+            if (params.tokens[i + 1].type === 'dfn_open') {
                 continue;
             }
 
-            if (i < size - 2 && params.tokens[i + 2].type === 'template_open') {
+            if (i < size - 2 && params.tokens[i + 2].type === 'dfn_open') {
                 continue;
             }