@diplodoc/transform 4.24.0 → 4.25.1
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.map +1 -1
- package/dist/css/yfm.min.css.map +1 -1
- package/dist/js/yfm.js +5 -0
- package/dist/js/yfm.js.map +2 -2
- package/dist/js/yfm.min.js +1 -1
- package/dist/js/yfm.min.js.map +3 -3
- package/lib/liquid/conditions.js +33 -5
- package/lib/liquid/conditions.js.map +1 -1
- package/lib/plugins/includes/index.js +2 -1
- package/lib/plugins/includes/index.js.map +1 -1
- package/lib/plugins/term/termDefinitions.js +1 -0
- package/lib/plugins/term/termDefinitions.js.map +1 -1
- package/package.json +1 -1
- package/src/js/term/index.ts +2 -0
- package/src/js/term/utils.ts +8 -0
- package/src/transform/liquid/conditions.ts +38 -5
- package/src/transform/plugins/includes/index.ts +1 -1
- package/src/transform/plugins/term/termDefinitions.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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"}
|
|
@@ -9,6 +9,7 @@ function stripTitleTokens(tokens) {
|
|
|
9
9
|
}
|
|
10
10
|
}
|
|
11
11
|
function unfoldIncludes(state, path, options) {
|
|
12
|
+
var _a;
|
|
12
13
|
const { root, notFoundCb, log, noReplaceInclude = false } = options;
|
|
13
14
|
const { tokens } = state;
|
|
14
15
|
let i = 0;
|
|
@@ -56,7 +57,7 @@ function unfoldIncludes(state, path, options) {
|
|
|
56
57
|
}
|
|
57
58
|
catch (e) {
|
|
58
59
|
// @ts-ignore for some reason typescript fails here
|
|
59
|
-
const errPath = e.path.replace(root, '');
|
|
60
|
+
const errPath = (_a = e.path) === null || _a === void 0 ? void 0 : _a.replace(root, '');
|
|
60
61
|
if (notFoundCb) {
|
|
61
62
|
notFoundCb(errPath);
|
|
62
63
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transform/plugins/includes/index.ts"],"names":[],"mappings":";AAAA,iCAA2B;AAE3B,2CAAiG;AACjG,uCAA4C;AAK5C,MAAM,cAAc,GAAG,sDAAsD,CAAC;AAE9E,SAAS,gBAAgB,CAAC,MAAe;IACrC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,cAAc,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,eAAe,EAAE;QACzE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;KACvB;AACL,CAAC;AAQD,SAAS,cAAc,CAAC,KAAgB,EAAE,IAAY,EAAE,OAAgB
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transform/plugins/includes/index.ts"],"names":[],"mappings":";AAAA,iCAA2B;AAE3B,2CAAiG;AACjG,uCAA4C;AAK5C,MAAM,cAAc,GAAG,sDAAsD,CAAC;AAE9E,SAAS,gBAAgB,CAAC,MAAe;IACrC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,cAAc,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,eAAe,EAAE;QACzE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;KACvB;AACL,CAAC;AAQD,SAAS,cAAc,CAAC,KAAgB,EAAE,IAAY,EAAE,OAAgB;;IACpE,MAAM,EAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,gBAAgB,GAAG,KAAK,EAAC,GAAG,OAAO,CAAC;IAClE,MAAM,EAAC,MAAM,EAAC,GAAG,KAAK,CAAC;IACvB,IAAI,CAAC,GAAG,CAAC,CAAC;IAEV,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE;QACtB,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAC5B,MAAM,YAAY,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QACnC,MAAM,UAAU,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QACjC,IAAI,KAAK,CAAC;QAEV,IACI,SAAS,CAAC,IAAI,KAAK,gBAAgB;YACnC,YAAY,CAAC,IAAI,KAAK,QAAQ;YAC9B,CAAC,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YACpD,UAAU,CAAC,IAAI,KAAK,iBAAiB,EACvC;YACE,IAAI;gBACA,MAAM,CAAC,EAAE,OAAO,CAAC,iBAAiB,EAAE,AAAD,EAAG,WAAW,CAAC,GAAG,KAAK,CAAC;gBAE3D,MAAM,eAAe,GAAG,IAAA,4BAAkB,EAAC,WAAW,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;gBACpE,IAAI,QAAQ,GAAG,eAAe,CAAC;gBAC/B,IAAI,IAAI,GAAG,EAAE,CAAC;gBACd,MAAM,SAAS,GAAG,eAAe,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;gBACnD,IAAI,SAAS,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,sBAAY,EAAC,QAAQ,CAAC,EAAE;oBAC3C,QAAQ,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;oBAC/C,IAAI,GAAG,eAAe,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC;iBAC/C;gBAED,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;oBAC5B,CAAC,EAAE,CAAC;oBAEJ,SAAS;iBACZ;gBAED,MAAM,UAAU,GAAG,IAAA,uBAAa,EAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;gBAE3D,IAAI,cAAc,CAAC;gBACnB,IAAI,IAAI,EAAE;oBACN,cAAc,GAAG,IAAA,uBAAe,EAAC,UAAU,EAAE,IAAI,CAAC,CAAC;iBACtD;qBAAM;oBACH,cAAc,GAAG,UAAU,CAAC;iBAC/B;gBAED,IAAI,OAAO,KAAK,SAAS,EAAE;oBACvB,gBAAgB,CAAC,cAAc,CAAC,CAAC;iBACpC;gBAED,IAAI,gBAAgB,EAAE;oBAClB,CAAC,EAAE,CAAC;iBACP;qBAAM;oBACH,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,cAAc,CAAC,CAAC;oBAEvC,CAAC,IAAI,cAAc,CAAC,MAAM,CAAC;iBAC9B;aACJ;YAAC,OAAO,CAAC,EAAE;gBACR,mDAAmD;gBACnD,MAAM,OAAO,GAAG,MAAA,CAAC,CAAC,IAAI,0CAAE,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBAE1C,IAAI,UAAU,EAAE;oBACZ,UAAU,CAAC,OAAO,CAAC,CAAC;iBACvB;gBACD,GAAG,CAAC,KAAK,CAAC,eAAe,CAAC,OAAO,OAAO,EAAE,CAAC,CAAC;gBAE5C,CAAC,EAAE,CAAC;aACP;SACJ;aAAM;YACH,CAAC,EAAE,CAAC;SACP;KACJ;AACL,CAAC;AAED,MAAM,KAAK,GAAgC,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE;IACvD,MAAM,EAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAC,GAAG,OAAO,CAAC;IAErC,MAAM,MAAM,GAAG,CAAC,KAAgB,EAAE,EAAE;QAChC,MAAM,EAAC,GAAG,EAAC,GAAG,KAAK,CAAC;QACpB,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,IAAI,OAAO,CAAC;QAEjC,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC;QAElC,MAAM,iBAAiB,GAAG,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEtD,IAAI,iBAAiB,IAAI,KAAK,CAAC,GAAG,CAAC,oBAAoB,EAAE;YACrD,OAAO;SACV;QAED,IAAI,iBAAiB,EAAE;YACnB,GAAG,CAAC,KAAK,CAAC,sBAAsB,IAAA,YAAI,EAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;YAC/E,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACnB;QAED,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxB,cAAc,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QACrC,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;IACvB,CAAC,CAAC;IAEF,IAAI;QACA,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,kBAAkB,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;KAChE;IAAC,OAAO,CAAC,EAAE;QACR,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;KAC1C;AACL,CAAC,CAAC;AAEF,iBAAS,KAAK,CAAC"}
|
|
@@ -100,6 +100,7 @@ function processTermDefinition(md, options, state, currentLine, startLine, endLi
|
|
|
100
100
|
token.attrSet('class', 'yfm yfm-term_dfn');
|
|
101
101
|
token.attrSet('id', ':' + label + '_element');
|
|
102
102
|
token.attrSet('role', 'tooltip');
|
|
103
|
+
token.attrSet('aria-live', 'polite');
|
|
103
104
|
state.tokens.push(token);
|
|
104
105
|
const titleTokens = md.parse(title, state.env);
|
|
105
106
|
for (const titleToken of titleTokens) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"termDefinitions.js","sourceRoot":"","sources":["../../../src/transform/plugins/term/termDefinitions.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"termDefinitions.js","sourceRoot":"","sources":["../../../src/transform/plugins/term/termDefinitions.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/js/term/index.ts
CHANGED
|
@@ -6,6 +6,7 @@ import {
|
|
|
6
6
|
openDefinitionClass,
|
|
7
7
|
setDefinitionId,
|
|
8
8
|
setDefinitionPosition,
|
|
9
|
+
setDefinitonAriaLive,
|
|
9
10
|
} from './utils';
|
|
10
11
|
import {getEventTarget, isCustom} from '../utils';
|
|
11
12
|
|
|
@@ -43,6 +44,7 @@ if (typeof document !== 'undefined') {
|
|
|
43
44
|
}
|
|
44
45
|
|
|
45
46
|
setDefinitionId(definitionElement, target);
|
|
47
|
+
setDefinitonAriaLive(definitionElement, target);
|
|
46
48
|
setDefinitionPosition(definitionElement, target);
|
|
47
49
|
|
|
48
50
|
definitionElement.classList.toggle(openClass);
|
package/src/js/term/utils.ts
CHANGED
|
@@ -24,6 +24,14 @@ export function setDefinitionId(definitionElement: HTMLElement, termElement: HTM
|
|
|
24
24
|
definitionElement?.setAttribute('term-id', termId);
|
|
25
25
|
}
|
|
26
26
|
|
|
27
|
+
export function setDefinitonAriaLive(
|
|
28
|
+
definitionElement: HTMLElement,
|
|
29
|
+
termElement: HTMLElement,
|
|
30
|
+
): void {
|
|
31
|
+
const ariaLive = termElement.getAttribute('aria-live') || 'polite';
|
|
32
|
+
definitionElement?.setAttribute('aria-live', ariaLive);
|
|
33
|
+
}
|
|
34
|
+
|
|
27
35
|
export function setDefinitionPosition(
|
|
28
36
|
definitionElement: HTMLElement,
|
|
29
37
|
termElement: HTMLElement,
|
|
@@ -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
|
|
|
@@ -77,7 +77,7 @@ function unfoldIncludes(state: StateCore, path: string, options: Options) {
|
|
|
77
77
|
}
|
|
78
78
|
} catch (e) {
|
|
79
79
|
// @ts-ignore for some reason typescript fails here
|
|
80
|
-
const errPath = e.path
|
|
80
|
+
const errPath = e.path?.replace(root, '');
|
|
81
81
|
|
|
82
82
|
if (notFoundCb) {
|
|
83
83
|
notFoundCb(errPath);
|