@shigen/eslint-plugin 0.8.0 → 0.10.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/dist/index.d.ts +6 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +8 -6
- package/dist/index.js.map +1 -1
- package/dist/rules/group-imports.d.ts +1 -1
- package/dist/rules/group-imports.d.ts.map +1 -1
- package/dist/rules/group-imports.js +17 -17
- package/dist/rules/group-imports.js.map +1 -1
- package/dist/rules/sort-imports.d.ts +2 -2
- package/dist/rules/sort-imports.d.ts.map +1 -1
- package/dist/rules/sort-imports.js +29 -22
- package/dist/rules/sort-imports.js.map +1 -1
- package/package.json +1 -1
package/dist/index.d.ts
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
|
+
export declare const rules: {
|
|
2
|
+
'group-imports': import("./tools/rule.js").RuleModule<import("./rules/group-imports.js").GroupConfiguration[]>;
|
|
3
|
+
'sort-imports': import("./tools/rule.js").RuleModule<[(Partial<import("./rules/sort-imports.js").Configuration> | undefined)?]>;
|
|
4
|
+
};
|
|
1
5
|
declare const plugin: {
|
|
2
6
|
rules: {
|
|
3
|
-
'group-imports': import("./tools/rule").RuleModule<import("./rules/group-imports").GroupConfiguration[]>;
|
|
4
|
-
'sort-imports': import("./tools/rule").RuleModule<[(Partial<import("./rules/sort-imports").Configuration> | undefined)?]>;
|
|
7
|
+
'group-imports': import("./tools/rule.js").RuleModule<import("./rules/group-imports.js").GroupConfiguration[]>;
|
|
8
|
+
'sort-imports': import("./tools/rule.js").RuleModule<[(Partial<import("./rules/sort-imports.js").Configuration> | undefined)?]>;
|
|
5
9
|
};
|
|
6
10
|
};
|
|
7
11
|
export default plugin;
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAKA,QAAA,MAAM,MAAM;;;;;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,KAAK;;;CAGjB,CAAC;AAEF,QAAA,MAAM,MAAM;;;;;CAEa,CAAC;AAE1B,eAAe,MAAM,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
|
|
4
|
-
const
|
|
3
|
+
exports.rules = void 0;
|
|
4
|
+
const group_imports_js_1 = require("./rules/group-imports.js");
|
|
5
|
+
const sort_imports_js_1 = require("./rules/sort-imports.js");
|
|
6
|
+
exports.rules = {
|
|
7
|
+
'group-imports': group_imports_js_1.rule,
|
|
8
|
+
'sort-imports': sort_imports_js_1.rule,
|
|
9
|
+
};
|
|
5
10
|
const plugin = {
|
|
6
|
-
rules:
|
|
7
|
-
'group-imports': group_imports_1.rule,
|
|
8
|
-
'sort-imports': sort_imports_1.rule,
|
|
9
|
-
},
|
|
11
|
+
rules: exports.rules,
|
|
10
12
|
};
|
|
11
13
|
exports.default = plugin;
|
|
12
14
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAEA,+DAAgE;AAChE,6DAA8D;AAEjD,QAAA,KAAK,GAAG;IACpB,eAAe,EAAE,uBAAY;IAC7B,cAAc,EAAE,sBAAW;CAC3B,CAAC;AAEF,MAAM,MAAM,GAAG;IACd,KAAK,EAAL,aAAK;CACmB,CAAC;AAE1B,kBAAe,MAAM,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { RuleModule } from '../tools/rule';
|
|
1
|
+
import type { RuleModule } from '../tools/rule.js';
|
|
2
2
|
export type ModuleClassOption = 'node' | 'external' | 'absolute' | 'relative';
|
|
3
3
|
export type TypeImportOption = 'include' | 'exclude' | 'only';
|
|
4
4
|
declare const ModuleClass_base: import("@shigen/enum").EnumConstructor<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"group-imports.d.ts","sourceRoot":"","sources":["../../src/rules/group-imports.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAe,UAAU,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"group-imports.d.ts","sourceRoot":"","sources":["../../src/rules/group-imports.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAe,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAKhE,MAAM,MAAM,iBAAiB,GAAG,MAAM,GAAG,UAAU,GAAG,UAAU,GAAG,UAAU,CAAC;AAC9E,MAAM,MAAM,gBAAgB,GAAG,SAAS,GAAG,SAAS,GAAG,MAAM,CAAC;;SAKjB,iBAAiB;;;;;AAA9D,qBAAa,WAAY,SAAQ,gBAA+C;IAC/E,MAAM,CAAC,QAAQ,CAAC,IAAI,cAAmD;IACvE,MAAM,CAAC,QAAQ,CAAC,QAAQ,cAAuD;IAC/E,MAAM,CAAC,QAAQ,CAAC,QAAQ,cAAuD;IAC/E,MAAM,CAAC,QAAQ,CAAC,QAAQ,cAAuD;CAC/E;;SAE2C,gBAAgB;;;;;AAA5D,qBAAa,UAAW,SAAQ,eAA6C;IAC5E,MAAM,CAAC,QAAQ,CAAC,OAAO,aAAoD;IAC3E,MAAM,CAAC,QAAQ,CAAC,OAAO,aAAoD;IAC3E,MAAM,CAAC,QAAQ,CAAC,IAAI,aAAiD;CACrE;AAED,UAAU,wBAAwB;IACjC,KAAK,EAAE,iBAAiB,CAAC;IACzB,KAAK,CAAC,EAAE,gBAAgB,CAAC;CACzB;AAED,UAAU,uBAAuB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,gBAAgB,CAAC;CACzB;AAED,KAAK,mBAAmB,GAAG,MAAM,GAAG,uBAAuB,GAAG,wBAAwB,CAAC;AAEvF,MAAM,MAAM,kBAAkB,GAAG,mBAAmB,GAAG,mBAAmB,EAAE,CAAC;AAgL7E,eAAO,MAAM,IAAI,EAAE,UAAU,CAAC,kBAAkB,EAAE,CAuHjD,CAAC"}
|
|
@@ -4,9 +4,9 @@ exports.rule = exports.TypeImport = exports.ModuleClass = void 0;
|
|
|
4
4
|
const node_module_1 = require("node:module");
|
|
5
5
|
const node_path_1 = require("node:path");
|
|
6
6
|
const enum_1 = require("@shigen/enum");
|
|
7
|
-
const
|
|
8
|
-
const
|
|
9
|
-
const
|
|
7
|
+
const ast_js_1 = require("../tools/ast.js");
|
|
8
|
+
const rule_js_1 = require("../tools/rule.js");
|
|
9
|
+
const sort_js_1 = require("../tools/sort.js");
|
|
10
10
|
const moduleClassId = Symbol();
|
|
11
11
|
const typeImportId = Symbol();
|
|
12
12
|
class ModuleClass extends (0, enum_1.Enum)(moduleClassId) {
|
|
@@ -39,7 +39,7 @@ function groupIndex(node, groups) {
|
|
|
39
39
|
}
|
|
40
40
|
return callback(group);
|
|
41
41
|
});
|
|
42
|
-
const isTypeImport = (0,
|
|
42
|
+
const isTypeImport = (0, ast_js_1.isTypeImportOrExport)(node);
|
|
43
43
|
const hardCodedIndex = findIndex((group) => {
|
|
44
44
|
if (typeof group === 'string') {
|
|
45
45
|
return importPath.startsWith(group);
|
|
@@ -85,11 +85,11 @@ function checkLines(context, previous, next, lineCount) {
|
|
|
85
85
|
const tokensBetween = context.sourceCode.getTokensBetween(previous, next, { includeComments: true });
|
|
86
86
|
const relevantItems = [previous];
|
|
87
87
|
for (const token of tokensBetween) {
|
|
88
|
-
if (!(0,
|
|
88
|
+
if (!(0, ast_js_1.isComment)(token)) {
|
|
89
89
|
return context.report({
|
|
90
90
|
loc: {
|
|
91
|
-
start: (0,
|
|
92
|
-
end: (0,
|
|
91
|
+
start: (0, ast_js_1.assertLoc)(tokensBetween.find((t) => !(0, ast_js_1.isComment)(t))).start,
|
|
92
|
+
end: (0, ast_js_1.assertLoc)(tokensBetween.findLast((t) => !(0, ast_js_1.isComment)(t))).end,
|
|
93
93
|
},
|
|
94
94
|
message: `Unexpected code between imports of group`,
|
|
95
95
|
});
|
|
@@ -100,10 +100,10 @@ function checkLines(context, previous, next, lineCount) {
|
|
|
100
100
|
for (let i = 0; i < relevantItems.length - 1; i++) {
|
|
101
101
|
const a = relevantItems[i];
|
|
102
102
|
const b = relevantItems[i + 1];
|
|
103
|
-
const locA = (0,
|
|
104
|
-
const locB = (0,
|
|
105
|
-
const rangeA = (0,
|
|
106
|
-
const rangeB = (0,
|
|
103
|
+
const locA = (0, ast_js_1.assertLoc)(a);
|
|
104
|
+
const locB = (0, ast_js_1.assertLoc)(b);
|
|
105
|
+
const rangeA = (0, ast_js_1.assertRange)(a);
|
|
106
|
+
const rangeB = (0, ast_js_1.assertRange)(b);
|
|
107
107
|
const linesBetween = locB.start.line - locA.end.line - 1;
|
|
108
108
|
if (lineCount === 0) {
|
|
109
109
|
if (linesBetween > 0) {
|
|
@@ -122,7 +122,7 @@ function checkLines(context, previous, next, lineCount) {
|
|
|
122
122
|
}
|
|
123
123
|
}
|
|
124
124
|
else {
|
|
125
|
-
const columnOffset = (0,
|
|
125
|
+
const columnOffset = (0, ast_js_1.isComment)(b) ? 0 : locB.start.column;
|
|
126
126
|
const reportLoc = {
|
|
127
127
|
start: locA.end,
|
|
128
128
|
end: {
|
|
@@ -131,7 +131,7 @@ function checkLines(context, previous, next, lineCount) {
|
|
|
131
131
|
},
|
|
132
132
|
};
|
|
133
133
|
const fix = (fixer) => fixer.replaceTextRange([rangeA[1], rangeB[0] - columnOffset], '\n\n');
|
|
134
|
-
if ((0,
|
|
134
|
+
if ((0, ast_js_1.isComment)(a) || (0, ast_js_1.isComment)(b)) {
|
|
135
135
|
if (linesBetween > 1) {
|
|
136
136
|
context.report({
|
|
137
137
|
loc: reportLoc,
|
|
@@ -219,7 +219,7 @@ exports.rule = {
|
|
|
219
219
|
create(context) {
|
|
220
220
|
const groupConfigurations = context.options.length ? context.options : defaultConfiguration;
|
|
221
221
|
const source = context.sourceCode;
|
|
222
|
-
const imports = (0,
|
|
222
|
+
const imports = (0, ast_js_1.importModules)(source).map((node) => {
|
|
223
223
|
return {
|
|
224
224
|
index: groupIndex(node, groupConfigurations),
|
|
225
225
|
node,
|
|
@@ -228,7 +228,7 @@ exports.rule = {
|
|
|
228
228
|
if (imports.length === 0) {
|
|
229
229
|
return {};
|
|
230
230
|
}
|
|
231
|
-
const sorted = (0,
|
|
231
|
+
const sorted = (0, sort_js_1.sortByPath)(imports, ['index']);
|
|
232
232
|
let previousIndex = sorted[0]?.index;
|
|
233
233
|
const groups = sorted.reduce((result, value) => {
|
|
234
234
|
const current = result.at(-1);
|
|
@@ -242,8 +242,8 @@ exports.rule = {
|
|
|
242
242
|
return result;
|
|
243
243
|
}, [[]]);
|
|
244
244
|
if (sorted.some((node, i) => node !== imports[i])) {
|
|
245
|
-
(0,
|
|
246
|
-
range: (0,
|
|
245
|
+
(0, rule_js_1.fixRange)(context, {
|
|
246
|
+
range: (0, ast_js_1.extrema)(imports.map(({ node }) => node)),
|
|
247
247
|
message: `Expected import groups: ${groupLabels(groupConfigurations).join(', ')}`,
|
|
248
248
|
code: groups.map((nodes) => nodes.map((node) => source.getText(node)).join('\n')).join('\n\n'),
|
|
249
249
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"group-imports.js","sourceRoot":"","sources":["../../src/rules/group-imports.ts"],"names":[],"mappings":";;;AAAA,6CAAwC;AACxC,yCAAuC;AAIvC,uCAAoC;AAIpC,
|
|
1
|
+
{"version":3,"file":"group-imports.js","sourceRoot":"","sources":["../../src/rules/group-imports.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { RuleModule } from '../tools/rule';
|
|
2
|
-
import type { SortOptions } from '../tools/sort';
|
|
1
|
+
import type { RuleModule } from '../tools/rule.js';
|
|
2
|
+
import type { SortOptions } from '../tools/sort.js';
|
|
3
3
|
export type GroupPositionOption = 'ignore' | 'top' | 'bottom' | 'above-value' | 'below-value';
|
|
4
4
|
export type InlinePositionOption = 'ignore' | 'start' | 'end';
|
|
5
5
|
declare const TypeImportGroupPosition_base: import("@shigen/enum").EnumConstructor<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sort-imports.d.ts","sourceRoot":"","sources":["../../src/rules/sort-imports.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"sort-imports.d.ts","sourceRoot":"","sources":["../../src/rules/sort-imports.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAKpD,MAAM,MAAM,mBAAmB,GAAG,QAAQ,GAAG,KAAK,GAAG,QAAQ,GAAG,aAAa,GAAG,aAAa,CAAC;AAC9F,MAAM,MAAM,oBAAoB,GAAG,QAAQ,GAAG,OAAO,GAAG,KAAK,CAAC;;SAKL,mBAAmB;;;;;AAA5E,qBAAa,uBAAwB,SAAQ,4BAA6D;IACzG,MAAM,CAAC,QAAQ,CAAC,MAAM,0BAA6E;IACnG,MAAM,CAAC,QAAQ,CAAC,GAAG,0BAA0E;IAC7F,MAAM,CAAC,QAAQ,CAAC,MAAM,0BAA6E;IACnG,MAAM,CAAC,QAAQ,CAAC,UAAU,0BAAkF;IAC5G,MAAM,CAAC,QAAQ,CAAC,UAAU,0BAAkF;CAC5G;;SAEyD,oBAAoB;;;;;AAA9E,qBAAa,wBAAyB,SAAQ,6BAA+D;IAC5G,MAAM,CAAC,QAAQ,CAAC,MAAM,2BAA+E;IACrG,MAAM,CAAC,QAAQ,CAAC,KAAK,2BAA8E;IACnG,MAAM,CAAC,QAAQ,CAAC,GAAG,2BAA4E;CAC/F;AAED,MAAM,WAAW,aAAc,SAAQ,WAAW;IACjD,SAAS,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAC/B,WAAW,EAAE,OAAO,CAAC;IACrB,YAAY,EAAE,mBAAmB,CAAC;IAClC,WAAW,EAAE,oBAAoB,CAAC;CAClC;AAYD,eAAO,MAAM,IAAI,EAAE,UAAU,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CA6LtD,CAAC"}
|
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.rule = exports.TypeImportInlinePosition = exports.TypeImportGroupPosition = void 0;
|
|
4
4
|
const enum_1 = require("@shigen/enum");
|
|
5
|
-
const
|
|
6
|
-
const
|
|
7
|
-
const
|
|
5
|
+
const ast_js_1 = require("../tools/ast.js");
|
|
6
|
+
const rule_js_1 = require("../tools/rule.js");
|
|
7
|
+
const sort_js_1 = require("../tools/sort.js");
|
|
8
8
|
const typeImportGroupPositionId = Symbol();
|
|
9
9
|
const typeImportInlinePositionId = Symbol();
|
|
10
10
|
class TypeImportGroupPosition extends (0, enum_1.Enum)(typeImportGroupPositionId) {
|
|
@@ -78,18 +78,18 @@ exports.rule = {
|
|
|
78
78
|
const configuration = { ...defaultConfiguration, ...context.options[0] };
|
|
79
79
|
const source = context.sourceCode;
|
|
80
80
|
const partition = (result, node, index, from) => {
|
|
81
|
-
if (index > 0 && (0,
|
|
81
|
+
if (index > 0 && (0, ast_js_1.linesBetween)(from[index - 1], node) > 0) {
|
|
82
82
|
result.push([]);
|
|
83
83
|
}
|
|
84
84
|
result.at(-1)?.push(node);
|
|
85
85
|
return result;
|
|
86
86
|
};
|
|
87
87
|
const sortModules = (group) => {
|
|
88
|
-
const sorted = (0,
|
|
88
|
+
const sorted = (0, sort_js_1.sortByPath)(group, ['source', 'value'], configuration);
|
|
89
89
|
if (configuration.typesInGroup !== TypeImportGroupPosition.Ignore.key) {
|
|
90
90
|
sorted.sort((a, b) => {
|
|
91
|
-
const aIsType = (0,
|
|
92
|
-
const bIsType = (0,
|
|
91
|
+
const aIsType = (0, ast_js_1.isTypeImportOrExport)(a);
|
|
92
|
+
const bIsType = (0, ast_js_1.isTypeImportOrExport)(b);
|
|
93
93
|
if (aIsType === bIsType) {
|
|
94
94
|
return 0;
|
|
95
95
|
}
|
|
@@ -113,13 +113,20 @@ exports.rule = {
|
|
|
113
113
|
});
|
|
114
114
|
}
|
|
115
115
|
if (sorted.some((node, i) => node !== group[i])) {
|
|
116
|
-
(0,
|
|
117
|
-
range: (0,
|
|
116
|
+
(0, rule_js_1.fixRange)(context, {
|
|
117
|
+
range: (0, ast_js_1.extrema)(group),
|
|
118
118
|
message: 'Expected modules in group to be sorted',
|
|
119
119
|
code: sorted.map((node) => source.getText(node)).join('\n'),
|
|
120
120
|
});
|
|
121
121
|
}
|
|
122
122
|
};
|
|
123
|
+
const specifiersText = (nodes) => {
|
|
124
|
+
if (nodes[0]?.loc?.start.line !== nodes[1]?.loc?.start.line) {
|
|
125
|
+
const indent = source.lines[nodes[0].loc.start.line - 1]?.match(/^\s+/g)?.[0] ?? '';
|
|
126
|
+
return nodes.map((node, index) => `${index > 0 ? indent : ''}${source.getText(node)}`).join(',\n');
|
|
127
|
+
}
|
|
128
|
+
return nodes.map((node) => source.getText(node)).join(', ');
|
|
129
|
+
};
|
|
123
130
|
const sortSpecifiers = (specifiers) => {
|
|
124
131
|
if (!specifiers.length) {
|
|
125
132
|
return;
|
|
@@ -127,15 +134,15 @@ exports.rule = {
|
|
|
127
134
|
const sorted = (() => {
|
|
128
135
|
if (specifiers[0]?.type === 'ImportSpecifier') {
|
|
129
136
|
const from = configuration.specifier === 'source' ? 'imported' : 'local';
|
|
130
|
-
return (0,
|
|
137
|
+
return (0, sort_js_1.sortByPath)(specifiers, [from, 'name'], configuration);
|
|
131
138
|
}
|
|
132
139
|
const from = configuration.specifier === 'source' ? 'local' : 'exported';
|
|
133
|
-
return (0,
|
|
140
|
+
return (0, sort_js_1.sortByPath)(specifiers, [from, 'name'], configuration);
|
|
134
141
|
})();
|
|
135
142
|
if (configuration.inlineTypes !== TypeImportInlinePosition.Ignore.key) {
|
|
136
143
|
sorted.sort((a, b) => {
|
|
137
|
-
const aIsType = (0,
|
|
138
|
-
const bIsType = (0,
|
|
144
|
+
const aIsType = (0, ast_js_1.isTypeImportOrExport)(a);
|
|
145
|
+
const bIsType = (0, ast_js_1.isTypeImportOrExport)(b);
|
|
139
146
|
if (aIsType === bIsType) {
|
|
140
147
|
return 0;
|
|
141
148
|
}
|
|
@@ -150,14 +157,14 @@ exports.rule = {
|
|
|
150
157
|
});
|
|
151
158
|
}
|
|
152
159
|
if (sorted.some((node, i) => node !== specifiers[i])) {
|
|
153
|
-
(0,
|
|
154
|
-
range: (0,
|
|
160
|
+
(0, rule_js_1.fixRange)(context, {
|
|
161
|
+
range: (0, ast_js_1.extrema)(specifiers),
|
|
155
162
|
message: 'Expected specifiers to be sorted',
|
|
156
|
-
code: sorted
|
|
163
|
+
code: specifiersText(sorted),
|
|
157
164
|
});
|
|
158
165
|
}
|
|
159
166
|
};
|
|
160
|
-
(0,
|
|
167
|
+
(0, ast_js_1.importModules)(source)
|
|
161
168
|
.reduce(partition, [[]])
|
|
162
169
|
.forEach((group) => {
|
|
163
170
|
sortModules(group);
|
|
@@ -168,16 +175,16 @@ exports.rule = {
|
|
|
168
175
|
if (configuration.sortExports) {
|
|
169
176
|
const sortExportSpecifiers = (specifiers) => {
|
|
170
177
|
const from = configuration.specifier === 'source' ? 'local' : 'exported';
|
|
171
|
-
const sorted = (0,
|
|
178
|
+
const sorted = (0, sort_js_1.sortByPath)(specifiers, [from, 'name'], configuration);
|
|
172
179
|
if (sorted.some((node, i) => node !== specifiers[i])) {
|
|
173
|
-
(0,
|
|
174
|
-
range: (0,
|
|
180
|
+
(0, rule_js_1.fixRange)(context, {
|
|
181
|
+
range: (0, ast_js_1.extrema)(specifiers),
|
|
175
182
|
message: 'Expected specifiers to be sorted',
|
|
176
|
-
code: sorted
|
|
183
|
+
code: specifiersText(sorted),
|
|
177
184
|
});
|
|
178
185
|
}
|
|
179
186
|
};
|
|
180
|
-
(0,
|
|
187
|
+
(0, ast_js_1.exportModules)(source)
|
|
181
188
|
.reduce(partition, [[]])
|
|
182
189
|
.forEach((group) => {
|
|
183
190
|
sortModules(group);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sort-imports.js","sourceRoot":"","sources":["../../src/rules/sort-imports.ts"],"names":[],"mappings":";;;AACA,uCAAoC;AAWpC,
|
|
1
|
+
{"version":3,"file":"sort-imports.js","sourceRoot":"","sources":["../../src/rules/sort-imports.ts"],"names":[],"mappings":"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"}
|