@diplodoc/transform 4.7.0 → 4.7.2

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

@@ -3,7 +3,7 @@ import {sep} from 'path';
 
 import {getSinglePageAnchorId, resolveRelativePath} from '../../utilsFS';
 import {transformLinkToOriginalArticle} from '../../utils';
-import {CUSTOM_ID_REGEXP, CUSTOM_ID_EXCEPTION} from './constants';
+import {CUSTOM_ID_EXCEPTION, CUSTOM_ID_REGEXP} from './constants';
 import {сarriage} from '../utils';
 import {MarkdownItPluginOpts} from '../typings';
 
@@ -84,9 +84,8 @@ const collect = (input: string, options: MarkdownItPluginOpts & {singlePage: boo
 
         if (needToSetOriginalPathAttr) {
             const originalArticleHref = transformLinkToOriginalArticle({root, currentPath});
-            lines[
-                i
-            ] = `${baseHeaderSyntax} {data-original-article=${originalArticleHref}} ${newCustomHeadersStr}`;
+            lines[i] =
+                `${baseHeaderSyntax} {data-original-article=${originalArticleHref}} ${newCustomHeadersStr}`;
 
             needToSetOriginalPathAttr = false;
         }

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

@@ -2,7 +2,7 @@ import {bold} from 'chalk';
 import GithubSlugger from 'github-slugger';
 
 import {headingInfo} from '../../utils';
-import {CUSTOM_ID_REGEXP, CUSTOM_ID_EXCEPTION} from './constants';
+import {CUSTOM_ID_EXCEPTION, CUSTOM_ID_REGEXP} from './constants';
 import StateCore from 'markdown-it/lib/rules_core/state_core';
 import Token from 'markdown-it/lib/token';
 import {escapeHtml} from 'markdown-it/lib/common/utils';

package/src/transform/plugins/block-anchor/index.ts

@@ -1,5 +1,5 @@
 import MarkdownIt from 'markdown-it';
-import {renderTokens, replaceTokens, TOKEN_NAME} from './block-anchor';
+import {TOKEN_NAME, renderTokens, replaceTokens} from './block-anchor';
 
 const blockAnchor = (md: MarkdownIt) => {
     md.core.ruler.before('curly_attributes', TOKEN_NAME, replaceTokens);
@@ -8,4 +8,4 @@ const blockAnchor = (md: MarkdownIt) => {
     return md;
 };
 
-export default blockAnchor;
+export = blockAnchor;

package/src/transform/plugins/cut.ts

@@ -68,15 +68,19 @@ const cut: MarkdownItPluginCb = (md, {path, log}) => {
                 const newCloseToken = new state.Token('yfm_cut_close', 'div', -1);
                 newCloseToken.map = tokens[closeTokenIdx].map;
 
+                const insertTokens = tokens.slice(i + 3, closeTokenIdx);
+                const rest = insertTokens.length % 3;
+
                 const insideTokens = [
                     newOpenToken,
                     titleOpen,
                     titleInline,
                     titleClose,
                     contentOpen,
-                    ...tokens.slice(i + 3, closeTokenIdx),
+                    ...insertTokens.slice(0, insertTokens.length - rest),
                     contentClose,
                     newCloseToken,
+                    ...insertTokens.slice(insertTokens.length - rest),
                 ];
 
                 tokens.splice(i, closeTokenIdx - i + 3, ...insideTokens);

package/src/transform/plugins/file/file.ts

@@ -3,10 +3,10 @@ import type ParserInline from 'markdown-it/lib/parser_inline';
 import type Renderer from 'markdown-it/lib/renderer';
 
 import {
-    FileClassName,
-    FileSpecialAttr,
     FILE_TOKEN,
     FILE_TO_LINK_ATTRS_MAP,
+    FileClassName,
+    FileSpecialAttr,
     KNOWN_ATTRS,
     PREFIX,
     PREFIX_LENGTH,

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

@@ -2,8 +2,8 @@ import {readFileSync} from 'fs';
 import {join, sep} from 'path';
 import {bold} from 'chalk';
 
-import {resolveRelativePath, isFileExists} from '../../utilsFS';
-import {isLocalUrl, isExternalHref} from '../../utils';
+import {isFileExists, resolveRelativePath} from '../../utilsFS';
+import {isExternalHref, isLocalUrl} from '../../utils';
 import Token from 'markdown-it/lib/token';
 import {MarkdownItPluginCb, MarkdownItPluginOpts} from '../typings';
 import {StateCore} from '../../typings';

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

@@ -1,6 +1,6 @@
 import {bold} from 'chalk';
 
-import {getFileTokens, GetFileTokensOpts, getFullIncludePath, isFileExists} from '../../utilsFS';
+import {GetFileTokensOpts, getFileTokens, getFullIncludePath, isFileExists} from '../../utilsFS';
 import {findBlockTokens} from '../../utils';
 import Token from 'markdown-it/lib/token';
 import {MarkdownItPluginCb, MarkdownItPluginOpts} from '../typings';

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

@@ -1,7 +1,7 @@
 import url from 'url';
 import {bold} from 'chalk';
-import {isLocalUrl, findBlockTokens, headingInfo, getHrefTokenAttr} from '../../utils';
-import {isFileExists, getFileTokens} from '../../utilsFS';
+import {findBlockTokens, getHrefTokenAttr, headingInfo, isLocalUrl} from '../../utils';
+import {getFileTokens, isFileExists} from '../../utilsFS';
 import {PAGE_LINK_REGEXP} from './constants';
 import Token from 'markdown-it/lib/token';
 import {Logger} from 'src/transform/log';

package/src/transform/plugins/notes.ts

@@ -87,6 +87,7 @@ const notes: MarkdownItPluginCb = (md, {lang, path: optPath, log}) => {
                 }
 
                 const newCloseToken = new state.Token('yfm_note_close', 'div', -1);
+                newCloseToken.map = tokens[closeTokenIdx].map;
 
                 // Add extra paragraph
                 const titleOpen = new state.Token('yfm_note_title_open', 'p', 1);

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

@@ -12,7 +12,7 @@ import type Renderer from 'markdown-it/lib/renderer';
 
 import type {VideoFullOptions, VideoPluginOptions, VideoToken} from './types';
 import {parseVideoUrl} from './parsers';
-import {defaults, VideoService} from './const';
+import {VideoService, defaults} from './const';
 
 // eslint-disable-next-line valid-jsdoc
 /**

package/src/transform/utilsFS.ts

@@ -2,7 +2,7 @@ import {readFileSync, statSync} from 'fs';
 import type {Dictionary} from 'lodash';
 import escapeRegExp from 'lodash/escapeRegExp';
 
-import {parse, resolve, join, sep} from 'path';
+import {join, parse, resolve, sep} from 'path';
 
 import liquid from './liquid';
 import {StateCore} from './typings';

package/src/transform/yfmlint/index.ts

@@ -18,7 +18,7 @@ import {
 import {errorToString, getLogLevel} from './utils';
 import {Options} from './typings';
 import type {Dictionary} from 'lodash';
-import {Logger, LogLevels} from '../log';
+import {LogLevels, Logger} from '../log';
 import {yfm009} from './markdownlint-custom-rule/yfm009';
 
 const defaultLintRules = [yfm001, yfm002, yfm003, yfm004, yfm005, yfm006, yfm007, yfm008, yfm009];

package/src/transform/yfmlint/markdownlint-custom-rule/yfm007.ts

@@ -9,20 +9,21 @@ export const yfm007: Rule = {
         if (!config) {
             return;
         }
-        params.tokens.forEach((el) =>
-            el.children
-                ?.filter((token) => {
-                    return token.type === '__yfm_lint';
-                })
-                .forEach((term) => {
-                    // @ts-expect-error bad markdownlint typings
-                    if (term.attrGet('YFM007')) {
-                        onError({
-                            lineNumber: term.lineNumber,
-                            context: term.line,
-                        });
-                    }
-                }),
+        params.tokens.forEach(
+            (el) =>
+                el.children
+                    ?.filter((token) => {
+                        return token.type === '__yfm_lint';
+                    })
+                    .forEach((term) => {
+                        // @ts-expect-error bad markdownlint typings
+                        if (term.attrGet('YFM007')) {
+                            onError({
+                                lineNumber: term.lineNumber,
+                                context: term.line,
+                            });
+                        }
+                    }),
         );
     },
 };

package/src/.eslintrc

@@ -1,10 +0,0 @@
-{
-    "extends": "@yandex-cloud/eslint-config/client",
-    "overrides": [{
-        "files": ["*"],
-        "rules": {
-            "new-cap": [2, { "capIsNew": false }],
-            "@typescript-eslint/no-namespace": [1, { "allowDeclarations": true }]
-        }
-    }]
-}