eslint-plugin-putout 14.12.0 → 15.1.1

package/README.md

@@ -57,7 +57,7 @@ Then configure the rules you want to use under the rules section.
         "putout/remove-empty-newline-after-import": "error",
         "putout/remove-empty-specifiers": "error",
         "putout/objects-braces-inside-array": "error",
-        "putout/object-init": "error",
+        "putout/object-property-newline": "error",
         "putout/tape-add-newline-between-tests": "error",
         "putout/tape-add-newline-before-assertion": "error",
         "putout/tape-remove-newline-before-t-end": "error"
@@ -81,6 +81,7 @@ Then configure the rules you want to use under the rules section.
 ### TypeScript
 
 - ✅ [Add newlines between types in union](/packages/eslint-plugin-putout/lib/add-newlines-between-types-in-union#readme)
+- ✅ [Object property newline](/packages/eslint-plugin-putout/lib/object-property-newline#readme)
 
 ### ESM
 
@@ -110,7 +111,6 @@ Then configure the rules you want to use under the rules section.
 - ✅ [Remove empty newline after import](/packages/eslint-plugin-putout/lib/remove-empty-newline-after-import#readme)
 - ✅ [Remove empty specifiers](/packages/eslint-plugin-putout/lib/remove-empty-specifiers#readme)
 - ✅ [Objects braces inside array](/packages/eslint-plugin-putout/lib/objects-braces-inside-array#readme)
-- ✅ [Object init](/packages/eslint-plugin-putout/lib/object-init#readme)
 - ✅ [Nonblock statement body newline](/packages/eslint-plugin-putout/lib/non-block-statement-body-newline#readme)
 
 ### Safe mode

package/lib/add-newlines-between-specifiers/index.js

@@ -1,7 +1,5 @@
 'use strict';
 
-const regExp = /, +?[A-z]/g;
-
 module.exports.category = 'layout';
 module.exports.report = () => 'Add newlines between specifiers';
 
@@ -19,6 +17,8 @@ module.exports.fix = ({text}) => {
 };
 
 module.exports.filter = ({text, node}) => {
+    const regExp = /, +?[a-zA-Z]/g;
+    
     if (node.specifiers.length < 4)
         return false;
     

package/lib/index.js

@@ -37,7 +37,7 @@ module.exports.rules = {
     ...getWrapRule('remove-empty-newline-after-last-element'),
     ...getWrapRule('remove-empty-specifiers'),
     ...getWrapRule('objects-braces-inside-array'),
-    ...getWrapRule('object-init'),
+    ...getWrapRule('object-property-newline'),
     ...getWrapRule('no-unresolved'),
     ...getWrapRule('remove-duplicate-extensions'),
     ...getWrapRule('evaluate'),
@@ -81,7 +81,7 @@ const recommended = {
         'putout/remove-empty-newline-after-import': 'error',
         'putout/remove-empty-specifiers': 'error',
         'putout/objects-braces-inside-array': 'error',
-        'putout/object-init': 'error',
+        'putout/object-property-newline': 'error',
         'putout/no-unresolved': 'error',
         'putout/remove-duplicate-extensions': 'error',
         'putout/evaluate': 'error',

package/lib/{object-init → object-property-newline}/README.md

@@ -1,20 +1,29 @@
-# object-init
+# object-property-newline
 
-Keep each property on separate line when initializing an object. In the same way as **ESLint** [`object-property-newline`](https://eslint.org/docs/rules/object-property-newline) but for initializing variables with [**Object Expression**](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Working_with_Objects).
+Keep each property on separate line when initializing an object. In the same way as **ESLint** [`object-property-newline`](https://eslint.org/docs/rules/object-property-newline) but for initializing variables with [**Object Expression**](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Working_with_Objects) or using `type` and `interface` keywords in **TypeScript**.
 
 Part of [**eslint-plugin-putout**](https://github.com/coderaiser/putout/tree/master/packages/eslint-plugin-putout#rules).
 
 ## ❌ Example of incorrect code
 
-```js
-const user = {name};
+```ts
+const user = {
+    name,
+};
+
+module.exports = {
+    lint: 'putout lint',
+};
 
-module.exports = {lint: 'putout lint'};
+type User = {name: string};
+interface Place {
+message: string
+}
 ```
 
 ## ✅ Example of correct code
 
-```js
+```ts
 const user = {
     name,
 };
@@ -22,4 +31,12 @@ const user = {
 module.exports = {
     lint: 'putout lint',
 };
+
+type User = {
+    name: string,
+};
+
+interface Place {
+    message: string;
+}
 ```

package/lib/object-property-newline/index.js

@@ -0,0 +1,63 @@
+'use strict';
+
+const {types} = require('putout');
+const {isCorrectLoc} = require('../common');
+
+const {
+    isVariableDeclarator,
+    isAssignmentExpression,
+    isTSTypeAliasDeclaration,
+} = types;
+
+module.exports.category = 'destructuring';
+module.exports.report = () => 'Keep each property on separate line';
+
+module.exports.include = () => [
+    `VariableDeclarator[init.type="ObjectExpression"]`,
+    `AssignmentExpression[right.type="ObjectExpression"]`,
+    `TSTypeAliasDeclaration[typeAnnotation.type="TSTypeLiteral"]`,
+    `TSInterfaceDeclaration`,
+];
+
+module.exports.filter = ({node}) => {
+    const {
+        loc,
+        right,
+    } = node;
+    
+    if (isVariableDeclarator(node)) {
+        const {init} = node;
+        const {properties} = init;
+        const {line} = loc.start;
+        
+        return !isCorrectLoc(line, properties);
+    }
+    
+    if (isAssignmentExpression(node)) {
+        const {properties} = right;
+        const {line} = loc.start;
+        
+        return !isCorrectLoc(line, properties);
+    }
+    
+    if (isTSTypeAliasDeclaration(node)) {
+        const {members} = node.typeAnnotation;
+        const {line} = loc.start;
+        
+        return !isCorrectLoc(line, members);
+    }
+    
+    const {body} = node.body;
+    const {line} = loc.start;
+    
+    return !isCorrectLoc(line, body);
+};
+
+module.exports.fix = ({text}) => {
+    return text
+        .replace(/,(\s+)?/g, ',\n    ')
+        .replace(/{/g, '{\n    ')
+        .replace(/}/g, '\n}')
+        .replace(/\n(\s+)?\n/g, '\n');
+};
+

package/lib/ts.js

@@ -7,8 +7,8 @@ const extensionRules = {
     'no-undef': 'off',
     'no-var': 'off',
     
-    'brace-style': 'off',
-    '@typescript-eslint/brace-style': ['error'],
+    // putout/object-property-newline instead
+    '@typescript-eslint/brace-style': 'off',
     
     'comma-dangle': 'off',
     '@typescript-eslint/comma-dangle': rules['comma-dangle'],

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "eslint-plugin-putout",
-  "version": "14.12.0",
+  "version": "15.1.1",
   "type": "commonjs",
-  "description": "eslint plugin for putout",
+  "description": "ESLint plugin for 🐊Putout",
   "release": false,
   "tag": false,
   "homepage": "https://github.com/coderaiser/putout/tree/master/packages/eslint-plugin-putout#readme",

package/lib/object-init/index.js

@@ -1,42 +0,0 @@
-'use strict';
-
-const {types} = require('putout');
-const {isCorrectLoc} = require('../common');
-
-const {isVariableDeclarator} = types;
-
-module.exports.category = 'destructuring';
-module.exports.report = () => 'Keep each property on separate line';
-
-module.exports.include = () => [
-    `VariableDeclarator[init.type="ObjectExpression"]`,
-    `AssignmentExpression[right.type="ObjectExpression"]`,
-];
-
-module.exports.filter = ({node}) => {
-    const {
-        loc,
-        right,
-    } = node;
-    
-    if (isVariableDeclarator(node)) {
-        const {init} = node;
-        const {properties} = init;
-        const {line} = loc.start;
-        
-        return !isCorrectLoc(line, properties);
-    }
-    
-    const {properties} = right;
-    const {line} = loc.start;
-    
-    return !isCorrectLoc(line, properties);
-};
-
-module.exports.fix = ({text}) => {
-    return text
-        .replace(/,/g, ',\n')
-        .replace(/{/g, '{\n')
-        .replace(/}/g, '\n}');
-};
-