Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/rules/mergers.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import { mergeBanTypes } from "./mergers/ban-types";
import { mergeIndent } from "./mergers/indent";
import { mergeNoMemberDelimiterStyle } from "./mergers/member-delimiter-style";
import { mergeNoCaller } from "./mergers/no-caller";
import { mergeNoEval } from "./mergers/no-eval";
import { mergeNoUnnecessaryTypeAssertion } from "./mergers/no-unnecessary-type-assertion";

export const mergers = new Map([
["@typescript-eslint/ban-types", mergeBanTypes],
["@typescript-eslint/indent", mergeIndent],
["@typescript-eslint/member-delimiter-style", mergeNoMemberDelimiterStyle],
["@typescript-eslint/no-unnecessary-type-assertion", mergeNoUnnecessaryTypeAssertion],
["no-caller", mergeNoCaller],
["no-eval", mergeNoEval],
Expand Down
21 changes: 21 additions & 0 deletions src/rules/mergers/member-delimiter-style.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { RuleMerger } from "../merger";

export const mergeNoMemberDelimiterStyle: RuleMerger = (existingOptions, newOptions) => {
if (existingOptions === undefined && newOptions === undefined) {
return [];
}

return [merge((existingOptions || [])[0] || {}, (newOptions || [])[0] || {})];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The 100% coverage requirement is failing because one part of this line isn't hit. Without looking deeply at the report, my guess is it's that you're missing a test case for old object config existing (as in, only that one, and not the new config).

};

const merge = (...objs: Record<string, any>[]) =>
[...objs].reduce(
(acc, obj) => ({
...acc,
...Object.keys(obj).reduce((_, k) => {
acc[k] = obj[k];
return acc;
}, {}),
}),
{},
);
98 changes: 98 additions & 0 deletions src/rules/mergers/tests/member-delimiter-style.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
import { mergeNoMemberDelimiterStyle } from "../member-delimiter-style";

describe(mergeNoMemberDelimiterStyle, () => {
test("neither options existing", () => {
const result = mergeNoMemberDelimiterStyle(undefined, undefined);

expect(result).toEqual([]);
});

test("new object config existing", () => {
const result = mergeNoMemberDelimiterStyle(undefined, [
{
multiline: {
delimiter: "semi",
requireLast: true,
},
singleline: {
delimiter: "semi",
requireLast: false,
},
},
]);

expect(result).toEqual([
{
multiline: {
delimiter: "semi",
requireLast: true,
},
singleline: {
delimiter: "semi",
requireLast: false,
},
},
]);
});

test("original object config existing", () => {
const result = mergeNoMemberDelimiterStyle(
[
{
multiline: {
delimiter: "semi",
requireLast: true,
},
},
],
undefined,
);

expect(result).toEqual([
{
multiline: {
delimiter: "semi",
requireLast: true,
},
},
]);
});

test("both object config existing", () => {
const result = mergeNoMemberDelimiterStyle(
[
{
singleline: {
delimiter: "semi",
requireLast: false,
},
},
],
[
{
singleline: {
delimiter: "semi",
requireLast: false,
},
multiline: {
delimiter: "semi",
requireLast: true,
},
},
],
);

expect(result).toEqual([
{
multiline: {
delimiter: "semi",
requireLast: true,
},
singleline: {
delimiter: "semi",
requireLast: false,
},
},
]);
});
});