@diplodoc/transform 4.48.3 → 4.49.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/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.3",
+  "version": "4.49.0",
   "description": "A simple transformer of text in YFM (Yandex Flavored Markdown) to HTML",
   "keywords": [
     "markdown",

package/src/scss/_common.scss

@@ -136,6 +136,7 @@
     table,
     pre {
         margin-block: var(--yfm-text-block-margin-block, 0 15px);
+        margin-inline: var(--yfm-text-block-margin-inline, 0);
     }
 
     ul,

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