eslint-plugin-putout 29.3.0 → 29.4.0

package/lib/nonblock-statement-body-newline/index.js

@@ -1,6 +1,5 @@
-'use strict';
+import {types} from 'putout';
 
-const {types} = require('putout');
 const {
     isBlockStatement,
     isIfStatement,
@@ -9,20 +8,20 @@ const {
 
 const reg = /\)\n(\s+)?\n/;
 
-module.exports.report = () => `Remove useless newline`;
+export const report = () => `Remove useless newline`;
 
-module.exports.fix = ({text}) => {
+export const fix = ({text}) => {
     return text.replace(reg, ')\n');
 };
 
-module.exports.include = () => [
+export const include = () => [
     'IfStatement',
     'ForOfStatement',
     'ForStatement',
     'WhileStatement',
 ];
 
-module.exports.filter = ({text, node}) => {
+export const filter = ({text, node}) => {
     if (isIf(text, node))
         return true;
     

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

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

package/lib/objects-braces-inside-array/index.js

@@ -1,11 +1,11 @@
-'use strict';
+import {types} from 'putout';
 
-const {isObjectExpression} = require('putout').types;
+const {isObjectExpression} = types;
 
-module.exports.category = 'destructuring';
-module.exports.report = () => 'Keep braces on the same line with brackets';
+export const category = 'destructuring';
+export const report = () => 'Keep braces on the same line with brackets';
 
-module.exports.include = () => [
+export const include = () => [
     'ArrayExpression',
 ];
 
@@ -13,7 +13,7 @@ const badStart = /^\[\n(\s+)?{/;
 const badEndReg = /},?\n(\s+)?]/;
 const badMiddle = /\},\n(\s+)?\{/;
 
-module.exports.filter = ({node, text}) => {
+export const filter = ({node, text}) => {
     const {elements} = node;
     
     for (const element of elements) {
@@ -28,7 +28,7 @@ module.exports.filter = ({node, text}) => {
     return isStart || isEnd || isBadMiddle;
 };
 
-module.exports.fix = ({text}) => {
+export const fix = ({text}) => {
     return text
         .replace('[\n', '[')
         .replace(/\[\s+{/, '[{')

package/lib/plugin.js

@@ -0,0 +1,70 @@
+import {createPlugin} from '@putout/eslint/create-plugin';
+import * as arrayElementNewline from './array-element-newline/index.js';
+import * as singlePropertyDestructuring from './single-property-destructuring/index.js';
+import * as multiplePropertiesDestructuring from './multiple-properties-destructuring/index.js';
+import * as forOfMultiplePropertiesDestructuring from './for-of-multiple-properties-destructuring/index.js';
+import * as longPropertiesDestructuring from './long-properties-destructuring/index.js';
+import * as destructuringAsFunctionArgument from './destructuring-as-function-argument/index.js';
+import * as alignSpaces from './align-spaces/index.js';
+import * as newlineFunctionCallArguments from './newline-function-call-arguments/index.js';
+import * as functionDeclarationParenNewline from './function-declaration-paren-newline/index.js';
+import * as addNewlinesBetweenTypesInUnion from './add-newlines-between-types-in-union/index.js';
+import * as addNewlinesBetweenSpecifiers from './add-newlines-between-specifiers/index.js';
+import * as addNewlineBeforeReturn from './add-newline-before-return/index.js';
+import * as addNewlineBeforeFunctionCall from './add-newline-before-function-call/index.js';
+import * as addNewlineAfterFunctionCall from './add-newline-after-function-call/index.js';
+import * as removeNewlineAfterDefaultImport from './remove-newline-after-default-import/index.js';
+import * as removeNewlineFromEmptyObject from './remove-newline-from-empty-object/index.js';
+import * as removeEmptyNewlineBeforeFirstSpecifier from './remove-empty-newline-before-first-specifier/index.js';
+import * as removeEmptyNewlineAfterLastSpecifier from './remove-empty-newline-after-last-specifier/index.js';
+import * as removeEmptyNewlineAfterLastElement from './remove-empty-newline-after-last-element/index.js';
+import * as removeEmptySpecifiers from './remove-empty-specifiers/index.js';
+import * as objectsBracesInsideArray from './objects-braces-inside-array/index.js';
+import * as objectPropertyNewline from './object-property-newline/index.js';
+import * as noUnresolved from './no-unresolved/index.js';
+import * as removeDuplicateExtensions from './remove-duplicate-extensions/index.js';
+import * as evaluate from './evaluate/index.js';
+import * as tapeAddNewlineBeforeAssertion from './tape-add-newline-before-assertion/index.js';
+import * as tapeAddNewlineBetweenTests from './tape-add-newline-between-tests/index.js';
+import * as tapeRemoveNewlineBeforeTEnd from './tape-remove-newline-before-t-end/index.js';
+import * as nonblockStatementBodyNewline from './nonblock-statement-body-newline/index.js';
+import putout from './putout/index.js';
+import removeEmptyNewlineAfterImport from './remove-empty-newline-after-import/index.js';
+import removeEmptyNewlineBetweenDeclarations from './remove-empty-newline-between-declarations/index.js';
+
+export const rules = {
+    'putout': putout,
+    'remove-empty-newline-after-import': removeEmptyNewlineAfterImport,
+    'remove-empty-newline-between-declarations': removeEmptyNewlineBetweenDeclarations,
+    
+    'function-declaration-paren-newline': createPlugin(functionDeclarationParenNewline),
+    'array-element-newline': createPlugin(arrayElementNewline),
+    'single-property-destructuring': createPlugin(singlePropertyDestructuring),
+    'multiple-properties-destructuring': createPlugin(multiplePropertiesDestructuring),
+    'for-of-multiple-properties-destructuring': createPlugin(forOfMultiplePropertiesDestructuring),
+    'long-properties-destructuring': createPlugin(longPropertiesDestructuring),
+    'destructuring-as-function-argument': createPlugin(destructuringAsFunctionArgument),
+    'align-spaces': createPlugin(alignSpaces),
+    'newline-function-call-arguments': createPlugin(newlineFunctionCallArguments),
+    'newlinene-function-call-arguments': createPlugin(functionDeclarationParenNewline),
+    'add-newlines-between-types-in-union': createPlugin(addNewlinesBetweenTypesInUnion),
+    'add-newlines-between-specifiers': createPlugin(addNewlinesBetweenSpecifiers),
+    'add-newline-before-return': createPlugin(addNewlineBeforeReturn),
+    'add-newline-before-function-call': createPlugin(addNewlineBeforeFunctionCall),
+    'add-newline-after-function-call': createPlugin(addNewlineAfterFunctionCall),
+    'remove-newline-after-default-import': createPlugin(removeNewlineAfterDefaultImport),
+    'remove-newline-from-empty-object': createPlugin(removeNewlineFromEmptyObject),
+    'remove-empty-newline-before-first-specifier': createPlugin(removeEmptyNewlineBeforeFirstSpecifier),
+    'remove-empty-newline-after-last-specifier': createPlugin(removeEmptyNewlineAfterLastSpecifier),
+    'remove-empty-newline-after-last-element': createPlugin(removeEmptyNewlineAfterLastElement),
+    'remove-empty-specifiers': createPlugin(removeEmptySpecifiers),
+    'objects-braces-inside-array': createPlugin(objectsBracesInsideArray),
+    'object-property-newline': createPlugin(objectPropertyNewline),
+    'no-unresolved': createPlugin(noUnresolved),
+    'remove-duplicate-extensions': createPlugin(removeDuplicateExtensions),
+    'evaluate': createPlugin(evaluate),
+    'tape-add-newline-before-assertion': createPlugin(tapeAddNewlineBeforeAssertion),
+    'tape-add-newline-between-tests': createPlugin(tapeAddNewlineBetweenTests),
+    'tape-remove-newline-before-t-end': createPlugin(tapeRemoveNewlineBeforeTEnd),
+    'nonblock-statement-body-newline': createPlugin(nonblockStatementBodyNewline),
+};

package/lib/putout/index.js

@@ -1,14 +1,13 @@
-'use strict';
-
-const {putoutSync} = require('./sync.mjs');
+import {putoutSync} from './sync.js';
 
 const getContextOptions = ({options}) => {
     const [allContextOptions = {}] = options;
     return allContextOptions;
 };
 
-module.exports = {
+export default {
     meta: {
+        messages: [],
         type: 'suggestion',
         docs: {
             description: 'Putout',
@@ -16,6 +15,7 @@ module.exports = {
             recommended: true,
         },
         schema: false,
+        defaultOptions: [],
         fixable: 'code',
     },
     

package/lib/putout/parse-error.js

@@ -1,6 +1,4 @@
-'use strict';
-
-module.exports.parseError = ({code, message, name}) => {
+export const parseError = ({code, message, name}) => {
     if (message.includes('buildError'))
         return 'Parser error';
     

package/lib/remove-duplicate-extensions/index.js

@@ -1,21 +1,19 @@
-'use strict';
-
 const getValue = ({source}) => source?.value;
 
-module.exports.category = 'errors';
-module.exports.report = () => 'Avoid duplicate extensions in relative imports';
-module.exports.include = () => [
+export const category = 'errors';
+export const report = () => 'Avoid duplicate extensions in relative imports';
+export const include = () => [
     'ImportDeclaration',
     'ImportExpression',
     'ExportAllDeclaration',
     'ExportNamedDeclaration',
 ];
 
-module.exports.fix = ({text}) => {
+export const fix = ({text}) => {
     return text.replace('.js.js', '.js');
 };
 
-module.exports.filter = ({node}) => {
+export const filter = ({node}) => {
     const value = getValue(node);
     return /\.js\.js/.test(value);
 };

package/lib/remove-empty-newline-after-import/index.js

@@ -1,6 +1,5 @@
-'use strict';
+import {isBuiltin} from 'node:module';
 
-const {isBuiltin} = require('node:module');
 const isLocal = (a) => a.source.value.startsWith('.');
 const isNode = (a) => isBuiltin(a.source.value);
 
@@ -11,7 +10,7 @@ const isSameGroup = (a, b) => {
     return isNode(a) && isNode(b);
 };
 
-module.exports = {
+export default {
     meta: {
         type: 'suggestion',
         docs: {

package/lib/remove-empty-newline-after-last-element/index.js

@@ -1,18 +1,16 @@
-'use strict';
-
-module.exports.category = 'array';
-module.exports.report = () => 'Remove newline after last element';
+export const category = 'array';
+export const report = () => 'Remove newline after last element';
 
 const regExp = /\n\n(\s+)?]/;
 
-module.exports.filter = ({text}) => {
+export const filter = ({text}) => {
     return regExp.test(text);
 };
 
-module.exports.fix = ({text}) => {
+export const fix = ({text}) => {
     return text.replace(regExp, '\n]');
 };
 
-module.exports.include = () => [
+export const include = () => [
     'ArrayExpression',
 ];

package/lib/remove-empty-newline-after-last-specifier/index.js

@@ -1,19 +1,17 @@
-'use strict';
-
-module.exports.category = 'import';
-module.exports.report = () => 'Remove newline after last specifier';
+export const category = 'import';
+export const report = () => 'Remove newline after last specifier';
 
 const regExp = /\n\n(\s+)?}/;
 
-module.exports.filter = ({text}) => {
+export const filter = ({text}) => {
     return regExp.test(text);
 };
 
-module.exports.fix = ({text}) => {
+export const fix = ({text}) => {
     return text.replace(regExp, '\n}');
 };
 
-module.exports.include = () => [
+export const include = () => [
     'ImportDeclaration',
     'ObjectExpression',
 ];

package/lib/remove-empty-newline-before-first-specifier/index.js

@@ -1,19 +1,17 @@
-'use strict';
-
-module.exports.category = 'import';
-module.exports.report = () => 'Remove newline before first specifier';
+export const category = 'import';
+export const report = () => 'Remove newline before first specifier';
 
 const regExp = /{\n(\s+)?\n/;
 
-module.exports.filter = ({text}) => {
+export const filter = ({text}) => {
     return regExp.test(text);
 };
 
-module.exports.fix = ({text}) => {
+export const fix = ({text}) => {
     return text.replace(regExp, '{\n');
 };
 
-module.exports.include = () => [
+export const include = () => [
     'ImportDeclaration',
     'ObjectExpression',
 ];

package/lib/remove-empty-newline-between-declarations/index.js

@@ -1,8 +1,8 @@
-'use strict';
+import {types} from 'putout';
 
-const {isObjectPattern} = require('putout').types;
+const {isObjectPattern} = types;
 
-module.exports = {
+export default {
     meta: {
         type: 'suggestion',
         docs: {

package/lib/remove-empty-specifiers/index.js

@@ -1,9 +1,7 @@
-'use strict';
+export const category = 'object';
+export const report = () => 'Remove empty import specifiers';
 
-module.exports.category = 'object';
-module.exports.report = () => 'Remove empty import specifiers';
-
-module.exports.filter = ({text, node, getCommentsInside}) => {
+export const filter = ({text, node, getCommentsInside}) => {
     const comments = getCommentsInside(node);
     
     if (comments.length)
@@ -12,12 +10,12 @@ module.exports.filter = ({text, node, getCommentsInside}) => {
     return text.includes('{}');
 };
 
-module.exports.fix = ({text}) => {
+export const fix = ({text}) => {
     return text
         .replace('import {} from', 'import')
         .replace(/,? {}/, '');
 };
 
-module.exports.include = () => [
+export const include = () => [
     'ImportDeclaration',
 ];

package/lib/remove-newline-after-default-import/index.js

@@ -1,18 +1,16 @@
-'use strict';
-
-module.exports.category = 'import';
-module.exports.report = () => 'Keep opening curly brace on one line with default import';
+export const category = 'import';
+export const report = () => 'Keep opening curly brace on one line with default import';
 
 const regExp = /,\n\s*{/;
 
-module.exports.filter = ({text}) => {
+export const filter = ({text}) => {
     return regExp.test(text);
 };
 
-module.exports.fix = ({text}) => {
+export const fix = ({text}) => {
     return text.replace(regExp, ', {');
 };
 
-module.exports.include = () => [
+export const include = () => [
     'ImportDeclaration',
 ];

package/lib/remove-newline-from-empty-object/index.js

@@ -1,14 +1,13 @@
-'use strict';
+import {types} from 'putout';
 
-const {types} = require('putout');
 const {isArrayExpression} = types;
 
-module.exports.category = 'object';
-module.exports.report = () => 'Remove newline from empty object';
+export const category = 'object';
+export const report = () => 'Remove newline from empty object';
 
 const regExp = /\n/;
 
-module.exports.filter = ({text, node, getCommentsInside}) => {
+export const filter = ({text, node, getCommentsInside}) => {
     const comments = getCommentsInside(node);
     
     if (comments.length)
@@ -23,8 +22,8 @@ module.exports.filter = ({text, node, getCommentsInside}) => {
     return regExp.test(text);
 };
 
-module.exports.fix = () => '{}';
+export const fix = () => '{}';
 
-module.exports.include = () => [
+export const include = () => [
     'ObjectExpression',
 ];

package/lib/single-property-destructuring/index.js

@@ -1,6 +1,4 @@
-'use strict';
-
-const {operator, types} = require('putout');
+import {operator, types} from 'putout';
 
 const {
     isRestElement,
@@ -14,15 +12,15 @@ const AssignRegExp = /{\n?.*=.*\n?.*}/;
 
 const {compare} = operator;
 
-module.exports.category = 'destructuring';
-module.exports.report = () => 'Keep curly braces on one line when you have one destructuring property';
+export const category = 'destructuring';
+export const report = () => 'Keep curly braces on one line when you have one destructuring property';
 
-module.exports.include = () => [
+export const include = () => [
     'VariableDeclarator[id.type="ObjectPattern"][id.properties.length=1]',
     'ImportDeclaration[specifiers.length=1]',
 ];
 
-module.exports.filter = ({node, text, getText, getCommentsInside}) => {
+export const filter = ({node, text, getText, getCommentsInside}) => {
     if (getCommentsInside(node).length)
         return false;
     
@@ -47,7 +45,7 @@ module.exports.filter = ({node, text, getText, getCommentsInside}) => {
     return false;
 };
 
-module.exports.fix = ({text, node, getText}) => {
+export const fix = ({text, node, getText}) => {
     if (isImportDeclaration(node))
         return text.replace(NewLinesReg, '');
     

package/lib/tape-add-newline-before-assertion/index.js

@@ -1,11 +1,9 @@
-'use strict';
-
-module.exports.category = 'tape';
-module.exports.report = () => 'Add newline before assertion';
+export const category = 'tape';
+export const report = () => 'Add newline before assertion';
 
 const regexp = /;\n +?t\..*;\n +?t.end\(\);/;
 
-module.exports.filter = ({text}) => {
+export const filter = ({text}) => {
     if (!/^test(\.only|\.skip)?\(/.test(text))
         return false;
     
@@ -20,11 +18,11 @@ module.exports.filter = ({text}) => {
     return regexp.test(text);
 };
 
-module.exports.fix = ({text}) => {
+export const fix = ({text}) => {
     const [assertion] = text.match(/\st\..*/);
     return text.replace(assertion, `\n${assertion}`);
 };
 
-module.exports.include = () => [
+export const include = () => [
     'CallExpression',
 ];

package/lib/tape-add-newline-between-tests/index.js

@@ -1,9 +1,7 @@
-'use strict';
+export const category = 'tape';
+export const report = () => 'Add newline between tests';
 
-module.exports.category = 'tape';
-module.exports.report = () => 'Add newline between tests';
-
-module.exports.filter = ({text, node, getText, getCommentsBefore}) => {
+export const filter = ({text, node, getText, getCommentsBefore}) => {
     if (!/^test(\.only|\.skip)?\(/.test(text))
         return false;
     
@@ -17,10 +15,10 @@ module.exports.filter = ({text, node, getText, getCommentsBefore}) => {
     return a === ';';
 };
 
-module.exports.fix = ({text}) => {
+export const fix = ({text}) => {
     return `\n${text}`;
 };
 
-module.exports.include = () => [
+export const include = () => [
     'CallExpression ',
 ];

package/lib/tape-remove-newline-before-t-end/index.js

@@ -1,6 +1,4 @@
-'use strict';
-
-const {operator, types} = require('putout');
+import {operator, types} from 'putout';
 
 const {
     isCallExpression,
@@ -9,12 +7,12 @@ const {
 
 const {compare} = operator;
 
-module.exports.category = 'tape';
-module.exports.report = () => 'Remove newline before t.end()';
+export const category = 'tape';
+export const report = () => 'Remove newline before t.end()';
 
 const newlineReg = /\n( +)?\n +t.end\(\)/;
 
-module.exports.filter = ({text, node}) => {
+export const filter = ({text, node}) => {
     if (!/^test(\.only|\.skip)?\(/.test(text))
         return false;
     
@@ -44,10 +42,10 @@ module.exports.filter = ({text, node}) => {
     return false;
 };
 
-module.exports.fix = ({text}) => {
+export const fix = ({text}) => {
     return text.replace(newlineReg, '\n    t.end()');
 };
 
-module.exports.include = () => [
+export const include = () => [
     'CallExpression',
 ];

package/lib/{ts.mjs → ts.js}

@@ -3,8 +3,8 @@ import tseslint from 'typescript-eslint';
 import tsPlugin from '@typescript-eslint/eslint-plugin';
 import stylistic from '@stylistic/eslint-plugin';
 import parser from '#typescript-eslint/parser';
-import {jsx} from './jsx.mjs';
-import * as plugin from './plugin.mjs';
+import {jsx} from './jsx.js';
+import * as plugin from './plugin.js';
 
 const {assign} = Object;
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eslint-plugin-putout",
-  "version": "29.3.0",
-  "type": "commonjs",
+  "version": "29.4.0",
+  "type": "module",
   "description": "ESLint plugin for 🐊Putout",
   "release": false,
   "tag": false,
@@ -12,7 +12,7 @@
     "url": "git+https://github.com/coderaiser/putout.git"
   },
   "exports": {
-    ".": "./lib/index.mjs",
+    ".": "./lib/index.js",
     "./babel": "./eslint-v10/babel.js"
   },
   "keywords": [

package/lib/plugin.mjs

@@ -1,47 +0,0 @@
-import {createRequire} from 'node:module';
-import {createPlugin} from '@putout/eslint/create-plugin';
-
-const require = createRequire(import.meta.url);
-
-const getRule = (a) => ({
-    [a]: require(`./${a}`),
-});
-
-const getWrapRule = (a) => ({
-    [a]: createPlugin(require(`./${a}`)),
-});
-
-export const rules = {
-    ...getWrapRule('array-element-newline'),
-    ...getWrapRule('single-property-destructuring'),
-    ...getWrapRule('multiple-properties-destructuring'),
-    ...getWrapRule('for-of-multiple-properties-destructuring'),
-    ...getWrapRule('long-properties-destructuring'),
-    ...getWrapRule('destructuring-as-function-argument'),
-    ...getWrapRule('align-spaces'),
-    ...getWrapRule('newline-function-call-arguments'),
-    ...getWrapRule('function-declaration-paren-newline'),
-    ...getWrapRule('add-newlines-between-types-in-union'),
-    ...getWrapRule('add-newlines-between-specifiers'),
-    ...getWrapRule('add-newline-before-return'),
-    ...getWrapRule('add-newline-before-function-call'),
-    ...getWrapRule('add-newline-after-function-call'),
-    ...getWrapRule('remove-newline-after-default-import'),
-    ...getWrapRule('remove-newline-from-empty-object'),
-    ...getWrapRule('remove-empty-newline-before-first-specifier'),
-    ...getWrapRule('remove-empty-newline-after-last-specifier'),
-    ...getWrapRule('remove-empty-newline-after-last-element'),
-    ...getWrapRule('remove-empty-specifiers'),
-    ...getWrapRule('objects-braces-inside-array'),
-    ...getWrapRule('object-property-newline'),
-    ...getWrapRule('no-unresolved'),
-    ...getWrapRule('remove-duplicate-extensions'),
-    ...getWrapRule('evaluate'),
-    ...getWrapRule('tape-add-newline-before-assertion'),
-    ...getWrapRule('tape-add-newline-between-tests'),
-    ...getWrapRule('tape-remove-newline-before-t-end'),
-    ...getWrapRule('nonblock-statement-body-newline'),
-    ...getRule('putout'),
-    ...getRule('remove-empty-newline-after-import'),
-    ...getRule('remove-empty-newline-between-declarations'),
-};