@putout/plugin-package-json 8.2.2 → 8.3.0

package/lib/remove-exports-with-missing-files/find-keys/index.js

@@ -3,10 +3,7 @@ import {operator, types} from 'putout';
 const {isObjectExpression} = types;
 const {getProperty, __json} = operator;
 
-export const report = ({node}) => {
-    const key = node.key.value;
-    const {value} = node.value;
-    
+export const report = ({key, value}) => {
     return `${key} -> ${value}`;
 };
 
@@ -26,7 +23,38 @@ export const traverse = ({push}) => ({
             return;
         
         for (const property of objectPath.get('properties')) {
-            push(property);
+            const valuePath = property.get('value');
+            const keyPath = property.get('key');
+            
+            if (valuePath.isObjectExpression()) {
+                processNested({
+                    push,
+                    keyPath,
+                    valuePath,
+                });
+                continue;
+            }
+            
+            push({
+                path: property,
+                key: keyPath.node.value,
+                value: valuePath.node.value,
+            });
         }
     },
 });
+
+function processNested({push, keyPath, valuePath}) {
+    const root = keyPath.node.value;
+    
+    for (const property of valuePath.get('properties')) {
+        const key = `${root}+${property.node.key.value}`;
+        const {value} = property.node.value;
+        
+        push({
+            key,
+            value,
+            path: property,
+        });
+    }
+}

package/lib/remove-exports-with-missing-files/index.js

@@ -21,8 +21,13 @@ const {
 
 export const report = () => `Avoid exports with missing files`;
 
-export const fix = (file, {ast, source}) => {
+export const fix = (file, {key, ast, source}) => {
     transform(ast, source, {
+        rules: {
+            'remove-keys': ['on', {
+                keys: [key],
+            }],
+        },
         plugins: [
             ['remove-keys', removeKeys],
         ],
@@ -60,7 +65,6 @@ export const scan = (root, {push, trackFile}) => {
         
         for (const [key, name] of tuples) {
             const full = join(dir, name);
-            
             const [exportedFile] = findFile(dirPath, full);
             
             if (!exportedFile)

package/lib/remove-exports-with-missing-files/remove-keys/index.js

@@ -19,16 +19,39 @@ export const fix = (path) => {
 
 export const traverse = ({push, options}) => ({
     [__json](path) {
-        const {keys = ['./loader']} = options;
-        
+        const {keys = []} = options;
         const object = path.get('arguments.0');
         const exportsPath = getProperty(object, 'exports');
         
         for (const property of exportsPath.get('value.properties')) {
             const {value} = property.node.key;
             
-            if (keys.includes(value))
-                push(property);
+            for (const key of keys) {
+                if (key === value) {
+                    push(property);
+                    continue;
+                }
+                
+                if (key.includes('+'))
+                    processNested({
+                        key,
+                        value,
+                        property,
+                        push,
+                    });
+            }
         }
     },
 });
+
+function processNested({key, value, property, push}) {
+    const [one, two] = key.split('+');
+    
+    if (one !== value)
+        return;
+    
+    for (const current of property.get('value.properties')) {
+        if (two === current.node.key.value)
+            push(current);
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-package-json",
-  "version": "8.2.2",
+  "version": "8.3.0",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin for package.json",