@diplodoc/transform 4.48.4 → 4.50.0

package/lib/index.d.ts

@@ -1,9 +1,10 @@
-import type { OptionsType, OutputType, RootCollectorOptions } from './typings';
-declare type TransformFunction = {
-    (originInput: string, options?: OptionsType): OutputType;
-    collect: (input: string, options: RootCollectorOptions<any>) => string;
+import type Token from 'markdown-it/lib/token';
+import type { OptionsType, OutputType } from './typings';
+declare type TokensOptionsType = OptionsType & {
+    tokens: true;
 };
-declare const transform: TransformFunction;
+declare function transform(originInput: string, options: TokensOptionsType): Token[];
+declare function transform(originInput: string, options?: OptionsType): OutputType;
 export = transform;
 declare namespace transform {
     type Options = OptionsType;

package/lib/index.js

@@ -22,35 +22,19 @@ function emitResult(html, env) {
         logs: log_1.log.get(),
     };
 }
-// eslint-disable-next-line consistent-return
-const transform = (originInput, options = {}) => {
+function transform(originInput, options = {}) {
     const input = applyLiquid(originInput, options);
     const { parse, compile, env } = (0, md_1.default)(options);
     try {
-        return emitResult(compile(parse(input)), env);
+        const tokens = parse(input);
+        if (options.tokens === true) {
+            return tokens;
+        }
+        return emitResult(compile(tokens), env);
     }
     catch (error) {
         handleError(error, options.path);
     }
-};
-transform.collect = (input, 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-{ mdItInitOptions, pluginCollectOptions, parserPluginsOverride }) => {
-    var _a;
-    const maybeLiquidedInput = applyLiquid(input, mdItInitOptions);
-    const { parse } = (0, md_1.default)(Object.assign(Object.assign({}, mdItInitOptions), { plugins: parserPluginsOverride !== null && parserPluginsOverride !== void 0 ? parserPluginsOverride : mdItInitOptions.plugins }));
-    const plugins = (_a = mdItInitOptions.plugins) !== null && _a !== void 0 ? _a : [];
-    try {
-        const tokenStream = parse(maybeLiquidedInput);
-        return plugins.reduce((collected, plugin) => {
-            var _a;
-            const collectOutput = (_a = plugin.collect) === null || _a === void 0 ? void 0 : _a.call(plugin, collected, Object.assign(Object.assign({}, pluginCollectOptions), { tokenStream }));
-            return collectOutput !== null && collectOutput !== void 0 ? collectOutput : collected;
-        }, maybeLiquidedInput);
-    }
-    catch (error) {
-        handleError(error, mdItInitOptions.path);
-    }
-};
+}
 module.exports = transform;
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/transform/index.ts"],"names":[],"mappings":";;;;AAEA,iCAA2B;AAE3B,+BAA0B;AAC1B,sDAAsC;AACtC,8CAAkC;AAElC,SAAS,WAAW,CAAC,KAAa,EAAE,OAAoB;IACpD,MAAM,EACF,IAAI,GAAG,EAAE,EACT,IAAI,EACJ,gBAAgB,GAAG,KAAK,EACxB,aAAa,GAAG,KAAK,EACrB,UAAU,GAAG,KAAK,GACrB,GAAG,OAAO,CAAC;IAEZ,OAAO,aAAa,IAAI,UAAU;QAC9B,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,IAAA,gBAAc,EAAC,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,EAAC,gBAAgB,EAAC,CAAC,CAAC;AAChE,CAAC;AAED,SAAS,WAAW,CAAC,KAAc,EAAE,IAAa;IAC9C,SAAG,CAAC,KAAK,CAAC,iBAAiB,IAAI,CAAC,CAAC,CAAC,OAAO,IAAA,YAAI,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAE9D,MAAM,KAAK,CAAC;AAChB,CAAC;AAED,SAAS,UAAU,CAAC,IAAY,EAAE,GAAY;IAC1C,OAAO;QACH,MAAM,kCAAM,GAAG,KAAE,IAAI,GAAC;QACtB,IAAI,EAAE,SAAG,CAAC,GAAG,EAAE;KAClB,CAAC;AACN,CAAC;AAQD,6CAA6C;AAC7C,MAAM,SAAS,GAAsB,CAAC,WAAmB,EAAE,UAAuB,EAAE,EAAE,EAAE;IACpF,MAAM,KAAK,GAAG,WAAW,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAChD,MAAM,EAAC,KAAK,EAAE,OAAO,EAAE,GAAG,EAAC,GAAG,IAAA,YAAc,EAAC,OAAO,CAAC,CAAC;IAEtD,IAAI;QACA,OAAO,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;KACjD;IAAC,OAAO,KAAK,EAAE;QACZ,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;KACpC;AACL,CAAC,CAAC;AAEF,SAAS,CAAC,OAAO,GAAG,CAChB,KAAa;AACb,8DAA8D;AAC9D,EAAC,eAAe,EAAE,oBAAoB,EAAE,qBAAqB,EAA4B,EAC3F,EAAE;;IACA,MAAM,kBAAkB,GAAG,WAAW,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;IAC/D,MAAM,EAAC,KAAK,EAAC,GAAG,IAAA,YAAc,kCACvB,eAAe,KAClB,OAAO,EAAE,qBAAqB,aAArB,qBAAqB,cAArB,qBAAqB,GAAI,eAAe,CAAC,OAAO,IAC3D,CAAC;IAEH,MAAM,OAAO,GAAG,MAAA,eAAe,CAAC,OAAO,mCAAI,EAAE,CAAC;IAE9C,IAAI;QACA,MAAM,WAAW,GAAG,KAAK,CAAC,kBAAkB,CAAC,CAAC;QAE9C,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE;;YACxC,MAAM,aAAa,GAAG,MAAA,MAAM,CAAC,OAAO,uDAAG,SAAS,kCACzC,oBAAoB,KACvB,WAAW,IACb,CAAC;YAEH,OAAO,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,SAAS,CAAC;QACtC,CAAC,EAAE,kBAAkB,CAAC,CAAC;KAC1B;IAAC,OAAO,KAAK,EAAE;QACZ,WAAW,CAAC,KAAK,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;KAC5C;AACL,CAAC,CAAC;AAEF,iBAAS,SAAS,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/transform/index.ts"],"names":[],"mappings":";;;;AAGA,iCAA2B;AAE3B,+BAA0B;AAC1B,sDAAsC;AACtC,8CAAkC;AAElC,SAAS,WAAW,CAAC,KAAa,EAAE,OAAoB;IACpD,MAAM,EACF,IAAI,GAAG,EAAE,EACT,IAAI,EACJ,gBAAgB,GAAG,KAAK,EACxB,aAAa,GAAG,KAAK,EACrB,UAAU,GAAG,KAAK,GACrB,GAAG,OAAO,CAAC;IAEZ,OAAO,aAAa,IAAI,UAAU;QAC9B,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,IAAA,gBAAc,EAAC,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,EAAC,gBAAgB,EAAC,CAAC,CAAC;AAChE,CAAC;AAED,SAAS,WAAW,CAAC,KAAc,EAAE,IAAa;IAC9C,SAAG,CAAC,KAAK,CAAC,iBAAiB,IAAI,CAAC,CAAC,CAAC,OAAO,IAAA,YAAI,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAE9D,MAAM,KAAK,CAAC;AAChB,CAAC;AAED,SAAS,UAAU,CAAC,IAAY,EAAE,GAAY;IAC1C,OAAO;QACH,MAAM,kCAAM,GAAG,KAAE,IAAI,GAAC;QACtB,IAAI,EAAE,SAAG,CAAC,GAAG,EAAE;KAClB,CAAC;AACN,CAAC;AAMD,SAAS,SAAS,CAAC,WAAmB,EAAE,UAAuB,EAAE;IAC7D,MAAM,KAAK,GAAG,WAAW,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAChD,MAAM,EAAC,KAAK,EAAE,OAAO,EAAE,GAAG,EAAC,GAAG,IAAA,YAAc,EAAC,OAAO,CAAC,CAAC;IAEtD,IAAI;QACA,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;QAC5B,IAAI,OAAO,CAAC,MAAM,KAAK,IAAI,EAAE;YACzB,OAAO,MAAM,CAAC;SACjB;QAED,OAAO,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC;KAC3C;IAAC,OAAO,KAAK,EAAE;QACZ,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;KACpC;AACL,CAAC;AAED,iBAAS,SAAS,CAAC"}

package/lib/md.js

@@ -22,6 +22,7 @@ const highlight_1 = __importDefault(require("./highlight"));
 const title_1 = __importDefault(require("./title"));
 const headings_1 = __importDefault(require("./headings"));
 const sanitize_1 = __importDefault(require("./sanitize"));
+const ol_attr_conversion_1 = require("./plugins/ol-attr-conversion");
 function initMarkdownIt(options) {
     const { allowHTML = false, linkify = false, breaks = true, highlightLangs = {}, disableRules = [], } = options;
     const highlight = (0, highlight_1.default)(highlightLangs);
@@ -70,6 +71,7 @@ function initPlugins(md, options, pluginOptions) {
     const { linkify = false, linkifyTlds, leftDelimiter = '{', rightDelimiter = '}', plugins = plugins_1.default, } = options;
     // Need for ids of headers
     md.use(markdown_it_attrs_1.default, { leftDelimiter, rightDelimiter });
+    md.use(ol_attr_conversion_1.olAttrConversion);
     plugins.forEach((plugin) => md.use(plugin, pluginOptions));
     if (linkify && linkifyTlds) {
         md.linkify.tlds(linkifyTlds, true);

package/lib/md.js.map

@@ -1 +1 @@
-{"version":3,"file":"md.js","sourceRoot":"","sources":["../src/transform/md.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"md.js","sourceRoot":"","sources":["../src/transform/md.ts"],"names":[],"mappings":"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"}

package/lib/plugins/ol-attr-conversion.d.ts

@@ -0,0 +1,2 @@
+import { MarkdownItPluginCb } from '../typings';
+export declare const olAttrConversion: MarkdownItPluginCb;

package/lib/plugins/ol-attr-conversion.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.olAttrConversion = void 0;
+const cssWhitelist = {
+    '--hier-list-start': true,
+};
+const olAttrConversion = (md) => {
+    md.core.ruler.after('block', 'olAttrs', (state) => {
+        var _a;
+        state.tokens.forEach((token) => {
+            const maybeStart = token.attrGet('start');
+            if (token.type === 'ordered_list_open' && maybeStart) {
+                token.attrSet('style', `--hier-list-start: ${Number(maybeStart) - 1};`);
+            }
+        });
+        (_a = state.env).additionalOptionsCssWhiteList || (_a.additionalOptionsCssWhiteList = {});
+        Object.assign(state.env.additionalOptionsCssWhiteList, cssWhitelist);
+    });
+};
+exports.olAttrConversion = olAttrConversion;
+//# sourceMappingURL=ol-attr-conversion.js.map

package/lib/plugins/ol-attr-conversion.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ol-attr-conversion.js","sourceRoot":"","sources":["../../src/transform/plugins/ol-attr-conversion.ts"],"names":[],"mappings":";;;AAEA,MAAM,YAAY,GAAG;IACjB,mBAAmB,EAAE,IAAI;CAC5B,CAAC;AAEK,MAAM,gBAAgB,GAAuB,CAAC,EAAE,EAAE,EAAE;IACvD,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE;;QAC9C,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAC3B,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAE1C,IAAI,KAAK,CAAC,IAAI,KAAK,mBAAmB,IAAI,UAAU,EAAE;gBAClD,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,sBAAsB,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;aAC3E;QACL,CAAC,CAAC,CAAC;QAEH,MAAA,KAAK,CAAC,GAAG,EAAC,6BAA6B,QAA7B,6BAA6B,GAAK,EAAE,EAAC;QAE/C,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,6BAA6B,EAAE,YAAY,CAAC,CAAC;IACzE,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAdW,QAAA,gBAAgB,oBAc3B"}

package/lib/typings.d.ts

@@ -23,6 +23,7 @@ export declare type Heading = {
     items?: Heading[];
 };
 export interface OptionsType {
+    tokens?: boolean;
     vars?: Record<string, string>;
     path?: string;
     extractTitle?: boolean;
@@ -89,11 +90,6 @@ export declare type IntrinsicCollectOptions = {
 export declare type ExtendedPluginWithCollect<PluginRegularOptions extends {} = {}, PluginCollectOptions = {}> = MarkdownItPluginCb<PluginRegularOptions> & {
     collect?: (input: string, options: PluginCollectOptions & IntrinsicCollectOptions) => string | void;
 };
-export declare type RootCollectorOptions<PluginCollectOptions> = {
-    mdItInitOptions: OptionsType;
-    pluginCollectOptions: PluginCollectOptions;
-    parserPluginsOverride?: ExtendedPluginWithCollect<any, any>[];
-};
 export declare type MarkdownItPreprocessorCb<T extends unknown = {}> = {
     (input: string, opts: T & Partial<MarkdownItPluginOpts>, md?: MarkdownIt): string;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diplodoc/transform",
-  "version": "4.48.4",
+  "version": "4.50.0",
   "description": "A simple transformer of text in YFM (Yandex Flavored Markdown) to HTML",
   "keywords": [
     "markdown",

package/src/scss/_common.scss

@@ -2,6 +2,7 @@
 
 @import 'private';
 @import 'brand';
+@import 'lists';
 
 @mixin removeMarginForEdgeChildren {
     & > *:first-child {
@@ -303,24 +304,6 @@
         margin-bottom: 0;
     }
 
-    ol > li {
-        &::marker {
-            content: counter(list-item) '. ';
-        }
-
-        & > ol > li::marker {
-            content: counters(list-item, '.') '. ';
-        }
-    }
-
-    &.yfm_no-list-reset ol,
-    ol.yfm_no-list-reset {
-        // No direct ancestor (>) combinator to preserve legacy behavior
-        & > li::marker {
-            content: unset;
-        }
-    }
-
     li {
         word-wrap: break-word;
     }

package/src/scss/_lists.scss

@@ -0,0 +1,71 @@
+@use 'sass:list';
+@use 'sass:string';
+
+@function get-counter-ident($depth) {
+    $ident: hier-list-item;
+
+    @for $i from 0 to $depth {
+        $ident: sub-#{$ident};
+    }
+
+    @return $ident;
+}
+
+@function get-selector($depth) {
+    $selector: ol;
+
+    @for $i from 0 to $depth {
+        $selector: '#{$selector} > li > ol';
+    }
+
+    @return $selector;
+}
+
+@function get-marker-content($idents) {
+    $length: list.length($idents);
+    $content: '';
+
+    @for $i from 1 through $length {
+        @if $i > 1 {
+            $content: '#{$content} "."';
+        }
+
+        $content: '#{$content} counter(#{list.nth($idents, $i)})';
+    }
+
+    @return #{$content} '. ';
+}
+
+@mixin hier-list($max-depth) {
+    $ident-path: ();
+
+    @for $i from 0 through $max-depth {
+        $ident: get-counter-ident($i);
+        $ident-path: list.append($ident-path, $ident);
+
+        & #{get-selector($i)} {
+            --hier-list-start: 0;
+            counter-reset: #{$ident} var(--hier-list-start);
+
+            & > li {
+                counter-increment: $ident;
+
+                &::marker {
+                    content: get-marker-content($ident-path);
+                }
+            }
+        }
+    }
+}
+
+.yfm {
+    @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;
+        }
+    }
+}

package/src/transform/index.ts

@@ -1,4 +1,5 @@
-import type {EnvType, OptionsType, OutputType, RootCollectorOptions} from './typings';
+import type Token from 'markdown-it/lib/token';
+import type {EnvType, OptionsType, OutputType} from './typings';
 
 import {bold} from 'chalk';
 
@@ -33,52 +34,25 @@ function emitResult(html: string, env: EnvType): OutputType {
     };
 }
 
-type TransformFunction = {
-    (originInput: string, options?: OptionsType): OutputType;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    collect: (input: string, options: RootCollectorOptions<any>) => string;
-};
+type TokensOptionsType = OptionsType & {tokens: true};
 
-// eslint-disable-next-line consistent-return
-const transform: TransformFunction = (originInput: string, options: OptionsType = {}) => {
+function transform(originInput: string, options: TokensOptionsType): Token[];
+function transform(originInput: string, options?: OptionsType): OutputType;
+function transform(originInput: string, options: OptionsType = {}): OutputType | Token[] {
     const input = applyLiquid(originInput, options);
     const {parse, compile, env} = initMarkdownIt(options);
 
     try {
-        return emitResult(compile(parse(input)), env);
-    } catch (error) {
-        handleError(error, options.path);
-    }
-};
-
-transform.collect = (
-    input: string,
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    {mdItInitOptions, pluginCollectOptions, parserPluginsOverride}: RootCollectorOptions<any>,
-) => {
-    const maybeLiquidedInput = applyLiquid(input, mdItInitOptions);
-    const {parse} = initMarkdownIt({
-        ...mdItInitOptions,
-        plugins: parserPluginsOverride ?? mdItInitOptions.plugins,
-    });
-
-    const plugins = mdItInitOptions.plugins ?? [];
+        const tokens = parse(input);
+        if (options.tokens === true) {
+            return tokens;
+        }
 
-    try {
-        const tokenStream = parse(maybeLiquidedInput);
-
-        return plugins.reduce((collected, plugin) => {
-            const collectOutput = plugin.collect?.(collected, {
-                ...pluginCollectOptions,
-                tokenStream,
-            });
-
-            return collectOutput ?? collected;
-        }, maybeLiquidedInput);
+        return emitResult(compile(tokens), env);
     } catch (error) {
-        handleError(error, mdItInitOptions.path);
+        handleError(error, options.path);
     }
-};
+}
 
 export = transform;
 

package/src/transform/md.ts

@@ -11,6 +11,7 @@ import makeHighlight from './highlight';
 import extractTitle from './title';
 import getHeadings from './headings';
 import sanitizeHtml from './sanitize';
+import {olAttrConversion} from './plugins/ol-attr-conversion';
 
 function initMarkdownIt(options: OptionsType) {
     const {
@@ -98,6 +99,7 @@ function initPlugins(md: MarkdownIt, options: OptionsType, pluginOptions: Markdo
 
     // Need for ids of headers
     md.use(attrs, {leftDelimiter, rightDelimiter});
+    md.use(olAttrConversion);
 
     plugins.forEach((plugin) => md.use(plugin, pluginOptions));
 

package/src/transform/plugins/ol-attr-conversion.ts

@@ -0,0 +1,21 @@
+import {MarkdownItPluginCb} from '../typings';
+
+const cssWhitelist = {
+    '--hier-list-start': true,
+};
+
+export const olAttrConversion: MarkdownItPluginCb = (md) => {
+    md.core.ruler.after('block', 'olAttrs', (state) => {
+        state.tokens.forEach((token) => {
+            const maybeStart = token.attrGet('start');
+
+            if (token.type === 'ordered_list_open' && maybeStart) {
+                token.attrSet('style', `--hier-list-start: ${Number(maybeStart) - 1};`);
+            }
+        });
+
+        state.env.additionalOptionsCssWhiteList ||= {};
+
+        Object.assign(state.env.additionalOptionsCssWhiteList, cssWhitelist);
+    });
+};

package/src/transform/typings.ts

@@ -30,6 +30,7 @@ export type Heading = {
 };
 
 export interface OptionsType {
+    tokens?: boolean;
     vars?: Record<string, string>;
     path?: string;
     extractTitle?: boolean;
@@ -111,13 +112,6 @@ export type ExtendedPluginWithCollect<
     ) => string | void;
 };
 
-export type RootCollectorOptions<PluginCollectOptions> = {
-    mdItInitOptions: OptionsType;
-    pluginCollectOptions: PluginCollectOptions;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    parserPluginsOverride?: ExtendedPluginWithCollect<any, any>[];
-};
-
 export type MarkdownItPreprocessorCb<T extends unknown = {}> = {
     (input: string, opts: T & Partial<MarkdownItPluginOpts>, md?: MarkdownIt): string;
 };