@putout/operator-filesystem 6.0.2 → 6.1.0

package/README.md

@@ -37,7 +37,23 @@ const [dirPath] = findFile(ast, 'hello');
 const newDirectoryPath = createDirectory(dirPath, 'world');
 ```
 
-### `findFile(directoryPath: DirectoryPath, name: string | string[], exclude?: string[] | (FilePath) => boolean): (FilePath | DirectoryPath)[]`
+### `readDirectory(directoryPath: DirectoryPath): (FilePath | DirectoryPath)[]`
+
+```js
+const {operator} = require('putout');
+const {
+    finedFiles,
+    findFile,
+    readDirectory,
+} = operator;
+
+const [dirPath] = findFile(ast, '/bin');
+readDirectory(dirPath);
+// returns list of files
+[];
+```
+
+### `findFile(directoryPath: DirectoryPath, name: string | string[], exclude?: string[]): (FilePath | DirectoryPath)[]`
 
 ```js
 const {operator} = require('putout');
@@ -63,11 +79,6 @@ import {operator} from 'putout';
 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

@@ -1,8 +1,8 @@
 'use strict';
 
 const {join, basename} = require('node:path');
-const tryCatch = require('try-catch');
 const {types} = require('@putout/babel');
+const tryCatch = require('try-catch');
 
 const {
     setLiteralValue,
@@ -11,7 +11,15 @@ const {
 } = require('@putout/operate');
 
 const maybeFS = require('./maybe-fs');
-const isFn = (a) => typeof a === 'function';
+
+const {
+    arrayExpression,
+    stringLiteral,
+    objectProperty,
+    isProgram,
+    objectExpression,
+} = types;
+
 const isString = (a) => typeof a === 'string';
 const {isArray} = Array;
 const maybeArray = (a) => isArray(a) ? a : [a];
@@ -34,14 +42,6 @@ const fromBase64 = (content) => {
     return content;
 };
 
-const {
-    ObjectExpression,
-    ArrayExpression,
-    StringLiteral,
-    ObjectProperty,
-    isProgram,
-} = types;
-
 const getRegExp = (wildcard) => {
     const escaped = wildcard
         .replace(/\./g, '\\.')
@@ -65,10 +65,7 @@ module.exports.getParentDirectory = (filePath) => {
 
 module.exports.findFile = findFile;
 
-function isExcluded({path, name, base, exclude}) {
-    if (isFn(exclude))
-        return exclude(path);
-    
+function isExcluded({name, base, exclude}) {
     for (const currentExclude of exclude) {
         if (name === currentExclude || getRegExp(currentExclude).test(base))
             return true;
@@ -91,7 +88,6 @@ function findFile(node, name, exclude = []) {
             if (value === name || getRegExp(name).test(base)) {
                 const path = filenamePath.parentPath;
                 const excluded = isExcluded({
-                    path,
                     name,
                     base,
                     exclude,
@@ -173,7 +169,7 @@ module.exports.moveFile = (filePath, dirPath) => {
     
     const dirname = getFilename(dirPath);
     const filename = getFilename(filePath);
-    const dirPathFiles = getProperty(dirPath, 'files');
+    const dirPathFiles = getFiles(dirPath);
     const filenamePath = getProperty(filePath, 'filename');
     
     const basename = filename
@@ -202,7 +198,7 @@ module.exports.copyFile = (filePath, dirPath) => {
     const newFilename = join(dirname, basename);
     const [hasContent, content] = getFileContent(filePath);
     
-    const copiedFile = ObjectExpression([
+    const copiedFile = objectExpression([
         createTypeProperty('file'),
         createFilenameProperty(newFilename),
         hasContent && createContentProperty(content),
@@ -234,19 +230,19 @@ function maybeRemoveFile(dirPath, filename) {
     fileToOverwrite.remove();
 }
 
-const createTypeProperty = (type) => ObjectProperty(StringLiteral('type'), StringLiteral(type));
+const createTypeProperty = (type) => objectProperty(stringLiteral('type'), stringLiteral(type));
 
 module.exports.createTypeProperty = createTypeProperty;
 
-const createFilesProperty = (files) => ObjectProperty(StringLiteral('files'), ArrayExpression(files));
+const createFilesProperty = (files) => objectProperty(stringLiteral('files'), arrayExpression(files));
 
 module.exports.createFilesProperty = createFilesProperty;
 
-const createFilenameProperty = (filename) => ObjectProperty(StringLiteral('filename'), StringLiteral(filename));
+const createFilenameProperty = (filename) => objectProperty(stringLiteral('filename'), stringLiteral(filename));
 
 module.exports.createFilenameProperty = createFilenameProperty;
 
-const createContentProperty = (content) => ObjectProperty(StringLiteral('content'), StringLiteral(content));
+const createContentProperty = (content) => objectProperty(stringLiteral('content'), stringLiteral(content));
 
 module.exports.createContentProperty = createContentProperty;
 
@@ -266,7 +262,7 @@ module.exports.createFile = (dirPath, name, content) => {
         content && createContentProperty(content),
     ].filter(Boolean);
     
-    dirPathFiles.node.value.elements.push(ObjectExpression(properties));
+    dirPathFiles.node.value.elements.push(objectExpression(properties));
     
     const filePath = dirPathFiles.get('value.elements').at(-1);
     
@@ -278,6 +274,15 @@ module.exports.createFile = (dirPath, name, content) => {
 
 const getFiles = (dirPath) => getProperty(dirPath, 'files');
 
+module.exports.readDirectory = (dirPath) => {
+    const fileType = getFileType(dirPath);
+    
+    if (fileType !== 'directory')
+        return [];
+    
+    return getFiles(dirPath).get('value.elements');
+};
+
 module.exports.createDirectory = (dirPath, name) => {
     const dirPathFiles = getFiles(dirPath);
     const parentFilename = getFilename(dirPath);
@@ -287,7 +292,7 @@ module.exports.createDirectory = (dirPath, name) => {
     const filesProperty = createFilesProperty([]);
     const filenameProperty = createFilenameProperty(filename);
     
-    dirPathFiles.node.value.elements.push(ObjectExpression([
+    dirPathFiles.node.value.elements.push(objectExpression([
         typeProperty,
         filenameProperty,
         filesProperty,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/operator-filesystem",
-  "version": "6.0.2",
+  "version": "6.1.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",
@@ -37,13 +37,13 @@
   ],
   "devDependencies": {
     "@putout/engine-parser": "^12.0.0",
+    "@putout/eslint-flat": "^2.0.0",
     "@putout/operator-json": "^2.0.0",
-    "@putout/test": "^11.0.0",
+    "@putout/test": "^12.0.0",
     "c8": "^10.0.0",
     "eslint": "^9.0.0",
     "eslint-plugin-n": "^17.0.0",
-    "eslint-plugin-putout": "^24.0.0",
-    "lerna": "^6.0.1",
+    "eslint-plugin-putout": "^25.0.1",
     "madrun": "^10.0.0",
     "montag": "^1.2.1",
     "nodemon": "^3.0.1",