@putout/plugin-esm 7.1.1 → 7.2.0

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

@@ -8,14 +8,12 @@ import {
 } from 'putout';
 import * as getImports from '#get-imports';
 import * as changeImports from '#change-imports';
+import {findPackage} from '#find-package';
 
 const {
     getFilename,
-    getFileType,
-    getParentDirectory,
     readFileContent,
     writeFileContent,
-    readDirectory,
 } = operator;
 
 const {parse: parseJson} = JSON;
@@ -124,25 +122,3 @@ const createGetPackageType = (importsCache = new Map()) => (file) => {
     
     return type;
 };
-
-function findPackage(file) {
-    const parentDirectory = getParentDirectory(file);
-    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];
-    }
-    
-    if (directoryName === '/')
-        return [];
-    
-    return findPackage(parentDirectory);
-}

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

@@ -0,0 +1,31 @@
+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);
+};

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

@@ -12,14 +12,12 @@ import {
 } from 'putout';
 import * as getImports from '#get-imports';
 import * as changeImports from '#change-imports';
+import {findPackage} from '#find-package';
 
 const {
     getFilename,
-    getFileType,
-    getParentDirectory,
     readFileContent,
     writeFileContent,
-    readDirectory,
 } = operator;
 
 const {entries} = Object;
@@ -79,8 +77,9 @@ export const scan = (rootPath, {push, trackFile}) => {
         const dir = dirname(filename);
         
         for (const from of imports) {
-            const to = join(dir, from).replace(dir, '.');
+            const to = join(dir, from);
             
+            //.replace(dir, '.');
             if (privateImports.has(to))
                 push(file, {
                     from,
@@ -97,7 +96,7 @@ const createGetPrivateImports = (importsCache = new Map(), emptyMap = new Map())
     const dir = dirname(filename);
     
     if (importsCache.has(dir))
-        return importsCache.get(dir);
+        return [dir, importsCache.get(dir)];
     
     const [packageDirectory, packagePath] = findPackage(file);
     
@@ -127,25 +126,3 @@ const createGetPrivateImports = (importsCache = new Map(), emptyMap = new Map())
     
     return [packageDirectory, importsEntries];
 };
-
-function findPackage(file) {
-    const parentDirectory = getParentDirectory(file);
-    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];
-    }
-    
-    if (directoryName === '/')
-        return [];
-    
-    return findPackage(parentDirectory);
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-esm",
-  "version": "7.1.1",
+  "version": "7.2.0",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin improves ability to transform ESM code",
@@ -16,6 +16,9 @@
     },
     "#change-imports": {
       "default": "./lib/resolve-imported-file/change-imports/index.js"
+    },
+    "#find-package": {
+      "default": "./lib/apply-privately-imported-file/find-package.js"
     }
   },
   "release": false,
@@ -63,6 +66,7 @@
     "madrun": "^12.0.0",
     "montag": "^1.2.1",
     "nodemon": "^3.0.1",
+    "redlint": "^5.0.4",
     "supertape": "^12.0.0"
   },
   "peerDependencies": {