@diplodoc/transform 4.76.8 → 4.76.10
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/dist/css/_yfm-only.css.map +1 -1
- package/dist/css/_yfm-only.min.css.map +1 -1
- package/dist/css/base.css +1 -1
- package/dist/css/base.css.map +2 -2
- package/dist/css/base.min.css +1 -1
- package/dist/css/base.min.css.map +2 -2
- package/dist/css/print.css.map +1 -1
- package/dist/css/yfm.css +1 -1
- package/dist/css/yfm.css.map +2 -2
- package/dist/css/yfm.min.css +1 -1
- package/dist/css/yfm.min.css.map +2 -2
- package/dist/scss/_code.scss +1 -1
- package/lib/plugins/links/collect.js +6 -6
- package/lib/plugins/links/collect.js.map +1 -1
- package/lib/plugins/links/index.js +11 -14
- package/lib/plugins/links/index.js.map +1 -1
- package/lib/utils.js +3 -6
- package/lib/utils.js.map +1 -1
- package/package.json +3 -3
- package/src/scss/_code.scss +1 -1
- package/src/transform/plugins/links/collect.ts +2 -2
- package/src/transform/plugins/links/index.ts +4 -4
- package/src/transform/utils.ts +3 -3
package/dist/scss/_code.scss
CHANGED
|
@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
const markdown_it_1 = __importDefault(require("markdown-it"));
|
|
6
6
|
const path_1 = require("path");
|
|
7
|
-
const
|
|
8
|
-
const
|
|
7
|
+
const utils_1 = require("@diplodoc/utils");
|
|
8
|
+
const utils_2 = require("../../utils");
|
|
9
9
|
const utilsFS_1 = require("../../utilsFS");
|
|
10
10
|
const index_1 = __importDefault(require("./index"));
|
|
11
11
|
const replaceLinkHref = (input, href, newHref) => {
|
|
@@ -38,15 +38,15 @@ const collect = (input, options) => {
|
|
|
38
38
|
continue;
|
|
39
39
|
}
|
|
40
40
|
const linkToken = childrenTokens[j];
|
|
41
|
-
const href = (0,
|
|
41
|
+
const href = (0, utils_2.getHrefTokenAttr)(linkToken);
|
|
42
42
|
const isIncludeLink = (0, utilsFS_1.resolveRelativePath)(startPath, href).includes(`_includes${path_1.sep}`);
|
|
43
|
-
if (!href || !(0,
|
|
43
|
+
if (!href || !(0, utils_2.isLocalUrl)(href) || isIncludeLink) {
|
|
44
44
|
j++;
|
|
45
45
|
continue;
|
|
46
46
|
}
|
|
47
|
-
const { pathname, hash } =
|
|
47
|
+
const { pathname, hash } = (0, utils_1.parseHref)(href);
|
|
48
48
|
if (pathname) {
|
|
49
|
-
const isPageFile =
|
|
49
|
+
const isPageFile = utils_2.PAGE_LINK_REGEXP.test(pathname);
|
|
50
50
|
if (isPageFile) {
|
|
51
51
|
const newHref = (0, utilsFS_1.getSinglePageAnchorId)({
|
|
52
52
|
root,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collect.js","sourceRoot":"","sources":["../../../src/transform/plugins/links/collect.ts"],"names":[],"mappings":";;;;AAAA,8DAAqC;AACrC,+BAAyB;AACzB,
|
|
1
|
+
{"version":3,"file":"collect.js","sourceRoot":"","sources":["../../../src/transform/plugins/links/collect.ts"],"names":[],"mappings":";;;;AAAA,8DAAqC;AACrC,+BAAyB;AACzB,2CAA0C;AAE1C,uCAA2E;AAC3E,2CAAyE;AAEzE,oDAA4B;AAE5B,MAAM,eAAe,GAAG,CAAC,KAAa,EAAE,IAAY,EAAE,OAAe,EAAE,EAAE;IACrE,oCAAoC;IACpC,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,IAAI,GAAG,EAAE,KAAK,OAAO,GAAG,CAAC,CAAC;AACxD,CAAC,CAAC;AAQF;;KAEK;AACL,MAAM,OAAO,GAAG,CAAC,KAAa,EAAE,OAAgB,EAAE,EAAE;IAChD,MAAM,EAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAC,GAAG,OAAO,CAAC;IAEpD,IAAI,CAAC,UAAU,EAAE,CAAC;QACd,OAAO;IACX,CAAC;IAED,IAAI,MAAM,GAAG,KAAK,CAAC;IAEnB,+FAA+F;IAC/F,MAAM,cAAc,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,UAAG,EAAE,CAAC,CAAC;IAC1E,MAAM,aAAa,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC;IAC7C,MAAM,EAAE,GAAG,IAAI,qBAAU,EAAE,CAAC,GAAG,CAAC,eAAK,EAAE,EAAC,GAAG,OAAO,EAAE,aAAa,EAAE,cAAc,EAAC,CAAC,CAAC;IACpF,MAAM,MAAM,GAAG,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAEpC,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC;QACvB,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC9B,MAAM,cAAc,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,IAAI,EAAE,CAAC;YAChD,IAAI,CAAC,GAAG,CAAC,CAAC;YAEV,OAAO,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC;gBAC/B,MAAM,eAAe,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC;gBAE/D,IAAI,CAAC,eAAe,EAAE,CAAC;oBACnB,CAAC,EAAE,CAAC;oBACJ,SAAS;gBACb,CAAC;gBAED,MAAM,SAAS,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;gBACpC,MAAM,IAAI,GAAG,IAAA,wBAAgB,EAAC,SAAS,CAAC,CAAC;gBAEzC,MAAM,aAAa,GAAG,IAAA,6BAAmB,EAAC,SAAS,EAAE,IAAI,CAAC,CAAC,QAAQ,CAC/D,YAAY,UAAG,EAAE,CACpB,CAAC;gBAEF,IAAI,CAAC,IAAI,IAAI,CAAC,IAAA,kBAAU,EAAC,IAAI,CAAC,IAAI,aAAa,EAAE,CAAC;oBAC9C,CAAC,EAAE,CAAC;oBACJ,SAAS;gBACb,CAAC;gBAED,MAAM,EAAC,QAAQ,EAAE,IAAI,EAAC,GAAG,IAAA,iBAAS,EAAC,IAAI,CAAC,CAAC;gBACzC,IAAI,QAAQ,EAAE,CAAC;oBACX,MAAM,UAAU,GAAG,wBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oBACnD,IAAI,UAAU,EAAE,CAAC;wBACb,MAAM,OAAO,GAAG,IAAA,+BAAqB,EAAC;4BAClC,IAAI;4BACJ,WAAW,EAAE,SAAS;4BACtB,QAAQ;4BACR,IAAI;yBACP,CAAC,CAAC;wBACH,MAAM,GAAG,eAAe,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;oBACpD,CAAC;gBACL,CAAC;qBAAM,IAAI,IAAI,EAAE,CAAC;oBACd,MAAM,OAAO,GAAG,IAAA,+BAAqB,EAAC,EAAC,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,IAAI,EAAC,CAAC,CAAC;oBAC5E,MAAM,GAAG,eAAe,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;gBACpD,CAAC;gBAED,CAAC,EAAE,CAAC;YACR,CAAC;QACL,CAAC;QAED,CAAC,EAAE,CAAC;IACR,CAAC;IAED,6CAA6C;IAC7C,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC;AAEF,iBAAS,OAAO,CAAC"}
|
|
@@ -32,13 +32,10 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
32
32
|
return result;
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
|
-
|
|
36
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
37
|
-
};
|
|
38
|
-
const url_1 = __importDefault(require("url"));
|
|
35
|
+
const utils_1 = require("@diplodoc/utils");
|
|
39
36
|
const chalk_1 = require("chalk");
|
|
40
37
|
const path_1 = __importStar(require("path"));
|
|
41
|
-
const
|
|
38
|
+
const utils_2 = require("../../utils");
|
|
42
39
|
const utilsFS_1 = require("../../utilsFS");
|
|
43
40
|
function getTitleFromTokens(tokens) {
|
|
44
41
|
var _a;
|
|
@@ -47,7 +44,7 @@ function getTitleFromTokens(tokens) {
|
|
|
47
44
|
while (i < tokens.length) {
|
|
48
45
|
const token = tokens[i];
|
|
49
46
|
if ((token === null || token === void 0 ? void 0 : token.type) === 'heading_open') {
|
|
50
|
-
const info = (0,
|
|
47
|
+
const info = (0, utils_2.headingInfo)(tokens, i);
|
|
51
48
|
title = (_a = info === null || info === void 0 ? void 0 : info.title) !== null && _a !== void 0 ? _a : '';
|
|
52
49
|
break;
|
|
53
50
|
}
|
|
@@ -67,7 +64,7 @@ const getTitle = (md, id, options) => {
|
|
|
67
64
|
disableCircularError: true,
|
|
68
65
|
inheritVars: false,
|
|
69
66
|
}, included);
|
|
70
|
-
const sourceTokens = id ? (0,
|
|
67
|
+
const sourceTokens = id ? (0, utils_2.findBlockTokens)(fileTokens, id) : fileTokens;
|
|
71
68
|
return getTitleFromTokens(sourceTokens);
|
|
72
69
|
};
|
|
73
70
|
const addTitle = (md, options) => {
|
|
@@ -103,16 +100,16 @@ function processLink(md, state, tokens, idx, opts) {
|
|
|
103
100
|
const currentPath = state.env.path || startPath;
|
|
104
101
|
const linkToken = tokens[idx];
|
|
105
102
|
const nextToken = tokens[idx + 1];
|
|
106
|
-
const originalHref = (0,
|
|
103
|
+
const originalHref = (0, utils_2.getHrefTokenAttr)(linkToken);
|
|
107
104
|
if (!originalHref) {
|
|
108
105
|
log.error(`Empty link in ${(0, chalk_1.bold)(startPath)}`);
|
|
109
106
|
return;
|
|
110
107
|
}
|
|
111
|
-
const { pathname, hash } =
|
|
108
|
+
const { pathname, hash } = (0, utils_1.parseHref)(originalHref);
|
|
112
109
|
let file;
|
|
113
110
|
let fileExists;
|
|
114
111
|
let isPageFile;
|
|
115
|
-
if (!(0,
|
|
112
|
+
if (!(0, utils_2.isLocalUrl)(originalHref)) {
|
|
116
113
|
linkToken.attrSet('target', '_blank');
|
|
117
114
|
linkToken.attrSet('rel', 'noreferrer noopener');
|
|
118
115
|
return;
|
|
@@ -120,7 +117,7 @@ function processLink(md, state, tokens, idx, opts) {
|
|
|
120
117
|
if (pathname) {
|
|
121
118
|
file = (0, path_1.resolve)(path_1.default.parse(currentPath).dir, pathname);
|
|
122
119
|
fileExists = skipLinkFileCheck || (0, utilsFS_1.isFileExists)(file);
|
|
123
|
-
isPageFile =
|
|
120
|
+
isPageFile = utils_2.PAGE_LINK_REGEXP.test(pathname);
|
|
124
121
|
if (isPageFile && !fileExists) {
|
|
125
122
|
let needShowError = true;
|
|
126
123
|
if (needSkipLinkFn) {
|
|
@@ -166,12 +163,12 @@ function processLink(md, state, tokens, idx, opts) {
|
|
|
166
163
|
});
|
|
167
164
|
}
|
|
168
165
|
const patchedHref = !(0, path_1.isAbsolute)(originalHref) && !originalHref.includes('//')
|
|
169
|
-
?
|
|
170
|
-
...
|
|
166
|
+
? (0, utils_1.formatHref)({
|
|
167
|
+
...(0, utils_1.parseHref)(originalHref),
|
|
171
168
|
pathname: getPublicPath(opts, file),
|
|
172
169
|
})
|
|
173
170
|
: originalHref;
|
|
174
|
-
const linkHrefTransformer = transformLink ||
|
|
171
|
+
const linkHrefTransformer = transformLink || utils_2.defaultTransformLink;
|
|
175
172
|
linkToken.attrSet('href', linkHrefTransformer(patchedHref));
|
|
176
173
|
}
|
|
177
174
|
const index = (md, opts) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transform/plugins/links/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transform/plugins/links/index.ts"],"names":[],"mappings":"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"}
|
package/lib/utils.js
CHANGED
|
@@ -1,7 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.PAGE_LINK_REGEXP = void 0;
|
|
7
4
|
exports.isLocalUrl = isLocalUrl;
|
|
@@ -13,7 +10,7 @@ exports.getHrefTokenAttr = getHrefTokenAttr;
|
|
|
13
10
|
exports.getSrcTokenAttr = getSrcTokenAttr;
|
|
14
11
|
exports.defaultTransformLink = defaultTransformLink;
|
|
15
12
|
exports.filterTokens = filterTokens;
|
|
16
|
-
const
|
|
13
|
+
const utils_1 = require("@diplodoc/utils");
|
|
17
14
|
function isLocalUrl(url) {
|
|
18
15
|
return !/^(?:[a-z]+:)?\/\//i.test(url);
|
|
19
16
|
}
|
|
@@ -95,8 +92,8 @@ function getSrcTokenAttr(token) {
|
|
|
95
92
|
exports.PAGE_LINK_REGEXP = /\.(md|ya?ml)$/i;
|
|
96
93
|
function defaultTransformLink(href) {
|
|
97
94
|
var _a;
|
|
98
|
-
const parsed =
|
|
99
|
-
href =
|
|
95
|
+
const parsed = (0, utils_1.parseHref)(href);
|
|
96
|
+
href = (0, utils_1.formatHref)({
|
|
100
97
|
...parsed,
|
|
101
98
|
pathname: (_a = parsed.pathname) === null || _a === void 0 ? void 0 : _a.replace(exports.PAGE_LINK_REGEXP, '.html'),
|
|
102
99
|
});
|
package/lib/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/transform/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/transform/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@diplodoc/transform",
|
|
3
|
-
"version": "4.76.
|
|
3
|
+
"version": "4.76.10",
|
|
4
4
|
"description": "A simple transformer of text in YFM (Yandex Flavored Markdown) to HTML",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"markdown",
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
"@diplodoc/cut-extension": "^1.1.3",
|
|
57
57
|
"@diplodoc/file-extension": "^0.2.4",
|
|
58
58
|
"@diplodoc/tabs-extension": "^3.10.2",
|
|
59
|
-
"@diplodoc/utils": "^2.
|
|
59
|
+
"@diplodoc/utils": "^2.3.3",
|
|
60
60
|
"chalk": "^4.1.2",
|
|
61
61
|
"cheerio": "^1.0.0",
|
|
62
62
|
"css": "^3.0.0",
|
|
@@ -78,7 +78,7 @@
|
|
|
78
78
|
"ts-dedent": "^2.2.0"
|
|
79
79
|
},
|
|
80
80
|
"devDependencies": {
|
|
81
|
-
"@diplodoc/infra": "2.2.
|
|
81
|
+
"@diplodoc/infra": "2.2.1",
|
|
82
82
|
"@types/css": "0.0.34",
|
|
83
83
|
"@types/github-slugger": "^1.3.0",
|
|
84
84
|
"@types/js-yaml": "^4.0.5",
|
package/src/scss/_code.scss
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import MarkdownIt from 'markdown-it';
|
|
2
2
|
import {sep} from 'path';
|
|
3
|
-
import
|
|
3
|
+
import {parseHref} from '@diplodoc/utils';
|
|
4
4
|
|
|
5
5
|
import {PAGE_LINK_REGEXP, getHrefTokenAttr, isLocalUrl} from '../../utils';
|
|
6
6
|
import {getSinglePageAnchorId, resolveRelativePath} from '../../utilsFS';
|
|
@@ -62,7 +62,7 @@ const collect = (input: string, options: Options) => {
|
|
|
62
62
|
continue;
|
|
63
63
|
}
|
|
64
64
|
|
|
65
|
-
const {pathname, hash} =
|
|
65
|
+
const {pathname, hash} = parseHref(href);
|
|
66
66
|
if (pathname) {
|
|
67
67
|
const isPageFile = PAGE_LINK_REGEXP.test(pathname);
|
|
68
68
|
if (isPageFile) {
|
|
@@ -4,7 +4,7 @@ import type {CacheContext, StateCore} from '../../typings';
|
|
|
4
4
|
import type {MarkdownItPluginCb, MarkdownItPluginOpts} from '../typings';
|
|
5
5
|
import type {MarkdownItIncluded} from '../includes/types';
|
|
6
6
|
|
|
7
|
-
import
|
|
7
|
+
import {formatHref, parseHref} from '@diplodoc/utils';
|
|
8
8
|
import {bold} from 'chalk';
|
|
9
9
|
import path, {isAbsolute, parse, relative, resolve} from 'path';
|
|
10
10
|
|
|
@@ -153,7 +153,7 @@ function processLink(
|
|
|
153
153
|
return;
|
|
154
154
|
}
|
|
155
155
|
|
|
156
|
-
const {pathname, hash} =
|
|
156
|
+
const {pathname, hash} = parseHref(originalHref);
|
|
157
157
|
let file;
|
|
158
158
|
let fileExists;
|
|
159
159
|
let isPageFile;
|
|
@@ -219,8 +219,8 @@ function processLink(
|
|
|
219
219
|
|
|
220
220
|
const patchedHref =
|
|
221
221
|
!isAbsolute(originalHref) && !originalHref.includes('//')
|
|
222
|
-
?
|
|
223
|
-
...
|
|
222
|
+
? formatHref({
|
|
223
|
+
...parseHref(originalHref),
|
|
224
224
|
pathname: getPublicPath(opts, file),
|
|
225
225
|
})
|
|
226
226
|
: originalHref;
|
package/src/transform/utils.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type Token from 'markdown-it/lib/token';
|
|
2
2
|
|
|
3
|
-
import
|
|
3
|
+
import {formatHref, parseHref} from '@diplodoc/utils';
|
|
4
4
|
|
|
5
5
|
export function isLocalUrl(url: string) {
|
|
6
6
|
return !/^(?:[a-z]+:)?\/\//i.test(url);
|
|
@@ -105,8 +105,8 @@ export function getSrcTokenAttr(token: Token) {
|
|
|
105
105
|
export const PAGE_LINK_REGEXP = /\.(md|ya?ml)$/i;
|
|
106
106
|
|
|
107
107
|
export function defaultTransformLink(href: string) {
|
|
108
|
-
const parsed =
|
|
109
|
-
href =
|
|
108
|
+
const parsed = parseHref(href);
|
|
109
|
+
href = formatHref({
|
|
110
110
|
...parsed,
|
|
111
111
|
pathname: parsed.pathname?.replace(PAGE_LINK_REGEXP, '.html'),
|
|
112
112
|
});
|