@putout/plugin-esm 7.3.0 → 7.4.1

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,7 +12,6 @@ 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';
 
@@ -20,6 +19,7 @@ const {
     getFilename,
     readFileContent,
     writeFileContent,
+    findFileUp,
 } = operator;
 
 const {entries} = Object;
@@ -99,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, {});

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

@@ -3,6 +3,7 @@ import {
     dirname,
     basename,
 } from 'node:path';
+import {tryCatch} from 'try-catch';
 import {
     parse,
     print,
@@ -51,7 +52,10 @@ export const scan = (rootPath, {push, trackFile}) => {
         if (!content.includes('import'))
             continue;
         
-        const ast = parse(content);
+        const [error, ast] = tryCatch(parse, content);
+        
+        if (error)
+            continue;
         
         const places = transform(ast, content, {
             plugins: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-esm",
-  "version": "7.3.0",
+  "version": "7.4.1",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin improves ability to transform ESM code",
@@ -12,8 +12,7 @@
   },
   "imports": {
     "#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"
+    "#change-imports": "./lib/resolve-imported-file/change-imports/index.js"
   },
   "release": false,
   "tag": false,
@@ -43,7 +42,7 @@
     "esm"
   ],
   "devDependencies": {
-    "@putout/eslint-flat": "^3.0.0",
+    "@putout/eslint-flat": "^4.0.0",
     "@putout/plugin-declare": "*",
     "@putout/plugin-declare-before-reference": "*",
     "@putout/plugin-destructuring": "*",

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);
-};