@diplodoc/transform 4.20.0 → 4.22.0

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

@@ -1,7 +1,7 @@
 import StateBlock from 'markdown-it/lib/rules_block/state_block';
 import {MarkdownItPluginCb} from '../typings';
 import Token from 'markdown-it/lib/token';
-import {parseAttrsClass} from './utils';
+import {AttrsParser} from './attrs';
 
 const pluginName = 'yfm_table';
 const pipeChar = 0x7c; // |
@@ -96,6 +96,7 @@ class StateIterator {
 interface RowPositions {
     rows: [number, number, [Stats, Stats][]][];
     endOfTable: number | null;
+    pos: number;
 }
 
 function getTableRowPositions(
@@ -214,7 +215,19 @@ function getTableRowPositions(
 
         iter.next();
     }
-    return {rows, endOfTable};
+
+    const {pos} = iter;
+
+    return {rows, endOfTable, pos};
+}
+
+function extractAttributes(state: StateBlock, pos: number): Record<string, string[]> {
+    const attrsStringStart = state.skipSpaces(pos);
+    const attrsString = state.src.slice(attrsStringStart);
+
+    const attrsParser = new AttrsParser();
+
+    return attrsParser.parse(attrsString);
 }
 
 /**
@@ -232,7 +245,10 @@ function extractAndApplyClassFromToken(contentToken: Token, tdOpenToken: Token):
     if (!allAttrs) {
         return;
     }
-    const attrsClass = parseAttrsClass(allAttrs[0].trim());
+
+    const attrs = new AttrsParser().parse(allAttrs[0].trim());
+    const attrsClass = attrs?.class?.join(' ');
+
     if (attrsClass) {
         tdOpenToken.attrSet('class', attrsClass);
         // remove the class from the token so that it's not propagated to tr or table level
@@ -363,13 +379,15 @@ const yfmTable: MarkdownItPluginCb = (md) => {
                 return true;
             }
 
-            const {rows, endOfTable} = getTableRowPositions(
+            const {rows, endOfTable, pos} = getTableRowPositions(
                 state,
                 startPosition,
                 endPosition,
                 startLine,
             );
 
+            const attrs = extractAttributes(state, pos);
+
             if (!endOfTable) {
                 token = state.push('__yfm_lint', '', 0);
                 token.hidden = true;
@@ -385,6 +403,16 @@ const yfmTable: MarkdownItPluginCb = (md) => {
 
             const tableStart = state.tokens.length;
             token = state.push('yfm_table_open', 'table', 1);
+
+            const {attr: singleKeyAttrs = [], ...fullAttrs} = attrs;
+            for (const [property, values] of Object.entries(fullAttrs)) {
+                token.attrJoin(property, values.join(' '));
+            }
+
+            for (const attr of singleKeyAttrs) {
+                token.attrJoin(attr, 'true');
+            }
+
             token.map = [startLine, endOfTable];
 
             token = state.push('yfm_tbody_open', 'tbody', 1);

package/src/transform/sanitize.ts

@@ -288,6 +288,7 @@ const htmlAttrs = [
     'referrerpolicy',
     'aria-describedby',
     'data-*',
+    'wide-content',
 ];
 
 const svgAttrs = [

package/lib/plugins/table/utils.d.ts

@@ -1,8 +0,0 @@
-/**
- * Parse the markdown-attrs format to retrieve a class name
- * Putting all the requirements in regex was more complicated than parsing a string char by char.
- *
- * @param {string} inputString - The string to parse.
- * @returns {string|null} - The extracted class or null if there is none
- */
-export declare function parseAttrsClass(inputString: string): string | null;

package/lib/plugins/table/utils.js

@@ -1,40 +0,0 @@
-"use strict";
-/**
- * Parse the markdown-attrs format to retrieve a class name
- * Putting all the requirements in regex was more complicated than parsing a string char by char.
- *
- * @param {string} inputString - The string to parse.
- * @returns {string|null} - The extracted class or null if there is none
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseAttrsClass = void 0;
-function parseAttrsClass(inputString) {
-    const validChars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ .=-_';
-    if (!inputString.startsWith('{')) {
-        return null;
-    }
-    for (let i = 1; i < inputString.length; i++) {
-        const char = inputString[i];
-        if (char === '}') {
-            const contentInside = inputString.slice(1, i).trim(); // content excluding { and }
-            if (!contentInside) {
-                return null;
-            }
-            const parts = contentInside.split('.');
-            if (parts.length !== 2 || !parts[1]) {
-                return null;
-            }
-            //There should be a preceding whitespace
-            if (!parts[0].endsWith(' ') && parts[0] !== '') {
-                return null;
-            }
-            return parts[1];
-        }
-        if (!validChars.includes(char)) {
-            return null;
-        }
-    }
-    return null;
-}
-exports.parseAttrsClass = parseAttrsClass;
-//# sourceMappingURL=utils.js.map

package/lib/plugins/table/utils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/transform/plugins/table/utils.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAEH,SAAgB,eAAe,CAAC,WAAmB;IAC/C,MAAM,UAAU,GAAG,2DAA2D,CAAC;IAE/E,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QAC9B,OAAO,IAAI,CAAC;KACf;IAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACzC,MAAM,IAAI,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QAE5B,IAAI,IAAI,KAAK,GAAG,EAAE;YACd,MAAM,aAAa,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,4BAA4B;YAElF,IAAI,CAAC,aAAa,EAAE;gBAChB,OAAO,IAAI,CAAC;aACf;YAED,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACvC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;gBACjC,OAAO,IAAI,CAAC;aACf;YACD,wCAAwC;YACxC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE;gBAC5C,OAAO,IAAI,CAAC;aACf;YAED,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;SACnB;QAED,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YAC5B,OAAO,IAAI,CAAC;SACf;KACJ;IAED,OAAO,IAAI,CAAC;AAChB,CAAC;AAnCD,0CAmCC"}

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

@@ -1,44 +0,0 @@
-/**
- * Parse the markdown-attrs format to retrieve a class name
- * Putting all the requirements in regex was more complicated than parsing a string char by char.
- *
- * @param {string} inputString - The string to parse.
- * @returns {string|null} - The extracted class or null if there is none
- */
-
-export function parseAttrsClass(inputString: string): string | null {
-    const validChars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ .=-_';
-
-    if (!inputString.startsWith('{')) {
-        return null;
-    }
-
-    for (let i = 1; i < inputString.length; i++) {
-        const char = inputString[i];
-
-        if (char === '}') {
-            const contentInside = inputString.slice(1, i).trim(); // content excluding { and }
-
-            if (!contentInside) {
-                return null;
-            }
-
-            const parts = contentInside.split('.');
-            if (parts.length !== 2 || !parts[1]) {
-                return null;
-            }
-            //There should be a preceding whitespace
-            if (!parts[0].endsWith(' ') && parts[0] !== '') {
-                return null;
-            }
-
-            return parts[1];
-        }
-
-        if (!validChars.includes(char)) {
-            return null;
-        }
-    }
-
-    return null;
-}