@putout/plugin-esm 8.6.0 → 8.8.0

package/README.md

@@ -34,8 +34,8 @@ npm i putout @putout/plugin-esm -D
 
 ## File rules
 
-- ✅ [apply-name-to-imported-file](#apply-name-to-imported-file]]);
-- ✅ [apply-namespace-to-imported-file](#apply-namespace-to-imported-file]]);
+- ✅ [apply-name-to-imported-file](#apply-name-to-imported-file);
+- ✅ [apply-namespace-to-imported-file](#apply-namespace-to-imported-file);
 - ✅ [apply-privately-imported-file](#apply-privately-imported-file);
 - ✅ [apply-js-imported-file](#apply-js-imported-file);
 - ✅ [resolve-imported-file](#resolve-imported-file);
@@ -428,9 +428,9 @@ Let's consider file structure:
 
 ```
 /
-|-- lib/
-|  `-- index.js "import a from './a.js';"
-|  `-- a.js "export const x = 2;"
+└── lib/
+    ├── index.js "import a from './a.js';"
+    └── b.js "export const b = 2;" 
 ```
 
 In this case `index.js` can be fixed:
@@ -459,10 +459,10 @@ Let's consider file structure:
 
 ```
 /
-|-- lib/
-|  `-- index.js "import a from './a.js';\n export * as b from './b.js'"
-|  `-- a.js "export const a = 2;"
-|  `-- b.js "export const b = 2;"
+└── lib/
+    ├── index.js "import a from './a.js';\n export * as b from './b.js'"
+    ├── a.js "export const a = 2;"
+    └── b.js "export const b = 2;" 
 ```
 
 In this case `index.js` can be fixed:
@@ -500,12 +500,12 @@ Let's consider file structure:
 
 ```
 /
-|-- package.json {"imports": {"#is: {"default": "./lib/tokenize/is.js"}}}
-|-- lib/
-|  `-- tokenize/
-|     `-- is.js "export const isPrev = () => {}"
-|     `-- expressions/
-        `-- spread-element.js "import {isPrev} from '../is.js"
+├── package.json {"imports": {"#is: {"default": "./lib/tokenize/is.js"}}}
+└──  lib/
+    └── tokenize/
+        ├── is.js "export const isPrev = () => {}"
+        └── expressions/
+            └── spread-element.js "import {isPrev} from '../is.js"
 ```
 
 In this case `spread-element.js` can be fixed:
@@ -534,9 +534,9 @@ Let's consider file structure:
 
 ```
 /
-|-- lib/
-|  `-- index.js
-|  `-- a.js
+└── lib/
+    ├── index.js
+    └── a.js
 ```
 
 In this case `index.js` can be fixed:
@@ -564,9 +564,9 @@ Let's consider file structure:
 
 ```
 /
-|-- processors/
-|  `-- index.js
-|  `-- parse-processor-names.js
+└── processors/
+    ├── index.js
+    └── parse-processor-names.js
 ```
 
 In this case `index.js` can be fixed:
@@ -594,9 +594,9 @@ Let's consider file structure:
 
 ```
 /
-|-- lib/
-|  `-- index.js
-|  `-- a.js
+└── lib/
+    ├── index.js
+    └── a.js
 ```
 
 In this case `index.js` can be fixed:

package/lib/apply-name-to-imported-file/determine-import-type.js

@@ -5,20 +5,15 @@ import * as isESMPlugin from '#is-esm';
 const isESM = (a) => a.rule === 'is-esm';
 const hasExportDefault = (a) => a.rule === 'has-export-default';
 
-const {
-    findFile,
-    readFileContent,
-} = operator;
+const {readFileContent} = operator;
 
-export const determineImportType = ({name, rootPath, importedFilename, privateImports, crawled}) => {
+export const determineImportType = ({name, rootPath, importedFilename, privateImports, crawlFile}) => {
     const parsedName = parseImportedFilename({
         importedFilename,
         privateImports,
     });
     
-    const [importedFile] = findFile(rootPath, parsedName, {
-        crawled,
-    });
+    const [importedFile] = crawlFile(rootPath, parsedName);
     
     if (!importedFile)
         return '';

package/lib/apply-name-to-imported-file/get-imports/index.js

@@ -31,6 +31,7 @@ const getImport = (path) => {
     
     if (isImportDefaultSpecifier(first)) {
         const {name} = first.local;
+        
         return [
             name,
             source,

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

@@ -6,14 +6,13 @@ import {
 } from 'putout';
 import {createGetPrivateImports} from '#private-imports';
 import {determineImportType} from '#determine-import-type';
+import {getImportsTuples} from '#get-imports-tuples';
 import {transformNamedImport} from './transform-named-import.js';
-import {getImportsTuples} from './get-imports-tuples.js';
 
 const {
     getFilename,
     readFileContent,
     writeFileContent,
-    crawlDirectory,
 } = operator;
 
 export const report = (file, {name, source, type}) => {
@@ -37,14 +36,13 @@ export const fix = (file, {name, source, content, ast}) => {
     writeFileContent(file, newContent);
 };
 
-export const scan = (rootPath, {push, trackFile}) => {
+export const scan = (rootPath, {push, trackFile, crawlFile}) => {
     const mask = [
         '*.js',
         '*.mjs',
     ];
     
     const getPrivateImports = createGetPrivateImports();
-    const crawled = crawlDirectory(rootPath);
     
     for (const file of trackFile(rootPath, mask)) {
         const content = readFileContent(file);
@@ -65,7 +63,7 @@ export const scan = (rootPath, {push, trackFile}) => {
                 rootPath,
                 importedFilename,
                 privateImports,
-                crawled,
+                crawlFile,
             });
             
             if (importType === 'equal')

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

@@ -6,14 +6,13 @@ import {
 } from 'putout';
 import {createGetPrivateImports} from '#private-imports';
 import {determineImportType} from '#determine-import-type';
+import {getImportsTuples} from '#get-imports-tuples';
 import {transformNamespaceImport} from './transform-namespace-import.js';
-import {getImportsTuples} from '../apply-name-to-imported-file/get-imports-tuples.js';
 
 const {
     getFilename,
     readFileContent,
     writeFileContent,
-    crawlDirectory,
 } = operator;
 
 export const report = (file, {name, source}) => {
@@ -33,14 +32,13 @@ export const fix = (file, {name, source, content, ast}) => {
     writeFileContent(file, newContent);
 };
 
-export const scan = (rootPath, {push, trackFile}) => {
+export const scan = (rootPath, {push, trackFile, crawlFile}) => {
     const mask = [
         '*.js',
         '*.mjs',
     ];
     
     const getPrivateImports = createGetPrivateImports();
-    const crawled = crawlDirectory(rootPath);
     
     for (const file of trackFile(rootPath, mask)) {
         const content = readFileContent(file);
@@ -61,7 +59,7 @@ export const scan = (rootPath, {push, trackFile}) => {
                 rootPath,
                 importedFilename,
                 privateImports,
-                crawled,
+                crawlFile,
             });
             
             if (importType === 'namespace')

package/lib/group-imports-by-source/index.js

@@ -25,10 +25,11 @@ export const fix = ({grouped}) => {
 
 export const traverse = ({push}) => ({
     Program(path) {
-        const external = [];
-        const internal = [];
+        const css = [];
         const builtin = [];
+        const external = [];
         const hashed = [];
+        const internal = [];
         const all = path.get('body').filter(isImportDeclaration);
         
         if (!all.length)
@@ -37,6 +38,11 @@ export const traverse = ({push}) => ({
         for (const current of all) {
             const {value} = current.node.source;
             
+            if (value.endsWith('.css')) {
+                css.push(current);
+                continue;
+            }
+            
             if (value.startsWith('.')) {
                 internal.push(current);
                 continue;
@@ -56,6 +62,7 @@ export const traverse = ({push}) => ({
         }
         
         const grouped = [
+            ...css,
             ...builtin,
             ...external,
             ...hashed,

package/lib/resolve-imported-file/change-imports/index.js

@@ -1,6 +1,9 @@
 export const report = () => '';
 export const replace = ({options}) => {
-    const {from = '', to = ''} = options;
+    const {
+        from = '',
+        to = '',
+    } = options;
     
     if (!from || !to)
         return {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-esm",
-  "version": "8.6.0",
+  "version": "8.8.0",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin improves ability to transform ESM code",
@@ -12,7 +12,7 @@
   },
   "imports": {
     "#get-imports": "./lib/shorten-imported-file/get-imports/index.js",
-    "#get-imports-tuples": "./lib/shorten-imported-file/get-imports-tuples.js",
+    "#get-imports-tuples": "./lib/apply-name-to-imported-file/get-imports-tuples.js",
     "#get-default-imports": "./lib/apply-name-to-imported-file/get-imports/index.js",
     "#change-imports": "./lib/resolve-imported-file/change-imports/index.js",
     "#private-imports": "./lib/apply-privately-imported-file/private-imports.js",