@diplodoc/transform 4.25.0 → 4.26.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/dist/css/print.css.map +1 -1
- package/dist/css/yfm.css +7 -6
- 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/liquid/conditions.js +33 -5
- package/lib/liquid/conditions.js.map +1 -1
- package/lib/md.js +4 -2
- package/lib/md.js.map +1 -1
- package/lib/plugins/cut.js +4 -4
- package/lib/plugins/cut.js.map +1 -1
- package/lib/typings.d.ts +1 -0
- package/package.json +1 -1
- package/src/scss/_cut.scss +11 -12
- package/src/transform/liquid/conditions.ts +38 -5
- package/src/transform/md.ts +4 -2
- package/src/transform/plugins/cut.ts +4 -4
- package/src/transform/typings.ts +1 -0
package/lib/liquid/conditions.js
CHANGED
|
@@ -55,16 +55,40 @@ function trimResult(content, ifTag, ifCon) {
|
|
|
55
55
|
if (!ifCon) {
|
|
56
56
|
const head = headLinebreak(ifTag.rawStart);
|
|
57
57
|
const tail = tailLinebreak(ifTag.rawEnd);
|
|
58
|
-
|
|
58
|
+
let rest = head + tail;
|
|
59
|
+
if (rest !== head && rest !== tail) {
|
|
60
|
+
// We have extra line break, if condition was placed on individual line
|
|
61
|
+
rest = rest.replace('\n', '');
|
|
62
|
+
}
|
|
63
|
+
return ifTag.isBlock ? '\n' : rest;
|
|
59
64
|
}
|
|
60
65
|
content = content.substring(ifCon.start, ifCon.end);
|
|
61
|
-
|
|
66
|
+
if (ifTag.isBlock) {
|
|
67
|
+
return trimBlockResult(content, ifCon);
|
|
68
|
+
}
|
|
69
|
+
else {
|
|
70
|
+
return trimInlineResult(content, ifTag);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
function trimBlockResult(content, ifCon) {
|
|
74
|
+
const head = headLinebreak(ifCon.rawStart);
|
|
75
|
+
if (head) {
|
|
76
|
+
content = '\n' + content;
|
|
77
|
+
}
|
|
78
|
+
const tail = tailLinebreak(ifCon.rawEnd);
|
|
79
|
+
if (tail) {
|
|
80
|
+
content = content + '\n';
|
|
81
|
+
}
|
|
82
|
+
return content;
|
|
83
|
+
}
|
|
84
|
+
function trimInlineResult(content, ifTag) {
|
|
85
|
+
const head = headLinebreak(ifTag.rawStart);
|
|
62
86
|
if (head) {
|
|
63
|
-
content =
|
|
87
|
+
content = head + content;
|
|
64
88
|
}
|
|
65
|
-
const tail =
|
|
89
|
+
const tail = tailLinebreak(ifTag.rawEnd);
|
|
66
90
|
if (tail) {
|
|
67
|
-
content = content +
|
|
91
|
+
content = content + tail;
|
|
68
92
|
}
|
|
69
93
|
return content;
|
|
70
94
|
}
|
|
@@ -198,6 +222,10 @@ module.exports = function conditions(input, vars, path, settings) {
|
|
|
198
222
|
input = result;
|
|
199
223
|
break;
|
|
200
224
|
}
|
|
225
|
+
default:
|
|
226
|
+
// This is not condition.
|
|
227
|
+
// Step back last linebreaks to match them on next condition
|
|
228
|
+
R_LIQUID.lastIndex -= tailLinebreak(match[1]).length;
|
|
201
229
|
}
|
|
202
230
|
}
|
|
203
231
|
if (tagStack.length !== 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conditions.js","sourceRoot":"","sources":["../../src/transform/liquid/conditions.ts"],"names":[],"mappings":";AAAA,iCAA2B;AAC3B,6CAA8C;AAC9C,uCAAkC;AAClC,gCAA2B;AAC3B,2CAA4E;AAS5E,SAAS,WAAW,CAAC,MAAc,EAAE,KAAgB,EAAE,KAAuB,EAAE,GAAiB;IAC7F,MAAM,CAAC,eAAe,EAAE,aAAa,CAAC,GAAG;QACrC,IAAA,yBAAa,EAAC,MAAM,EAAE,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC;QACtC,IAAA,yBAAa,EAAC,MAAM,EAAE,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC;KACvC,CAAC;IAEF,IAAI,eAAe,KAAK,aAAa,IAAI,KAAK,KAAK,KAAK,EAAE;QACtD,OAAO;KACV;IAED,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;IAC7C,MAAM,EAAC,iBAAiB,EAAE,SAAS,EAAE,WAAW,EAAC,GAAG,GAAG,CAAC;IAExD,IAAI,eAAe,CAAC;IACpB,IAAI,KAAK,EAAE;QACP,MAAM,CAAC,eAAe,EAAE,aAAa,CAAC,GAAG;YACrC,IAAA,yBAAa,EAAC,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC;YAClC,IAAA,yBAAa,EAAC,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC;SACnC,CAAC;QAEF,sCAAsC;QACtC,MAAM,kBAAkB,GAAG,eAAe,GAAG,eAAe,CAAC;QAC7D,SAAS,CAAC;YACN,KAAK,EAAE,eAAe;YACtB,GAAG,EAAE,aAAa;YAClB,MAAM,EAAE,kBAAkB;YAC1B,WAAW,EAAE,IAAI;SACpB,CAAC,CAAC;QAEH,+CAA+C;QAC/C,WAAW,CAAC,EAAC,KAAK,EAAE,eAAe,EAAE,GAAG,EAAE,eAAe,GAAG,CAAC,EAAC,CAAC,CAAC;QAChE,WAAW,CAAC,EAAC,KAAK,EAAE,aAAa,GAAG,CAAC,EAAE,GAAG,EAAE,aAAa,EAAC,CAAC,CAAC;QAE5D,wCAAwC;QACxC,eAAe,GAAG,iBAAiB,CAAC,aAAa,CAAC,GAAG,aAAa,CAAC;KACtE;SAAM;QACH,mCAAmC;QACnC,WAAW,CAAC,EAAC,KAAK,EAAE,eAAe,EAAE,GAAG,EAAE,aAAa,EAAC,CAAC,CAAC;QAE1D,qCAAqC;QACrC,eAAe,GAAG,eAAe,GAAG,aAAa,GAAG,CAAC,CAAC;KACzD;IAED,wBAAwB;IACxB,SAAS,CAAC,EAAC,KAAK,EAAE,aAAa,GAAG,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,eAAe,EAAC,CAAC,CAAC;AACpF,CAAC;AAMD,SAAS,aAAa,CAAC,GAAW;IAC9B,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IAEvC,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AACjC,CAAC;AAED,SAAS,aAAa,CAAC,GAAW;IAC9B,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IAEvC,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AACjC,CAAC;AAED,SAAS,UAAU,CAAC,OAAe,EAAE,KAAY,EAAE,KAAyB;IACxE,IAAI,CAAC,KAAK,EAAE;QACR,MAAM,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC3C,MAAM,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"conditions.js","sourceRoot":"","sources":["../../src/transform/liquid/conditions.ts"],"names":[],"mappings":"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"}
|
package/lib/md.js
CHANGED
|
@@ -87,9 +87,11 @@ function initParser(md, options, env) {
|
|
|
87
87
|
};
|
|
88
88
|
}
|
|
89
89
|
function initCompiler(md, options, env) {
|
|
90
|
-
const { needToSanitizeHtml = true, sanitizeOptions } = options;
|
|
90
|
+
const { needToSanitizeHtml = true, renderInline = false, sanitizeOptions } = options;
|
|
91
91
|
return (tokens) => {
|
|
92
|
-
const html =
|
|
92
|
+
const html = renderInline
|
|
93
|
+
? md.renderer.renderInline(tokens, md.options, env)
|
|
94
|
+
: md.renderer.render(tokens, md.options, env);
|
|
93
95
|
return needToSanitizeHtml ? (0, sanitize_1.default)(html, sanitizeOptions) : html;
|
|
94
96
|
};
|
|
95
97
|
}
|
package/lib/md.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"md.js","sourceRoot":"","sources":["../src/transform/md.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"md.js","sourceRoot":"","sources":["../src/transform/md.ts"],"names":[],"mappings":"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"}
|
package/lib/plugins/cut.js
CHANGED
|
@@ -24,13 +24,13 @@ const cut = (md, { path, log }) => {
|
|
|
24
24
|
i += 3;
|
|
25
25
|
continue;
|
|
26
26
|
}
|
|
27
|
-
const newOpenToken = new state.Token('yfm_cut_open', '
|
|
27
|
+
const newOpenToken = new state.Token('yfm_cut_open', 'details', 1);
|
|
28
28
|
newOpenToken.attrSet('class', 'yfm-cut');
|
|
29
29
|
newOpenToken.map = tokens[i].map;
|
|
30
|
-
const titleOpen = new state.Token('yfm_cut_title_open', '
|
|
30
|
+
const titleOpen = new state.Token('yfm_cut_title_open', 'summary', 1);
|
|
31
31
|
titleOpen.attrSet('class', 'yfm-cut-title');
|
|
32
32
|
const titleInline = state.md.parseInline(match[1] === undefined ? 'ad' : match[1], state.env)[0];
|
|
33
|
-
const titleClose = new state.Token('yfm_cut_title_close', '
|
|
33
|
+
const titleClose = new state.Token('yfm_cut_title_close', 'summary', -1);
|
|
34
34
|
const contentOpen = new state.Token('yfm_cut_content_open', 'div', 1);
|
|
35
35
|
contentOpen.attrSet('class', 'yfm-cut-content');
|
|
36
36
|
if (newOpenToken.map) {
|
|
@@ -39,7 +39,7 @@ const cut = (md, { path, log }) => {
|
|
|
39
39
|
contentOpen.map = [contentOpenStart, contentOpenEnd];
|
|
40
40
|
}
|
|
41
41
|
const contentClose = new state.Token('yfm_cut_content_close', 'div', -1);
|
|
42
|
-
const newCloseToken = new state.Token('yfm_cut_close', '
|
|
42
|
+
const newCloseToken = new state.Token('yfm_cut_close', 'details', -1);
|
|
43
43
|
newCloseToken.map = tokens[closeTokenIdx].map;
|
|
44
44
|
const insideTokens = [
|
|
45
45
|
newOpenToken,
|
package/lib/plugins/cut.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cut.js","sourceRoot":"","sources":["../../src/transform/plugins/cut.ts"],"names":[],"mappings":";AAGA,mCAA4F;AAE5F,MAAM,UAAU,GAAG,iCAAiC,CAAC;AAErD,MAAM,eAAe,GAAuB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;IACtD,OAAO,CACH,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,gBAAgB;QACnC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ;QAC/B,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,cAAc,CAClD,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,MAAe,EAAE,CAAS,EAAE,EAAE;IAClD,OAAO,CACH,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,gBAAgB;QACnC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ;QAC/B,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAC1C,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,IAAA,kCAAiB,EAAC,KAAK,EAAE,cAAc,EAAE,eAAe,CAAC,CAAC;AAEpF,MAAM,GAAG,GAAuB,CAAC,EAAE,EAAE,EAAC,IAAI,EAAE,GAAG,EAAC,EAAE,EAAE;IAChD,MAAM,MAAM,GAAkB,CAAC,KAAK,EAAE,EAAE;QACpC,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAC5B,IAAI,CAAC,GAAG,CAAC,CAAC;QAEV,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE;YACtB,MAAM,KAAK,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YAExC,IAAI,KAAK,EAAE;gBACP,MAAM,aAAa,GAAG,iBAAiB,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;gBAElE,IAAI,CAAC,aAAa,EAAE;oBAChB,CAAC,IAAI,CAAC,CAAC;oBACP,SAAS;iBACZ;gBAED,MAAM,YAAY,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"cut.js","sourceRoot":"","sources":["../../src/transform/plugins/cut.ts"],"names":[],"mappings":"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"}
|
package/lib/typings.d.ts
CHANGED
package/package.json
CHANGED
package/src/scss/_cut.scss
CHANGED
|
@@ -1,20 +1,28 @@
|
|
|
1
1
|
.yfm-cut {
|
|
2
2
|
$class: &;
|
|
3
|
-
|
|
4
3
|
margin-bottom: 15px;
|
|
5
4
|
|
|
6
5
|
&-title {
|
|
6
|
+
list-style: none;
|
|
7
7
|
cursor: pointer;
|
|
8
8
|
position: relative;
|
|
9
9
|
user-select: none;
|
|
10
10
|
padding: 5px 0 5px 30px;
|
|
11
11
|
|
|
12
|
+
&::-webkit-details-marker {
|
|
13
|
+
display: none;
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
&:focus {
|
|
17
|
+
outline-color: $accentColor;
|
|
18
|
+
}
|
|
19
|
+
|
|
12
20
|
&:before {
|
|
13
21
|
content: '';
|
|
14
22
|
z-index: 1;
|
|
15
23
|
left: 0;
|
|
16
24
|
top: 50%;
|
|
17
|
-
background-image: url(
|
|
25
|
+
background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxNiAxNiI+CiAgICA8cGF0aCBzdHJva2U9ImN1cnJlbnRDb2xvciIgZmlsbD0ibm9uZSIgZD0iTTMgNmw1IDUgNS01Ii8+Cjwvc3ZnPgo=');
|
|
18
26
|
transform: translateY(-50%) rotate(-90deg);
|
|
19
27
|
transition: transform 0.3s ease;
|
|
20
28
|
height: 20px;
|
|
@@ -24,17 +32,10 @@
|
|
|
24
32
|
}
|
|
25
33
|
|
|
26
34
|
&-content {
|
|
27
|
-
|
|
28
|
-
overflow: hidden;
|
|
29
|
-
transition: height 0.3s ease-in-out;
|
|
35
|
+
padding: 5px 0 15px 30px;
|
|
30
36
|
}
|
|
31
37
|
|
|
32
38
|
&.open {
|
|
33
|
-
> #{$class}-content {
|
|
34
|
-
display: revert;
|
|
35
|
-
padding: 5px 0 15px 30px;
|
|
36
|
-
}
|
|
37
|
-
|
|
38
39
|
> #{$class}-title:before {
|
|
39
40
|
transform: translateY(-50%);
|
|
40
41
|
}
|
|
@@ -52,5 +53,3 @@
|
|
|
52
53
|
}
|
|
53
54
|
}
|
|
54
55
|
}
|
|
55
|
-
|
|
56
|
-
|
|
@@ -78,19 +78,48 @@ function trimResult(content: string, ifTag: IfTag, ifCon: IfCondition | null) {
|
|
|
78
78
|
if (!ifCon) {
|
|
79
79
|
const head = headLinebreak(ifTag.rawStart);
|
|
80
80
|
const tail = tailLinebreak(ifTag.rawEnd);
|
|
81
|
-
|
|
81
|
+
|
|
82
|
+
let rest = head + tail;
|
|
83
|
+
if (rest !== head && rest !== tail) {
|
|
84
|
+
// We have extra line break, if condition was placed on individual line
|
|
85
|
+
rest = rest.replace('\n', '');
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
return ifTag.isBlock ? '\n' : rest;
|
|
82
89
|
}
|
|
83
90
|
|
|
84
91
|
content = content.substring(ifCon.start, ifCon.end);
|
|
85
92
|
|
|
86
|
-
|
|
93
|
+
if (ifTag.isBlock) {
|
|
94
|
+
return trimBlockResult(content, ifCon);
|
|
95
|
+
} else {
|
|
96
|
+
return trimInlineResult(content, ifTag);
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
function trimBlockResult(content: string, ifCon: IfCondition) {
|
|
101
|
+
const head = headLinebreak(ifCon.rawStart);
|
|
102
|
+
if (head) {
|
|
103
|
+
content = '\n' + content;
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
const tail = tailLinebreak(ifCon.rawEnd);
|
|
107
|
+
if (tail) {
|
|
108
|
+
content = content + '\n';
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
return content;
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
function trimInlineResult(content: string, ifTag: IfTag) {
|
|
115
|
+
const head = headLinebreak(ifTag.rawStart);
|
|
87
116
|
if (head) {
|
|
88
|
-
content =
|
|
117
|
+
content = head + content;
|
|
89
118
|
}
|
|
90
119
|
|
|
91
|
-
const tail =
|
|
120
|
+
const tail = tailLinebreak(ifTag.rawEnd);
|
|
92
121
|
if (tail) {
|
|
93
|
-
content = content +
|
|
122
|
+
content = content + tail;
|
|
94
123
|
}
|
|
95
124
|
|
|
96
125
|
return content;
|
|
@@ -279,6 +308,10 @@ export = function conditions(
|
|
|
279
308
|
|
|
280
309
|
break;
|
|
281
310
|
}
|
|
311
|
+
default:
|
|
312
|
+
// This is not condition.
|
|
313
|
+
// Step back last linebreaks to match them on next condition
|
|
314
|
+
R_LIQUID.lastIndex -= tailLinebreak(match[1]).length;
|
|
282
315
|
}
|
|
283
316
|
}
|
|
284
317
|
|
package/src/transform/md.ts
CHANGED
|
@@ -118,10 +118,12 @@ function initParser(md: MarkdownIt, options: OptionsType, env: EnvType) {
|
|
|
118
118
|
}
|
|
119
119
|
|
|
120
120
|
function initCompiler(md: MarkdownIt, options: OptionsType, env: EnvType) {
|
|
121
|
-
const {needToSanitizeHtml = true, sanitizeOptions} = options;
|
|
121
|
+
const {needToSanitizeHtml = true, renderInline = false, sanitizeOptions} = options;
|
|
122
122
|
|
|
123
123
|
return (tokens: Token[]) => {
|
|
124
|
-
const html =
|
|
124
|
+
const html = renderInline
|
|
125
|
+
? md.renderer.renderInline(tokens, md.options, env)
|
|
126
|
+
: md.renderer.render(tokens, md.options, env);
|
|
125
127
|
|
|
126
128
|
return needToSanitizeHtml ? sanitizeHtml(html, sanitizeOptions) : html;
|
|
127
129
|
};
|
|
@@ -39,11 +39,11 @@ const cut: MarkdownItPluginCb = (md, {path, log}) => {
|
|
|
39
39
|
continue;
|
|
40
40
|
}
|
|
41
41
|
|
|
42
|
-
const newOpenToken = new state.Token('yfm_cut_open', '
|
|
42
|
+
const newOpenToken = new state.Token('yfm_cut_open', 'details', 1);
|
|
43
43
|
newOpenToken.attrSet('class', 'yfm-cut');
|
|
44
44
|
newOpenToken.map = tokens[i].map;
|
|
45
45
|
|
|
46
|
-
const titleOpen = new state.Token('yfm_cut_title_open', '
|
|
46
|
+
const titleOpen = new state.Token('yfm_cut_title_open', 'summary', 1);
|
|
47
47
|
titleOpen.attrSet('class', 'yfm-cut-title');
|
|
48
48
|
|
|
49
49
|
const titleInline = state.md.parseInline(
|
|
@@ -51,7 +51,7 @@ const cut: MarkdownItPluginCb = (md, {path, log}) => {
|
|
|
51
51
|
state.env,
|
|
52
52
|
)[0];
|
|
53
53
|
|
|
54
|
-
const titleClose = new state.Token('yfm_cut_title_close', '
|
|
54
|
+
const titleClose = new state.Token('yfm_cut_title_close', 'summary', -1);
|
|
55
55
|
|
|
56
56
|
const contentOpen = new state.Token('yfm_cut_content_open', 'div', 1);
|
|
57
57
|
contentOpen.attrSet('class', 'yfm-cut-content');
|
|
@@ -65,7 +65,7 @@ const cut: MarkdownItPluginCb = (md, {path, log}) => {
|
|
|
65
65
|
|
|
66
66
|
const contentClose = new state.Token('yfm_cut_content_close', 'div', -1);
|
|
67
67
|
|
|
68
|
-
const newCloseToken = new state.Token('yfm_cut_close', '
|
|
68
|
+
const newCloseToken = new state.Token('yfm_cut_close', 'details', -1);
|
|
69
69
|
newCloseToken.map = tokens[closeTokenIdx].map;
|
|
70
70
|
|
|
71
71
|
const insideTokens = [
|
package/src/transform/typings.ts
CHANGED