@putout/plugin-types 7.0.0 → 8.1.0

package/lib/apply-is-array/index.js

@@ -1,8 +1,6 @@
-'use strict';
+export const report = () => `Use 'Array.isArray()' instead of 'instanceof'`;
 
-module.exports.report = () => `Use 'Array.isArray()' instead of 'instanceof'`;
-
-module.exports.replace = ({options}) => {
+export const replace = ({options}) => {
     const {inline} = options;
     
     return {

package/lib/convert-typeof-to-is-type/index.js

@@ -1,7 +1,10 @@
-'use strict';
+import {operator} from 'putout';
 
-const {operator} = require('putout');
-const {compare, getBindingPath} = operator;
+const {
+    compare,
+    getBindingPath,
+    extract,
+} = operator;
 
 const NAMES = {
     function: 'isFn',
@@ -11,6 +14,7 @@ const NAMES = {
     undefined: 'isUndefined',
     symbol: 'isSymbol',
     bigint: 'isBigInt',
+    Object: 'isObject',
 };
 
 const EQUAL = 'typeof __a === "__b"';
@@ -50,17 +54,18 @@ const NOT_BODIES = {
     equalUndefined: '__a !== undefined',
 };
 
-module.exports.report = () => `Use function to check type instead of 'typeof' or 'instanceof'`;
-module.exports.match = () => ({
+export const report = () => `Use function to check type instead of 'typeof' or 'instanceof'`;
+export const match = () => ({
     [EQUAL]: check,
     [NOT_EQUAL]: check,
-    [EQUAL_INSTANCE_OF]: check,
+    
     [NOT_EQUAL_INSTANCE_OF]: check,
     [EQUAL_UNDEFINED]: check,
     [NOT_EQUAL_UNDEFINED]: check,
+    [EQUAL_INSTANCE_OF]: check,
 });
 
-module.exports.replace = () => ({
+export const replace = () => ({
     [BODIES.function]: 'isFn(__a)',
     [BODIES.string]: 'isString(__a)',
     [BODIES.number]: 'isNumber(__a)',
@@ -89,7 +94,7 @@ function check({__a, __b}, path) {
     if (path.parentPath.isFunction())
         return false;
     
-    if (__b && isBind(path, __b.value))
+    if (__b && isBind(path, extract(__b)))
         return false;
     
     return getBindingPath(path, __a);
@@ -104,7 +109,13 @@ function isBind(path, name) {
         return false;
     
     if (bindingPath.isVariableDeclarator()) {
-        const {body} = bindingPath.node.init;
+        const initPath = bindingPath.get('init');
+        
+        if (!initPath.isFunction())
+            return true;
+        
+        const {body} = initPath.node;
+        
         return !compare(body, fnBody);
     }
     

package/lib/declare/index.js

@@ -1,6 +1,4 @@
-'use strict';
-
-module.exports.declare = () => ({
+export const declare = () => ({
     isString: `const isString = (a) => typeof a === 'string'`,
     isEmptyString: `const isEmptyString = (a) => !a && isString(a)`,
     isNumber: `const isNumber = (a) => !Number.isNaN(a) && typeof a === 'number'`,

package/lib/index.js

@@ -1,16 +1,14 @@
-'use strict';
+import * as applyIsArray from './apply-is-array/index.js';
+import * as declare from './declare/index.js';
+import * as convertTypeofToIsType from './convert-typeof-to-is-type/index.js';
+import * as removeUselessConversion from './remove-useless-conversion/index.js';
+import * as removeUselessConstructor from './remove-useless-constructor/index.js';
+import * as removeDoubleNegations from './remove-double-negations/index.js';
+import * as removeUselessTypeof from './remove-useless-typeof/index.js';
 
-const applyIsArray = require('./apply-is-array');
-const declare = require('./declare');
-const convertTypeofToIsType = require('./convert-typeof-to-is-type');
-const removeUselessConversion = require('./remove-useless-conversion');
-const removeUselessConstructor = require('./remove-useless-constructor');
-const removeDoubleNegations = require('./remove-double-negations');
-const removeUselessTypeof = require('./remove-useless-typeof');
-
-module.exports.rules = {
+export const rules = {
     'apply-is-array': applyIsArray,
-    declare,
+    'declare': declare,
     'convert-typeof-to-is-type': convertTypeofToIsType,
     'remove-useless-conversion': removeUselessConversion,
     'remove-useless-constructor': removeUselessConstructor,

package/lib/remove-double-negations/index.js

@@ -1,10 +1,8 @@
-'use strict';
+export const report = () => `Avoid double negations in conditions`;
 
-module.exports.report = () => `Avoid double negations in conditions`;
+export const filter = ({parentPath}) => !parentPath.isJSXExpressionContainer();
 
-module.exports.filter = ({parentPath}) => !parentPath.isJSXExpressionContainer();
-
-module.exports.replace = () => ({
+export const replace = () => ({
     'if (!!__a) __b': 'if (__a) __b',
     '!!__a ? __b : __c': '__a ? __b : __c',
     '!!__a && __b': '__a && __b',

package/lib/remove-useless-constructor/index.js

@@ -1,19 +1,18 @@
-'use strict';
+import {types} from 'putout';
 
-const {types} = require('putout');
 const {
     isBooleanLiteral,
     isNumericLiteral,
 } = types;
 
-module.exports.report = () => 'Avoid useless constructor';
+export const report = () => 'Avoid useless constructor';
 
-module.exports.match = () => ({
+export const match = () => ({
     'Boolean(__a)': ({__a}) => isBooleanLiteral(__a),
     'Number(__a)': ({__a}) => isNumericLiteral(__a),
 });
 
-module.exports.replace = () => ({
+export const replace = () => ({
     'String("__a")': '__a',
     'Boolean(__a)': '__a',
     'Number(__a)': '__a',

package/lib/remove-useless-conversion/index.js

@@ -1,8 +1,6 @@
-'use strict';
+export const report = () => `Avoid useless type conversion`;
 
-module.exports.report = () => `Avoid useless type conversion`;
-
-module.exports.replace = () => ({
+export const replace = () => ({
     'Boolean(__a.includes(__b))': '__a.includes(__b)',
     'String(typeof __a)': 'typeof __a',
     'if (Boolean(__a)) __b': 'if (__a) __b',

package/lib/remove-useless-typeof/index.js

@@ -1,7 +1,5 @@
-'use strict';
+export const report = () => `Avoid useless 'typeof'`;
 
-module.exports.report = () => `Avoid useless 'typeof'`;
-
-module.exports.replace = () => ({
+export const replace = () => ({
     'typeof typeof __a': 'typeof __a',
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@putout/plugin-types",
-  "version": "7.0.0",
-  "type": "commonjs",
+  "version": "8.1.0",
+  "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin adds ability to transform code related to types assertions",
   "homepage": "https://github.com/coderaiser/putout/tree/master/packages/plugin-types#readme",
@@ -31,24 +31,24 @@
     "types"
   ],
   "devDependencies": {
-    "@putout/eslint-flat": "^2.0.0",
+    "@putout/eslint-flat": "^3.0.0",
+    "@putout/plugin-declare-before-reference": "*",
     "@putout/plugin-putout": "*",
-    "@putout/test": "^11.0.0",
+    "@putout/test": "^14.0.0",
     "c8": "^10.0.0",
     "eslint": "^9.0.0",
     "eslint-plugin-n": "^17.0.0",
-    "eslint-plugin-putout": "^24.0.0",
-    "lerna": "^6.0.1",
-    "madrun": "^10.0.0",
+    "eslint-plugin-putout": "^28.0.0",
+    "madrun": "^11.0.0",
     "montag": "^1.2.1",
     "nodemon": "^3.0.1"
   },
   "peerDependencies": {
-    "putout": ">=38"
+    "putout": ">=40"
   },
   "license": "MIT",
   "engines": {
-    "node": ">=18"
+    "node": ">=20"
   },
   "publishConfig": {
     "access": "public"