@diplodoc/transform 4.35.0 → 4.37.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +61 -0
- package/README.ru.md +61 -0
- package/dist/css/_yfm-only.css +7 -7
- package/dist/css/_yfm-only.css.map +3 -3
- package/dist/css/_yfm-only.min.css +1 -1
- package/dist/css/_yfm-only.min.css.map +3 -3
- package/dist/css/base.css.map +1 -1
- package/dist/css/base.min.css.map +1 -1
- package/dist/css/print.css.map +1 -1
- package/dist/css/yfm.css +7 -7
- package/dist/css/yfm.css.map +3 -3
- package/dist/css/yfm.min.css +1 -1
- package/dist/css/yfm.min.css.map +3 -3
- package/lib/md.d.ts +1 -0
- package/lib/md.js +7 -7
- package/lib/md.js.map +1 -1
- package/lib/plugins/anchors/index.d.ts +1 -0
- package/lib/plugins/anchors/index.js +5 -3
- package/lib/plugins/anchors/index.js.map +1 -1
- package/lib/plugins/imsize/const.d.ts +2 -1
- package/lib/plugins/imsize/const.js +1 -0
- package/lib/plugins/imsize/const.js.map +1 -1
- package/lib/plugins/imsize/index.d.ts +3 -2
- package/lib/plugins/imsize/index.js +2 -2
- package/lib/plugins/imsize/index.js.map +1 -1
- package/lib/plugins/imsize/plugin.d.ts +4 -1
- package/lib/plugins/imsize/plugin.js +26 -1
- package/lib/plugins/imsize/plugin.js.map +1 -1
- package/lib/plugins/includes/collect.js +8 -7
- package/lib/plugins/includes/collect.js.map +1 -1
- package/lib/plugins/includes/index.js +3 -4
- package/lib/plugins/includes/index.js.map +1 -1
- package/lib/plugins/includes/types.d.ts +1 -1
- package/lib/plugins/links/index.js +10 -7
- package/lib/plugins/links/index.js.map +1 -1
- package/lib/plugins/notes/index.js +5 -10
- package/lib/plugins/notes/index.js.map +1 -1
- package/lib/preprocessors/included/index.js +8 -3
- package/lib/preprocessors/included/index.js.map +1 -1
- package/lib/preprocessors/index.d.ts +7 -0
- package/lib/preprocessors/index.js +18 -0
- package/lib/preprocessors/index.js.map +1 -0
- package/lib/sanitize.d.ts +2 -4
- package/lib/sanitize.js +4 -1
- package/lib/sanitize.js.map +1 -1
- package/lib/typings.d.ts +4 -0
- package/lib/utilsFS.d.ts +1 -1
- package/lib/utilsFS.js +4 -2
- package/lib/utilsFS.js.map +1 -1
- package/lib/yfmlint/index.js +4 -5
- package/lib/yfmlint/index.js.map +1 -1
- package/package.json +1 -1
- package/src/scss/_note.scss +2 -3
- package/src/transform/md.ts +6 -7
- package/src/transform/plugins/anchors/index.ts +13 -4
- package/src/transform/plugins/file/README.md +0 -54
- package/src/transform/plugins/imsize/const.ts +1 -0
- package/src/transform/plugins/imsize/index.ts +4 -4
- package/src/transform/plugins/imsize/plugin.ts +32 -1
- package/src/transform/plugins/includes/collect.ts +10 -8
- package/src/transform/plugins/includes/index.ts +5 -15
- package/src/transform/plugins/includes/types.ts +1 -1
- package/src/transform/plugins/links/index.ts +29 -14
- package/src/transform/plugins/notes/index.ts +8 -6
- package/src/transform/preprocessors/included/index.ts +9 -3
- package/src/transform/preprocessors/index.ts +25 -0
- package/src/transform/sanitize.ts +14 -3
- package/src/transform/typings.ts +3 -0
- package/src/transform/utilsFS.ts +10 -2
- package/src/transform/yfmlint/index.ts +4 -11
- package/lib/preprocessors.d.ts +0 -3
- package/lib/preprocessors.js +0 -8
- package/lib/preprocessors.js.map +0 -1
- package/src/scss/_cut.scss +0 -55
- package/src/transform/preprocessors.ts +0 -7
package/lib/md.d.ts
CHANGED
|
@@ -9,6 +9,7 @@ declare function initMarkdownIt(options: OptionsType): {
|
|
|
9
9
|
assets?: unknown[] | undefined;
|
|
10
10
|
meta?: object | undefined;
|
|
11
11
|
changelogs?: import("./plugins/changelog/types").ChangelogItem[] | undefined;
|
|
12
|
+
additionalOptionsCssWhiteList?: import("./typings").CssWhiteList | undefined;
|
|
12
13
|
};
|
|
13
14
|
};
|
|
14
15
|
export = initMarkdownIt;
|
package/lib/md.js
CHANGED
|
@@ -16,7 +16,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
16
16
|
const markdown_it_1 = __importDefault(require("markdown-it"));
|
|
17
17
|
const markdown_it_attrs_1 = __importDefault(require("markdown-it-attrs"));
|
|
18
18
|
const plugins_1 = __importDefault(require("./plugins"));
|
|
19
|
-
const preprocessors_1 =
|
|
19
|
+
const preprocessors_1 = require("./preprocessors");
|
|
20
20
|
const log_1 = require("./log");
|
|
21
21
|
const highlight_1 = __importDefault(require("./highlight"));
|
|
22
22
|
const title_1 = __importDefault(require("./title"));
|
|
@@ -77,11 +77,9 @@ function initPlugins(md, options, pluginOptions) {
|
|
|
77
77
|
}
|
|
78
78
|
function initParser(md, options, env, pluginOptions) {
|
|
79
79
|
return (input) => {
|
|
80
|
-
const { extractTitle: extractTitleOption, needTitle, needFlatListHeadings = false, getPublicPath,
|
|
81
|
-
// Run
|
|
82
|
-
|
|
83
|
-
input = preprocessor(input, pluginOptions, md);
|
|
84
|
-
}
|
|
80
|
+
const { extractTitle: extractTitleOption, needTitle, needFlatListHeadings = false, getPublicPath, } = options;
|
|
81
|
+
// Run preprocessor
|
|
82
|
+
input = (0, preprocessors_1.preprocess)(input, pluginOptions, options, md);
|
|
85
83
|
// Generate global href link
|
|
86
84
|
const href = getPublicPath ? getPublicPath(options) : '';
|
|
87
85
|
// Generate MD tokens
|
|
@@ -114,7 +112,9 @@ function initCompiler(md, options, env) {
|
|
|
114
112
|
// Generate HTML
|
|
115
113
|
const html = md.renderer.render(tokens, md.options, env);
|
|
116
114
|
// Sanitize the page
|
|
117
|
-
return needToSanitizeHtml
|
|
115
|
+
return needToSanitizeHtml
|
|
116
|
+
? (0, sanitize_1.default)(html, sanitizeOptions, { cssWhiteList: env.additionalOptionsCssWhiteList })
|
|
117
|
+
: html;
|
|
118
118
|
};
|
|
119
119
|
}
|
|
120
120
|
module.exports = initMarkdownIt;
|
package/lib/md.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"md.js","sourceRoot":"","sources":["../src/transform/md.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAGA,8DAA4C;AAC5C,0EAAsC;AAEtC,wDAAuC;AACvC,
|
|
1
|
+
{"version":3,"file":"md.js","sourceRoot":"","sources":["../src/transform/md.ts"],"names":[],"mappings":"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"}
|
|
@@ -53,7 +53,7 @@ const removeCustomIds = (token) => {
|
|
|
53
53
|
});
|
|
54
54
|
};
|
|
55
55
|
const index = (md, options) => {
|
|
56
|
-
const { extractTitle, path, log, supportGithubAnchors, getPublicPath } = options;
|
|
56
|
+
const { extractTitle, path, log, supportGithubAnchors, getPublicPath, disableCommonAnchors } = options;
|
|
57
57
|
const plugin = (state) => {
|
|
58
58
|
/* Do not use the plugin if it is included in the file */
|
|
59
59
|
if (state.env.includes && state.env.includes.length) {
|
|
@@ -106,8 +106,10 @@ const index = (md, options) => {
|
|
|
106
106
|
allAnchorIds.forEach((customId) => {
|
|
107
107
|
var _a, _b;
|
|
108
108
|
const setId = id !== customId;
|
|
109
|
-
|
|
110
|
-
|
|
109
|
+
if (!disableCommonAnchors) {
|
|
110
|
+
const linkTokens = createLinkTokens(state, customId, anchorTitle, setId, href);
|
|
111
|
+
(_a = inlineToken.children) === null || _a === void 0 ? void 0 : _a.unshift(...linkTokens);
|
|
112
|
+
}
|
|
111
113
|
if (supportGithubAnchors) {
|
|
112
114
|
const ghLinkTokens = createLinkTokens(state, ghId, anchorTitle, true, href);
|
|
113
115
|
(_b = inlineToken.children) === null || _b === void 0 ? void 0 : _b.unshift(...ghLinkTokens);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transform/plugins/anchors/index.ts"],"names":[],"mappings":";;;;AAAA,iCAA2B;AAC3B,oEAA2C;AAG3C,wDAAwD;AAExD,uCAAwC;AAGxC,2CAAkE;AAElE,MAAM,OAAO,GAAsC,OAAO,CAAC,SAAS,CAAC,CAAC;AAEtE,SAAS,gBAAgB,CACrB,KAAgB,EAChB,EAAU,EACV,KAAa,EACb,KAAK,GAAG,KAAK,EACb,IAAY;IAEZ,MAAM,IAAI,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;IAClD,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,YAAY,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;IAErD,IAAI,KAAK,EAAE;QACP,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;KAC1B;IACD,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,GAAG,GAAG,GAAG,EAAE,CAAC,CAAC;IACtC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IACpC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IAEpC,2EAA2E;IAC3E,MAAM,UAAU,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,oBAAoB,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IAEhE,UAAU,CAAC,OAAO,GAAG,KAAK,CAAC;IAE3B,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;AACrC,CAAC;AAED,MAAM,YAAY,GAAG,CAAC,OAAe,EAAE,EAAE;IACrC,MAAM,GAAG,GAAa,EAAE,CAAC;IAEzB,OAAO,CAAC,OAAO,CAAC,4BAAgB,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;QAClD,IAAI,KAAK,KAAK,+BAAmB,EAAE;YAC/B,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACtB;QAED,OAAO,EAAE,CAAC;IACd,CAAC,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;AACnC,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,OAAe,EAAE,EAAE;IACvC,IAAI,4BAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;QAChC,OAAO,OAAO;aACT,OAAO,CAAC,4BAAgB,EAAE,CAAC,KAAK,EAAE,EAAE;YACjC,IAAI,KAAK,KAAK,+BAAmB,EAAE;gBAC/B,OAAO,KAAK,CAAC;aAChB;YAED,OAAO,EAAE,CAAC;QACd,CAAC,CAAC;aACD,IAAI,EAAE,CAAC;KACf;IAED,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,KAAY,EAAE,EAAE;;IACrC,KAAK,CAAC,OAAO,GAAG,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC9C,MAAA,KAAK,CAAC,QAAQ,0CAAE,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QAC9B,KAAK,CAAC,OAAO,GAAG,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transform/plugins/anchors/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"const.js","sourceRoot":"","sources":["../../../src/transform/plugins/imsize/const.ts"],"names":[],"mappings":";;;AAAA,IAAY,
|
|
1
|
+
{"version":3,"file":"const.js","sourceRoot":"","sources":["../../../src/transform/plugins/imsize/const.ts"],"names":[],"mappings":";;;AAAA,IAAY,UAOX;AAPD,WAAY,UAAU;IAClB,yBAAW,CAAA;IACX,yBAAW,CAAA;IACX,6BAAe,CAAA;IACf,6BAAe,CAAA;IACf,+BAAiB,CAAA;IACjB,6BAAe,CAAA;AACnB,CAAC,EAPW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAOrB"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { PluginWithOptions } from 'markdown-it';
|
|
2
|
+
import { ImsizeOptions } from './plugin';
|
|
2
3
|
/**
|
|
3
4
|
* Imsize plugin for markdown-it.
|
|
4
5
|
* This plugin overloads original image renderer.
|
|
5
6
|
* Forked from https://github.com/tatsy/markdown-it-imsize
|
|
6
7
|
*/
|
|
7
|
-
declare const imsize:
|
|
8
|
+
declare const imsize: PluginWithOptions<ImsizeOptions>;
|
|
8
9
|
export = imsize;
|
|
@@ -5,8 +5,8 @@ const plugin_1 = require("./plugin");
|
|
|
5
5
|
* This plugin overloads original image renderer.
|
|
6
6
|
* Forked from https://github.com/tatsy/markdown-it-imsize
|
|
7
7
|
*/
|
|
8
|
-
const imsize = (md) => {
|
|
9
|
-
md.inline.ruler.before('emphasis', 'image', (0, plugin_1.imageWithSize)(md));
|
|
8
|
+
const imsize = (md, opts) => {
|
|
9
|
+
md.inline.ruler.before('emphasis', 'image', (0, plugin_1.imageWithSize)(md, opts));
|
|
10
10
|
};
|
|
11
11
|
module.exports = imsize;
|
|
12
12
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transform/plugins/imsize/index.ts"],"names":[],"mappings":";AAEA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transform/plugins/imsize/index.ts"],"names":[],"mappings":";AAEA,qCAAsD;AAEtD;;;;GAIG;AAEH,MAAM,MAAM,GAAqC,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE;IAC1D,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,IAAA,sBAAa,EAAC,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC;AACzE,CAAC,CAAC;AAEF,iBAAS,MAAM,CAAC"}
|
|
@@ -1,3 +1,6 @@
|
|
|
1
1
|
import type MarkdownIt from 'markdown-it';
|
|
2
2
|
import type ParserInline from 'markdown-it/lib/parser_inline';
|
|
3
|
-
export declare
|
|
3
|
+
export declare type ImsizeOptions = {
|
|
4
|
+
enableInlineStyling?: boolean;
|
|
5
|
+
};
|
|
6
|
+
export declare const imageWithSize: (md: MarkdownIt, opts?: ImsizeOptions) => ParserInline.RuleInline;
|
|
@@ -3,9 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.imageWithSize = void 0;
|
|
4
4
|
const const_1 = require("./const");
|
|
5
5
|
const helpers_1 = require("./helpers");
|
|
6
|
-
const imageWithSize = (md) => {
|
|
6
|
+
const imageWithSize = (md, opts) => {
|
|
7
7
|
// eslint-disable-next-line complexity
|
|
8
8
|
return (state, silent) => {
|
|
9
|
+
var _a;
|
|
10
|
+
var _b;
|
|
9
11
|
if (state.src.charCodeAt(state.pos) !== 0x21 /* ! */) {
|
|
10
12
|
return false;
|
|
11
13
|
}
|
|
@@ -178,6 +180,29 @@ const imageWithSize = (md) => {
|
|
|
178
180
|
if (height !== '') {
|
|
179
181
|
token.attrs.push([const_1.ImsizeAttr.Height, height]);
|
|
180
182
|
}
|
|
183
|
+
if (opts === null || opts === void 0 ? void 0 : opts.enableInlineStyling) {
|
|
184
|
+
let style = '';
|
|
185
|
+
const widthWithPercent = width.includes('%');
|
|
186
|
+
const heightWithPercent = height.includes('%');
|
|
187
|
+
if (width !== '') {
|
|
188
|
+
const widthString = widthWithPercent ? width : `${width}px`;
|
|
189
|
+
style += `width: ${widthString};`;
|
|
190
|
+
}
|
|
191
|
+
if (height !== '') {
|
|
192
|
+
if (width !== '' && !heightWithPercent && !widthWithPercent) {
|
|
193
|
+
style += `aspect-ratio: ${width} / ${height};height: auto;`;
|
|
194
|
+
(_a = (_b = state.env).additionalOptionsCssWhiteList) !== null && _a !== void 0 ? _a : (_b.additionalOptionsCssWhiteList = {});
|
|
195
|
+
state.env.additionalOptionsCssWhiteList['aspect-ratio'] = true;
|
|
196
|
+
}
|
|
197
|
+
else {
|
|
198
|
+
const heightString = heightWithPercent ? height : `${height}px`;
|
|
199
|
+
style += `height: ${heightString};`;
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
if (style) {
|
|
203
|
+
token.attrs.push([const_1.ImsizeAttr.Style, style]);
|
|
204
|
+
}
|
|
205
|
+
}
|
|
181
206
|
}
|
|
182
207
|
state.pos = pos;
|
|
183
208
|
state.posMax = max;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../src/transform/plugins/imsize/plugin.ts"],"names":[],"mappings":";;;AAIA,mCAAmC;AACnC,uCAAyC;
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../src/transform/plugins/imsize/plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,10 +4,10 @@ const chalk_1 = require("chalk");
|
|
|
4
4
|
const fs_1 = require("fs");
|
|
5
5
|
const utilsFS_1 = require("../../utilsFS");
|
|
6
6
|
const includesPaths = [];
|
|
7
|
-
function processRecursive(includePath, targetDestPath, options) {
|
|
7
|
+
function processRecursive(relativePath, includePath, targetDestPath, options) {
|
|
8
8
|
var _a, _b;
|
|
9
9
|
const { path, log, copyFile, includedParentPath: includedParentPathNullable, included } = options;
|
|
10
|
-
const includedParentPath = includedParentPathNullable ||
|
|
10
|
+
const includedParentPath = includedParentPathNullable || [];
|
|
11
11
|
const includeOptions = Object.assign(Object.assign({}, options), { path: includePath, destPath: targetDestPath });
|
|
12
12
|
try {
|
|
13
13
|
const contentProcessed = copyFile(includePath, targetDestPath, includeOptions);
|
|
@@ -15,13 +15,14 @@ function processRecursive(includePath, targetDestPath, options) {
|
|
|
15
15
|
if (included) {
|
|
16
16
|
const content = contentProcessed !== null && contentProcessed !== void 0 ? contentProcessed : (0, fs_1.readFileSync)(targetDestPath, 'utf8');
|
|
17
17
|
if (content) {
|
|
18
|
-
const
|
|
18
|
+
const key = [...includedParentPath, relativePath];
|
|
19
|
+
const hash = key.join(':');
|
|
19
20
|
// The appendix is the map that protects from multiple include files
|
|
20
|
-
if (!((_a = options.appendix) === null || _a === void 0 ? void 0 : _a.has(
|
|
21
|
+
if (!((_a = options.appendix) === null || _a === void 0 ? void 0 : _a.has(hash))) {
|
|
21
22
|
// Recursive function to include the depth structure
|
|
22
|
-
const includeContent = collectRecursive(content, Object.assign(Object.assign({}, options), { path: includePath, includedParentPath }));
|
|
23
|
+
const includeContent = collectRecursive(content, Object.assign(Object.assign({}, options), { path: includePath, includedParentPath: key }));
|
|
23
24
|
// Add to appendix set structure
|
|
24
|
-
(_b = options.appendix) === null || _b === void 0 ? void 0 : _b.set(
|
|
25
|
+
(_b = options.appendix) === null || _b === void 0 ? void 0 : _b.set(relativePath, `{% included (${hash}) %}\n${includeContent}\n{% endincluded %}`);
|
|
25
26
|
}
|
|
26
27
|
}
|
|
27
28
|
}
|
|
@@ -56,7 +57,7 @@ function collectRecursive(result, options) {
|
|
|
56
57
|
INCLUDE_REGEXP.lastIndex = INCLUDE_REGEXP.lastIndex - delta;
|
|
57
58
|
}
|
|
58
59
|
includesPaths.push(includePath);
|
|
59
|
-
processRecursive(includePath, targetDestPath, options);
|
|
60
|
+
processRecursive(relativePath, includePath, targetDestPath, options);
|
|
60
61
|
includesPaths.pop();
|
|
61
62
|
}
|
|
62
63
|
return result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collect.js","sourceRoot":"","sources":["../../../src/transform/plugins/includes/collect.ts"],"names":[],"mappings":";AAAA,+BAA8B;AAC9B,iCAA2B;AAC3B,2BAAgC;AAEhC,
|
|
1
|
+
{"version":3,"file":"collect.js","sourceRoot":"","sources":["../../../src/transform/plugins/includes/collect.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,9 +25,6 @@ function unfoldIncludes(md, state, path, options) {
|
|
|
25
25
|
try {
|
|
26
26
|
const [, keyword /* description */, , includePath] = match;
|
|
27
27
|
const fullIncludePath = (0, utilsFS_1.getFullIncludePath)(includePath, root, path);
|
|
28
|
-
const relativeIncludePath = (0, utilsFS_1.resolveRelativePath)(path, includePath);
|
|
29
|
-
// Check the existed included store and extract it
|
|
30
|
-
const included = (_a = md.included) === null || _a === void 0 ? void 0 : _a[relativeIncludePath];
|
|
31
28
|
let pathname = fullIncludePath;
|
|
32
29
|
let hash = '';
|
|
33
30
|
const hashIndex = fullIncludePath.lastIndexOf('#');
|
|
@@ -39,7 +36,9 @@ function unfoldIncludes(md, state, path, options) {
|
|
|
39
36
|
i++;
|
|
40
37
|
continue;
|
|
41
38
|
}
|
|
42
|
-
|
|
39
|
+
// Check the existed included store and extract it
|
|
40
|
+
const included = (_a = md.included) === null || _a === void 0 ? void 0 : _a[pathname];
|
|
41
|
+
const fileTokens = (0, utilsFS_1.getFileTokens)(pathname, state, options, included);
|
|
43
42
|
let includedTokens;
|
|
44
43
|
if (hash) {
|
|
45
44
|
includedTokens = (0, utils_1.findBlockTokens)(fileTokens, hash);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transform/plugins/includes/index.ts"],"names":[],"mappings":";AAAA,iCAA2B;AAI3B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transform/plugins/includes/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ export declare type IncludeCollectOpts = MarkdownItPluginOpts & {
|
|
|
10
10
|
copyFile(path: string, dest: string, opts: IncludeCollectOpts): string | null | undefined;
|
|
11
11
|
singlePage: Boolean;
|
|
12
12
|
included: Boolean;
|
|
13
|
-
includedParentPath?: string;
|
|
13
|
+
includedParentPath?: string[];
|
|
14
14
|
additionalIncludedList?: string[];
|
|
15
15
|
appendix?: Map<string, string>;
|
|
16
16
|
};
|
|
@@ -43,18 +43,21 @@ function getTitleFromTokens(tokens) {
|
|
|
43
43
|
}
|
|
44
44
|
return title;
|
|
45
45
|
}
|
|
46
|
-
const getTitle = (id, options) => {
|
|
46
|
+
const getTitle = (md, id, options) => {
|
|
47
|
+
var _a;
|
|
47
48
|
const { file, state, opts } = options;
|
|
48
|
-
|
|
49
|
+
// Check the existed included store and extract it
|
|
50
|
+
const included = (_a = md.included) === null || _a === void 0 ? void 0 : _a[file];
|
|
51
|
+
const fileTokens = (0, utilsFS_1.getFileTokens)(file, state, Object.assign(Object.assign({}, opts), { disableLint: true, disableTitleRefSubstitution: true, disableCircularError: true, inheritVars: false }), included);
|
|
49
52
|
const sourceTokens = id ? (0, utils_1.findBlockTokens)(fileTokens, id) : fileTokens;
|
|
50
53
|
return getTitleFromTokens(sourceTokens);
|
|
51
54
|
};
|
|
52
|
-
const addTitle = (options) => {
|
|
55
|
+
const addTitle = (md, options) => {
|
|
53
56
|
var _a;
|
|
54
57
|
const { hash, state, isEmptyLink, tokens, idx, nextToken, href, currentPath, log, cache } = options;
|
|
55
58
|
const id = hash && hash.slice(1);
|
|
56
59
|
const key = [id, path_1.default].join('::');
|
|
57
|
-
const title = (_a = cache === null || cache === void 0 ? void 0 : cache.get(key)) !== null && _a !== void 0 ? _a : getTitle(id, options);
|
|
60
|
+
const title = (_a = cache === null || cache === void 0 ? void 0 : cache.get(key)) !== null && _a !== void 0 ? _a : getTitle(md, id, options);
|
|
58
61
|
cache === null || cache === void 0 ? void 0 : cache.set(key, title);
|
|
59
62
|
if (title) {
|
|
60
63
|
let textToken;
|
|
@@ -75,7 +78,7 @@ function getDefaultPublicPath({ file, path, }, input) {
|
|
|
75
78
|
return (0, path_1.relative)((0, path_1.parse)(path || '').dir, input || file || '');
|
|
76
79
|
}
|
|
77
80
|
// eslint-disable-next-line complexity
|
|
78
|
-
function processLink(state, tokens, idx, opts) {
|
|
81
|
+
function processLink(md, state, tokens, idx, opts) {
|
|
79
82
|
const { path: startPath, root, transformLink, notFoundCb, needSkipLinkFn, log, getPublicPath = getDefaultPublicPath, cache, } = opts;
|
|
80
83
|
const currentPath = state.env.path || startPath;
|
|
81
84
|
const linkToken = tokens[idx];
|
|
@@ -125,7 +128,7 @@ function processLink(state, tokens, idx, opts) {
|
|
|
125
128
|
fileExists &&
|
|
126
129
|
isPageFile &&
|
|
127
130
|
!state.env.disableTitleRefSubstitution) {
|
|
128
|
-
addTitle({
|
|
131
|
+
addTitle(md, {
|
|
129
132
|
hash,
|
|
130
133
|
file,
|
|
131
134
|
state,
|
|
@@ -164,7 +167,7 @@ const index = (md, opts) => {
|
|
|
164
167
|
/* Don't process anchor links */
|
|
165
168
|
const isYfmAnchor = tokenClass ? tokenClass.includes('yfm-anchor') : false;
|
|
166
169
|
if (isLinkOpenToken && !isYfmAnchor) {
|
|
167
|
-
processLink(state, childrenTokens, j, opts);
|
|
170
|
+
processLink(md, state, childrenTokens, j, opts);
|
|
168
171
|
}
|
|
169
172
|
j++;
|
|
170
173
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transform/plugins/links/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAsB;AACtB,iCAA2B;AAE3B,6CAAgE;AAIhE,uCAOqB;AACrB,2CAA0D;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transform/plugins/links/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAsB;AACtB,iCAA2B;AAE3B,6CAAgE;AAIhE,uCAOqB;AACrB,2CAA0D;AAK1D,SAAS,kBAAkB,CAAC,MAAe;IACvC,IAAI,KAAK,GAAG,EAAE,CAAC;IAEf,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE;QACtB,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAExB,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc,EAAE;YAC/B,CAAC,EAAC,KAAK,GAAG,EAAE,EAAC,GAAG,IAAA,mBAAW,EAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;YAExC,MAAM;SACT;QAED,CAAC,IAAI,CAAC,CAAC;KACV;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAiBD,MAAM,QAAQ,GAAG,CAAC,EAAsB,EAAE,EAAiB,EAAE,OAAgB,EAAE,EAAE;;IAC7E,MAAM,EAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAC,GAAG,OAAO,CAAC;IAEpC,kDAAkD;IAClD,MAAM,QAAQ,GAAG,MAAA,EAAE,CAAC,QAAQ,0CAAG,IAAI,CAAC,CAAC;IAErC,MAAM,UAAU,GAAG,IAAA,uBAAa,EAC5B,IAAI,EACJ,KAAK,kCAEE,IAAI,KACP,WAAW,EAAE,IAAI,EACjB,2BAA2B,EAAE,IAAI,EACjC,oBAAoB,EAAE,IAAI,EAC1B,WAAW,EAAE,KAAK,KAEtB,QAAQ,CACX,CAAC;IACF,MAAM,YAAY,GAAG,EAAE,CAAC,CAAC,CAAC,IAAA,uBAAe,EAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;IACvE,OAAO,kBAAkB,CAAC,YAAY,CAAC,CAAC;AAC5C,CAAC,CAAC;AAEF,MAAM,QAAQ,GAAG,CAAC,EAAsB,EAAE,OAAgB,EAAE,EAAE;;IAC1D,MAAM,EAAC,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,KAAK,EAAC,GACnF,OAAO,CAAC;IAEZ,MAAM,EAAE,GAAG,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACjC,MAAM,GAAG,GAAG,CAAC,EAAE,EAAE,cAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClC,MAAM,KAAK,GAAG,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,GAAG,CAAC,GAAG,CAAC,mCAAI,QAAQ,CAAC,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;IAC3D,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAEvB,IAAI,KAAK,EAAE;QACP,IAAI,SAAS,CAAC;QAEd,IAAI,WAAW,EAAE;YACb,SAAS,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;YAC3C,MAAM,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC;SACxC;aAAM;YACH,SAAS,GAAG,SAAS,CAAC;SACzB;QAED,SAAS,CAAC,OAAO,GAAG,KAAK,CAAC;KAC7B;SAAM;QACH,GAAG,CAAC,IAAI,CAAC,oBAAoB,IAAA,YAAI,EAAC,IAAI,CAAC,OAAO,IAAA,YAAI,EAAC,WAAW,CAAC,EAAE,CAAC,CAAC;KACtE;AACL,CAAC,CAAC;AASF,SAAS,oBAAoB,CACzB,EACI,IAAI,EACJ,IAAI,GAIP,EACD,KAAqB;IAErB,OAAO,IAAA,eAAQ,EAAC,IAAA,YAAK,EAAC,IAAI,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;AAChE,CAAC;AAED,sCAAsC;AACtC,SAAS,WAAW,CAChB,EAAsB,EACtB,KAAgB,EAChB,MAAe,EACf,GAAW,EACX,IAAc;IAEd,MAAM,EACF,IAAI,EAAE,SAAS,EACf,IAAI,EACJ,aAAa,EACb,UAAU,EACV,cAAc,EACd,GAAG,EACH,aAAa,GAAG,oBAAoB,EACpC,KAAK,GACR,GAAG,IAAI,CAAC;IAET,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,IAAI,SAAS,CAAC;IAChD,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IAC9B,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;IAElC,IAAI,IAAI,GAAG,IAAA,wBAAgB,EAAC,SAAS,CAAC,CAAC;IAEvC,IAAI,CAAC,IAAI,EAAE;QACP,GAAG,CAAC,KAAK,CAAC,iBAAiB,IAAA,YAAI,EAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QAC9C,OAAO;KACV;IAED,MAAM,EAAC,QAAQ,EAAE,IAAI,EAAC,GAAG,aAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACzC,IAAI,IAAI,CAAC;IACT,IAAI,UAAU,CAAC;IACf,IAAI,UAAU,CAAC;IAEf,IAAI,CAAC,IAAA,kBAAU,EAAC,IAAI,CAAC,EAAE;QACnB,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACtC,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,qBAAqB,CAAC,CAAC;QAChD,OAAO;KACV;IAED,IAAI,QAAQ,EAAE;QACV,IAAI,GAAG,IAAA,cAAO,EAAC,cAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACtD,UAAU,GAAG,IAAA,sBAAY,EAAC,IAAI,CAAC,CAAC;QAChC,UAAU,GAAG,wBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAE7C,IAAI,UAAU,IAAI,CAAC,UAAU,EAAE;YAC3B,IAAI,aAAa,GAAG,IAAI,CAAC;YACzB,IAAI,cAAc,EAAE;gBAChB,aAAa,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;aACzC;YAED,IAAI,UAAU,IAAI,aAAa,EAAE;gBAC7B,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;aACtC;YAED,IAAI,aAAa,EAAE;gBACf,GAAG,CAAC,KAAK,CAAC,wBAAwB,IAAA,YAAI,EAAC,IAAI,CAAC,OAAO,IAAA,YAAI,EAAC,WAAW,CAAC,EAAE,CAAC,CAAC;aAC3E;SACJ;KACJ;SAAM,IAAI,IAAI,EAAE;QACb,IAAI,GAAG,SAAS,CAAC;QACjB,UAAU,GAAG,IAAI,CAAC;QAClB,UAAU,GAAG,IAAI,CAAC;KACrB;SAAM;QACH,OAAO;KACV;IAED,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,KAAK,YAAY,CAAC;IACpD,MAAM,cAAc,GAAG,SAAS,CAAC,IAAI,KAAK,MAAM,IAAI,SAAS,CAAC,OAAO,KAAK,MAAM,CAAC;IACjF,IACI,CAAC,WAAW,IAAI,cAAc,CAAC;QAC/B,UAAU;QACV,UAAU;QACV,CAAC,KAAK,CAAC,GAAG,CAAC,2BAA2B,EACxC;QACE,QAAQ,CAAC,EAAE,EAAE;YACT,IAAI;YACJ,IAAI;YACJ,KAAK;YACL,IAAI;YACJ,WAAW;YACX,MAAM;YACN,GAAG;YACH,SAAS;YACT,IAAI;YACJ,WAAW;YACX,GAAG;YACH,KAAK;SACR,CAAC,CAAC;KACN;IAED,IAAI,WAAW,GAAG,EAAE,CAAC;IAErB,IAAI,CAAC,IAAA,iBAAU,EAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAC3C,WAAW,GAAG,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAExC,IAAI,GAAG,aAAG,CAAC,MAAM,iCACV,aAAG,CAAC,KAAK,CAAC,IAAI,CAAC,KAClB,QAAQ,EAAE,WAAW,IACvB,CAAC;KACN;IAED,IAAI,QAAQ,IAAI,WAAW,EAAE;QACzB,MAAM,WAAW,GAAG,aAAa,IAAI,4BAAoB,CAAC;QAC1D,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;KAChD;AACL,CAAC;AAED,MAAM,KAAK,GAA2C,CAAC,EAAsB,EAAE,IAAI,EAAE,EAAE;IACnF,MAAM,MAAM,GAAG,CAAC,KAAgB,EAAE,EAAE;QAChC,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAC5B,IAAI,CAAC,GAAG,CAAC,CAAC;QAEV,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE;YACtB,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAC7B,MAAM,cAAc,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,IAAI,EAAE,CAAC;gBAChD,IAAI,CAAC,GAAG,CAAC,CAAC;gBAEV,OAAO,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE;oBAC9B,MAAM,eAAe,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC;oBAC/D,MAAM,UAAU,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;oBAEtD,iCAAiC;oBACjC,MAAM,WAAW,GAAG,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;oBAE3E,IAAI,eAAe,IAAI,CAAC,WAAW,EAAE;wBACjC,WAAW,CAAC,EAAE,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;qBACnD;oBAED,CAAC,EAAE,CAAC;iBACP;aACJ;YAED,CAAC,EAAE,CAAC;SACP;IACL,CAAC,CAAC;IAEF,IAAI;QACA,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;KACrD;IAAC,OAAO,CAAC,EAAE;QACR,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;KACvC;AACL,CAAC,CAAC;AAEF,iBAAS,KAAK,CAAC"}
|
|
@@ -70,16 +70,11 @@ const index = (md, { lang, notesAutotitle, path: optPath, log }) => {
|
|
|
70
70
|
contentOpen.map = [newOpenToken.map[0] + 2, newOpenToken.map[1] - 2];
|
|
71
71
|
}
|
|
72
72
|
state.md.inline.parse(titleInline.content, state.md, state.env, titleInline.children);
|
|
73
|
-
const insideTokens = [
|
|
74
|
-
|
|
75
|
-
titleOpen,
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
contentOpen,
|
|
79
|
-
...tokens.slice(i + 3, closeTokenIdx),
|
|
80
|
-
contentClose,
|
|
81
|
-
newCloseToken,
|
|
82
|
-
];
|
|
73
|
+
const insideTokens = [newOpenToken];
|
|
74
|
+
if (titleInline.content) {
|
|
75
|
+
insideTokens.push(titleOpen, titleInline, titleClose);
|
|
76
|
+
}
|
|
77
|
+
insideTokens.push(contentOpen, ...tokens.slice(i + 3, closeTokenIdx), contentClose, newCloseToken);
|
|
83
78
|
tokens.splice(i, closeTokenIdx - i + 3, ...insideTokens);
|
|
84
79
|
i++;
|
|
85
80
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transform/plugins/notes/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transform/plugins/notes/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,11 +10,12 @@ const preprocessLine = (lines, start, { root, path, }, md) => {
|
|
|
10
10
|
if (!match) {
|
|
11
11
|
return false;
|
|
12
12
|
}
|
|
13
|
-
const
|
|
13
|
+
const includePathKey = match[1];
|
|
14
14
|
// Protect from empty path
|
|
15
|
-
if (!
|
|
15
|
+
if (!includePathKey) {
|
|
16
16
|
return false;
|
|
17
17
|
}
|
|
18
|
+
const includePaths = includePathKey.split(':');
|
|
18
19
|
// Read all content from top to bottom(!) char of the included block
|
|
19
20
|
const data = [];
|
|
20
21
|
let line = start;
|
|
@@ -35,7 +36,11 @@ const preprocessLine = (lines, start, { root, path, }, md) => {
|
|
|
35
36
|
md.included = {};
|
|
36
37
|
}
|
|
37
38
|
// Normalize the path to absolute
|
|
38
|
-
|
|
39
|
+
let includePath = (0, utilsFS_1.getFullIncludePath)(includePaths[0], root, path);
|
|
40
|
+
for (let index = 1; index < includePaths.length; index++) {
|
|
41
|
+
const pathname = includePaths[index];
|
|
42
|
+
includePath = (0, utilsFS_1.getFullIncludePath)(pathname, root, includePath);
|
|
43
|
+
}
|
|
39
44
|
// Store the included content
|
|
40
45
|
md.included[includePath] = data.join('\n');
|
|
41
46
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transform/preprocessors/included/index.ts"],"names":[],"mappings":";AAAA,2CAAiD;AAIjD,MAAM,cAAc,GAAG,wCAAwC,CAAC;AAChE,MAAM,kBAAkB,GAAG,2BAA2B,CAAC;AAEvD,MAAM,cAAc,GAAG,CACnB,KAAe,EACf,KAAa,EACb,EACI,IAAI,EACJ,IAAI,GAIP,EACD,EAAuB,EACzB,EAAE;IACA,MAAM,gBAAgB,GAAG,EAAE,IAAI,IAAI,IAAI,IAAI,CAAC;IAC5C,MAAM,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;IACzB,MAAM,KAAK,GAAG,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,KAAK,CAAC,cAAc,CAAC,CAAC;IAEzC,iCAAiC;IACjC,IAAI,CAAC,KAAK,EAAE;QACR,OAAO,KAAK,CAAC;KAChB;IAED,MAAM,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transform/preprocessors/included/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import type { MarkdownIt, MarkdownItPluginOpts, MarkdownItPreprocessorCb } from '../plugins/typings';
|
|
2
|
+
import type { PluginOptions } from '../yfmlint';
|
|
3
|
+
declare const defaultPreprocessors: MarkdownItPreprocessorCb<{}>[];
|
|
4
|
+
export default defaultPreprocessors;
|
|
5
|
+
export declare function preprocess(content: string, pluginOptions: MarkdownItPluginOpts | PluginOptions | unknown, options?: Partial<MarkdownItPluginOpts> & {
|
|
6
|
+
preprocessors?: MarkdownItPreprocessorCb[];
|
|
7
|
+
}, md?: MarkdownIt): string;
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.preprocess = void 0;
|
|
7
|
+
const included_1 = __importDefault(require("./included"));
|
|
8
|
+
const defaultPreprocessors = [included_1.default];
|
|
9
|
+
exports.default = defaultPreprocessors;
|
|
10
|
+
function preprocess(content, pluginOptions, options, md) {
|
|
11
|
+
const { preprocessors = defaultPreprocessors } = options !== null && options !== void 0 ? options : {};
|
|
12
|
+
for (const preprocessor of preprocessors) {
|
|
13
|
+
content = preprocessor(content, pluginOptions, md);
|
|
14
|
+
}
|
|
15
|
+
return content;
|
|
16
|
+
}
|
|
17
|
+
exports.preprocess = preprocess;
|
|
18
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/transform/preprocessors/index.ts"],"names":[],"mappings":";;;;;;AAGA,0DAAkC;AAElC,MAAM,oBAAoB,GAAG,CAAC,kBAAQ,CAA+B,CAAC;AAEtE,kBAAe,oBAAoB,CAAC;AAEpC,SAAgB,UAAU,CACtB,OAAe,EACf,aAA6D,EAC7D,OAEC,EACD,EAAe;IAEf,MAAM,EAAC,aAAa,GAAG,oBAAoB,EAAC,GAAG,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,CAAC;IAE7D,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE;QACtC,OAAO,GAAG,YAAY,CAAC,OAAO,EAAE,aAAqC,EAAE,EAAE,CAAC,CAAC;KAC9E;IAED,OAAO,OAAO,CAAC;AACnB,CAAC;AAfD,gCAeC"}
|
package/lib/sanitize.d.ts
CHANGED
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
import sanitizeHtml from 'sanitize-html';
|
|
2
|
-
|
|
3
|
-
[property: string]: boolean;
|
|
4
|
-
};
|
|
2
|
+
import { CssWhiteList } from './typings';
|
|
5
3
|
export interface SanitizeOptions extends sanitizeHtml.IOptions {
|
|
6
4
|
cssWhiteList?: CssWhiteList;
|
|
7
5
|
disableStyleSanitizer?: boolean;
|
|
@@ -10,4 +8,4 @@ export declare const defaultParseOptions: {
|
|
|
10
8
|
lowerCaseAttributeNames: boolean;
|
|
11
9
|
};
|
|
12
10
|
export declare const defaultOptions: SanitizeOptions;
|
|
13
|
-
export default function sanitize(html: string, options?: SanitizeOptions): string;
|
|
11
|
+
export default function sanitize(html: string, options?: SanitizeOptions, additionalOptions?: SanitizeOptions): string;
|