@putout/plugin-optional-chaining 1.0.4 → 3.0.0

package/README.md

@@ -114,7 +114,7 @@ maybeAnObj?.prop = theValue;
 maybeAnObj && (maybeAnObj.prop = theValue);
 ```
 
-## convert-optioanl-to-logical
+## convert-optional-to-logical
 
 Disabled by default.
 Checkout in 🐊[**Putout Editor**](https://putout.cloudcmd.io/#/gist/e0a4ccb41708ad37e34d527a978ebb88/482f15c954cdaa35e37da7a1dddb82338d7e93a2).

package/lib/convert-logical-assign-to-optional/index.js

@@ -1,8 +1,6 @@
-'use strict';
+export const report = () => `Use optional expression ('a?.b = c') instead of 'condition' ('a && a.b = c')`;
 
-module.exports.report = () => `Use optional expression ('a?.b = c') instead of 'condition' ('a && a.b = c')`;
-
-module.exports.replace = () => ({
+export const replace = () => ({
     'if (__a) {__a.__b = __c}': '__a?.__b = __c',
     'if (__a) __a.__b = __c': '__a?.__b = __c',
     '__a && (__a.__b = __c)': '__a?.__b = __c',

package/lib/convert-logical-to-optional/index.js

@@ -1,8 +1,6 @@
-'use strict';
+export const report = () => 'Use optional chaining';
 
-module.exports.report = () => 'Use optional chaining';
-
-module.exports.replace = () => ({
+export const replace = () => ({
     '__a && __a.__b && __a.__b.__c && __a.__b.__c.__d && __a.__b.__c.__d.__e': '__a?.__b?.__c?.__d?.__e',
     '__a && __a.__b && __a.__b.__c && __a.__b.__c.__d': '__a?.__b?.__c?.__d',
     '__a && __a.__b && __a.__b.__c': '__a?.__b?.__c',
@@ -11,7 +9,6 @@ module.exports.replace = () => ({
     '__a && __a[__b]': '__a?.[__b]',
     '__a[__b] && __a[__b][__c]': '__a[__b]?.[__c]',
     'typeof __a === "function" && __a(__args)': '__a?.(__args)',
-    'isFn(__a) && __a(__args)': '__a?.(__args)',
     'if (typeof __a === "function") __a(__args)': '__a?.(__args)',
     'if (typeof __a === "function") {__a(__args)}': '__a?.(__args)',
     '__a && __a.__b(__args)': '__a?.__b(__args)',

package/lib/convert-optional-assign-to-logical/index.js

@@ -1,13 +1,11 @@
-'use strict';
+import {template, operator} from 'putout';
+import {getLogical} from '../get-logical.js';
 
-const {template, operator} = require('putout');
-
-const {getLogical} = require('../get-logical');
 const {replaceWith} = operator;
 
-module.exports.report = () => `Use Logical Expression ('a && a.b = c') instead of Optional Chaining ('a?.b = c')`;
+export const report = () => `Use Logical Expression ('a && a.b = c') instead of Optional Chaining ('a?.b = c')`;
 
-module.exports.fix = (path) => {
+export const fix = (path) => {
     const logical = getLogical(path, {
         assign: true,
     });
@@ -18,7 +16,7 @@ module.exports.fix = (path) => {
     replaceWith(path.parentPath, logicalNode);
 };
 
-module.exports.traverse = ({push, listStore}) => ({
+export const traverse = ({push, listStore}) => ({
     'OptionalMemberExpression|OptionalCallExpression'(path) {
         if (!path.parentPath.isAssignmentExpression())
             return;

package/lib/convert-optional-to-logical/index.js

@@ -1,23 +1,21 @@
-'use strict';
+import {template, operator} from 'putout';
+import {getLogical} from '../get-logical.js';
 
-const {template, operator} = require('putout');
-const {getLogical} = require('../get-logical');
-
-module.exports.report = () => `Use Logical Expression instead of Optional Chaining`;
+export const report = () => `Use Logical Expression instead of Optional Chaining`;
 
 const {replaceWith} = operator;
 
-module.exports.fix = (path) => {
+export const fix = (path) => {
     const logical = getLogical(path);
     replaceWith(path, template.ast(logical));
 };
 
-module.exports.include = () => [
+export const include = () => [
     'OptionalMemberExpression',
     'OptionalCallExpression',
 ];
 
-module.exports.filter = ({parentPath}) => {
+export const filter = ({parentPath}) => {
     if (parentPath.isOptionalMemberExpression())
         return false;
     

package/lib/get-logical.js

@@ -1,6 +1,4 @@
-'use strict';
-
-module.exports.getLogical = (path, {assign} = {}) => {
+export const getLogical = (path, {assign} = {}) => {
     const list = path
         .toString()
         .split('?.');
@@ -11,7 +9,7 @@ module.exports.getLogical = (path, {assign} = {}) => {
     const logical = [member];
     
     while (++i < n) {
-        member += compute(member, list[i]);
+        member += compute(list[i]);
         logical.push(member);
     }
     
@@ -23,7 +21,7 @@ module.exports.getLogical = (path, {assign} = {}) => {
     return `${fullLogical} && (${logical.at(-1)} = __a)`;
 };
 
-function compute(member, current) {
+function compute(current) {
     if (current[0] === '(')
         return current;
     

package/lib/index.js

@@ -1,11 +1,9 @@
-'use strict';
+import * as convertLogicalAssignToOptional from './convert-logical-assign-to-optional/index.js';
+import * as convertLogicalToOptional from './convert-logical-to-optional/index.js';
+import * as convertOptionalAssignToLogical from './convert-optional-assign-to-logical/index.js';
+import * as convertOptionalToLogical from './convert-optional-to-logical/index.js';
 
-const convertLogicalAssignToOptional = require('./convert-logical-assign-to-optional');
-const convertLogicalToOptional = require('./convert-logical-to-optional');
-const convertOptionalAssignToLogical = require('./convert-optional-assign-to-logical');
-const convertOptionalToLogical = require('./convert-optional-to-logical');
-
-module.exports.rules = {
+export const rules = {
     'convert-logical-assign-to-optional': ['off', convertLogicalAssignToOptional],
     'convert-logical-to-optional': convertLogicalToOptional,
     'convert-optional-assign-to-logical': convertOptionalAssignToLogical,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@putout/plugin-optional-chaining",
-  "version": "1.0.4",
-  "type": "commonjs",
+  "version": "3.0.0",
+  "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin adds ability apply optional chaining",
   "homepage": "https://github.com/coderaiser/putout/tree/master/packages/plugin-optional-chaining#readme",
@@ -31,21 +31,21 @@
     "optional-chaining"
   ],
   "devDependencies": {
-    "@putout/test": "^11.0.0",
-    "c8": "^10.0.0",
-    "eslint": "^9.0.0",
+    "@putout/eslint-flat": "^4.0.0",
+    "@putout/test": "^15.0.0",
+    "eslint": "^10.0.0",
     "eslint-plugin-n": "^17.0.0",
-    "eslint-plugin-putout": "^23.0.0",
-    "lerna": "^6.0.1",
-    "madrun": "^10.0.0",
-    "nodemon": "^3.0.1"
+    "eslint-plugin-putout": "^31.0.0",
+    "madrun": "^13.0.0",
+    "nodemon": "^3.0.1",
+    "superc8": "^12.0.0"
   },
   "peerDependencies": {
-    "putout": ">=37"
+    "putout": ">=42"
   },
   "license": "MIT",
   "engines": {
-    "node": ">=18"
+    "node": ">=22"
   },
   "publishConfig": {
     "access": "public"