@diplodoc/liquid 1.3.3 → 1.4.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/lib/conditions.js +7 -3
- package/lib/conditions.js.map +1 -1
- package/lib/index.js +2 -1
- package/lib/index.js.map +1 -1
- package/lib/legacyConditions.d.ts +2 -0
- package/lib/legacyConditions.js +135 -0
- package/lib/legacyConditions.js.map +1 -0
- package/lib/types.d.ts +1 -0
- package/package.json +4 -1
package/lib/conditions.js
CHANGED
|
@@ -7,6 +7,7 @@ exports.applyConditions = applyConditions;
|
|
|
7
7
|
const chalk_1 = __importDefault(require("chalk"));
|
|
8
8
|
const lexical_1 = require("./syntax/lexical");
|
|
9
9
|
const evaluate_1 = require("./syntax/evaluate");
|
|
10
|
+
const legacyConditions_1 = __importDefault(require("./legacyConditions"));
|
|
10
11
|
function resourcemap(source, ifTag, ifCon, sourcemap) {
|
|
11
12
|
const lines = sourcemap.lines(source);
|
|
12
13
|
const sourcel = sourcemap.location(ifTag.start + 1, ifTag.end - 1, lines);
|
|
@@ -32,8 +33,8 @@ function headLinebreak(raw) {
|
|
|
32
33
|
return match ? match[1] : '';
|
|
33
34
|
}
|
|
34
35
|
function tailLinebreak(raw) {
|
|
35
|
-
const match = raw.match(/.*}(\s*\n)$/);
|
|
36
|
-
return match ? match[1] : '';
|
|
36
|
+
const match = raw.match(/.*}(\s*\r?\n)$/);
|
|
37
|
+
return match ? match[1].replace(/\r\n/g, '\n') : '';
|
|
37
38
|
}
|
|
38
39
|
function trimResult(content, ifTag, ifCon) {
|
|
39
40
|
if (!ifCon) {
|
|
@@ -166,10 +167,13 @@ function inlineConditions(content, vars, ifTag) {
|
|
|
166
167
|
}
|
|
167
168
|
function applyConditions(input, vars, sourcemap) {
|
|
168
169
|
const { path } = this;
|
|
170
|
+
if (this.settings.legacyConditions) {
|
|
171
|
+
return legacyConditions_1.default.call(this, input, vars);
|
|
172
|
+
}
|
|
169
173
|
const tagStack = [];
|
|
170
174
|
// Consumes all between curly braces
|
|
171
175
|
// and all closest upon to first linebreak before and after braces.
|
|
172
|
-
const R_LIQUID = /((?:\n[\t ]*)?{%-?([\s\S]*?)-?%}(?:[\t ]*\n)?)/g;
|
|
176
|
+
const R_LIQUID = /((?:\r?\n[\t ]*)?{%-?([\s\S]*?)-?%}(?:[\t ]*\r?\n)?)/g;
|
|
173
177
|
let match;
|
|
174
178
|
while ((match = R_LIQUID.exec(input)) !== null) {
|
|
175
179
|
if (!match[1]) {
|
package/lib/conditions.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conditions.js","sourceRoot":"","sources":["../src/conditions.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"conditions.js","sourceRoot":"","sources":["../src/conditions.ts"],"names":[],"mappings":"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"}
|
package/lib/index.js
CHANGED
|
@@ -47,7 +47,8 @@ function liquidJson(json, vars) {
|
|
|
47
47
|
return (0, cloneDeepWith_1.default)(json, (value) => typeof value === 'string' ? liquidSnippet.call(this, value, vars) : undefined);
|
|
48
48
|
}
|
|
49
49
|
function liquidDocument(input, vars, sourcemap) {
|
|
50
|
-
const
|
|
50
|
+
const normalizedInput = input.replace(/\r\n/g, '\n');
|
|
51
|
+
const [frontMatter, strippedContent, rawFrontmatter] = (0, frontmatter_1.extractFrontMatter)(normalizedInput);
|
|
51
52
|
const liquidedFrontMatter = liquidJson.call(this, frontMatter, vars);
|
|
52
53
|
const composedFrontmatter = (0, frontmatter_1.composeFrontMatter)(liquidedFrontMatter);
|
|
53
54
|
if (sourcemap && rawFrontmatter.length) {
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAiBA,sCAsCC;AAED,gCAIC;AAED,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAiBA,sCAsCC;AAED,gCAIC;AAED,wCAsBC;AAED,sCAQC;AA5FD,yEAAiD;AAEjD,+CAAqE;AACrE,mDAAmD;AACnD,qCAAqC;AACrC,6CAA6C;AAC7C,mCAAkC;AAIlC,8CAAoD;AAA5C,oGAAA,QAAQ,OAAA;AAAE,mGAAA,OAAO,OAAA;AACzB,yCAAsC;AAA9B,sGAAA,SAAS,OAAA;AACjB,6CAAqE;AAA7D,iHAAA,kBAAkB,OAAA;AAAE,iHAAA,kBAAkB,OAAA;AAE9C,SAAgB,aAAa,CAEzB,KAAa,EACb,IAA6B,EAC7B,SAAqB;IAErB,MAAM,EACF,MAAM,GAAG,IAAI,EACb,UAAU,GAAG,IAAI,EACjB,aAAa,GAAG,IAAI,EACpB,gBAAgB,GAAG,KAAK,GAC3B,GAAG,IAAI,CAAC,QAAQ,CAAC;IAElB,MAAM,EAAC,QAAQ,EAAE,UAAU,EAAC,GAAG,iBAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEpD,IAAI,MAAM,GAAG,KAAK,CAAC;IAEnB,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACpB,MAAM,GAAG,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACpC,CAAC;IAED,IAAI,MAAM,EAAE,CAAC;QACT,MAAM,GAAG,oBAAW,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;IAC7D,CAAC;IAED,IAAI,UAAU,EAAE,CAAC;QACb,MAAM,GAAG,4BAAe,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;IACjE,CAAC;IAED,IAAI,aAAa,EAAE,CAAC;QAChB,MAAM,GAAG,kCAAkB,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IACzD,CAAC;IAED,IAAI,CAAC,gBAAgB,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QAClD,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;IAChC,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAgB,UAAU,CAAsB,IAAY,EAAE,IAA6B;IACvF,OAAO,IAAA,uBAAa,EAAC,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE,CACjC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAChF,CAAC;AACN,CAAC;AAED,SAAgB,cAAc,CAE1B,KAAa,EACb,IAA6B,EAC7B,SAAqB;IAErB,MAAM,eAAe,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAErD,MAAM,CAAC,WAAW,EAAE,eAAe,EAAE,cAAc,CAAC,GAAG,IAAA,gCAAkB,EAAC,eAAe,CAAC,CAAC;IAE3F,MAAM,mBAAmB,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;IACrE,MAAM,mBAAmB,GAAG,IAAA,gCAAkB,EAAC,mBAAmB,CAAC,CAAC;IAEpE,IAAI,SAAS,IAAI,cAAc,CAAC,MAAM,EAAE,CAAC;QACrC,SAAS,CAAC,KAAK,CAAC;YACZ,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,mBAAmB,CAAC,CAAC;SACtD,CAAC,CAAC;IACP,CAAC;IAED,MAAM,cAAc,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,eAAe,EAAE,IAAI,CAAC,CAAC;IAEvE,OAAO,mBAAmB,GAAG,cAAc,CAAC;AAChD,CAAC;AAED,SAAgB,aAAa,CACzB,MAAc,EACd,WAAoC,EAAE;IAEtC,OAAO;QACH,MAAM;QACN,QAAQ;KACX,CAAC;AACN,CAAC"}
|
|
@@ -0,0 +1,135 @@
|
|
|
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.default = legacyConditions;
|
|
7
|
+
const chalk_1 = __importDefault(require("chalk"));
|
|
8
|
+
const lexical_1 = require("./syntax/lexical");
|
|
9
|
+
const utils_1 = require("./utils");
|
|
10
|
+
const evaluate_1 = require("./syntax/evaluate");
|
|
11
|
+
function getElseProp({ elses }, propName, index = 0) {
|
|
12
|
+
if (!elses.length || index >= elses.length) {
|
|
13
|
+
return undefined;
|
|
14
|
+
}
|
|
15
|
+
return elses[index][propName];
|
|
16
|
+
}
|
|
17
|
+
function inlineConditions({ ifTag, vars, content, match, lastIndex }) {
|
|
18
|
+
let res = '';
|
|
19
|
+
if (evaluate_1.evaluate.call(this, ifTag.condition, vars)) {
|
|
20
|
+
const ifRawLastIndex = ifTag.startPos + ifTag.ifRaw.length;
|
|
21
|
+
const contentLastIndex = getElseProp(ifTag, 'startPos') || match.index;
|
|
22
|
+
res = content.substring(ifRawLastIndex, contentLastIndex);
|
|
23
|
+
}
|
|
24
|
+
else {
|
|
25
|
+
ifTag.elses.some(({ condition, startPos, raw }, index) => {
|
|
26
|
+
const isTruthy = !condition || evaluate_1.evaluate.call(this, condition, vars);
|
|
27
|
+
if (isTruthy) {
|
|
28
|
+
const elseRawLastIndex = startPos + raw.length;
|
|
29
|
+
const contentLastIndex = getElseProp(ifTag, 'startPos', index + 1) || match.index;
|
|
30
|
+
res = content.substring(elseRawLastIndex, contentLastIndex);
|
|
31
|
+
return true;
|
|
32
|
+
}
|
|
33
|
+
return false;
|
|
34
|
+
});
|
|
35
|
+
}
|
|
36
|
+
const preparedLeftContent = (0, utils_1.getPreparedLeftContent)({
|
|
37
|
+
content,
|
|
38
|
+
tagStartPos: ifTag.startPos,
|
|
39
|
+
tagContent: res,
|
|
40
|
+
});
|
|
41
|
+
let shift = 0;
|
|
42
|
+
if (res === '' &&
|
|
43
|
+
preparedLeftContent[preparedLeftContent.length - 1] === '\n' &&
|
|
44
|
+
content[lastIndex] === '\n') {
|
|
45
|
+
shift = 1;
|
|
46
|
+
}
|
|
47
|
+
if (res !== '') {
|
|
48
|
+
if (res[0] === '\n') {
|
|
49
|
+
res = res.substring(1);
|
|
50
|
+
}
|
|
51
|
+
res = (0, utils_1.removeIndentBlock)(res);
|
|
52
|
+
if (res[res.length - 1] === '\n') {
|
|
53
|
+
res = res.slice(0, -1);
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
const leftPart = preparedLeftContent + res;
|
|
57
|
+
return {
|
|
58
|
+
result: leftPart + content.substring(lastIndex + shift),
|
|
59
|
+
idx: leftPart.length,
|
|
60
|
+
};
|
|
61
|
+
}
|
|
62
|
+
function legacyConditions(originInput, vars) {
|
|
63
|
+
const { path } = this;
|
|
64
|
+
const R_LIQUID = /({%-?([\s\S]*?)-?%})/g;
|
|
65
|
+
let match;
|
|
66
|
+
const tagStack = [];
|
|
67
|
+
let input = originInput;
|
|
68
|
+
while ((match = R_LIQUID.exec(input)) !== null) {
|
|
69
|
+
if (!match[1]) {
|
|
70
|
+
continue;
|
|
71
|
+
}
|
|
72
|
+
const tagMatch = match[2].trim().match(lexical_1.tagLine);
|
|
73
|
+
if (!tagMatch) {
|
|
74
|
+
continue;
|
|
75
|
+
}
|
|
76
|
+
const [type, args] = tagMatch.slice(1);
|
|
77
|
+
switch (type) {
|
|
78
|
+
case 'if':
|
|
79
|
+
tagStack.push({
|
|
80
|
+
condition: args,
|
|
81
|
+
startPos: match.index,
|
|
82
|
+
ifRaw: match[1],
|
|
83
|
+
elses: [],
|
|
84
|
+
});
|
|
85
|
+
break;
|
|
86
|
+
case 'else': {
|
|
87
|
+
const currentTag = tagStack[tagStack.length - 1];
|
|
88
|
+
if (!currentTag) {
|
|
89
|
+
this.logger.error(`Else block must have a preceding if block${path ? ` in ${chalk_1.default.bold(path)}` : ''}`);
|
|
90
|
+
break;
|
|
91
|
+
}
|
|
92
|
+
currentTag.elses.push({
|
|
93
|
+
startPos: match.index,
|
|
94
|
+
raw: match[1],
|
|
95
|
+
});
|
|
96
|
+
break;
|
|
97
|
+
}
|
|
98
|
+
case 'elsif': {
|
|
99
|
+
const currentTag = tagStack[tagStack.length - 1];
|
|
100
|
+
if (!currentTag) {
|
|
101
|
+
this.logger.error(`Elsif block must have a preceding if block${path ? ` in ${chalk_1.default.bold(path)}` : ''}`);
|
|
102
|
+
break;
|
|
103
|
+
}
|
|
104
|
+
currentTag.elses.push({
|
|
105
|
+
condition: args,
|
|
106
|
+
startPos: match.index,
|
|
107
|
+
raw: match[1],
|
|
108
|
+
});
|
|
109
|
+
break;
|
|
110
|
+
}
|
|
111
|
+
case 'endif': {
|
|
112
|
+
const ifTag = tagStack.pop();
|
|
113
|
+
if (!ifTag) {
|
|
114
|
+
this.logger.error(`If block must be opened before close${path ? ` in ${chalk_1.default.bold(path)}` : ''}`);
|
|
115
|
+
break;
|
|
116
|
+
}
|
|
117
|
+
const { idx, result } = inlineConditions.call(this, {
|
|
118
|
+
ifTag,
|
|
119
|
+
vars,
|
|
120
|
+
content: input,
|
|
121
|
+
match,
|
|
122
|
+
lastIndex: R_LIQUID.lastIndex,
|
|
123
|
+
});
|
|
124
|
+
R_LIQUID.lastIndex = idx;
|
|
125
|
+
input = result;
|
|
126
|
+
break;
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
if (tagStack.length !== 0) {
|
|
131
|
+
this.logger.error(`Condition block must be closed${path ? ` in ${chalk_1.default.bold(path)}` : ''}`);
|
|
132
|
+
}
|
|
133
|
+
return input;
|
|
134
|
+
}
|
|
135
|
+
//# sourceMappingURL=legacyConditions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"legacyConditions.js","sourceRoot":"","sources":["../src/legacyConditions.ts"],"names":[],"mappings":"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"}
|
package/lib/types.d.ts
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@diplodoc/liquid",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.4.0",
|
|
4
4
|
"description": "A simple transformer of text in YFM (Yandex Flavored Markdown) to HTML",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"docs",
|
|
@@ -11,6 +11,9 @@
|
|
|
11
11
|
"tools",
|
|
12
12
|
"generator"
|
|
13
13
|
],
|
|
14
|
+
"engines": {
|
|
15
|
+
"npm": ">=11.5.1"
|
|
16
|
+
},
|
|
14
17
|
"homepage": "https://github.com/diplodoc-platform/liquid#readme",
|
|
15
18
|
"bugs": {
|
|
16
19
|
"url": "https://github.com/diplodoc-platform/liquid/issues"
|