Skip to content

Commit a1a77e0

Browse files
nirtamir2nirtamir2
authored
Fix incomplete sort (#20)
1 parent 27ad8e8 commit a1a77e0

File tree

2 files changed

+164
-60
lines changed

2 files changed

+164
-60
lines changed

‎src/rules/sort-export-all.test.ts

+135-45
Original file line numberDiff line numberDiff line change
@@ -37,68 +37,96 @@ run({
3737
export * from "./b";
3838
export * from "./a";
3939
`,
40+
output: js`
41+
export * from "./a";
42+
export * from "./b";
43+
`,
4044
errors: [
4145
{
4246
message:
4347
"\"export * from './a'\" should occur before \"export * from './b'\".",
4448
},
4549
],
50+
},
51+
{
52+
code: js`
53+
export * from "./b";
54+
export * from "./a";
55+
`,
4656
output: js`
4757
export * from "./a";
4858
export * from "./b";
4959
`,
60+
errors: [
61+
{
62+
messageId: "unorderedSortExportAll",
63+
data: {
64+
beforeName: "./a",
65+
afterName: "./b",
66+
},
67+
},
68+
],
5069
},
5170
{
5271
code: js`
5372
export * from "./b";
5473
export * from "./a";
5574
export * from "./c";
5675
`,
57-
errors: [
58-
{
59-
message:
60-
"\"export * from './a'\" should occur before \"export * from './b'\".",
61-
},
62-
],
6376
output: js`
6477
export * from "./a";
6578
export * from "./b";
6679
export * from "./c";
6780
`,
81+
errors: [
82+
{
83+
messageId: "unorderedSortExportAll",
84+
data: {
85+
beforeName: "./a",
86+
afterName: "./b",
87+
},
88+
},
89+
],
6890
},
6991
{
7092
code: js`
7193
export * from "./a";
7294
export * from "./c";
7395
export * from "./b";
7496
`,
75-
errors: [
76-
{
77-
message:
78-
"\"export * from './b'\" should occur before \"export * from './c'\".",
79-
},
80-
],
8197
output: js`
8298
export * from "./a";
8399
export * from "./b";
84100
export * from "./c";
85101
`,
102+
errors: [
103+
{
104+
messageId: "unorderedSortExportAll",
105+
data: {
106+
beforeName: "./b",
107+
afterName: "./c",
108+
},
109+
},
110+
],
86111
},
87112
{
88113
code: js`
89114
export * from "./ca/cb";
90115
export * from "./a";
91116
`,
92-
errors: [
93-
{
94-
message:
95-
"\"export * from './a'\" should occur before \"export * from './ca/cb'\".",
96-
},
97-
],
98117
output: js`
99118
export * from "./a";
100119
export * from "./ca/cb";
101120
`,
121+
errors: [
122+
{
123+
messageId: "unorderedSortExportAll",
124+
data: {
125+
beforeName: "./a",
126+
afterName: "./ca/cb",
127+
},
128+
},
129+
],
102130
},
103131
],
104132
});
@@ -128,44 +156,106 @@ run({
128156
export type * from "./types";
129157
export * from "./constants";
130158
`,
159+
output: ts`
160+
export * from "./constants";
161+
export type * from "./types";
162+
export * from "./utils";
163+
`,
131164
errors: [
132165
{
133-
message:
134-
"\"export * from './constants'\" should occur before \"export * from './utils'\".",
166+
messageId: "unorderedSortExportAll",
167+
data: {
168+
beforeName: "./constants",
169+
afterName: "./utils",
170+
},
135171
},
136172
],
173+
},
174+
{
175+
name: "should handle duplicate names",
176+
code: ts`
177+
export * from "./b";
178+
export * from "./a";
179+
export * from "./b";
180+
`,
181+
137182
output: ts`
138-
export * from "./constants";
139-
export type * from "./types";
140-
export * from "./utils";
183+
export * from "./a";
184+
export * from "./b";
185+
export * from "./b";
141186
`,
187+
errors: [
188+
{
189+
messageId: "unorderedSortExportAll",
190+
data: {
191+
beforeName: "./a",
192+
afterName: "./b",
193+
},
194+
},
195+
],
196+
},
197+
{
198+
name: "should handle duplicate names (issue)",
199+
code: ts`
200+
export * from "./lib/ticker-wat/Wat";
201+
export * from "./lib/sticky-wat/Wat";
202+
export * from "./lib/client-wat/Wat";
203+
export * from "./lib/custom-wat/Wat";
204+
export * from "./lib/rules-wat/Wat";
205+
export * from "./lib/send-wat/Wat";
206+
export * from "./assets/timezone";
207+
export * from "./hooks/useWat";
208+
export * from "./lib/avatar/Avatar";
209+
`,
210+
211+
output: ts`
212+
export * from "./assets/timezone";
213+
export * from "./hooks/useWat";
214+
export * from "./lib/avatar/Avatar";
215+
export * from "./lib/client-wat/Wat";
216+
export * from "./lib/custom-wat/Wat";
217+
export * from "./lib/rules-wat/Wat";
218+
export * from "./lib/send-wat/Wat";
219+
export * from "./lib/sticky-wat/Wat";
220+
export * from "./lib/ticker-wat/Wat";
221+
`,
222+
},
223+
{
224+
name: "should handle multiple fixes",
225+
code: ts`
226+
export * from "./c";
227+
export * from "./b";
228+
export * from "./a";
229+
`,
230+
231+
output: ts`
232+
export * from "./a";
233+
export * from "./b";
234+
export * from "./c";
235+
`,
236+
errors: [
237+
{
238+
messageId: "unorderedSortExportAll",
239+
data: {
240+
beforeName: "./a",
241+
afterName: "./c",
242+
},
243+
},
244+
],
142245
},
143-
// TODO: Fix make this test pass
144246
// {
247+
// name: "should handle comment",
145248
// code: ts`
146-
// export * from "./lib/ticker-wat/Wat";
147-
// export * from "./lib/sticky-wat/Wat";
148-
// export * from "./lib/client-wat/Wat";
149-
// export * from "./lib/ticker-wat/Wat";
150-
// export * from "./lib/custom-wat/Wat";
151-
// export * from "./lib/rules-wat/Wat";
152-
// export * from "./lib/send-wat/Wat";
153-
// export * from "./assets/timezone";
154-
// export * from "./hooks/useWat";
155-
// export * from "./lib/avatar/Avatar";
249+
// // This is C
250+
// export * from "./c";
251+
// export * from "./b";
252+
// export * from "./a";
156253
// `,
157-
//
158254
// output: ts`
159-
// export * from "./assets/timezone";
160-
// export * from "./hooks/useWat";
161-
// export * from "./lib/avatar/Avatar";
162-
// export * from "./lib/client-wat/Wat";
163-
// export * from "./lib/custom-wat/Wat";
164-
// export * from "./lib/rules-wat/Wat";
165-
// export * from "./lib/send-wat/Wat";
166-
// export * from "./lib/sticky-wat/Wat";
167-
// export * from "./lib/ticker-wat/Wat";
168-
// export * from "./lib/ticker-wat/Wat";
255+
// export * from "./a";
256+
// export * from "./b";
257+
// // This is C
258+
// export * from "./c";
169259
// `,
170260
// },
171261
],

‎src/rules/sort-export-all.ts

+29-15
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export default createEslintRule<Options, MessageIds>({
4848
},
4949
messages: {
5050
unorderedSortExportAll:
51-
"\"export * from '{{thisName}}'\" should occur before \"export * from '{{prevName}}'\".",
51+
"\"export * from '{{beforeName}}'\" should occur before \"export * from '{{afterName}}'\".",
5252
},
5353
schema: [
5454
{
@@ -84,7 +84,7 @@ export default createEslintRule<Options, MessageIds>({
8484
throw new Error("Invalid options");
8585
}
8686

87-
let prevNode: TSESTree.ExportAllDeclaration | null = null;
87+
const nodes: Array<TSESTree.ExportAllDeclaration> = [];
8888
return {
8989
ExportAllDeclaration: (node) => {
9090
if (node.type !== "ExportAllDeclaration") {
@@ -95,23 +95,38 @@ export default createEslintRule<Options, MessageIds>({
9595
if ("exportKind" in node && node.exportKind === "type") {
9696
return;
9797
}
98-
if (prevNode != null) {
99-
const thisName = node.source.value;
100-
const prevName = prevNode.source.value;
98+
nodes.push(node);
99+
},
100+
"Program:exit": () => {
101+
const sortedNodes = nodes.toSorted((a, b) => {
102+
return isValidOrder(a.source.value, b.source.value) ? -1 : 1;
103+
});
104+
105+
for (const [index, sortedNode] of sortedNodes.entries()) {
106+
const node = nodes[index];
107+
if (node == null) {
108+
continue;
109+
}
110+
111+
if (node.source.value === sortedNode.source.value) {
112+
continue;
113+
}
101114

102-
if (isValidOrder(thisName, prevName)) {
115+
const beforeName = sortedNode.source.value;
116+
const afterName = node.source.value;
117+
if (isValidOrder(beforeName, afterName)) {
103118
context.report({
104119
messageId: "unorderedSortExportAll",
105-
node,
106-
...(node.loc === null ? null : { loc: node.loc }),
120+
node: sortedNode,
121+
...(sortedNode.loc === null ? null : { loc: sortedNode.loc }),
107122
data: {
108-
thisName,
109-
prevName,
123+
beforeName,
124+
afterName,
110125
},
111126
fix(fixer) {
112-
if (prevNode == null) return null;
127+
if (node == null) return null;
113128
const fixes: Array<RuleFix> = [];
114-
const sourceCode = context.getSourceCode();
129+
const { sourceCode } = context;
115130
const moveExportAllDeclaration = (
116131
fromNode: TSESTree.ExportAllDeclaration,
117132
toNode: TSESTree.ExportAllDeclaration,
@@ -129,14 +144,13 @@ export default createEslintRule<Options, MessageIds>({
129144
}
130145
fixes.push(fixer.replaceText(toNode, prevText));
131146
};
132-
moveExportAllDeclaration(node, prevNode);
133-
moveExportAllDeclaration(prevNode, node);
147+
moveExportAllDeclaration(node, sortedNode);
148+
moveExportAllDeclaration(sortedNode, node);
134149
return fixes;
135150
},
136151
});
137152
}
138153
}
139-
prevNode = node;
140154
},
141155
};
142156
},

0 commit comments

Comments
 (0)