@putout/plugin-esm 7.2.1 → 7.4.0

package/lib/apply-js-imported-file/index.js

@@ -8,12 +8,12 @@ import {
 } from 'putout';
 import * as getImports from '#get-imports';
 import * as changeImports from '#change-imports';
-import {findPackage} from '#find-package';
 
 const {
     getFilename,
     readFileContent,
     writeFileContent,
+    findFileUp,
 } = operator;
 
 const {parse: parseJson} = JSON;
@@ -101,7 +101,7 @@ const createGetPackageType = (importsCache = new Map()) => (file) => {
     if (importsCache.has(dir))
         return importsCache.get(dir);
     
-    const [, packagePath] = findPackage(file);
+    const [, packagePath] = findFileUp(file, 'package.json');
     
     if (!packagePath) {
         importsCache.set(dir, 'commonjs');

package/lib/apply-privately-imported-file/index.js

@@ -12,12 +12,14 @@ import {
 } from 'putout';
 import * as getImports from '#get-imports';
 import * as changeImports from '#change-imports';
-import {findPackage} from '#find-package';
+
+const isString = (a) => typeof a === 'string';
 
 const {
     getFilename,
     readFileContent,
     writeFileContent,
+    findFileUp,
 } = operator;
 
 const {entries} = Object;
@@ -79,7 +81,6 @@ export const scan = (rootPath, {push, trackFile}) => {
         for (const from of imports) {
             const to = join(dir, from);
             
-            //.replace(dir, '.');
             if (privateImports.has(to))
                 push(file, {
                     from,
@@ -98,7 +99,7 @@ const createGetPrivateImports = (importsCache = new Map(), emptyMap = new Map())
     if (importsCache.has(dir))
         return [dir, importsCache.get(dir)];
     
-    const [packageDirectory, packagePath] = findPackage(file);
+    const [packageDirectory, packagePath] = findFileUp(file, 'package.json');
     
     if (!packagePath) {
         importsCache.set(dir, {});
@@ -117,8 +118,14 @@ const createGetPrivateImports = (importsCache = new Map(), emptyMap = new Map())
     const {imports = {}} = packageJson;
     const importsEntries = new Map();
     
-    for (const [alias, {default: filePath}] of entries(imports)) {
+    for (const [alias, property] of entries(imports)) {
+        const filePath = parseProperty(property);
+        
+        if (!filePath)
+            continue;
+        
         const resolvedPath = resolve(packageDirectory, filePath);
+        
         importsEntries.set(resolvedPath, alias);
     }
     
@@ -126,3 +133,16 @@ const createGetPrivateImports = (importsCache = new Map(), emptyMap = new Map())
     
     return [packageDirectory, importsEntries];
 };
+
+function parseProperty(property) {
+    if (isString(property))
+        return property;
+    
+    const {
+        default: filePath,
+        node,
+        browser,
+    } = property;
+    
+    return filePath || node || browser;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-esm",
-  "version": "7.2.1",
+  "version": "7.4.0",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin improves ability to transform ESM code",
@@ -11,15 +11,8 @@
     "./merge-duplicate-imports": "./lib/merge-duplicate-imports/index.js"
   },
   "imports": {
-    "#get-imports": {
-      "default": "./lib/shorten-imported-file/get-imports/index.js"
-    },
-    "#change-imports": {
-      "default": "./lib/resolve-imported-file/change-imports/index.js"
-    },
-    "#find-package": {
-      "default": "./lib/apply-privately-imported-file/find-package.js"
-    }
+    "#get-imports": "./lib/shorten-imported-file/get-imports/index.js",
+    "#change-imports": "./lib/resolve-imported-file/change-imports/index.js"
   },
   "release": false,
   "tag": false,

package/lib/apply-privately-imported-file/find-package.js

@@ -1,31 +0,0 @@
-import {operator} from 'putout';
-
-const {
-    getFileType,
-    readDirectory,
-    getFilename,
-    getParentDirectory,
-} = operator;
-
-export const findPackage = (file) => {
-    const parentDirectory = getParentDirectory(file);
-    
-    if (!parentDirectory)
-        return [];
-    
-    const directoryName = getFilename(parentDirectory);
-    
-    for (const currentFile of readDirectory(parentDirectory)) {
-        const type = getFileType(currentFile);
-        
-        if (type === 'directory')
-            continue;
-        
-        const currentName = getFilename(currentFile);
-        
-        if (currentName.endsWith('package.json'))
-            return [directoryName, currentFile];
-    }
-    
-    return findPackage(parentDirectory);
-};