@ben_12/eslint-plugin-dprint 0.7.0 → 0.8.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/README.md +54 -14
- package/dist/lib/configs/disable-conflict-rules.d.ts +1 -1
- package/dist/lib/configs/disable-conflict-rules.js +2 -2
- package/dist/lib/configs/disable-conflict-rules.js.map +1 -1
- package/dist/lib/configs/recommended.d.ts +26 -2
- package/dist/lib/configs/recommended.js +27 -3
- package/dist/lib/configs/recommended.js.map +1 -1
- package/dist/lib/dprint/dockerfile-config-schema.json +52 -0
- package/dist/lib/dprint/dprint.js +125 -0
- package/dist/lib/dprint/dprint.js.map +1 -0
- package/dist/lib/dprint/json-config-schema.json +158 -0
- package/dist/lib/dprint/markdown-config-schema.json +167 -0
- package/dist/lib/dprint/toml-config-schema.json +125 -0
- package/dist/lib/dprint/{config-schema.json → ts-config-schema.json} +1068 -466
- package/dist/lib/index.js +7 -5
- package/dist/lib/index.js.map +1 -1
- package/dist/lib/rules/dprint.d.ts +4 -5
- package/dist/lib/rules/dprint.js +193 -123
- package/dist/lib/rules/dprint.js.map +1 -1
- package/dist/lib/util/difference-iterator.d.ts +1 -1
- package/dist/lib/util/difference-iterator.js +6 -6
- package/dist/lib/util/difference-iterator.js.map +1 -1
- package/package.json +32 -8
- package/dist/lib/dprint/typescript.js +0 -166
- package/dist/lib/dprint/typescript.js.map +0 -1
- /package/dist/lib/dprint/{typescript.d.ts → dprint.d.ts} +0 -0
package/dist/lib/index.js
CHANGED
|
@@ -5,11 +5,13 @@ const recommended_1 = require("./configs/recommended");
|
|
|
5
5
|
const dprint_1 = require("./rules/dprint");
|
|
6
6
|
module.exports = {
|
|
7
7
|
configs: {
|
|
8
|
-
"disable-conflict-rules": disable_conflict_rules_1.
|
|
9
|
-
recommended: recommended_1.
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
8
|
+
"disable-typescript-conflict-rules": disable_conflict_rules_1.disableTypescriptConflictRules,
|
|
9
|
+
"dockerfile-recommended": recommended_1.dockerfileRecommended,
|
|
10
|
+
"json-recommended": recommended_1.jsonRecommended,
|
|
11
|
+
"markdown-recommended": recommended_1.markdownRecommended,
|
|
12
|
+
"toml-recommended": recommended_1.tomlRecommended,
|
|
13
|
+
"typescript-recommended": recommended_1.typescriptRecommended,
|
|
13
14
|
},
|
|
15
|
+
rules: dprint_1.dprintRules,
|
|
14
16
|
};
|
|
15
17
|
//# sourceMappingURL=index.js.map
|
package/dist/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/index.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/index.ts"],"names":[],"mappings":";;AAAA,6EAAiF;AACjF,uDAM8B;AAC9B,2CAA4C;AAE5C,MAAM,CAAC,OAAO,GAAG;IACb,OAAO,EAAE;QACL,mCAAmC,EAAE,uDAA8B;QACnE,wBAAwB,EAAE,mCAAqB;QAC/C,kBAAkB,EAAE,6BAAe;QACnC,sBAAsB,EAAE,iCAAmB;QAC3C,kBAAkB,EAAE,6BAAe;QACnC,wBAAwB,EAAE,mCAAqB;KAClD;IACD,KAAK,EAAE,oBAAW;CACrB,CAAA"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export declare const
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
}[], ESLintUtils.RuleListener>;
|
|
1
|
+
import { Rule } from "eslint";
|
|
2
|
+
export declare const dprintRules: {
|
|
3
|
+
[name: string]: Rule.RuleModule;
|
|
4
|
+
};
|
package/dist/lib/rules/dprint.js
CHANGED
|
@@ -3,14 +3,36 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.
|
|
7
|
-
const utils_1 = require("@typescript-eslint/utils");
|
|
6
|
+
exports.dprintRules = void 0;
|
|
8
7
|
const path_1 = __importDefault(require("path"));
|
|
9
|
-
const
|
|
10
|
-
const
|
|
8
|
+
const dockerfile_config_schema_json_1 = __importDefault(require("../dprint/dockerfile-config-schema.json"));
|
|
9
|
+
const dprint_1 = require("../dprint/dprint");
|
|
10
|
+
const json_config_schema_json_1 = __importDefault(require("../dprint/json-config-schema.json"));
|
|
11
|
+
const markdown_config_schema_json_1 = __importDefault(require("../dprint/markdown-config-schema.json"));
|
|
12
|
+
const toml_config_schema_json_1 = __importDefault(require("../dprint/toml-config-schema.json"));
|
|
13
|
+
const ts_config_schema_json_1 = __importDefault(require("../dprint/ts-config-schema.json"));
|
|
11
14
|
const difference_iterator_1 = require("../util/difference-iterator");
|
|
12
15
|
const predicate_1 = require("../util/predicate");
|
|
13
|
-
const
|
|
16
|
+
const configSchemas = [
|
|
17
|
+
{ name: "dockerfile", configSchema: dockerfile_config_schema_json_1.default },
|
|
18
|
+
{ name: "json", configSchema: json_config_schema_json_1.default },
|
|
19
|
+
{ name: "markdown", configSchema: markdown_config_schema_json_1.default },
|
|
20
|
+
{ name: "toml", configSchema: toml_config_schema_json_1.default },
|
|
21
|
+
{ name: "typescript", configSchema: ts_config_schema_json_1.default },
|
|
22
|
+
];
|
|
23
|
+
const messages = {
|
|
24
|
+
requireLinebreak: "Require line break(s).",
|
|
25
|
+
extraLinebreak: "Extra line break(s).",
|
|
26
|
+
requireWhitespace: "Require whitespace(s).",
|
|
27
|
+
extraWhitespace: "Extra whitespace(s).",
|
|
28
|
+
requireCode: "Require code {{text}}.",
|
|
29
|
+
extraCode: "Extra code {{text}}.",
|
|
30
|
+
replaceWhitespace: "Require tweaking whitespace(s).",
|
|
31
|
+
replaceCode: "Require code {{newText}} instead of {{oldText}}.",
|
|
32
|
+
moveCodeToNextLine: "Move code {{text}} to the next line.",
|
|
33
|
+
moveCodeToPrevLine: "Move code {{text}} to the previous line.",
|
|
34
|
+
moveCode: "Require tweaking whitespaces around code {{text}}.",
|
|
35
|
+
};
|
|
14
36
|
/**
|
|
15
37
|
* Count line breaks in the head whitespace sequence.
|
|
16
38
|
* @param s The text to check.
|
|
@@ -27,63 +49,99 @@ function getLineNumberOfFirstCode(s) {
|
|
|
27
49
|
}
|
|
28
50
|
return count;
|
|
29
51
|
}
|
|
52
|
+
function isAddDiff(d) {
|
|
53
|
+
return d.type === "add";
|
|
54
|
+
}
|
|
55
|
+
function isRemoveDiff(d) {
|
|
56
|
+
return d.type === "remove";
|
|
57
|
+
}
|
|
30
58
|
/**
|
|
31
|
-
* Create the report message of a given difference.
|
|
32
|
-
* @param d The difference object to create message.
|
|
59
|
+
* Create the report message of a given add difference.
|
|
60
|
+
* @param d The add difference object to create message.
|
|
33
61
|
*/
|
|
34
|
-
function
|
|
35
|
-
if (d.
|
|
36
|
-
if ((0, predicate_1.isWhitespace)(d.newText)) {
|
|
37
|
-
return {
|
|
38
|
-
messageId: (0, predicate_1.hasLinebreak)(d.newText)
|
|
39
|
-
? "requireLinebreak"
|
|
40
|
-
: "requireWhitespace",
|
|
41
|
-
data: {},
|
|
42
|
-
};
|
|
43
|
-
}
|
|
62
|
+
function createAddMessage(d) {
|
|
63
|
+
if ((0, predicate_1.isWhitespace)(d.newText)) {
|
|
44
64
|
return {
|
|
45
|
-
messageId:
|
|
46
|
-
|
|
65
|
+
messageId: (0, predicate_1.hasLinebreak)(d.newText)
|
|
66
|
+
? "requireLinebreak"
|
|
67
|
+
: "requireWhitespace",
|
|
68
|
+
data: {},
|
|
47
69
|
};
|
|
48
70
|
}
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
71
|
+
return {
|
|
72
|
+
messageId: "requireCode",
|
|
73
|
+
data: { text: JSON.stringify(d.newText.trim()) },
|
|
74
|
+
};
|
|
75
|
+
}
|
|
76
|
+
/**
|
|
77
|
+
* Create the report message of a given remove difference.
|
|
78
|
+
* @param d The remove difference object to create message.
|
|
79
|
+
*/
|
|
80
|
+
function createRemoveMessage(d) {
|
|
81
|
+
if ((0, predicate_1.isWhitespace)(d.oldText)) {
|
|
58
82
|
return {
|
|
59
|
-
messageId:
|
|
60
|
-
|
|
83
|
+
messageId: (0, predicate_1.hasLinebreak)(d.oldText)
|
|
84
|
+
? "extraLinebreak"
|
|
85
|
+
: "extraWhitespace",
|
|
86
|
+
data: {},
|
|
61
87
|
};
|
|
62
88
|
}
|
|
89
|
+
return {
|
|
90
|
+
messageId: "extraCode",
|
|
91
|
+
data: { text: JSON.stringify(d.oldText.trim()) },
|
|
92
|
+
};
|
|
93
|
+
}
|
|
94
|
+
/**
|
|
95
|
+
* Create the report message of a given replace difference if is whitespace difference.
|
|
96
|
+
* @param d The replace difference object to create message.
|
|
97
|
+
*/
|
|
98
|
+
function createWhitespaceMessage(d) {
|
|
63
99
|
if ((0, predicate_1.isWhitespace)(d.oldText) && (0, predicate_1.isWhitespace)(d.newText)) {
|
|
64
100
|
const oldHasLinebreak = (0, predicate_1.hasLinebreak)(d.oldText);
|
|
65
101
|
const newHasLinebreak = (0, predicate_1.hasLinebreak)(d.newText);
|
|
102
|
+
if (!oldHasLinebreak && newHasLinebreak) {
|
|
103
|
+
return {
|
|
104
|
+
messageId: "requireLinebreak",
|
|
105
|
+
data: {},
|
|
106
|
+
};
|
|
107
|
+
}
|
|
66
108
|
return {
|
|
67
|
-
messageId:
|
|
68
|
-
? "
|
|
69
|
-
:
|
|
70
|
-
? "extraLinebreak"
|
|
71
|
-
: "replaceWhitespace",
|
|
109
|
+
messageId: oldHasLinebreak && !newHasLinebreak
|
|
110
|
+
? "extraLinebreak"
|
|
111
|
+
: "replaceWhitespace",
|
|
72
112
|
data: {},
|
|
73
113
|
};
|
|
74
114
|
}
|
|
115
|
+
return false;
|
|
116
|
+
}
|
|
117
|
+
/**
|
|
118
|
+
* Create the report message of a given replace difference if is moved code difference.
|
|
119
|
+
* @param d The replace difference object to create message.
|
|
120
|
+
*/
|
|
121
|
+
function createMoveMessage(d) {
|
|
75
122
|
if (d.oldText.trim() === d.newText.trim()) {
|
|
76
123
|
const oldLine = getLineNumberOfFirstCode(d.oldText);
|
|
77
124
|
const newLine = getLineNumberOfFirstCode(d.newText);
|
|
125
|
+
if (newLine > oldLine) {
|
|
126
|
+
return {
|
|
127
|
+
messageId: "moveCodeToNextLine",
|
|
128
|
+
data: { text: JSON.stringify(d.oldText.trim()) },
|
|
129
|
+
};
|
|
130
|
+
}
|
|
78
131
|
return {
|
|
79
|
-
messageId: newLine
|
|
80
|
-
? "
|
|
81
|
-
:
|
|
82
|
-
? "moveCodeToPrevLine"
|
|
83
|
-
: "moveCode",
|
|
132
|
+
messageId: newLine < oldLine
|
|
133
|
+
? "moveCodeToPrevLine"
|
|
134
|
+
: "moveCode",
|
|
84
135
|
data: { text: JSON.stringify(d.oldText.trim()) },
|
|
85
136
|
};
|
|
86
137
|
}
|
|
138
|
+
return false;
|
|
139
|
+
}
|
|
140
|
+
/**
|
|
141
|
+
* Create the report message of a given replace difference.
|
|
142
|
+
* @param d The replace difference object to create message.
|
|
143
|
+
*/
|
|
144
|
+
function createRepaceMessage(d) {
|
|
87
145
|
return {
|
|
88
146
|
messageId: "replaceCode",
|
|
89
147
|
data: {
|
|
@@ -92,90 +150,102 @@ function createMessage(d) {
|
|
|
92
150
|
},
|
|
93
151
|
};
|
|
94
152
|
}
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
153
|
+
/**
|
|
154
|
+
* Create the report message of a given difference.
|
|
155
|
+
* @param d The difference object to create message.
|
|
156
|
+
*/
|
|
157
|
+
function createMessage(d) {
|
|
158
|
+
if (isAddDiff(d)) {
|
|
159
|
+
return createAddMessage(d);
|
|
160
|
+
}
|
|
161
|
+
if (isRemoveDiff(d)) {
|
|
162
|
+
return createRemoveMessage(d);
|
|
163
|
+
}
|
|
164
|
+
return createWhitespaceMessage(d) ||
|
|
165
|
+
createMoveMessage(d) ||
|
|
166
|
+
createRepaceMessage(d);
|
|
167
|
+
}
|
|
168
|
+
const defaultOptions = [{ configFile: "dprint.json", config: {} }];
|
|
169
|
+
exports.dprintRules = configSchemas.map((config) => ({
|
|
170
|
+
[config.name]: {
|
|
171
|
+
meta: {
|
|
172
|
+
docs: {
|
|
173
|
+
description: `Format ${config.name} with dprint`,
|
|
174
|
+
url: `https://github.com/ben12/eslint-plugin-dprint/blob/master/docs/rules/dprint-${config.name}.md`,
|
|
175
|
+
recommended: true,
|
|
176
|
+
},
|
|
177
|
+
fixable: "code",
|
|
178
|
+
messages,
|
|
179
|
+
schema: {
|
|
180
|
+
definitions: config.configSchema.definitions,
|
|
181
|
+
type: "array",
|
|
182
|
+
items: [{
|
|
183
|
+
type: "object",
|
|
184
|
+
properties: {
|
|
185
|
+
configFile: {
|
|
186
|
+
type: "string",
|
|
187
|
+
default: "dprint.json",
|
|
188
|
+
description: "dprint configuration file (default 'dprint.json')",
|
|
189
|
+
},
|
|
190
|
+
config: {
|
|
191
|
+
type: "object",
|
|
192
|
+
properties: config.configSchema.properties,
|
|
193
|
+
additionalProperties: false,
|
|
194
|
+
},
|
|
126
195
|
},
|
|
127
|
-
|
|
128
|
-
},
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
196
|
+
additionalProperties: false,
|
|
197
|
+
}],
|
|
198
|
+
additionalItems: false,
|
|
199
|
+
},
|
|
200
|
+
type: "layout",
|
|
132
201
|
},
|
|
133
|
-
|
|
202
|
+
create: (context) => ({
|
|
203
|
+
Program() {
|
|
204
|
+
var _a, _b, _c, _d;
|
|
205
|
+
const sourceCode = (_a = context.sourceCode) !== null && _a !== void 0 ? _a : context.getSourceCode();
|
|
206
|
+
const filePath = (_b = context.filename) !== null && _b !== void 0 ? _b : context.getFilename();
|
|
207
|
+
const fileText = sourceCode.getText();
|
|
208
|
+
const options = (_c = context.options[0]) !== null && _c !== void 0 ? _c : defaultOptions;
|
|
209
|
+
const configFile = (_d = options.configFile) !== null && _d !== void 0 ? _d : "dprint.json";
|
|
210
|
+
const config = options.config || {};
|
|
211
|
+
// Needs an absolute path
|
|
212
|
+
if (!filePath || !path_1.default.isAbsolute(filePath)) {
|
|
213
|
+
return;
|
|
214
|
+
}
|
|
215
|
+
// Does format
|
|
216
|
+
const formattedText = (0, dprint_1.format)(configFile, config, filePath, fileText);
|
|
217
|
+
if (typeof formattedText !== "string") {
|
|
218
|
+
return;
|
|
219
|
+
}
|
|
220
|
+
generateLintReports(fileText, formattedText, sourceCode, context);
|
|
221
|
+
},
|
|
222
|
+
}),
|
|
134
223
|
},
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
context.report({
|
|
163
|
-
loc,
|
|
164
|
-
messageId,
|
|
165
|
-
data,
|
|
166
|
-
fix(fixer) {
|
|
167
|
-
const range = d.range;
|
|
168
|
-
if (d.type === "add") {
|
|
169
|
-
return fixer.insertTextAfterRange(range, d.newText);
|
|
170
|
-
}
|
|
171
|
-
if (d.type === "remove") {
|
|
172
|
-
return fixer.removeRange(range);
|
|
173
|
-
}
|
|
174
|
-
return fixer.replaceTextRange(range, d.newText);
|
|
175
|
-
},
|
|
176
|
-
});
|
|
177
|
-
}
|
|
178
|
-
},
|
|
179
|
-
}),
|
|
180
|
-
});
|
|
224
|
+
})).reduce((r1, r2) => (Object.assign(Object.assign({}, r1), r2)));
|
|
225
|
+
function generateLintReports(fileText, formattedText, sourceCode, context) {
|
|
226
|
+
for (const d of difference_iterator_1.DifferenceIterator.iterate(fileText, formattedText)) {
|
|
227
|
+
const loc = d.type === "add"
|
|
228
|
+
? sourceCode.getLocFromIndex(d.range[0])
|
|
229
|
+
: {
|
|
230
|
+
start: sourceCode.getLocFromIndex(d.range[0]),
|
|
231
|
+
end: sourceCode.getLocFromIndex(d.range[1]),
|
|
232
|
+
};
|
|
233
|
+
const { messageId, data } = createMessage(d);
|
|
234
|
+
context.report({
|
|
235
|
+
loc,
|
|
236
|
+
messageId,
|
|
237
|
+
data,
|
|
238
|
+
fix(fixer) {
|
|
239
|
+
const range = d.range;
|
|
240
|
+
if (d.type === "add") {
|
|
241
|
+
return fixer.insertTextAfterRange(range, d.newText);
|
|
242
|
+
}
|
|
243
|
+
if (d.type === "remove") {
|
|
244
|
+
return fixer.removeRange(range);
|
|
245
|
+
}
|
|
246
|
+
return fixer.replaceTextRange(range, d.newText);
|
|
247
|
+
},
|
|
248
|
+
});
|
|
249
|
+
}
|
|
250
|
+
}
|
|
181
251
|
//# sourceMappingURL=dprint.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dprint.js","sourceRoot":"","sources":["../../../lib/rules/dprint.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"dprint.js","sourceRoot":"","sources":["../../../lib/rules/dprint.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,7 +23,7 @@ export type ReplaceDiff = {
|
|
|
23
23
|
export type Diff = AddDiff | RemoveDiff | ReplaceDiff;
|
|
24
24
|
/** The defference iterator. */
|
|
25
25
|
export declare class DifferenceIterator {
|
|
26
|
-
static iterate(
|
|
26
|
+
static iterate(oldStr: string, newStr: string): Generator<Diff>;
|
|
27
27
|
/** All changes that the `diffChars()` function detected. */
|
|
28
28
|
private readonly changes;
|
|
29
29
|
/** The current index in `this.changes`. */
|
|
@@ -5,16 +5,16 @@ const diff_1 = require("diff");
|
|
|
5
5
|
const predicate_1 = require("./predicate");
|
|
6
6
|
/** The defference iterator. */
|
|
7
7
|
class DifferenceIterator {
|
|
8
|
-
static iterate(
|
|
9
|
-
return new DifferenceIterator(
|
|
8
|
+
static iterate(oldStr, newStr) {
|
|
9
|
+
return new DifferenceIterator(oldStr, newStr).iterate();
|
|
10
10
|
}
|
|
11
11
|
/** Initialize this instance. */
|
|
12
|
-
constructor(
|
|
12
|
+
constructor(oldStr, newStr) {
|
|
13
13
|
/** The current index in `this.changes`. */
|
|
14
14
|
this.i = 0;
|
|
15
15
|
/** The current index in the original source code text. */
|
|
16
16
|
this.loc = 0;
|
|
17
|
-
this.changes = (0, diff_1.diffChars)(
|
|
17
|
+
this.changes = (0, diff_1.diffChars)(oldStr, newStr);
|
|
18
18
|
}
|
|
19
19
|
/** Iterate differences. */
|
|
20
20
|
*iterate() {
|
|
@@ -38,7 +38,7 @@ class DifferenceIterator {
|
|
|
38
38
|
const next1 = this.changeAt(this.i + 1);
|
|
39
39
|
const next2 = this.changeAt(this.i + 2);
|
|
40
40
|
// Merge the sequence "added → removed" as a replacement.
|
|
41
|
-
if (next1
|
|
41
|
+
if (next1 === null || next1 === void 0 ? void 0 : next1.removed) {
|
|
42
42
|
return this.newReplacedDiff(2, next1.value, current.value);
|
|
43
43
|
}
|
|
44
44
|
// Merge the following sequences as a replacement:
|
|
@@ -70,7 +70,7 @@ class DifferenceIterator {
|
|
|
70
70
|
const next1 = this.changeAt(this.i + 1);
|
|
71
71
|
const next2 = this.changeAt(this.i + 2);
|
|
72
72
|
// Merge the sequence "removed → added" as a replacement.
|
|
73
|
-
if (next1
|
|
73
|
+
if (next1 === null || next1 === void 0 ? void 0 : next1.added) {
|
|
74
74
|
return this.newReplacedDiff(2, current.value, next1.value);
|
|
75
75
|
}
|
|
76
76
|
// Merge the following sequences as a replacement:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"difference-iterator.js","sourceRoot":"","sources":["../../../lib/util/difference-iterator.ts"],"names":[],"mappings":";;;AAAA,+BAAwC;AACxC,2CAA0C;AA0B1C,+BAA+B;AAC/B,MAAa,kBAAkB;IACpB,MAAM,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"difference-iterator.js","sourceRoot":"","sources":["../../../lib/util/difference-iterator.ts"],"names":[],"mappings":";;;AAAA,+BAAwC;AACxC,2CAA0C;AA0B1C,+BAA+B;AAC/B,MAAa,kBAAkB;IACpB,MAAM,CAAC,OAAO,CAAC,MAAc,EAAE,MAAc;QAChD,OAAO,IAAI,kBAAkB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,OAAO,EAAE,CAAA;IAC3D,CAAC;IASD,gCAAgC;IAChC,YAAoB,MAAc,EAAE,MAAc;QANlD,2CAA2C;QACnC,MAAC,GAAG,CAAC,CAAA;QACb,0DAA0D;QAClD,QAAG,GAAG,CAAC,CAAA;QAIX,IAAI,CAAC,OAAO,GAAG,IAAA,gBAAS,EAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC5C,CAAC;IAED,2BAA2B;IACnB,CAAC,OAAO;QACZ,OAAO,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YACjC,oEAAoE;YACpE,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAE,CAAA;YAErC,IAAI,MAAM,CAAC,KAAK,EAAE;gBACd,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;aAC/B;iBAAM,IAAI,MAAM,CAAC,OAAO,EAAE;gBACvB,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAA;aAClC;iBAAM;gBACH,IAAI,CAAC,CAAC,IAAI,CAAC,CAAA;gBACX,IAAI,CAAC,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAA;aAClC;SACJ;IACL,CAAC;IAED,4DAA4D;IACpD,SAAS,CAAC,OAAe;QAC7B,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;QACvC,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;QAEvC,yDAAyD;QACzD,IAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,EAAE;YAChB,OAAO,IAAI,CAAC,eAAe,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;SAC7D;QAED,kDAAkD;QAClD,kEAAkE;QAClE,kHAAkH;QAClH,IACI,KAAK;YACL,KAAK;YACL,CAAC,KAAK,CAAC,KAAK;YACZ,CAAC,KAAK,CAAC,OAAO;YACd,IAAA,wBAAY,EAAC,KAAK,CAAC,KAAK,CAAC,EAC3B;YACE,gEAAgE;YAChE,iEAAiE;YACjE,IACI,KAAK,CAAC,KAAK;gBACX,IAAA,wBAAY,EAAC,OAAO,CAAC,KAAK,CAAC;gBAC3B,IAAA,wBAAY,EAAC,KAAK,CAAC,KAAK,CAAC,EAC3B;gBACE,OAAO,IAAI,CAAC,eAAe,CACvB,CAAC,EACD,KAAK,CAAC,KAAK,EACX,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAC5C,CAAA;aACJ;YAED,gHAAgH;YAChH,6DAA6D;YAC7D,IACI,KAAK,CAAC,OAAO;gBACb,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EACnD;gBACE,OAAO,IAAI,CAAC,eAAe,CACvB,CAAC,EACD,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,EACzB,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAC9B,CAAA;aACJ;SACJ;QAED,OAAO,IAAI,CAAC,YAAY,CAAC,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;IAC9C,CAAC;IAED,8DAA8D;IACtD,YAAY,CAAC,OAAe;QAChC,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;QACvC,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;QAEvC,yDAAyD;QACzD,IAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,KAAK,EAAE;YACd,OAAO,IAAI,CAAC,eAAe,CAAC,CAAC,EAAE,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAA;SAC7D;QAED,kDAAkD;QAClD,sEAAsE;QACtE,kHAAkH;QAClH,IACI,KAAK;YACL,KAAK;YACL,CAAC,KAAK,CAAC,KAAK;YACZ,CAAC,KAAK,CAAC,OAAO;YACd,IAAA,wBAAY,EAAC,KAAK,CAAC,KAAK,CAAC,EAC3B;YACE,oEAAoE;YACpE,mEAAmE;YACnE,IACI,KAAK,CAAC,OAAO;gBACb,IAAA,wBAAY,EAAC,OAAO,CAAC,KAAK,CAAC;gBAC3B,IAAA,wBAAY,EAAC,KAAK,CAAC,KAAK,CAAC,EAC3B;gBACE,OAAO,IAAI,CAAC,eAAe,CACvB,CAAC,EACD,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,EACzC,KAAK,CAAC,KAAK,CACd,CAAA;aACJ;YAED,gHAAgH;YAChH,yDAAyD;YACzD,IACI,KAAK,CAAC,KAAK;gBACX,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EACrD;gBACE,OAAO,IAAI,CAAC,eAAe,CACvB,CAAC,EACD,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,EAC3B,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAC5B,CAAA;aACJ;SACJ;QAED,kBAAkB;QAClB,OAAO,IAAI,CAAC,cAAc,CAAC,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;IAChD,CAAC;IAED,6BAA6B;IACrB,QAAQ,CAAC,CAAS;QACtB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAC1E,CAAC;IAED,yEAAyE;IACjE,YAAY,CAAC,UAAkB,EAAE,OAAe;QACpD,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAU,CAAA;QAE3C,IAAI,CAAC,CAAC,IAAI,UAAU,CAAA;QAEpB,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,CAAA;IAC9D,CAAC;IAED,2EAA2E;IACnE,cAAc,CAAC,UAAkB,EAAE,OAAe;QACtD,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,MAAM,CAAU,CAAA;QAE5D,IAAI,CAAC,CAAC,IAAI,UAAU,CAAA;QACpB,IAAI,CAAC,GAAG,IAAI,OAAO,CAAC,MAAM,CAAA;QAE1B,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAA;IACjE,CAAC;IAED,4EAA4E;IACpE,eAAe,CACnB,UAAkB,EAClB,OAAe,EACf,OAAe;QAEf,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,MAAM,CAAU,CAAA;QAE5D,IAAI,CAAC,CAAC,IAAI,UAAU,CAAA;QACpB,IAAI,CAAC,GAAG,IAAI,OAAO,CAAC,MAAM,CAAA;QAE1B,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAA;IACvD,CAAC;CACJ;AA9KD,gDA8KC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ben_12/eslint-plugin-dprint",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.8.0",
|
|
4
4
|
"description": "An ESLint plugin that fixes code with dprint",
|
|
5
5
|
"engines": {
|
|
6
6
|
"node": ">=18.0.0"
|
|
@@ -11,22 +11,44 @@
|
|
|
11
11
|
"dist"
|
|
12
12
|
],
|
|
13
13
|
"peerDependencies": {
|
|
14
|
-
"
|
|
14
|
+
"@dprint/dockerfile": "^0.3.0",
|
|
15
|
+
"@dprint/json": "^0.17.4",
|
|
16
|
+
"@dprint/markdown": "^0.16.2",
|
|
17
|
+
"@dprint/toml": "^0.5.4",
|
|
18
|
+
"@dprint/typescript": "^0.88.1",
|
|
19
|
+
"eslint": ">=7.0.0"
|
|
20
|
+
},
|
|
21
|
+
"peerDependenciesMeta": {
|
|
22
|
+
"@dprint/dockerfile": {
|
|
23
|
+
"optional": true
|
|
24
|
+
},
|
|
25
|
+
"@dprint/json": {
|
|
26
|
+
"optional": true
|
|
27
|
+
},
|
|
28
|
+
"@dprint/markdown": {
|
|
29
|
+
"optional": true
|
|
30
|
+
},
|
|
31
|
+
"@dprint/toml": {
|
|
32
|
+
"optional": true
|
|
33
|
+
},
|
|
34
|
+
"@dprint/typescript": {
|
|
35
|
+
"optional": true
|
|
36
|
+
}
|
|
15
37
|
},
|
|
16
38
|
"dependencies": {
|
|
17
|
-
"@dprint/
|
|
39
|
+
"@dprint/formatter": "^0.2.0",
|
|
18
40
|
"debug": "^4.1.1",
|
|
19
41
|
"diff": "^5.0.0",
|
|
20
42
|
"jsonc-parser": "^3.2.0"
|
|
21
43
|
},
|
|
22
44
|
"devDependencies": {
|
|
23
|
-
"@ben_12/eslint-plugin-dprint": "^0.
|
|
45
|
+
"@ben_12/eslint-plugin-dprint": "^0.7.1",
|
|
46
|
+
"@ben_12/eslint-simple-parser": "^0.1.0",
|
|
24
47
|
"@types/debug": "^4.1.5",
|
|
25
48
|
"@types/diff": "^5.0.0",
|
|
49
|
+
"@types/eslint": "^8.44.4",
|
|
26
50
|
"@types/node": "^18.0.0",
|
|
27
51
|
"@typescript-eslint/eslint-plugin": "^6.0.0",
|
|
28
|
-
"@typescript-eslint/parser": "^6.0.0",
|
|
29
|
-
"@typescript-eslint/utils": "^6.0.0",
|
|
30
52
|
"eslint": "^8.50.0",
|
|
31
53
|
"mocha": "^10.0.0",
|
|
32
54
|
"nyc": "^15.0.1",
|
|
@@ -38,7 +60,7 @@
|
|
|
38
60
|
"scripts": {
|
|
39
61
|
"build": "rimraf dist && tsc -p tsconfig.build.json",
|
|
40
62
|
"codecov": "nyc report --reporter text-lcov | codecov --pipe --disable=gcov",
|
|
41
|
-
"lint": "eslint
|
|
63
|
+
"lint": "eslint \"**/*.ts\"",
|
|
42
64
|
"test": "npm run -s lint && npm run -s test:ci",
|
|
43
65
|
"test:ci": "tsc && nyc mocha \"test/rules/**/*.ts\"",
|
|
44
66
|
"watch": "mocha --require ts-node/register --watch --watch-files \"lib/**/*.ts,test/**/*.ts\" \"test/rules/**/*.ts\"",
|
|
@@ -57,7 +79,9 @@
|
|
|
57
79
|
"keywords": [
|
|
58
80
|
"eslint",
|
|
59
81
|
"eslintplugin",
|
|
60
|
-
"
|
|
82
|
+
"eslint-plugin",
|
|
83
|
+
"dprint",
|
|
84
|
+
"formatter"
|
|
61
85
|
],
|
|
62
86
|
"author": "Benoît Moreau <public@ben12.dev>",
|
|
63
87
|
"license": "MIT",
|