@ben_12/eslint-plugin-dprint 1.1.0 → 1.1.2
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/lib/configs/recommended.js +4 -1
- package/dist/lib/configs/recommended.js.map +1 -1
- package/dist/lib/dprint/dprint.js +4 -4
- package/dist/lib/dprint/dprint.js.map +1 -1
- package/dist/lib/rules/dprint.js +6 -7
- package/dist/lib/rules/dprint.js.map +1 -1
- package/dist/lib/util/difference-iterator.js +8 -6
- package/dist/lib/util/difference-iterator.js.map +1 -1
- package/package.json +15 -7
|
@@ -28,7 +28,10 @@ exports.tomlRecommended = {
|
|
|
28
28
|
};
|
|
29
29
|
exports.typescriptRecommended = {
|
|
30
30
|
plugins: ["@ben_12/dprint"],
|
|
31
|
-
rules:
|
|
31
|
+
rules: {
|
|
32
|
+
...disable_conflict_rules_1.disableTypescriptConflictRules.rules,
|
|
33
|
+
"@ben_12/dprint/typescript": "warn",
|
|
34
|
+
},
|
|
32
35
|
};
|
|
33
36
|
exports.malvaRecommended = {
|
|
34
37
|
plugins: ["@ben_12/dprint"],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recommended.js","sourceRoot":"","sources":["../../../lib/configs/recommended.ts"],"names":[],"mappings":";;;AAAA,qEAAyE;AAE5D,QAAA,qBAAqB,GAAG;IACjC,OAAO,EAAE,CAAC,gBAAgB,CAAC;IAC3B,KAAK,EAAE;QACH,2BAA2B,EAAE,MAAM;KACtC;CACJ,CAAA;AAEY,QAAA,eAAe,GAAG;IAC3B,OAAO,EAAE,CAAC,gBAAgB,CAAC;IAC3B,KAAK,EAAE;QACH,qBAAqB,EAAE,MAAM;KAChC;CACJ,CAAA;AAEY,QAAA,mBAAmB,GAAG;IAC/B,OAAO,EAAE,CAAC,gBAAgB,CAAC;IAC3B,KAAK,EAAE;QACH,yBAAyB,EAAE,MAAM;KACpC;CACJ,CAAA;AAEY,QAAA,eAAe,GAAG;IAC3B,OAAO,EAAE,CAAC,gBAAgB,CAAC;IAC3B,KAAK,EAAE;QACH,qBAAqB,EAAE,MAAM;KAChC;CACJ,CAAA;AAEY,QAAA,qBAAqB,GAAG;IACjC,OAAO,EAAE,CAAC,gBAAgB,CAAC;IAC3B,KAAK,
|
|
1
|
+
{"version":3,"file":"recommended.js","sourceRoot":"","sources":["../../../lib/configs/recommended.ts"],"names":[],"mappings":";;;AAAA,qEAAyE;AAE5D,QAAA,qBAAqB,GAAG;IACjC,OAAO,EAAE,CAAC,gBAAgB,CAAC;IAC3B,KAAK,EAAE;QACH,2BAA2B,EAAE,MAAM;KACtC;CACJ,CAAA;AAEY,QAAA,eAAe,GAAG;IAC3B,OAAO,EAAE,CAAC,gBAAgB,CAAC;IAC3B,KAAK,EAAE;QACH,qBAAqB,EAAE,MAAM;KAChC;CACJ,CAAA;AAEY,QAAA,mBAAmB,GAAG;IAC/B,OAAO,EAAE,CAAC,gBAAgB,CAAC;IAC3B,KAAK,EAAE;QACH,yBAAyB,EAAE,MAAM;KACpC;CACJ,CAAA;AAEY,QAAA,eAAe,GAAG;IAC3B,OAAO,EAAE,CAAC,gBAAgB,CAAC;IAC3B,KAAK,EAAE;QACH,qBAAqB,EAAE,MAAM;KAChC;CACJ,CAAA;AAEY,QAAA,qBAAqB,GAAG;IACjC,OAAO,EAAE,CAAC,gBAAgB,CAAC;IAC3B,KAAK,EAAE;QACH,GAAG,uDAA8B,CAAC,KAAK;QACvC,2BAA2B,EAAE,MAAM;KACtC;CACJ,CAAA;AAEY,QAAA,gBAAgB,GAAG;IAC5B,OAAO,EAAE,CAAC,gBAAgB,CAAC;IAC3B,KAAK,EAAE;QACH,sBAAsB,EAAE,MAAM;KACjC;CACJ,CAAA;AAEY,QAAA,iBAAiB,GAAG;IAC7B,OAAO,EAAE,CAAC,gBAAgB,CAAC;IAC3B,KAAK,EAAE;QACH,uBAAuB,EAAE,MAAM;KAClC;CACJ,CAAA"}
|
|
@@ -40,10 +40,10 @@ function loadPlugin(module) {
|
|
|
40
40
|
catch (_) {
|
|
41
41
|
// plugin unavailable
|
|
42
42
|
}
|
|
43
|
-
if (plugin
|
|
43
|
+
if (plugin?.getPath) {
|
|
44
44
|
return fs.readFileSync(plugin.getPath());
|
|
45
45
|
}
|
|
46
|
-
else if (plugin
|
|
46
|
+
else if (plugin?.getBuffer) {
|
|
47
47
|
return plugin.getBuffer();
|
|
48
48
|
}
|
|
49
49
|
return undefined;
|
|
@@ -51,12 +51,12 @@ function loadPlugin(module) {
|
|
|
51
51
|
function loadWasm(module, wasmFile) {
|
|
52
52
|
let wasmPath = undefined;
|
|
53
53
|
try {
|
|
54
|
-
wasmPath = require.resolve([module, wasmFile].filter(s => s
|
|
54
|
+
wasmPath = require.resolve([module, wasmFile].filter(s => s?.length).join("/"));
|
|
55
55
|
}
|
|
56
56
|
catch (_) {
|
|
57
57
|
// plugin unavailable
|
|
58
58
|
}
|
|
59
|
-
if (wasmPath
|
|
59
|
+
if (wasmPath?.length) {
|
|
60
60
|
return fs.readFileSync(wasmPath);
|
|
61
61
|
}
|
|
62
62
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dprint.js","sourceRoot":"","sources":["../../../lib/dprint/dprint.ts"],"names":[],"mappings":";AAAA,0DAA0D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE1D,iDAA8E;AAC9E,uCAAwB;AACxB,oDAAqC;AACrC,gDAAuB;AASvB,SAAS,UAAU,CAAC,MAAc;IAC9B,IAAI,MAAM,GAAuB,SAAS,CAAA;IAC1C,IAAI;QACA,MAAM,GAAG,OAAO,CAAC,MAAM,CAAW,CAAA;KACrC;IAAC,OAAO,CAAC,EAAE;QACR,qBAAqB;KACxB;IACD,IAAI,MAAM,
|
|
1
|
+
{"version":3,"file":"dprint.js","sourceRoot":"","sources":["../../../lib/dprint/dprint.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/rules/dprint.js
CHANGED
|
@@ -169,7 +169,7 @@ function createMessage(d) {
|
|
|
169
169
|
createMoveMessage(d) ||
|
|
170
170
|
createRepaceMessage(d);
|
|
171
171
|
}
|
|
172
|
-
const defaultOptions =
|
|
172
|
+
const defaultOptions = { configFile: "dprint.json", config: {} };
|
|
173
173
|
exports.dprintRules = configSchemas.map((config) => ({
|
|
174
174
|
[config.name]: {
|
|
175
175
|
meta: {
|
|
@@ -205,12 +205,11 @@ exports.dprintRules = configSchemas.map((config) => ({
|
|
|
205
205
|
},
|
|
206
206
|
create: (context) => ({
|
|
207
207
|
Program() {
|
|
208
|
-
|
|
209
|
-
const
|
|
210
|
-
const filePath = (_b = context.filename) !== null && _b !== void 0 ? _b : context.getFilename();
|
|
208
|
+
const sourceCode = context.sourceCode ?? context.getSourceCode();
|
|
209
|
+
const filePath = context.filename ?? context.getFilename();
|
|
211
210
|
const fileText = sourceCode.getText();
|
|
212
|
-
const options =
|
|
213
|
-
const configFile =
|
|
211
|
+
const options = context.options[0] ?? defaultOptions;
|
|
212
|
+
const configFile = options.configFile ?? "dprint.json";
|
|
214
213
|
const configOpt = options.config || {};
|
|
215
214
|
// Needs an absolute path
|
|
216
215
|
if (!filePath || !path_1.default.isAbsolute(filePath)) {
|
|
@@ -225,7 +224,7 @@ exports.dprintRules = configSchemas.map((config) => ({
|
|
|
225
224
|
},
|
|
226
225
|
}),
|
|
227
226
|
},
|
|
228
|
-
})).reduce((r1, r2) => (
|
|
227
|
+
})).reduce((r1, r2) => ({ ...r1, ...r2 }), {});
|
|
229
228
|
function generateLintReports(fileText, formattedText, sourceCode, context) {
|
|
230
229
|
for (const d of difference_iterator_1.DifferenceIterator.iterate(fileText, formattedText)) {
|
|
231
230
|
const loc = d.type === "add"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dprint.js","sourceRoot":"","sources":["../../../lib/rules/dprint.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"dprint.js","sourceRoot":"","sources":["../../../lib/rules/dprint.ts"],"names":[],"mappings":";;;;;;AAEA,gDAAuB;AACvB,4GAA4E;AAC5E,6CAAyC;AACzC,gGAAgE;AAChE,kGAAkE;AAClE,wGAAwE;AACxE,oGAAoE;AACpE,gGAAgE;AAChE,4GAAoE;AACpE,qEAAwG;AACxG,iDAA8D;AAE9D,MAAM,aAAa,GAAG;IAClB,EAAE,IAAI,EAAE,YAAY,EAAE,YAAY,EAAE,uCAAqC,EAAE;IAC3E,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,iCAA+B,EAAE;IAC/D,EAAE,IAAI,EAAE,UAAU,EAAE,YAAY,EAAE,qCAAmC,EAAE;IACvE,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,iCAA+B,EAAE;IAC/D,EAAE,IAAI,EAAE,YAAY,EAAE,YAAY,EAAE,uCAA6B,EAAE;IACnE,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,kCAAgC,EAAE;IACjE,EAAE,IAAI,EAAE,QAAQ,EAAE,YAAY,EAAE,mCAAiC,EAAE;CACtE,CAAA;AAED,MAAM,QAAQ,GAAG;IACb,gBAAgB,EAAE,wBAAwB;IAC1C,cAAc,EAAE,sBAAsB;IACtC,iBAAiB,EAAE,wBAAwB;IAC3C,eAAe,EAAE,sBAAsB;IACvC,WAAW,EAAE,wBAAwB;IACrC,SAAS,EAAE,sBAAsB;IACjC,iBAAiB,EAAE,iCAAiC;IACpD,WAAW,EAAE,kDAAkD;IAC/D,kBAAkB,EAAE,sCAAsC;IAC1D,kBAAkB,EAAE,0CAA0C;IAC9D,QAAQ,EAAE,oDAAoD;CACxD,CAAA;AAUV;;;GAGG;AACH,SAAS,wBAAwB,CAAC,CAAS;IACvC,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACzB,IAAI,CAAC,CAAC,EAAE;QACJ,OAAO,CAAC,CAAA;KACX;IAED,MAAM,SAAS,GAAG,eAAe,CAAA;IACjC,IAAI,KAAK,GAAG,CAAC,CAAA;IACb,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE;QACjC,KAAK,IAAI,CAAC,CAAA;KACb;IAED,OAAO,KAAK,CAAA;AAChB,CAAC;AAED,SAAS,SAAS,CAAC,CAAO;IACtB,OAAO,CAAC,CAAC,IAAI,KAAK,KAAK,CAAA;AAC3B,CAAC;AAED,SAAS,YAAY,CAAC,CAAO;IACzB,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAA;AAC9B,CAAC;AAED;;;GAGG;AACH,SAAS,gBAAgB,CAAC,CAAU;IAChC,IAAI,IAAA,wBAAY,EAAC,CAAC,CAAC,OAAO,CAAC,EAAE;QACzB,OAAO;YACH,SAAS,EAAE,IAAA,wBAAY,EAAC,CAAC,CAAC,OAAO,CAAC;gBAC9B,CAAC,CAAC,kBAAkB;gBACpB,CAAC,CAAC,mBAAmB;YACzB,IAAI,EAAE,EAAE;SACX,CAAA;KACJ;IACD,OAAO;QACH,SAAS,EAAE,aAAa;QACxB,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE;KACnD,CAAA;AACL,CAAC;AAED;;;GAGG;AACH,SAAS,mBAAmB,CAAC,CAAa;IACtC,IAAI,IAAA,wBAAY,EAAC,CAAC,CAAC,OAAO,CAAC,EAAE;QACzB,OAAO;YACH,SAAS,EAAE,IAAA,wBAAY,EAAC,CAAC,CAAC,OAAO,CAAC;gBAC9B,CAAC,CAAC,gBAAgB;gBAClB,CAAC,CAAC,iBAAiB;YACvB,IAAI,EAAE,EAAE;SACX,CAAA;KACJ;IACD,OAAO;QACH,SAAS,EAAE,WAAW;QACtB,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE;KACnD,CAAA;AACL,CAAC;AAED;;;GAGG;AACH,SAAS,uBAAuB,CAAC,CAAc;IAC3C,IAAI,IAAA,wBAAY,EAAC,CAAC,CAAC,OAAO,CAAC,IAAI,IAAA,wBAAY,EAAC,CAAC,CAAC,OAAO,CAAC,EAAE;QACpD,MAAM,eAAe,GAAG,IAAA,wBAAY,EAAC,CAAC,CAAC,OAAO,CAAC,CAAA;QAC/C,MAAM,eAAe,GAAG,IAAA,wBAAY,EAAC,CAAC,CAAC,OAAO,CAAC,CAAA;QAC/C,IAAI,CAAC,eAAe,IAAI,eAAe,EAAE;YACrC,OAAO;gBACH,SAAS,EAAE,kBAAkB;gBAC7B,IAAI,EAAE,EAAE;aACX,CAAA;SACJ;QACD,OAAO;YACH,SAAS,EAAE,eAAe,IAAI,CAAC,eAAe;gBAC1C,CAAC,CAAC,gBAAgB;gBAClB,CAAC,CAAC,mBAAmB;YACzB,IAAI,EAAE,EAAE;SACX,CAAA;KACJ;IACD,OAAO,KAAK,CAAA;AAChB,CAAC;AAED;;;GAGG;AACH,SAAS,iBAAiB,CAAC,CAAc;IACrC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE;QACvC,MAAM,OAAO,GAAG,wBAAwB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;QACnD,MAAM,OAAO,GAAG,wBAAwB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;QACnD,IAAI,OAAO,GAAG,OAAO,EAAE;YACnB,OAAO;gBACH,SAAS,EAAE,oBAAoB;gBAC/B,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE;aACnD,CAAA;SACJ;QACD,OAAO;YACH,SAAS,EAAE,OAAO,GAAG,OAAO;gBACxB,CAAC,CAAC,oBAAoB;gBACtB,CAAC,CAAC,UAAU;YAChB,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE;SACnD,CAAA;KACJ;IACD,OAAO,KAAK,CAAA;AAChB,CAAC;AAED;;;GAGG;AACH,SAAS,mBAAmB,CAAC,CAAc;IACvC,OAAO;QACH,SAAS,EAAE,aAAa;QACxB,IAAI,EAAE;YACF,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC;YAClC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC;SACrC;KACJ,CAAA;AACL,CAAC;AAED;;;GAGG;AACH,SAAS,aAAa,CAAC,CAAO;IAC1B,IAAI,SAAS,CAAC,CAAC,CAAC,EAAE;QACd,OAAO,gBAAgB,CAAC,CAAC,CAAC,CAAA;KAC7B;IACD,IAAI,YAAY,CAAC,CAAC,CAAC,EAAE;QACjB,OAAO,mBAAmB,CAAC,CAAC,CAAC,CAAA;KAChC;IACD,OAAO,uBAAuB,CAAC,CAAC,CAAC;QAC7B,iBAAiB,CAAC,CAAC,CAAC;QACpB,mBAAmB,CAAC,CAAC,CAAC,CAAA;AAC9B,CAAC;AAGD,MAAM,cAAc,GAAY,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,EAAE,CAAA;AAE5D,QAAA,WAAW,GAAwC,aAAa,CAAC,GAAG,CAAC,CAC9E,MAAM,EAC6B,EAAE,CAAC,CAAC;IACvC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QACX,IAAI,EAAE;YACF,IAAI,EAAE;gBACF,WAAW,EAAE,UAAU,MAAM,CAAC,IAAI,cAAc;gBAChD,GAAG,EAAE,+EAA+E,MAAM,CAAC,IAAI,KAAK;gBACpG,WAAW,EAAE,IAAI;aACpB;YACD,OAAO,EAAE,MAAM;YACf,QAAQ;YACR,MAAM,EAAE;gBACJ,WAAW,EAAE,MAAM,CAAC,YAAY,CAAC,WAAW;gBAC5C,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,CAAC;wBACJ,IAAI,EAAE,QAAQ;wBACd,UAAU,EAAE;4BACR,UAAU,EAAE;gCACR,IAAI,EAAE,QAAQ;gCACd,OAAO,EAAE,aAAa;gCACtB,WAAW,EAAE,mDAAmD;6BACnE;4BACD,MAAM,EAAE;gCACJ,IAAI,EAAE,QAAQ;gCACd,UAAU,EAAE,MAAM,CAAC,YAAY,CAAC,UAAU;gCAC1C,oBAAoB,EAAE,KAAK;6BAC9B;yBACJ;wBACD,oBAAoB,EAAE,KAAK;qBAC9B,CAAC;gBACF,eAAe,EAAE,KAAK;aACzB;YACD,IAAI,EAAE,QAAQ;SACjB;QACD,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YAClB,OAAO;gBACH,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,aAAa,EAAE,CAAA;gBAChE,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,WAAW,EAAE,CAAA;gBAC1D,MAAM,QAAQ,GAAG,UAAU,CAAC,OAAO,EAAE,CAAA;gBACrC,MAAM,OAAO,GAAI,OAAO,CAAC,OAAO,CAAC,CAAC,CAAa,IAAI,cAAc,CAAA;gBACjE,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,aAAa,CAAA;gBACtD,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,IAAI,EAAE,CAAA;gBAEtC,yBAAyB;gBACzB,IAAI,CAAC,QAAQ,IAAI,CAAC,cAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;oBACzC,OAAM;iBACT;gBAED,cAAc;gBACd,MAAM,aAAa,GAAG,IAAA,eAAM,EAAC,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,CAAA;gBACpF,IAAI,OAAO,aAAa,KAAK,QAAQ,EAAE;oBACnC,OAAM;iBACT;gBAED,mBAAmB,CAAC,QAAQ,EAAE,aAAa,EAAE,UAAU,EAAE,OAAO,CAAC,CAAA;YACrE,CAAC;SACJ,CAAC;KACL;CACJ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;AAE9C,SAAS,mBAAmB,CACxB,QAAgB,EAChB,aAAqB,EACrB,UAAsB,EACtB,OAAyB;IAEzB,KAAK,MAAM,CAAC,IAAI,wCAAkB,CAAC,OAAO,CAAC,QAAQ,EAAE,aAAa,CAAC,EAAE;QACjE,MAAM,GAAG,GAAG,CAAC,CAAC,IAAI,KAAK,KAAK;YACxB,CAAC,CAAC;gBACE,KAAK,EAAE,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAC7C,GAAG,EAAE,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;aAC9C;YACD,CAAC,CAAC;gBACE,KAAK,EAAE,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAC7C,GAAG,EAAE,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;aAC9C,CAAA;QACL,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC,CAAC,CAAC,CAAA;QAE5C,OAAO,CAAC,MAAM,CAAC;YACX,GAAG;YACH,SAAS;YACT,IAAI;YAEJ,GAAG,CAAC,KAAK;gBACL,MAAM,KAAK,GAAG,CAAC,CAAC,KAAyB,CAAA;gBACzC,IAAI,CAAC,CAAC,IAAI,KAAK,KAAK,EAAE;oBAClB,OAAO,KAAK,CAAC,oBAAoB,CAAC,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,CAAA;iBACtD;gBACD,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE;oBACrB,OAAO,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;iBAClC;gBACD,OAAO,KAAK,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,CAAA;YACnD,CAAC;SACJ,CAAC,CAAA;KACL;AACL,CAAC"}
|
|
@@ -8,12 +8,14 @@ class DifferenceIterator {
|
|
|
8
8
|
static iterate(oldStr, newStr) {
|
|
9
9
|
return new DifferenceIterator(oldStr, newStr).iterate();
|
|
10
10
|
}
|
|
11
|
+
/** All changes that the `diffChars()` function detected. */
|
|
12
|
+
changes;
|
|
13
|
+
/** The current index in `this.changes`. */
|
|
14
|
+
i = 0;
|
|
15
|
+
/** The current index in the original source code text. */
|
|
16
|
+
loc = 0;
|
|
11
17
|
/** Initialize this instance. */
|
|
12
18
|
constructor(oldStr, newStr) {
|
|
13
|
-
/** The current index in `this.changes`. */
|
|
14
|
-
this.i = 0;
|
|
15
|
-
/** The current index in the original source code text. */
|
|
16
|
-
this.loc = 0;
|
|
17
19
|
this.changes = (0, diff_1.diffChars)(oldStr, newStr);
|
|
18
20
|
}
|
|
19
21
|
/** Iterate differences. */
|
|
@@ -38,7 +40,7 @@ class DifferenceIterator {
|
|
|
38
40
|
const next1 = this.changeAt(this.i + 1);
|
|
39
41
|
const next2 = this.changeAt(this.i + 2);
|
|
40
42
|
// Merge the sequence "added → removed" as a replacement.
|
|
41
|
-
if (next1
|
|
43
|
+
if (next1?.removed) {
|
|
42
44
|
return this.newReplacedDiff(2, next1.value, current.value);
|
|
43
45
|
}
|
|
44
46
|
// Merge the following sequences as a replacement:
|
|
@@ -70,7 +72,7 @@ class DifferenceIterator {
|
|
|
70
72
|
const next1 = this.changeAt(this.i + 1);
|
|
71
73
|
const next2 = this.changeAt(this.i + 2);
|
|
72
74
|
// Merge the sequence "removed → added" as a replacement.
|
|
73
|
-
if (next1
|
|
75
|
+
if (next1?.added) {
|
|
74
76
|
return this.newReplacedDiff(2, current.value, next1.value);
|
|
75
77
|
}
|
|
76
78
|
// 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,MAAc,EAAE,MAAc;QAChD,OAAO,IAAI,kBAAkB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,OAAO,EAAE,CAAA;IAC3D,CAAC;
|
|
1
|
+
{"version":3,"file":"difference-iterator.js","sourceRoot":"","sources":["../../../lib/util/difference-iterator.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ben_12/eslint-plugin-dprint",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.2",
|
|
4
4
|
"description": "An ESLint plugin that fixes code with dprint",
|
|
5
5
|
"engines": {
|
|
6
6
|
"node": ">=18.0.0"
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
"@dprint/toml": "^0.7.0",
|
|
18
18
|
"@dprint/typescript": "^0.94.0",
|
|
19
19
|
"dprint-plugin-malva": "^0.11.2",
|
|
20
|
-
"dprint-plugin-markup": "^0.19.
|
|
20
|
+
"dprint-plugin-markup": "^0.19.1",
|
|
21
21
|
"eslint": ">=7.0.0"
|
|
22
22
|
},
|
|
23
23
|
"peerDependenciesMeta": {
|
|
@@ -46,22 +46,29 @@
|
|
|
46
46
|
"dependencies": {
|
|
47
47
|
"@dprint/formatter": "^0.4.1",
|
|
48
48
|
"debug": "^4.1.1",
|
|
49
|
-
"diff": "^
|
|
49
|
+
"diff": "^7.0.0",
|
|
50
50
|
"jsonc-parser": "^3.2.0"
|
|
51
51
|
},
|
|
52
52
|
"devDependencies": {
|
|
53
53
|
"@ben_12/eslint-plugin-dprint": "file:./test/internal-rules",
|
|
54
54
|
"@ben_12/eslint-simple-parser": "^0.1.0",
|
|
55
|
+
"@dprint/dockerfile": "^0.3.2",
|
|
56
|
+
"@dprint/json": "^0.20.0",
|
|
57
|
+
"@dprint/markdown": "^0.18.0",
|
|
58
|
+
"@dprint/toml": "^0.7.0",
|
|
59
|
+
"@dprint/typescript": "^0.94.0",
|
|
55
60
|
"@types/debug": "^4.1.5",
|
|
56
|
-
"@types/diff": "^
|
|
61
|
+
"@types/diff": "^7.0.0",
|
|
57
62
|
"@types/eslint": "^9.0.0",
|
|
58
63
|
"@types/node": "^18.0.0",
|
|
59
64
|
"@typescript-eslint/eslint-plugin": "^8.0.0",
|
|
60
65
|
"axios": "^1.7.9",
|
|
66
|
+
"dprint-plugin-malva": "^0.11.2",
|
|
67
|
+
"dprint-plugin-markup": "^0.19.1",
|
|
61
68
|
"eslint": "^9.0.0",
|
|
62
|
-
"mocha": "^
|
|
63
|
-
"nyc": "^
|
|
64
|
-
"rimraf": "^
|
|
69
|
+
"mocha": "^11.0.0",
|
|
70
|
+
"nyc": "^17.0.0",
|
|
71
|
+
"rimraf": "^6.0.0",
|
|
65
72
|
"shx": "^0.3.4",
|
|
66
73
|
"ts-node": "^10.0.0",
|
|
67
74
|
"typescript": "~5.0.0"
|
|
@@ -70,6 +77,7 @@
|
|
|
70
77
|
"build": "rimraf dist && tsc -p tsconfig.build.json",
|
|
71
78
|
"codecov": "nyc report --reporter text-lcov | codecov --pipe --disable=gcov",
|
|
72
79
|
"lint": "eslint \"**/*.ts\" \"**/*.js\" \"**/*.md\"",
|
|
80
|
+
"nyc": "nyc",
|
|
73
81
|
"test": "npm run -s lint && npm run -s test:ci",
|
|
74
82
|
"test:ci:7.x": "tsc && nyc mocha \"test/rules/**/*.ts\"",
|
|
75
83
|
"test:ci:8.x": "tsc && nyc mocha \"test/rules/**/*.ts\"",
|