@putout/plugin-esm 7.2.0 → 7.3.0

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

@@ -14,6 +14,8 @@ 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,
@@ -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,
@@ -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/lib/resolve-imported-file/index.js

@@ -5,8 +5,8 @@ import {
     transform,
     operator,
 } from 'putout';
+import * as changeImports from '#change-imports';
 import * as getImports from './get-imports/index.js';
-import * as changeImports from './change-imports/index.js';
 
 const {
     findFile,

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

@@ -10,7 +10,7 @@ import {
     operator,
 } from 'putout';
 import * as changeImports from '#change-imports';
-import * as getImports from './get-imports/index.js';
+import * as getImports from '#get-imports';
 
 const {
     getFilename,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-esm",
-  "version": "7.2.0",
+  "version": "7.3.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,9 @@
     "./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",
+    "#find-package": "./lib/apply-privately-imported-file/find-package.js"
   },
   "release": false,
   "tag": false,