@putout/operator-filesystem 2.4.0 → 2.6.0

package/README.md

@@ -76,7 +76,7 @@ removeFile(filePath);
 
 ```js
 const {operator} = require('putout');
-const {moveFile} = operator;
+const {moveFile, copyFile} = operator;
 
 copyFile(filePath, dirPath);
 ```

package/lib/filesystem.js

@@ -120,13 +120,14 @@ module.exports.moveFile = (filePath, dirPath) => {
         .pop();
     
     const newname = `${dirname}/${basename}`;
-    const [is] = getFile(dirPathFiles, newname);
+    const [is, fileToOverwrite] = getFile(dirPathFiles, newname);
     
-    if (!is) {
-        setLiteralValue(filenamePath.get('value'), newname);
-        dirPathFiles.node.value.elements.push(filePath.node);
-        filePath.remove();
-    }
+    if (is)
+        fileToOverwrite.remove();
+    
+    setLiteralValue(filenamePath.get('value'), newname);
+    dirPathFiles.node.value.elements.push(filePath.node);
+    filePath.remove();
     
     maybeFS.renameFile(filename, newname);
 };
@@ -141,16 +142,20 @@ module.exports.copyFile = (filePath, dirPath) => {
         .pop();
     
     const newFilename = `${dirname}/${basename}`;
+    const [hasContent, content] = getFileContent(filePath);
     
-    const copyiedFile = ObjectExpression([
+    const copiedFile = ObjectExpression([
         createType('file'),
         createFilename(newFilename),
-    ]);
+        hasContent && createContent(content),
+    ].filter(Boolean));
     
-    const [is] = getFile(dirPathFiles, newFilename);
+    const [is, fileToOverwrite] = getFile(dirPathFiles, newFilename);
     
-    if (!is)
-        dirPathFiles.node.value.elements.push(copyiedFile);
+    if (is)
+        fileToOverwrite.remove();
+    
+    dirPathFiles.node.value.elements.push(copiedFile);
     
     maybeFS.copyFile(filename, newFilename);
 };
@@ -158,6 +163,7 @@ module.exports.copyFile = (filePath, dirPath) => {
 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));
 
 module.exports.createDirectory = (dirPath, name) => {
     const dirPathFiles = getProperty(dirPath, 'files');
@@ -183,7 +189,7 @@ module.exports.createDirectory = (dirPath, name) => {
 
 const createContentProperty = (content) => {
     const contentKey = StringLiteral('content');
-    const contentValue = StringLiteral(btoa(content));
+    const contentValue = StringLiteral(btoa(encodeURI(content)));
     
     return ObjectProperty(contentKey, contentValue);
 };
@@ -192,8 +198,12 @@ module.exports.readFileContent = (filePath) => {
     const [hasContent, content] = getFileContent(filePath);
     
     if (hasContent) {
-        const [, decoded] = tryCatch(atob, content);
-        return decoded || content;
+        const [e, decoded] = tryCatch(atob, content);
+        
+        if (!e)
+            return decodeURI(decoded);
+        
+        return content;
     }
     
     const filename = getFilename(filePath);

package/package.json

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