@putout/operator-filesystem 10.3.0 → 10.5.0

package/README.md

@@ -37,23 +37,6 @@ const [dirPath] = findFile(ast, 'hello');
 const newDirectoryPath = createDirectory(dirPath, 'world');
 ```
 
-### `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
-[];
-```
-
 ### `createNestedDirectory(path: FilePath|DirectoryPath, name: string): DirectoryPath`
 
 ```js
@@ -135,7 +118,7 @@ const {findFile} = operator;
 const coupleFiles = findFile(ast, ['/home/coderaiser', '/home/coderaiser/putout']);
 ```
 
-### `getFile(directoryPath: DirectoryPath, name: string, options?: Options): FilePath`
+### `getFile(directoryPath: DirectoryPath, name: string | string[], options?: Options): FilePath[]`
 
 ```ts
 type Options = {
@@ -149,7 +132,16 @@ Get file named `name` from `directoryPath`
 const {operator} = require('putout');
 const {getFile} = operator;
 
-const filePath = getFile(root, 'package.json');
+const [filePath] = getFile(root, 'package.json');
+```
+
+When you need a couple files use:
+
+```js
+import {operator} from 'putout';
+
+const {getFile} = operator;
+const [index, indexSpec] = getFile(root, ['index.js', 'index.spec.js']);
 ```
 
 ### `getParentDirectory(path: FilePath | DirectoryPath): FilePath | null`
@@ -171,7 +163,7 @@ dirPath === getParentDirectory(newDirectoryPath);
 true;
 ```
 
-### `getRootDirectory(path: FilePath | DirectoryPath): DrectoryPath`
+### `getRootDirectory(path: FilePath | DirectoryPath | File): DrectoryPath`
 
 ```js
 const {operator} = require('putout');
@@ -205,19 +197,6 @@ getFileType(filePath);
 'file';
 ```
 
-### `getFileContent(path: FilePath): [is: boolean, content: string]`
-
-Get `content` property if it exists, use [`readFileContent`](#read-file-content) to read file from **Filesystem**.
-
-```js
-const {operator} = require('putout');
-const {getFileContent} = operator;
-
-getFileContent(filePath);
-// returns
-[true, 'hello world'];
-```
-
 ### `removeFile(filePath: Path)`
 
 ```js

package/lib/filesystem.js

@@ -11,6 +11,7 @@ import {
     traverseProperties,
 } from '@putout/operate';
 import * as maybeFS from './maybe-fs.js';
+import {getRootFromAst} from './get-root-from-ast.js';
 import {
     createTypeProperty,
     createFilesProperty,
@@ -27,6 +28,9 @@ const isString = (a) => typeof a === 'string';
 const {isArray} = Array;
 const maybeArray = (a) => isArray(a) ? a : [a];
 
+const escape = (a) => encodeURIComponent(a).replaceAll('%', '+');
+const unescape = (a) => decodeURIComponent(a.replaceAll('+', '%'));
+
 const toBase64 = (content) => {
     const [e, result] = tryCatch(btoa, content);
     
@@ -42,8 +46,12 @@ const fromBase64 = (content) => {
     
     const [e, decoded] = tryCatch(atob, content);
     
-    if (!e)
-        return unescape(decoded);
+    if (!e) {
+        if (!decoded.includes(' ') && decoded.includes('+'))
+            return unescape(decoded);
+        
+        return decoded;
+    }
     
     return content;
 };
@@ -301,7 +309,7 @@ export function readDirectory(dirPath) {
 }
 
 export function createDirectory(dirPath, name) {
-    const existed = getFile(dirPath, name);
+    const [existed] = getFile(dirPath, name);
     
     if (existed) {
         const fileType = getFileType(existed);
@@ -419,6 +427,9 @@ export const createNestedDirectory = (path, name) => {
 };
 
 export function getRootDirectory(path) {
+    if (path.program)
+        return getRootFromAst(path);
+    
     let currentDirPath = getParentDirectory(path);
     
     if (!currentDirPath)
@@ -434,19 +445,25 @@ export function getRootDirectory(path) {
 }
 
 export function getFile(directoryPath, name, {type} = {}) {
+    const names = maybeArray(name);
+    const files = [];
+    
     for (const currentFile of readDirectory(directoryPath)) {
         const currentName = getFilename(currentFile);
         
-        if (!currentName.endsWith(name))
+        if (!names.includes(basename(currentName)))
             continue;
         
         if (type && type !== getFileType(currentFile))
             continue;
         
-        return currentFile;
+        files.push(currentFile);
+        
+        if (names.length === files.length)
+            break;
     }
     
-    return null;
+    return files;
 }
 
 export const {

package/lib/get-root-from-ast.js

@@ -0,0 +1,14 @@
+import {traverse} from '@putout/traverse';
+import {__filesystem_name} from '@putout/operator-json';
+
+export const getRootFromAst = (ast) => {
+    let root;
+    
+    traverse(ast, {
+        [`${__filesystem_name}(__)`](path) {
+            root = path.get('arguments.0');
+        },
+    });
+    
+    return root;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/operator-filesystem",
-  "version": "10.3.0",
+  "version": "10.5.0",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout operator adds ability to filesystem referenced variables that was not defined",
@@ -26,6 +26,8 @@
   "dependencies": {
     "@putout/babel": "^5.0.0",
     "@putout/operate": "^15.0.0",
+    "@putout/operator-json": "^3.2.0",
+    "@putout/traverse": "^16.0.0",
     "fullstore": "^4.0.0",
     "try-catch": "^4.0.0"
   },
@@ -38,7 +40,6 @@
   "devDependencies": {
     "@putout/engine-parser": "^15.0.1",
     "@putout/eslint-flat": "^4.0.0",
-    "@putout/operator-json": "^3.0.0",
     "@putout/test": "^15.0.0",
     "c8": "^10.0.0",
     "eslint": "^10.0.0-alpha.0",