@putout/operator-filesystem 5.1.0 → 5.4.0

package/README.md

@@ -37,7 +37,7 @@ const [dirPath] = findFile(ast, 'hello');
 const newDirectoryPath = createDirectory(dirPath, 'world');
 ```
 
-### `findFile(directoryPath: DirectoryPath, name: string | string[], exclude?: string[]): (FilePath | DirectoryPath)[]`
+### `findFile(directoryPath: DirectoryPath, name: string | string[], exclude?: string[] | (FilePath) => boolean): (FilePath | DirectoryPath)[]`
 
 ```js
 const {operator} = require('putout');
@@ -60,8 +60,14 @@ Or `exclude` some files:
 ```js
 import {operator} from 'putout';
 
-const {findFile} = operator;
-const coupleFiles = findFile(ast, '*.ts', ['*.d.ts']);
+const {findFile, getFilename} = operator;
+
+const coupleFilesWithExcludeArray = findFile(ast, '*.ts', ['*.d.ts']);
+
+const coupleFilesWithExcludeFn = findFile(ast, '*.ts', (filePath) => {
+    const name = getFilename(filePath);
+    return !name.endsWith('*.d.ts');
+});
 ```
 
 And even search for a directory:

package/lib/filesystem.js

@@ -11,6 +11,7 @@ const {
 } = require('@putout/operate');
 
 const maybeFS = require('./maybe-fs');
+const isFn = (a) => typeof a === 'function';
 const isString = (a) => typeof a === 'string';
 const {isArray} = Array;
 const maybeArray = (a) => isArray(a) ? a : [a];
@@ -51,6 +52,9 @@ const getRegExp = (wildcard) => {
 };
 
 module.exports.getParentDirectory = (filePath) => {
+    if (!filePath.parentPath)
+        return null;
+    
     const {parentPath} = filePath.parentPath.parentPath;
     
     if (isProgram(parentPath))
@@ -61,7 +65,10 @@ module.exports.getParentDirectory = (filePath) => {
 
 module.exports.findFile = findFile;
 
-function isExcluded(name, base, exclude) {
+function isExcluded({path, name, base, exclude}) {
+    if (isFn(exclude))
+        return exclude(path);
+    
     for (const currentExclude of exclude) {
         if (name === currentExclude || getRegExp(currentExclude).test(base))
             return true;
@@ -82,10 +89,18 @@ function findFile(node, name, exclude = []) {
         
         for (const name of names) {
             if (value === name || getRegExp(name).test(base)) {
-                if (isExcluded(name, base, exclude))
+                const path = filenamePath.parentPath;
+                const excluded = isExcluded({
+                    path,
+                    name,
+                    base,
+                    exclude,
+                });
+                
+                if (excluded)
                     continue;
                 
-                filePaths.push(filenamePath.parentPath);
+                filePaths.push(path);
             }
         }
     }
@@ -253,9 +268,7 @@ module.exports.createFile = (dirPath, name, content) => {
     
     dirPathFiles.node.value.elements.push(ObjectExpression(properties));
     
-    const filePath = dirPathFiles
-        .get('value.elements')
-        .at(-1);
+    const filePath = dirPathFiles.get('value.elements').at(-1);
     
     if (isString(content))
         writeFileContent(filePath, content);
@@ -263,9 +276,7 @@ module.exports.createFile = (dirPath, name, content) => {
     return filePath;
 };
 
-function getFiles(dirPath) {
-    return getProperty(dirPath, 'files');
-}
+const getFiles = (dirPath) => getProperty(dirPath, 'files');
 
 module.exports.createDirectory = (dirPath, name) => {
     const dirPathFiles = getFiles(dirPath);
@@ -284,9 +295,7 @@ module.exports.createDirectory = (dirPath, name) => {
     
     maybeFS.createDirectory(filename);
     
-    return dirPathFiles
-        .get('value.elements')
-        .at(-1);
+    return dirPathFiles.get('value.elements').at(-1);
 };
 
 module.exports.readFileContent = (filePath) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/operator-filesystem",
-  "version": "5.1.0",
+  "version": "5.4.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout operator adds ability to filesystem referenced variables that was not defined",
@@ -24,7 +24,7 @@
     "report": "madrun report"
   },
   "dependencies": {
-    "@putout/babel": "^2.0.0",
+    "@putout/babel": "^3.0.0",
     "@putout/operate": "^12.0.0",
     "fullstore": "^3.0.0",
     "try-catch": "^3.0.1"