@diplodoc/transform 4.52.0 → 4.54.0

package/lib/yfmlint/markdownlint-custom-rule/yfm009.js

@@ -13,19 +13,19 @@ exports.yfm009 = {
         let lastCloseIndex = -1;
         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;
             }
             if (i === size - 1) {
                 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;
             }
             onError({

package/lib/yfmlint/markdownlint-custom-rule/yfm009.js.map

@@ -1 +1 @@
-{"version":3,"file":"yfm009.js","sourceRoot":"","sources":["../../../src/transform/yfmlint/markdownlint-custom-rule/yfm009.ts"],"names":[],"mappings":";;;AAEa,QAAA,MAAM,GAAS;IACxB,KAAK,EAAE,CAAC,QAAQ,EAAE,+BAA+B,CAAC;IAClD,WAAW,EAAE,qDAAqD;IAClE,IAAI,EAAE,CAAC,MAAM,CAAC;IACd,QAAQ,EAAE,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO;QACrC,MAAM,EAAC,MAAM,EAAC,GAAG,MAAM,CAAC;QACxB,IAAI,CAAC,MAAM,EAAE;YACT,OAAO;SACV;QAED,IAAI,cAAc,GAAG,CAAC,CAAC,CAAC;QACxB,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC;QAElC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,EAAE;YAC3B,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,gBAAgB,EAAE;gBAC5C,cAAc,GAAG,CAAC,CAAC;aACtB;YAED,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,gBAAgB,EAAE;gBAC5C,SAAS;aACZ;YAED,IAAI,CAAC,KAAK,IAAI,GAAG,CAAC,EAAE;gBAChB,SAAS;aACZ;YAED,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,eAAe,EAAE;gBAC/C,SAAS;aACZ;YAED,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,eAAe,EAAE;gBAC/D,SAAS;aACZ;YAED,OAAO,CAAC;gBACJ,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU;gBAC3C,MAAM,EAAE,qGAAqG;aAChH,CAAC,CAAC;SACN;QAED,IAAI,cAAc,KAAK,CAAC,CAAC,EAAE;YACvB,OAAO;SACV;QAED,IAAI,cAAc,KAAK,IAAI,GAAG,CAAC,EAAE;YAC7B,OAAO,CAAC;gBACJ,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC,UAAU;gBACxD,MAAM,EAAE,mCAAmC;aAC9C,CAAC,CAAC;SACN;IACL,CAAC;CACJ,CAAC"}
+{"version":3,"file":"yfm009.js","sourceRoot":"","sources":["../../../src/transform/yfmlint/markdownlint-custom-rule/yfm009.ts"],"names":[],"mappings":";;;AAEa,QAAA,MAAM,GAAS;IACxB,KAAK,EAAE,CAAC,QAAQ,EAAE,+BAA+B,CAAC;IAClD,WAAW,EAAE,qDAAqD;IAClE,IAAI,EAAE,CAAC,MAAM,CAAC;IACd,QAAQ,EAAE,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO;QACrC,MAAM,EAAC,MAAM,EAAC,GAAG,MAAM,CAAC;QACxB,IAAI,CAAC,MAAM,EAAE;YACT,OAAO;SACV;QAED,IAAI,cAAc,GAAG,CAAC,CAAC,CAAC;QACxB,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC;QAElC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,EAAE;YAC3B,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,EAAE;gBACvC,cAAc,GAAG,CAAC,CAAC;aACtB;YAED,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,EAAE;gBACvC,SAAS;aACZ;YAED,IAAI,CAAC,KAAK,IAAI,GAAG,CAAC,EAAE;gBAChB,SAAS;aACZ;YAED,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,EAAE;gBAC1C,SAAS;aACZ;YAED,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,EAAE;gBAC1D,SAAS;aACZ;YAED,OAAO,CAAC;gBACJ,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU;gBAC3C,MAAM,EAAE,qGAAqG;aAChH,CAAC,CAAC;SACN;QAED,IAAI,cAAc,KAAK,CAAC,CAAC,EAAE;YACvB,OAAO;SACV;QAED,IAAI,cAAc,KAAK,IAAI,GAAG,CAAC,EAAE;YAC7B,OAAO,CAAC;gBACJ,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC,UAAU;gBACxD,MAAM,EAAE,mCAAmC;aAC9C,CAAC,CAAC;SACN;IACL,CAAC;CACJ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diplodoc/transform",
-  "version": "4.52.0",
+  "version": "4.54.0",
   "description": "A simple transformer of text in YFM (Yandex Flavored Markdown) to HTML",
   "keywords": [
     "markdown",
@@ -39,6 +39,8 @@
     "artifact:pages": "npm run build && npm run artifact:playground",
     "prepublishOnly": "npm run lint && npm run test && npm run build",
     "test": "jest --coverage",
+    "test:playwright:nobuild": "cd e2e && npm run playwright:docker",
+    "test:playwright": "npm run build && npm run test:playwright:nobuild",
     "typecheck": "tsc -p tsconfig.json --noEmit",
     "lint": "lint update && lint",
     "lint:fix": "lint update && lint fix",

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

@@ -10,7 +10,7 @@ import {log} from './log';
 import makeHighlight from './highlight';
 import extractTitle from './title';
 import getHeadings from './headings';
-import sanitizeHtml from './sanitize';
+import sanitizeHtml, {defaultOptions, sanitizeStyles} from './sanitize';
 import {olAttrConversion} from './plugins/ol-attr-conversion';
 
 function initMarkdownIt(options: OptionsType) {
@@ -169,18 +169,36 @@ function initCompiler(md: MarkdownIt, options: OptionsType, env: EnvType) {
         }
 
         // Generate HTML
-        const html = md.renderer.render(tokens, md.options, env);
+        let html = md.renderer.render(tokens, md.options, env);
 
         if (!needToSanitizeHtml) {
             return html;
         }
 
-        // Sanitize the page
-        return sanitize
+        // If a custom sanitizer was used, we need to ensure styles are sanitized
+        // unless explicitly disabled via disableStyleSanitizer option
+        if (sanitize && !(sanitizeOptions?.disableStyleSanitizer ?? false)) {
+            const baseOptions = sanitizeOptions || defaultOptions;
+
+            const mergedOptions = {
+                ...baseOptions,
+                cssWhiteList: {
+                    ...(defaultOptions.cssWhiteList || {}),
+                    ...(baseOptions.cssWhiteList || {}),
+                    ...(env.additionalOptionsCssWhiteList || {}),
+                },
+            };
+
+            html = sanitizeStyles(html, mergedOptions);
+        }
+
+        const sanitizedHtml = sanitize
             ? sanitize(html, sanitizeOptions)
             : sanitizeHtml(html, sanitizeOptions, {
                   cssWhiteList: env.additionalOptionsCssWhiteList,
               });
+
+        return sanitizedHtml;
     };
 }
 

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

@@ -599,7 +599,7 @@ function sanitizeStyleAttrs(dom: cheerio.CheerioAPI, cssWhiteList: CssWhiteList)
     });
 }
 
-function sanitizeStyles(html: string, options: SanitizeOptions) {
+export function sanitizeStyles(html: string, options: SanitizeOptions) {
     const cssWhiteList = options.cssWhiteList || {};
 
     const $ = cheerio.load(html);

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;
             }