@putout/plugin-remove-duplicate-keys 3.0.0 → 4.0.0

package/lib/remove-duplicate-keys.js

@@ -1,7 +1,8 @@
 'use strict';
 
-const {types} = require('putout');
+const {types, operator} = require('putout');
 const fullstore = require('fullstore');
+
 const {
     isSpreadElement,
     isIdentifier,
@@ -9,9 +10,21 @@ const {
     isStringLiteral,
 } = types;
 
-const isSpreadId = (name) => (a) => isSpreadElement(a) && isIdentifier(a.argument, {name});
-const isObjectPropertyId = (name, computed) => (a) => isObjectProperty(a, {computed}) && isIdentifier(a.key, {name});
-const isObjectPropertyLiteral = (value) => (a) => isObjectProperty(a) && isStringLiteral(a.key, {value});
+const {traverseProperties} = operator;
+
+const isSpreadId = (name) => (a) => isSpreadElement(a) && isIdentifier(a.argument, {
+    name,
+});
+
+const isObjectPropertyId = (name, computed) => (a) => isObjectProperty(a, {
+    computed,
+}) && isIdentifier(a.key, {
+    name,
+});
+
+const isObjectPropertyLiteral = (value) => (a) => isObjectProperty(a) && isStringLiteral(a.key, {
+    value,
+});
 
 const store = fullstore([]);
 
@@ -27,11 +40,14 @@ module.exports.replace = () => ({
 });
 
 module.exports.match = () => ({
-    __object: ({__object}) => {
+    __object: ({__object}, path) => {
         let is = false;
         const newProperties = [];
         const {properties} = __object;
-        const reversed = properties.slice().reverse();
+        
+        const reversed = properties
+            .slice()
+            .reverse();
         
         for (const prop of reversed) {
             if (isSpreadElement(prop) && isIdentifier(prop.argument)) {
@@ -48,16 +64,19 @@ module.exports.match = () => ({
                 const {computed} = prop;
                 const {name} = prop.key;
                 
-                if (name !== prop.value.name)
-                    continue;
-                
-                const isFirst = checkIfFirst(properties, newProperties, isObjectPropertyId, name, {
-                    computed,
+                const props = traverseProperties(path, name, {
+                    firstLevel: true,
                 });
                 
-                if (!isFirst) {
-                    is = true;
-                    continue;
+                if (props.length > 1) {
+                    const isFirst = checkIfFirst(properties, newProperties, isObjectPropertyId, name, {
+                        computed,
+                    });
+                    
+                    if (!isFirst) {
+                        is = true;
+                        continue;
+                    }
                 }
             }
             
@@ -87,4 +106,3 @@ function checkIfFirst(properties, newProperties, isFn, str, {computed} = {}) {
     
     return !newLength || oldLength <= 1;
 }
-

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@putout/plugin-remove-duplicate-keys",
-  "version": "3.0.0",
+  "version": "4.0.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
-  "description": "putout plugin adds ability to find and remove duplicate keys",
+  "description": "🐊Putout plugin adds ability to find and remove duplicate keys",
   "homepage": "https://github.com/coderaiser/putout/tree/master/packages/plugin-remove-duplicate-keys#readme",
   "main": "lib/remove-duplicate-keys.js",
   "release": false,
@@ -35,21 +35,21 @@
     "key"
   ],
   "devDependencies": {
-    "@putout/test": "^5.0.0",
-    "c8": "^7.5.0",
+    "@putout/test": "^8.0.0",
+    "c8": "^8.0.0",
     "eslint": "^8.0.1",
-    "eslint-plugin-node": "^11.0.0",
-    "eslint-plugin-putout": "^14.0.0",
-    "lerna": "^4.0.0",
-    "madrun": "^9.0.0",
-    "nodemon": "^2.0.1"
+    "eslint-plugin-n": "^16.0.0",
+    "eslint-plugin-putout": "^22.0.0",
+    "lerna": "^6.0.1",
+    "madrun": "^10.0.0",
+    "nodemon": "^3.0.1"
   },
   "peerDependencies": {
-    "putout": ">=25"
+    "putout": ">=34"
   },
   "license": "MIT",
   "engines": {
-    "node": ">=16"
+    "node": ">=18"
   },
   "publishConfig": {
     "access": "public"