@putout/operator-filesystem 3.3.0 → 3.5.0

package/README.md

@@ -100,6 +100,19 @@ 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

@@ -15,6 +15,24 @@ const isString = (a) => typeof a === 'string';
 const {isArray} = Array;
 const maybeArray = (a) => isArray(a) ? a : [a];
 
+const toBase64 = (content) => {
+    const [e, decoded] = tryCatch(btoa, content);
+    
+    if (!e)
+        return encodeURI(decoded);
+    
+    return content;
+};
+
+const fromBase64 = (content) => {
+    const [e, decoded] = tryCatch(atob, content);
+    
+    if (!e)
+        return decodeURI(decoded);
+    
+    return content;
+};
+
 const {
     ObjectExpression,
     ArrayExpression,
@@ -83,6 +101,8 @@ function getFileType(filePath) {
     return typePath.node.value.value;
 }
 
+module.exports.getFileContent = getFileContent;
+
 function getFileContent(filePath) {
     const content = getProperty(filePath, 'content');
     
@@ -137,8 +157,8 @@ module.exports.moveFile = (filePath, dirPath) => {
     
     setLiteralValue(filenamePath.get('value'), newFilename);
     dirPathFiles.node.value.elements.push(filePath.node);
-    filePath.remove();
     
+    filePath.remove();
     maybeFS.renameFile(filename, newFilename);
 };
 
@@ -154,9 +174,9 @@ module.exports.copyFile = (filePath, dirPath) => {
     const [hasContent, content] = getFileContent(filePath);
     
     const copiedFile = ObjectExpression([
-        createType('file'),
-        createFilename(newFilename),
-        hasContent && createContent(content),
+        createTypeProperty('file'),
+        createFilenameProperty(newFilename),
+        hasContent && createContentProperty(content),
     ].filter(Boolean));
     
     maybeRemoveFile(dirPath, newFilename);
@@ -177,28 +197,46 @@ function maybeRemoveFile(dirPath, filename) {
     fileToOverwrite.remove();
 }
 
-const createType = (type) => ObjectProperty(StringLiteral('type'), StringLiteral(type));
-const createFiles = (files) => ObjectProperty(StringLiteral('files'), ArrayExpression(files));
-const createFilename = (filename) => ObjectProperty(StringLiteral('filename'), StringLiteral(filename));
-const createContent = (content) => ObjectProperty(StringLiteral('content'), StringLiteral(content));
+const createTypeProperty = (type) => ObjectProperty(StringLiteral('type'), StringLiteral(type));
+
+module.exports.createTypeProperty = createTypeProperty;
+
+const createFilesProperty = (files) => ObjectProperty(StringLiteral('files'), ArrayExpression(files));
+
+module.exports.createFilesProperty = createFilesProperty;
 
-module.exports.createFile = (dirPath, name, content = '') => {
+const createFilenameProperty = (filename) => ObjectProperty(StringLiteral('filename'), StringLiteral(filename));
+
+module.exports.createFilenameProperty = createFilenameProperty;
+
+const createContentProperty = (content) => ObjectProperty(StringLiteral('content'), StringLiteral(content));
+
+module.exports.createContentProperty = createContentProperty;
+
+module.exports.createFile = (dirPath, name, content) => {
     maybeRemoveFile(dirPath, name);
     
     const dirPathFiles = getFiles(dirPath);
     const parentFilename = getFilename(dirPath);
     const filename = join(parentFilename, name);
     
-    const typeProperty = createType('file');
-    const filenameProperty = createFilename(filename);
+    const typeProperty = createTypeProperty('file');
+    const filenameProperty = createFilenameProperty(filename);
+    
+    const properties = [
+        typeProperty,
+        filenameProperty,
+        content && createContentProperty(content),
+    ].filter(Boolean);
     
-    dirPathFiles.node.value.elements.push(ObjectExpression([typeProperty, filenameProperty, createContent(content)]));
+    dirPathFiles.node.value.elements.push(ObjectExpression(properties));
     
     const filePath = dirPathFiles
         .get('value.elements')
         .at(-1);
     
-    writeFileContent(filePath, content);
+    if (isString(content))
+        writeFileContent(filePath, content);
     
     return filePath;
 };
@@ -212,9 +250,9 @@ module.exports.createDirectory = (dirPath, name) => {
     const parentFilename = getFilename(dirPath);
     const filename = join(parentFilename, name);
     
-    const typeProperty = createType('directory');
-    const filesProperty = createFiles([]);
-    const filenameProperty = createFilename(filename);
+    const typeProperty = createTypeProperty('directory');
+    const filesProperty = createFilesProperty([]);
+    const filenameProperty = createFilenameProperty(filename);
     
     dirPathFiles.node.value.elements.push(ObjectExpression([
         typeProperty,
@@ -229,13 +267,6 @@ module.exports.createDirectory = (dirPath, name) => {
         .at(-1);
 };
 
-const createContentProperty = (content) => {
-    const contentKey = StringLiteral('content');
-    const contentValue = StringLiteral(btoa(encodeURI(content)));
-    
-    return ObjectProperty(contentKey, contentValue);
-};
-
 module.exports.readFileContent = (filePath) => {
     const fileType = getFileType(filePath);
     
@@ -244,14 +275,8 @@ module.exports.readFileContent = (filePath) => {
     
     const [hasContent, content] = getFileContent(filePath);
     
-    if (hasContent) {
-        const [e, decoded] = tryCatch(atob, content);
-        
-        if (!e)
-            return decodeURI(decoded);
-        
-        return content;
-    }
+    if (hasContent)
+        return fromBase64(content);
     
     const filename = getFilename(filePath);
     const fileContent = maybeFS.readFileContent(filename);
@@ -277,11 +302,11 @@ function writeFileContent(filePath, content) {
     const contentPath = getProperty(filePath, 'content');
     
     if (contentPath) {
-        setLiteralValue(contentPath.node.value, btoa(content));
+        setLiteralValue(contentPath.node.value, toBase64(content));
         return;
     }
     
-    const property = createContentProperty(content);
+    const property = createContentProperty(toBase64(content));
     filePath.node.properties.push(property);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/operator-filesystem",
-  "version": "3.3.0",
+  "version": "3.5.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",