eslint-plugin-turmag-special-rules 1.0.24 → 1.0.25

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.
@@ -34,18 +34,24 @@ module.exports = {
34
34
  });
35
35
  }
36
36
 
37
+ const getSpecifiersArr = specifiers => {
38
+ const specifiersArr = [];
39
+ specifiers.forEach(specifier => {
40
+ const localName = specifier.local.name;
41
+
42
+ const name = specifier.importKind === 'type' ? `type ${localName}` : localName;
43
+ specifiersArr.push(name);
44
+ });
45
+
46
+ return specifiersArr;
47
+ };
48
+
37
49
  if(areLinesRepeated){
38
50
  context.report({
39
51
  node,
40
52
  messageId: 'column',
41
53
  fix: fixer => {
42
- const specifiersArr = [];
43
- node.specifiers.forEach(specifier => {
44
- const localName = specifier.local.name;
45
-
46
- const name = specifier.importKind === 'type' ? `type ${localName}` : localName;
47
- specifiersArr.push(name);
48
- });
54
+ const specifiersArr = getSpecifiersArr(node.specifiers);
49
55
 
50
56
  const replaceShiftSign = '\n ';
51
57
  return fixer.replaceText(node, `import ${isTypedNode ? 'type ' : ''}{${replaceShiftSign}${specifiersArr.join(`,${replaceShiftSign}`)},\n} from '${node.source.value}';`);
@@ -57,13 +63,7 @@ module.exports = {
57
63
  node,
58
64
  messageId: 'line',
59
65
  fix: fixer => {
60
- const specifiersArr = [];
61
- node.specifiers.forEach(specifier => {
62
- const localName = specifier.local.name;
63
-
64
- const name = specifier.importKind === 'type' ? `type ${localName}` : localName;
65
- specifiersArr.push(name);
66
- });
66
+ const specifiersArr = getSpecifiersArr(node.specifiers);
67
67
 
68
68
  const replaceShiftSign = ' ';
69
69
  return fixer.replaceText(node, `import ${isTypedNode ? 'type ' : ''}{${replaceShiftSign}${specifiersArr.join(`,${replaceShiftSign}`)} } from '${node.source.value}';`);
@@ -37,18 +37,28 @@ module.exports = {
37
37
  });
38
38
  }
39
39
 
40
+ const getPropertiesArr = properties => {
41
+ const propertiesArr = [];
42
+ properties.forEach(property => {
43
+ if (property.type === 'RestElement') {
44
+ propertiesArr.push(`...${property.argument.name}`);
45
+ return;
46
+ }
47
+ const key = property.key.name;
48
+ const value = property.value.name;
49
+ const name = key === value ? value : `${key}: ${value}`;
50
+ propertiesArr.push(name);
51
+ });
52
+
53
+ return propertiesArr;
54
+ };
55
+
40
56
  if (areLinesRepeated) {
41
57
  context.report({
42
58
  node,
43
59
  messageId: 'column',
44
60
  fix: fixer => {
45
- const propertiesArr = [];
46
- properties.forEach(property => {
47
- const key = property.key.name;
48
- const value = property.value.name;
49
- const name = key === value ? value : `${key}: ${value}`;
50
- propertiesArr.push(name);
51
- });
61
+ const propertiesArr = getPropertiesArr(properties);
52
62
  const replaceShiftSign = '\n ';
53
63
  return fixer.replaceText(node, `${kind} {${replaceShiftSign}${propertiesArr.join(`,${replaceShiftSign}`)},\n} = ${rightSideText};`);
54
64
  },
@@ -58,13 +68,7 @@ module.exports = {
58
68
  node,
59
69
  messageId: 'line',
60
70
  fix: fixer => {
61
- const propertiesArr = [];
62
- properties.forEach(property => {
63
- const key = property.key.name;
64
- const value = property.value.name;
65
- const name = key === value ? value : `${key}: ${value}`;
66
- propertiesArr.push(name);
67
- });
71
+ const propertiesArr = getPropertiesArr(properties);
68
72
  const replaceShiftSign = ' ';
69
73
  return fixer.replaceText(node, `${kind} {${replaceShiftSign}${propertiesArr.join(`,${replaceShiftSign}`)} } = ${rightSideText};`);
70
74
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "eslint-plugin-turmag-special-rules",
3
- "version": "1.0.24",
3
+ "version": "1.0.25",
4
4
  "type": "commonjs",
5
5
  "description": "Special eslint rules for your awesome projects",
6
6
  "keywords": [