skir 0.0.1 → 0.0.3
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/casing.d.ts +1 -4
- package/dist/casing.d.ts.map +1 -1
- package/dist/casing.js +0 -29
- package/dist/casing.js.map +1 -1
- package/dist/casing.test.js +2 -13
- package/dist/casing.test.js.map +1 -1
- package/dist/command_line_parser.d.ts +3 -3
- package/dist/command_line_parser.d.ts.map +1 -1
- package/dist/command_line_parser.js +35 -38
- package/dist/command_line_parser.js.map +1 -1
- package/dist/command_line_parser.test.js +73 -78
- package/dist/command_line_parser.test.js.map +1 -1
- package/dist/compatibility_checker.d.ts +9 -3
- package/dist/compatibility_checker.d.ts.map +1 -1
- package/dist/compatibility_checker.js +17 -4
- package/dist/compatibility_checker.js.map +1 -1
- package/dist/compatibility_checker.test.js +55 -1
- package/dist/compatibility_checker.test.js.map +1 -1
- package/dist/compiler.js +34 -17
- package/dist/compiler.js.map +1 -1
- package/dist/config.d.ts +5 -35
- package/dist/config.d.ts.map +1 -1
- package/dist/definition_finder.d.ts +1 -1
- package/dist/definition_finder.d.ts.map +1 -1
- package/dist/doc_comment_parser.d.ts +3 -0
- package/dist/doc_comment_parser.d.ts.map +1 -0
- package/dist/doc_comment_parser.js +223 -0
- package/dist/doc_comment_parser.js.map +1 -0
- package/dist/doc_comment_parser.test.d.ts +2 -0
- package/dist/doc_comment_parser.test.d.ts.map +1 -0
- package/dist/doc_comment_parser.test.js +496 -0
- package/dist/doc_comment_parser.test.js.map +1 -0
- package/dist/error_renderer.d.ts +1 -1
- package/dist/error_renderer.d.ts.map +1 -1
- package/dist/error_renderer.js +84 -65
- package/dist/error_renderer.js.map +1 -1
- package/dist/formatter.d.ts +15 -2
- package/dist/formatter.d.ts.map +1 -1
- package/dist/formatter.js +191 -234
- package/dist/formatter.js.map +1 -1
- package/dist/formatter.test.js +322 -88
- package/dist/formatter.test.js.map +1 -1
- package/dist/index.d.ts +1 -5
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -4
- package/dist/index.js.map +1 -1
- package/dist/language_server.js +1 -1
- package/dist/language_server.js.map +1 -1
- package/dist/literals.d.ts +1 -2
- package/dist/literals.d.ts.map +1 -1
- package/dist/literals.js +1 -12
- package/dist/literals.js.map +1 -1
- package/dist/literals.test.js +1 -4
- package/dist/literals.test.js.map +1 -1
- package/dist/module_set.d.ts +3 -7
- package/dist/module_set.d.ts.map +1 -1
- package/dist/module_set.js +205 -51
- package/dist/module_set.js.map +1 -1
- package/dist/module_set.test.js +595 -28
- package/dist/module_set.test.js.map +1 -1
- package/dist/parser.d.ts +3 -4
- package/dist/parser.d.ts.map +1 -1
- package/dist/parser.js +186 -92
- package/dist/parser.js.map +1 -1
- package/dist/parser.test.js +243 -15
- package/dist/parser.test.js.map +1 -1
- package/dist/project_initializer.d.ts +2 -0
- package/dist/project_initializer.d.ts.map +1 -0
- package/dist/project_initializer.js +30 -0
- package/dist/project_initializer.js.map +1 -0
- package/dist/snapshotter.d.ts +3 -0
- package/dist/snapshotter.d.ts.map +1 -1
- package/dist/snapshotter.js +43 -6
- package/dist/snapshotter.js.map +1 -1
- package/dist/tokenizer.d.ts +8 -2
- package/dist/tokenizer.d.ts.map +1 -1
- package/dist/tokenizer.js +26 -20
- package/dist/tokenizer.js.map +1 -1
- package/dist/tokenizer.test.js +285 -269
- package/dist/tokenizer.test.js.map +1 -1
- package/package.json +7 -5
- package/src/casing.ts +1 -36
- package/src/command_line_parser.ts +42 -48
- package/src/compatibility_checker.ts +29 -7
- package/src/compiler.ts +35 -18
- package/src/definition_finder.ts +1 -1
- package/src/doc_comment_parser.ts +251 -0
- package/src/error_renderer.ts +90 -66
- package/src/formatter.ts +249 -238
- package/src/index.ts +0 -6
- package/src/language_server.ts +8 -8
- package/src/literals.ts +5 -14
- package/src/module_set.ts +259 -79
- package/src/parser.ts +214 -98
- package/src/project_initializer.ts +39 -0
- package/src/snapshotter.ts +46 -5
- package/src/tokenizer.ts +47 -25
- package/dist/encoding.d.ts +0 -2
- package/dist/encoding.d.ts.map +0 -1
- package/dist/encoding.js +0 -38
- package/dist/encoding.js.map +0 -1
- package/dist/encoding.test.d.ts +0 -2
- package/dist/encoding.test.d.ts.map +0 -1
- package/dist/encoding.test.js +0 -23
- package/dist/encoding.test.js.map +0 -1
- package/dist/index.test.d.ts +0 -2
- package/dist/index.test.d.ts.map +0 -1
- package/dist/index.test.js +0 -14
- package/dist/index.test.js.map +0 -1
- package/dist/types.d.ts +0 -375
- package/dist/types.d.ts.map +0 -1
- package/dist/types.js +0 -2
- package/dist/types.js.map +0 -1
- package/src/encoding.ts +0 -32
- package/src/types.ts +0 -518
package/dist/formatter.js
CHANGED
|
@@ -1,263 +1,220 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
const
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
// Preserve comments before line break.
|
|
11
|
-
sink.write(" " + iterator.next().text);
|
|
12
|
-
}
|
|
1
|
+
/**
|
|
2
|
+
* Formats the given module and returns the new source code.
|
|
3
|
+
* Preserves token ordering.
|
|
4
|
+
*/
|
|
5
|
+
export function formatModule(moduleTokens) {
|
|
6
|
+
const tokens = moduleTokens.tokensWithComments;
|
|
7
|
+
const context = {
|
|
8
|
+
context: null,
|
|
9
|
+
indentStack: [{ indent: "" }],
|
|
13
10
|
};
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
}
|
|
11
|
+
let newSourceCode = "";
|
|
12
|
+
const textEdits = [];
|
|
13
|
+
const appendToken = (t) => {
|
|
14
|
+
const newToken = normalizeToken(t.text);
|
|
15
|
+
if (newToken !== t.text) {
|
|
16
|
+
textEdits.push({
|
|
17
|
+
oldStart: t.position,
|
|
18
|
+
oldEnd: t.position + t.text.length,
|
|
19
|
+
newText: newToken,
|
|
20
|
+
});
|
|
24
21
|
}
|
|
25
|
-
|
|
26
|
-
sink.write("\n" + " ".repeat(indentDepth));
|
|
27
|
-
}
|
|
28
|
-
};
|
|
29
|
-
const breakLineAndIndent = () => {
|
|
30
|
-
++indentDepth;
|
|
31
|
-
breakLine();
|
|
22
|
+
newSourceCode += newToken;
|
|
32
23
|
};
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
case "import":
|
|
44
|
-
case "method":
|
|
45
|
-
case "struct":
|
|
46
|
-
case "*":
|
|
47
|
-
case ":": {
|
|
48
|
-
sink.write(token.text + " ");
|
|
49
|
-
break;
|
|
50
|
-
}
|
|
51
|
-
case "from": {
|
|
52
|
-
sink.write(" from ");
|
|
53
|
-
break;
|
|
54
|
-
}
|
|
55
|
-
case "removed": {
|
|
56
|
-
if (iterator.hasNext() && iterator.peek().text === ";") {
|
|
57
|
-
sink.write("removed");
|
|
58
|
-
}
|
|
59
|
-
else {
|
|
60
|
-
sink.write("removed ");
|
|
61
|
-
}
|
|
62
|
-
break;
|
|
63
|
-
}
|
|
64
|
-
case "{": {
|
|
65
|
-
if (iterator.hasNext() && iterator.peek().text === "}") {
|
|
66
|
-
sink.write(inValue ? "{}" : " {}");
|
|
67
|
-
iterator.next();
|
|
68
|
-
if (!inValue) {
|
|
69
|
-
breakLine();
|
|
70
|
-
}
|
|
71
|
-
}
|
|
72
|
-
else {
|
|
73
|
-
sink.write(inValue ? "{" : " {");
|
|
74
|
-
breakLineAndIndent();
|
|
75
|
-
}
|
|
76
|
-
break;
|
|
77
|
-
}
|
|
78
|
-
case "{|": {
|
|
79
|
-
if (iterator.hasNext() && iterator.peek().text === "|}") {
|
|
80
|
-
sink.write(inValue ? "{||}" : " {||}");
|
|
81
|
-
iterator.next();
|
|
82
|
-
if (!inValue) {
|
|
83
|
-
breakLine();
|
|
84
|
-
}
|
|
85
|
-
}
|
|
86
|
-
else {
|
|
87
|
-
sink.write(inValue ? "{|" : " {|");
|
|
88
|
-
breakLineAndIndent();
|
|
89
|
-
}
|
|
90
|
-
break;
|
|
91
|
-
}
|
|
92
|
-
case "}": {
|
|
93
|
-
if (inValue) {
|
|
94
|
-
sink.maybeWriteTrailingComma();
|
|
95
|
-
breakLine();
|
|
96
|
-
}
|
|
97
|
-
unindent();
|
|
98
|
-
sink.write("}");
|
|
99
|
-
if (!inValue) {
|
|
100
|
-
breakLine();
|
|
101
|
-
}
|
|
24
|
+
appendToken(tokens[0]);
|
|
25
|
+
for (let i = 1; i < tokens.length; i++) {
|
|
26
|
+
const token = tokens[i - 1];
|
|
27
|
+
const next = tokens[i];
|
|
28
|
+
// Find the next non-comment token
|
|
29
|
+
let nextNonComment = next;
|
|
30
|
+
for (let j = i; j < tokens.length; j++) {
|
|
31
|
+
const token = tokens[j];
|
|
32
|
+
if (!isComment(token)) {
|
|
33
|
+
nextNonComment = token;
|
|
102
34
|
break;
|
|
103
35
|
}
|
|
104
|
-
case "|}": {
|
|
105
|
-
if (inValue) {
|
|
106
|
-
sink.maybeWriteTrailingComma();
|
|
107
|
-
breakLine();
|
|
108
|
-
}
|
|
109
|
-
unindent();
|
|
110
|
-
sink.write("|}");
|
|
111
|
-
if (!inValue) {
|
|
112
|
-
breakLine();
|
|
113
|
-
}
|
|
114
|
-
break;
|
|
115
|
-
}
|
|
116
|
-
case "[": {
|
|
117
|
-
if (iterator.hasNext() && iterator.peek().text === "]") {
|
|
118
|
-
sink.write("[]");
|
|
119
|
-
iterator.next();
|
|
120
|
-
}
|
|
121
|
-
else {
|
|
122
|
-
sink.write("[");
|
|
123
|
-
if (inValue) {
|
|
124
|
-
breakLineAndIndent();
|
|
125
|
-
}
|
|
126
|
-
}
|
|
127
|
-
break;
|
|
128
|
-
}
|
|
129
|
-
case "]": {
|
|
130
|
-
if (inValue) {
|
|
131
|
-
sink.maybeWriteTrailingComma();
|
|
132
|
-
breakLine();
|
|
133
|
-
unindent();
|
|
134
|
-
}
|
|
135
|
-
sink.write("]");
|
|
136
|
-
break;
|
|
137
|
-
}
|
|
138
|
-
case ";": {
|
|
139
|
-
sink.write(";");
|
|
140
|
-
inValue = false;
|
|
141
|
-
breakLine();
|
|
142
|
-
break;
|
|
143
|
-
}
|
|
144
|
-
case "=": {
|
|
145
|
-
inValue = true;
|
|
146
|
-
sink.write(" = ");
|
|
147
|
-
break;
|
|
148
|
-
}
|
|
149
|
-
case ",": {
|
|
150
|
-
if (inValue) {
|
|
151
|
-
sink.write(",");
|
|
152
|
-
breakLine();
|
|
153
|
-
}
|
|
154
|
-
else {
|
|
155
|
-
sink.write(", ");
|
|
156
|
-
}
|
|
157
|
-
break;
|
|
158
|
-
}
|
|
159
|
-
default: {
|
|
160
|
-
if (isComment(token.text)) {
|
|
161
|
-
sink.writeComment(token.text);
|
|
162
|
-
breakLine();
|
|
163
|
-
}
|
|
164
|
-
else if (token.text.startsWith("'")) {
|
|
165
|
-
const unescapedDoubleQuoteRegex = /(?:^|[^\\])(?:\\\\)*"/;
|
|
166
|
-
if (unescapedDoubleQuoteRegex.test(token.text)) {
|
|
167
|
-
sink.write(token.text);
|
|
168
|
-
}
|
|
169
|
-
else {
|
|
170
|
-
// Switch to double quotes.
|
|
171
|
-
const unquoted = token.text.slice(1, -1);
|
|
172
|
-
sink.write(`"${unquoted}"`);
|
|
173
|
-
}
|
|
174
|
-
}
|
|
175
|
-
else {
|
|
176
|
-
sink.write(token.text);
|
|
177
|
-
}
|
|
178
|
-
}
|
|
179
36
|
}
|
|
37
|
+
// Determine the text to add after 'token' and before 'next': a possible
|
|
38
|
+
// trailing comma followed by whitespace.
|
|
39
|
+
let newSeparator = shouldAddTrailingComma(token, nextNonComment, context)
|
|
40
|
+
? ","
|
|
41
|
+
: "";
|
|
42
|
+
newSeparator += getWhitespaceAfterToken(token, next, nextNonComment, context);
|
|
43
|
+
const topOfStack = context.indentStack.at(-1);
|
|
44
|
+
if (newSeparator.endsWith("\n")) {
|
|
45
|
+
newSeparator = newSeparator + topOfStack.indent;
|
|
46
|
+
}
|
|
47
|
+
const oldSeparator = moduleTokens.sourceCode.slice(token.position + token.text.length, next.position);
|
|
48
|
+
if (oldSeparator !== newSeparator) {
|
|
49
|
+
textEdits.push({
|
|
50
|
+
oldStart: token.position + token.text.length,
|
|
51
|
+
oldEnd: next.position,
|
|
52
|
+
newText: newSeparator,
|
|
53
|
+
});
|
|
54
|
+
}
|
|
55
|
+
newSourceCode += newSeparator;
|
|
56
|
+
appendToken(next);
|
|
180
57
|
}
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
}
|
|
185
|
-
return result;
|
|
58
|
+
return {
|
|
59
|
+
newSourceCode: newSourceCode,
|
|
60
|
+
textEdits: textEdits,
|
|
61
|
+
};
|
|
186
62
|
}
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
63
|
+
function getWhitespaceAfterToken(token, next,
|
|
64
|
+
// If 'next' is a comment, the next non-comment token after 'next'.
|
|
65
|
+
// Otherwise, 'next' itself.
|
|
66
|
+
nextNonComment, context) {
|
|
67
|
+
const topOfStack = () => context.indentStack.at(-1);
|
|
68
|
+
const indentUnit = " ";
|
|
69
|
+
if (token.text === "{" ||
|
|
70
|
+
token.text === "{|" ||
|
|
71
|
+
(context.context === "in-value" && token.text === "[")) {
|
|
72
|
+
context.indentStack.push({
|
|
73
|
+
indent: topOfStack().indent + indentUnit,
|
|
74
|
+
});
|
|
191
75
|
}
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
76
|
+
else if (token.text === "(" &&
|
|
77
|
+
["struct", "enum"].includes(nextNonComment.text)) {
|
|
78
|
+
context.indentStack.push({
|
|
79
|
+
indent: topOfStack().indent + indentUnit,
|
|
80
|
+
inlineRecordInBracket: true,
|
|
81
|
+
});
|
|
197
82
|
}
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
83
|
+
if (next.text === "}" ||
|
|
84
|
+
next.text === "|}" ||
|
|
85
|
+
(context.context === "in-value" && next.text === "]") ||
|
|
86
|
+
(next.text === ")" && topOfStack().inlineRecordInBracket)) {
|
|
87
|
+
context.indentStack.pop();
|
|
88
|
+
}
|
|
89
|
+
if (isComment(token)) {
|
|
90
|
+
return oneOrTwoLineBreaks(token, next);
|
|
91
|
+
}
|
|
92
|
+
else if (token.text !== "{" &&
|
|
93
|
+
next.text === "}" &&
|
|
94
|
+
context.context !== "in-value") {
|
|
95
|
+
return "\n";
|
|
96
|
+
}
|
|
97
|
+
else if (isComment(next)) {
|
|
98
|
+
return token.line.lineNumber === next.line.lineNumber
|
|
99
|
+
? " "
|
|
100
|
+
: oneOrTwoLineBreaks(token, next);
|
|
101
|
+
}
|
|
102
|
+
else if (next.text === "=") {
|
|
103
|
+
return " ";
|
|
104
|
+
}
|
|
105
|
+
else if ((token.text === "[" && next.text === "]") ||
|
|
106
|
+
(token.text === "{" && next.text === "}") ||
|
|
107
|
+
(token.text === "{|" && next.text === "|}")) {
|
|
108
|
+
return "";
|
|
109
|
+
}
|
|
110
|
+
else if (["{", "{|"].includes(token.text)) {
|
|
111
|
+
return "\n";
|
|
112
|
+
}
|
|
113
|
+
else if (token.text === "[") {
|
|
114
|
+
return context.context === "in-value" ? "\n" : "";
|
|
115
|
+
}
|
|
116
|
+
else if (["*", ":"].includes(token.text)) {
|
|
117
|
+
return " ";
|
|
118
|
+
}
|
|
119
|
+
else if (token.text === "(") {
|
|
120
|
+
return ["struct", "enum"].includes(next.text) ? "\n" : "";
|
|
121
|
+
}
|
|
122
|
+
else if (token.text === ")") {
|
|
123
|
+
return next.text === "{" ? " " : "";
|
|
124
|
+
}
|
|
125
|
+
else if (token.text === ";") {
|
|
126
|
+
context.context = null;
|
|
127
|
+
return oneOrTwoLineBreaks(token, next);
|
|
203
128
|
}
|
|
204
|
-
|
|
205
|
-
return
|
|
129
|
+
else if (token.text === "}") {
|
|
130
|
+
return [",", ";"].includes(next.text)
|
|
131
|
+
? ""
|
|
132
|
+
: oneOrTwoLineBreaks(token, next);
|
|
206
133
|
}
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
134
|
+
else if (token.text === ",") {
|
|
135
|
+
return context.context === "removed" ? " " : "\n";
|
|
136
|
+
}
|
|
137
|
+
else if (token.text === "=") {
|
|
138
|
+
if (context.context === "const") {
|
|
139
|
+
context.context = "in-value";
|
|
211
140
|
}
|
|
212
|
-
|
|
141
|
+
return " ";
|
|
142
|
+
}
|
|
143
|
+
else if (token.text === "const") {
|
|
144
|
+
context.context = "const";
|
|
145
|
+
return " ";
|
|
146
|
+
}
|
|
147
|
+
else if (token.text === "removed") {
|
|
148
|
+
context.context = "removed";
|
|
149
|
+
return next.text === ";" ? "" : " ";
|
|
150
|
+
}
|
|
151
|
+
else if (context.context === "in-value" &&
|
|
152
|
+
["]", "}", "|}"].includes(next.text)) {
|
|
153
|
+
return "\n";
|
|
154
|
+
}
|
|
155
|
+
else if (/^[A-Za-z]/.test(token.text) &&
|
|
156
|
+
!["(", ":", ",", ";", "|", ".", ")", "]", "?"].includes(next.text)) {
|
|
157
|
+
return " ";
|
|
158
|
+
}
|
|
159
|
+
else {
|
|
160
|
+
return "";
|
|
213
161
|
}
|
|
214
162
|
}
|
|
215
|
-
function
|
|
216
|
-
return
|
|
163
|
+
function shouldAddTrailingComma(first, nextNonComment, context) {
|
|
164
|
+
return (context.context === "in-value" &&
|
|
165
|
+
["]", "}", "|}"].includes(nextNonComment.text) &&
|
|
166
|
+
!["[", "{", "{|", ","].includes(first.text));
|
|
217
167
|
}
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
this.endPosition = 0;
|
|
168
|
+
function oneOrTwoLineBreaks(first, second) {
|
|
169
|
+
const firstLineNumber = first.line.lineNumber + first.text.split("\n").length - 1;
|
|
170
|
+
if (firstLineNumber < second.line.lineNumber - 1 &&
|
|
171
|
+
(isComment(second) || /^[A-Za-z]/.test(second.text))) {
|
|
172
|
+
return "\n\n";
|
|
224
173
|
}
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
const trimmed = text.trim();
|
|
228
|
-
if (trimmed && !isComment(trimmed)) {
|
|
229
|
-
this.endPosition = trimmed.endsWith(",")
|
|
230
|
-
? 0
|
|
231
|
-
: this.code.length + text.trimEnd().length;
|
|
232
|
-
}
|
|
233
|
-
this._code += text;
|
|
174
|
+
else {
|
|
175
|
+
return "\n";
|
|
234
176
|
}
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
177
|
+
}
|
|
178
|
+
function isComment(token) {
|
|
179
|
+
return token.text.startsWith("//") || token.text.startsWith("/*");
|
|
180
|
+
}
|
|
181
|
+
function normalizeToken(token) {
|
|
182
|
+
if (token.startsWith("//")) {
|
|
183
|
+
// Make sure there is a space between the double slash and the comment text.
|
|
184
|
+
if (token.startsWith("// ") ||
|
|
185
|
+
token.startsWith("/// ") ||
|
|
186
|
+
token === "//" ||
|
|
187
|
+
token === "///") {
|
|
188
|
+
return token;
|
|
189
|
+
}
|
|
190
|
+
else if (token.startsWith("///")) {
|
|
191
|
+
return "/// " + token.slice(3);
|
|
238
192
|
}
|
|
239
193
|
else {
|
|
240
|
-
|
|
194
|
+
return "// " + token.slice(2);
|
|
241
195
|
}
|
|
242
196
|
}
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
197
|
+
else if (token.startsWith("'")) {
|
|
198
|
+
// A single-quoted string
|
|
199
|
+
if (token.includes('"')) {
|
|
200
|
+
// Remove escape characters before single quotes.
|
|
201
|
+
return token.replace(/\\(?=(?:\\\\)*')/g, "");
|
|
246
202
|
}
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
this._code = this.code.slice(0, -suffix.length);
|
|
203
|
+
else {
|
|
204
|
+
// If the string does not contain double quotes, turn it into a
|
|
205
|
+
// double-quoted string for consistency
|
|
206
|
+
const content = token.slice(1, -1);
|
|
207
|
+
// Remove escape characters before double quotes.
|
|
208
|
+
return '"' + content.replace(/\\(?=(?:\\\\)*")/g, "") + '"';
|
|
254
209
|
}
|
|
255
210
|
}
|
|
256
|
-
|
|
257
|
-
|
|
211
|
+
else if (token.startsWith('"')) {
|
|
212
|
+
// A double-quoted string
|
|
213
|
+
// Remove escape characters before double quotes.
|
|
214
|
+
return token.replace(/\\(?=(?:\\\\)*')/g, "");
|
|
258
215
|
}
|
|
259
|
-
|
|
260
|
-
return
|
|
216
|
+
else {
|
|
217
|
+
return token;
|
|
261
218
|
}
|
|
262
219
|
}
|
|
263
220
|
//# sourceMappingURL=formatter.js.map
|
package/dist/formatter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formatter.js","sourceRoot":"","sources":["../src/formatter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"formatter.js","sourceRoot":"","sources":["../src/formatter.ts"],"names":[],"mappings":"AAgBA;;;GAGG;AACH,MAAM,UAAU,YAAY,CAAC,YAA0B;IACrD,MAAM,MAAM,GAAG,YAAY,CAAC,kBAAkB,CAAC;IAE/C,MAAM,OAAO,GAAY;QACvB,OAAO,EAAE,IAAI;QACb,WAAW,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;KAC9B,CAAC;IAEF,IAAI,aAAa,GAAG,EAAE,CAAC;IACvB,MAAM,SAAS,GAAe,EAAE,CAAC;IAEjC,MAAM,WAAW,GAAuB,CAAC,CAAQ,EAAE,EAAE;QACnD,MAAM,QAAQ,GAAG,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACxC,IAAI,QAAQ,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;YACxB,SAAS,CAAC,IAAI,CAAC;gBACb,QAAQ,EAAE,CAAC,CAAC,QAAQ;gBACpB,MAAM,EAAE,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM;gBAClC,OAAO,EAAE,QAAQ;aAClB,CAAC,CAAC;QACL,CAAC;QACD,aAAa,IAAI,QAAQ,CAAC;IAC5B,CAAC,CAAC;IACF,WAAW,CAAC,MAAM,CAAC,CAAC,CAAE,CAAC,CAAC;IAExB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACvC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAE,CAAC;QAC7B,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAE,CAAC;QAExB,kCAAkC;QAClC,IAAI,cAAc,GAAG,IAAI,CAAC;QAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACvC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAE,CAAC;YACzB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;gBACtB,cAAc,GAAG,KAAK,CAAC;gBACvB,MAAM;YACR,CAAC;QACH,CAAC;QAED,wEAAwE;QACxE,yCAAyC;QACzC,IAAI,YAAY,GAAG,sBAAsB,CAAC,KAAK,EAAE,cAAe,EAAE,OAAO,CAAC;YACxE,CAAC,CAAC,GAAG;YACL,CAAC,CAAC,EAAE,CAAC;QACP,YAAY,IAAI,uBAAuB,CACrC,KAAK,EACL,IAAI,EACJ,cAAe,EACf,OAAO,CACR,CAAC;QACF,MAAM,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC;QAC/C,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAChC,YAAY,GAAG,YAAY,GAAG,UAAU,CAAC,MAAM,CAAC;QAClD,CAAC;QAED,MAAM,YAAY,GAAG,YAAY,CAAC,UAAU,CAAC,KAAK,CAChD,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,EAClC,IAAI,CAAC,QAAQ,CACd,CAAC;QACF,IAAI,YAAY,KAAK,YAAY,EAAE,CAAC;YAClC,SAAS,CAAC,IAAI,CAAC;gBACb,QAAQ,EAAE,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM;gBAC5C,MAAM,EAAE,IAAI,CAAC,QAAQ;gBACrB,OAAO,EAAE,YAAY;aACtB,CAAC,CAAC;QACL,CAAC;QAED,aAAa,IAAI,YAAY,CAAC;QAE9B,WAAW,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC;IAED,OAAO;QACL,aAAa,EAAE,aAAa;QAC5B,SAAS,EAAE,SAAS;KACrB,CAAC;AACJ,CAAC;AAuBD,SAAS,uBAAuB,CAC9B,KAAY,EACZ,IAAW;AACX,mEAAmE;AACnE,4BAA4B;AAC5B,cAAqB,EACrB,OAAgB;IAEhB,MAAM,UAAU,GAA0B,GAAG,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC;IAE5E,MAAM,UAAU,GAAG,IAAI,CAAC;IACxB,IACE,KAAK,CAAC,IAAI,KAAK,GAAG;QAClB,KAAK,CAAC,IAAI,KAAK,IAAI;QACnB,CAAC,OAAO,CAAC,OAAO,KAAK,UAAU,IAAI,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,EACtD,CAAC;QACD,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC;YACvB,MAAM,EAAE,UAAU,EAAE,CAAC,MAAM,GAAG,UAAU;SACzC,CAAC,CAAC;IACL,CAAC;SAAM,IACL,KAAK,CAAC,IAAI,KAAK,GAAG;QAClB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,EAChD,CAAC;QACD,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC;YACvB,MAAM,EAAE,UAAU,EAAE,CAAC,MAAM,GAAG,UAAU;YACxC,qBAAqB,EAAE,IAAI;SAC5B,CAAC,CAAC;IACL,CAAC;IAED,IACE,IAAI,CAAC,IAAI,KAAK,GAAG;QACjB,IAAI,CAAC,IAAI,KAAK,IAAI;QAClB,CAAC,OAAO,CAAC,OAAO,KAAK,UAAU,IAAI,IAAI,CAAC,IAAI,KAAK,GAAG,CAAC;QACrD,CAAC,IAAI,CAAC,IAAI,KAAK,GAAG,IAAI,UAAU,EAAE,CAAC,qBAAqB,CAAC,EACzD,CAAC;QACD,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC;IAC5B,CAAC;IAED,IAAI,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;QACrB,OAAO,kBAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACzC,CAAC;SAAM,IACL,KAAK,CAAC,IAAI,KAAK,GAAG;QAClB,IAAI,CAAC,IAAI,KAAK,GAAG;QACjB,OAAO,CAAC,OAAO,KAAK,UAAU,EAC9B,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;SAAM,IAAI,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;QAC3B,OAAO,KAAK,CAAC,IAAI,CAAC,UAAU,KAAK,IAAI,CAAC,IAAI,CAAC,UAAU;YACnD,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,kBAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACtC,CAAC;SAAM,IAAI,IAAI,CAAC,IAAI,KAAK,GAAG,EAAE,CAAC;QAC7B,OAAO,GAAG,CAAC;IACb,CAAC;SAAM,IACL,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,IAAI,IAAI,CAAC,IAAI,KAAK,GAAG,CAAC;QACzC,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,IAAI,IAAI,CAAC,IAAI,KAAK,GAAG,CAAC;QACzC,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,EAC3C,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;SAAM,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5C,OAAO,IAAI,CAAC;IACd,CAAC;SAAM,IAAI,KAAK,CAAC,IAAI,KAAK,GAAG,EAAE,CAAC;QAC9B,OAAO,OAAO,CAAC,OAAO,KAAK,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;IACpD,CAAC;SAAM,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QAC3C,OAAO,GAAG,CAAC;IACb,CAAC;SAAM,IAAI,KAAK,CAAC,IAAI,KAAK,GAAG,EAAE,CAAC;QAC9B,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;IAC5D,CAAC;SAAM,IAAI,KAAK,CAAC,IAAI,KAAK,GAAG,EAAE,CAAC;QAC9B,OAAO,IAAI,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IACtC,CAAC;SAAM,IAAI,KAAK,CAAC,IAAI,KAAK,GAAG,EAAE,CAAC;QAC9B,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;QACvB,OAAO,kBAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACzC,CAAC;SAAM,IAAI,KAAK,CAAC,IAAI,KAAK,GAAG,EAAE,CAAC;QAC9B,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;YACnC,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,kBAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACtC,CAAC;SAAM,IAAI,KAAK,CAAC,IAAI,KAAK,GAAG,EAAE,CAAC;QAC9B,OAAO,OAAO,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;IACpD,CAAC;SAAM,IAAI,KAAK,CAAC,IAAI,KAAK,GAAG,EAAE,CAAC;QAC9B,IAAI,OAAO,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;YAChC,OAAO,CAAC,OAAO,GAAG,UAAU,CAAC;QAC/B,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;SAAM,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAClC,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC;QAC1B,OAAO,GAAG,CAAC;IACb,CAAC;SAAM,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACpC,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;QAC5B,OAAO,IAAI,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;IACtC,CAAC;SAAM,IACL,OAAO,CAAC,OAAO,KAAK,UAAU;QAC9B,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EACpC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;SAAM,IACL,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;QAC5B,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAClE,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;SAAM,CAAC;QACN,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,SAAS,sBAAsB,CAC7B,KAAY,EACZ,cAAqB,EACrB,OAAgB;IAEhB,OAAO,CACL,OAAO,CAAC,OAAO,KAAK,UAAU;QAC9B,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC;QAC9C,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAC5C,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAY,EAAE,MAAa;IACrD,MAAM,eAAe,GACnB,KAAK,CAAC,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;IAC5D,IACE,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC;QAC5C,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EACpD,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;SAAM,CAAC;QACN,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,SAAS,CAAC,KAAY;IAC7B,OAAO,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;AACpE,CAAC;AAED,SAAS,cAAc,CAAC,KAAa;IACnC,IAAI,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QAC3B,4EAA4E;QAC5E,IACE,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC;YACvB,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC;YACxB,KAAK,KAAK,IAAI;YACd,KAAK,KAAK,KAAK,EACf,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;aAAM,IAAI,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;YACnC,OAAO,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACjC,CAAC;aAAM,CAAC;YACN,OAAO,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;SAAM,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACjC,yBAAyB;QACzB,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACxB,iDAAiD;YACjD,OAAO,KAAK,CAAC,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC;QAChD,CAAC;aAAM,CAAC;YACN,+DAA+D;YAC/D,uCAAuC;YACvC,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YACnC,iDAAiD;YACjD,OAAO,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC;QAC9D,CAAC;IACH,CAAC;SAAM,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACjC,yBAAyB;QACzB,iDAAiD;QACjD,OAAO,KAAK,CAAC,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC;IAChD,CAAC;SAAM,CAAC;QACN,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}
|