@diplodoc/transform 4.45.2 → 4.45.4

package/dist/js/yfm.js

@@ -60,25 +60,25 @@
 
   // node_modules/@diplodoc/cut-extension/build/runtime/index.js
   (() => {
-    var c = "yfm_cut", i = { CUT: ".yfm .yfm-cut", TITLE: ".yfm .yfm-cut-title", CONTENT: ".yfm .yfm-cut-content" }, n = { OPEN: "open" };
-    var C = (g) => {
+    var i = "yfm_cut", I = { CUT: ".yfm .yfm-cut", TITLE: ".yfm .yfm-cut-title", CONTENT: ".yfm .yfm-cut-content" }, n = { OPEN: "open" };
+    var o = (g) => {
       let t = g.composedPath();
       return Array.isArray(t) && t.length > 0 ? t[0] : g.target;
-    }, o = (g) => {
-      let t = C(g);
+    }, l = (g) => {
+      let t = o(g);
       return !t || !t.matches;
     };
-    var I = class {
+    var c = class {
       constructor(t) {
         __publicField(this, "__doc");
         __publicField(this, "_onDocClick", (t) => {
-          if (o(t)) return;
+          if (l(t)) return;
           let e = this._findTitleInPath(t);
           e && this._toggleCut(e);
         });
         __publicField(this, "_matchTitle", (t) => {
           var _a;
-          return t instanceof HTMLElement ? (_a = t == null ? void 0 : t.matches) == null ? void 0 : _a.call(t, i.TITLE) : false;
+          return t instanceof HTMLElement ? (_a = t == null ? void 0 : t.matches) == null ? void 0 : _a.call(t, I.TITLE) : false;
         });
         this.__doc = t, this.__doc.addEventListener("click", this._onDocClick);
       }
@@ -87,7 +87,7 @@
       }
       focusActiveCut() {
         let t = window.location.hash.slice(1), e = document.getElementById(t);
-        e instanceof HTMLElement && e.matches(i.CUT) && (e.classList.toggle(n.OPEN), e.setAttribute("open", "true"), setTimeout(() => {
+        e instanceof HTMLElement && e.matches(I.CUT) && (e.classList.toggle(n.OPEN), e.setAttribute("open", "true"), setTimeout(() => {
           e.classList.add("cut-highlight"), e.scrollIntoView();
         }, 70), setTimeout(() => {
           e.classList.remove("cut-highlight");
@@ -95,7 +95,7 @@
       }
       _findTitleInPath(t) {
         var _a, _b;
-        let e = C(t);
+        let e = o(t);
         return this._matchTitle(e) ? e : (_b = (_a = t.composedPath) == null ? void 0 : _a.call(t)) == null ? void 0 : _b.find(this._matchTitle);
       }
       _toggleCut(t) {
@@ -103,7 +103,7 @@
         (_a = t.parentElement) == null ? void 0 : _a.classList.toggle(n.OPEN);
       }
     };
-    typeof window < "u" && typeof document < "u" && !window[c] && (window[c] = new I(document));
+    typeof window < "u" && typeof document < "u" && !window[i] && (window[i] = new c(document));
   })();
 
   // node_modules/@diplodoc/tabs-extension/build/runtime/index.js

package/lib/plugins/images/collect.d.ts

@@ -1,8 +1,10 @@
+import { Token } from 'markdown-it';
 import { MarkdownItPluginOpts } from '../typings';
 declare type Options = MarkdownItPluginOpts & {
     destPath: string;
     copyFile: (path: string, dest: string) => void;
     singlePage: boolean;
+    tokenStream: Token[];
 };
 declare const collect: (input: string, options: Options) => string | null;
 export = collect;

package/lib/plugins/images/collect.js

@@ -1,18 +1,11 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-const markdown_it_1 = __importDefault(require("markdown-it"));
 const path_1 = require("path");
 const utils_1 = require("../../utils");
 const utilsFS_1 = require("../../utilsFS");
-const imsize_1 = __importDefault(require("../imsize"));
 const collect = (input, options) => {
-    const md = new markdown_it_1.default().use(imsize_1.default);
-    const { root, path, destPath = '', copyFile, singlePage } = options;
-    const tokens = md.parse(input, {});
+    const { root, path, destPath = '', copyFile, singlePage, tokenStream } = options;
     let result = input;
-    tokens.forEach((token) => {
+    tokenStream.forEach((token) => {
         if (token.type !== 'inline') {
             return;
         }

package/lib/plugins/images/collect.js.map

@@ -1 +1 @@
-{"version":3,"file":"collect.js","sourceRoot":"","sources":["../../../src/transform/plugins/images/collect.ts"],"names":[],"mappings":";;;;AAAA,8DAAqC;AACrC,+BAA8B;AAE9B,uCAAuC;AACvC,2CAAkD;AAClD,uDAA+B;AAS/B,MAAM,OAAO,GAAG,CAAC,KAAa,EAAE,OAAgB,EAAE,EAAE;IAChD,MAAM,EAAE,GAAG,IAAI,qBAAU,EAAE,CAAC,GAAG,CAAC,gBAAM,CAAC,CAAC;IAExC,MAAM,EAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,GAAG,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAC,GAAG,OAAO,CAAC;IAClE,MAAM,MAAM,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACnC,IAAI,MAAM,GAAG,KAAK,CAAC;IAEnB,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QACrB,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE;YACzB,OAAO;SACV;QAED,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,IAAI,EAAE,CAAC;QAEtC,QAAQ,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;YAC5B,IAAI,UAAU,CAAC,IAAI,KAAK,OAAO,EAAE;gBAC7B,OAAO;aACV;YAED,MAAM,GAAG,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YAE5C,IAAI,CAAC,IAAA,kBAAU,EAAC,GAAG,CAAC,EAAE;gBAClB,OAAO;aACV;YAED,MAAM,UAAU,GAAG,IAAA,6BAAmB,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YAClD,MAAM,cAAc,GAAG,IAAA,6BAAmB,EAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;YAE1D,IAAI,UAAU,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;gBAC5C,MAAM,MAAM,GAAG,IAAA,eAAQ,EAAC,IAAI,EAAE,IAAA,6BAAmB,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;gBAE9D,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;aACxC;YAED,QAAQ,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,IAAI,UAAU,EAAE;QACZ,OAAO,MAAM,CAAC;KACjB;IAED,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC;AAEF,iBAAS,OAAO,CAAC"}
+{"version":3,"file":"collect.js","sourceRoot":"","sources":["../../../src/transform/plugins/images/collect.ts"],"names":[],"mappings":";AACA,+BAA8B;AAE9B,uCAAuC;AACvC,2CAAkD;AAUlD,MAAM,OAAO,GAAG,CAAC,KAAa,EAAE,OAAgB,EAAE,EAAE;IAChD,MAAM,EAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,GAAG,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAC,GAAG,OAAO,CAAC;IAE/E,IAAI,MAAM,GAAG,KAAK,CAAC;IAEnB,WAAW,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QAC1B,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE;YACzB,OAAO;SACV;QAED,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,IAAI,EAAE,CAAC;QAEtC,QAAQ,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;YAC5B,IAAI,UAAU,CAAC,IAAI,KAAK,OAAO,EAAE;gBAC7B,OAAO;aACV;YAED,MAAM,GAAG,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YAE5C,IAAI,CAAC,IAAA,kBAAU,EAAC,GAAG,CAAC,EAAE;gBAClB,OAAO;aACV;YAED,MAAM,UAAU,GAAG,IAAA,6BAAmB,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YAClD,MAAM,cAAc,GAAG,IAAA,6BAAmB,EAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;YAE1D,IAAI,UAAU,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;gBAC5C,MAAM,MAAM,GAAG,IAAA,eAAQ,EAAC,IAAI,EAAE,IAAA,6BAAmB,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;gBAE9D,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;aACxC;YAED,QAAQ,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,IAAI,UAAU,EAAE;QACZ,OAAO,MAAM,CAAC;KACjB;IAED,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC;AAEF,iBAAS,OAAO,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diplodoc/transform",
-  "version": "4.45.2",
+  "version": "4.45.4",
   "description": "A simple transformer of text in YFM (Yandex Flavored Markdown) to HTML",
   "keywords": [
     "markdown",
@@ -47,7 +47,7 @@
     "postinstall": "cd playground && npm ci --ignore-scripts || true"
   },
   "dependencies": {
-    "@diplodoc/cut-extension": "^0.7.1",
+    "@diplodoc/cut-extension": "^0.7.2",
     "@diplodoc/file-extension": "^0.2.0",
     "@diplodoc/tabs-extension": "^3.5.0",
     "chalk": "^4.1.2",

package/src/scss/_common.scss

@@ -22,6 +22,7 @@
     line-height: 20px;
     word-wrap: break-word;
     color: var(--yfm-color-text);
+    tab-size: var(--yfm-tab-size, inherit);
 
     * {
         box-sizing: border-box;
@@ -286,12 +287,6 @@
 
     dd {
         margin-left: 0;
-
-        & > ol:first-child,
-        & > ul:first-child,
-        & > dd:first-child {
-            padding-left: 0;
-        }
     }
 
     ul,
@@ -307,22 +302,29 @@
         margin-bottom: 0;
     }
 
-    &:not(.yfm_no-list-reset) {
-        ol {
-            list-style-type: none;
-            counter-reset: list;
+    ol {
+        counter-reset: list;
+
+        & > li {
+            position: relative;
+            counter-increment: list;
+        }
+    }
+
+    ol > li > ol > li::marker {
+        content: counters(list, '.') '. ';
+    }
+
+    :not(ol > li) > ol > li::marker {
+        content: counter(list) '. ';
+    }
 
-            & > li {
-                position: relative;
-                counter-increment: list;
+    ol.yfm_no-list-reset {
+        counter-reset: unset;
 
-                &::before {
-                    position: absolute;
-                    right: 100%;
-                    margin-right: 4px;
-                    content: counters(list, '.') '. ';
-                }
-            }
+        // No direct ancestor (>) combinator to preserve legacy behavior
+        & li::marker {
+            content: unset;
         }
     }
 
@@ -346,6 +348,7 @@
         font-size: 0.875em;
         white-space: pre-wrap;
         color: var(--yfm-color-inline-code);
+        tab-size: var(--yfm-tab-size-code, inherit);
     }
 
     pre {

package/src/scss/print/cut.scss

@@ -17,17 +17,3 @@
         }
     }
 }
-
-.yfm-cut-content {
-    .yfm:not(.yfm_no-list-reset) & ol {
-        counter-reset: cut-list;
-
-        & > li {
-            counter-increment: cut-list;
-
-            &::before {
-                content: counters(cut-list, '.') '. ';
-            }
-        }
-    }
-}

package/src/transform/plugins/images/collect.ts

@@ -1,25 +1,23 @@
-import MarkdownIt from 'markdown-it';
+import {Token} from 'markdown-it';
 import {relative} from 'path';
 
 import {isLocalUrl} from '../../utils';
 import {resolveRelativePath} from '../../utilsFS';
-import imsize from '../imsize';
 import {MarkdownItPluginOpts} from '../typings';
 
 type Options = MarkdownItPluginOpts & {
     destPath: string;
     copyFile: (path: string, dest: string) => void;
     singlePage: boolean;
+    tokenStream: Token[];
 };
 
 const collect = (input: string, options: Options) => {
-    const md = new MarkdownIt().use(imsize);
+    const {root, path, destPath = '', copyFile, singlePage, tokenStream} = options;
 
-    const {root, path, destPath = '', copyFile, singlePage} = options;
-    const tokens = md.parse(input, {});
     let result = input;
 
-    tokens.forEach((token) => {
+    tokenStream.forEach((token) => {
         if (token.type !== 'inline') {
             return;
         }