@putout/operator-filesystem 6.3.0 → 6.4.0

package/README.md

@@ -67,6 +67,20 @@ const {
 const newDirectoryPath = createNestedDirectory(ast, '/hello/world');
 ```
 
+### `removeEmptyDirectory(DirectoryPath)`
+
+```js
+const {operator} = require('putout');
+const {
+    removeEmptyDirectory,
+    createNestedDirectory,
+} = operator;
+
+const newDirectoryPath = createNestedDirectory(ast, '/hello/world');
+
+removeEmptyDirectory(newDirectoryPath);
+```
+
 ### `readDirectory(directoryPath: DirectoryPath): (FilePath | DirectoryPath)[]`
 
 ```js

package/lib/filesystem.js

@@ -18,9 +18,13 @@ const {
 const maybeFS = require('./maybe-fs');
 
 const {
-    arrayExpression,
-    stringLiteral,
-    objectProperty,
+    createTypeProperty,
+    createFilesProperty,
+    createFilenameProperty,
+    createContentProperty,
+} = require('./property');
+
+const {
     isProgram,
     objectExpression,
 } = types;
@@ -163,11 +167,35 @@ module.exports.renameFile = (filePath, name) => {
     maybeFS.renameFile(oldName, newFilename);
 };
 
-module.exports.removeFile = (filePath) => {
+module.exports.removeFile = removeFile;
+function removeFile(filePath) {
     const filename = getFilename(filePath);
     
+    if (!getParentDirectory(filePath))
+        return;
+    
     filePath.remove();
     maybeFS.removeFile(filename);
+}
+
+module.exports.removeEmptyDirectory = (dirPath) => {
+    const type = getFileType(dirPath);
+    
+    if (type !== 'directory')
+        return;
+    
+    let nextParentDir = dirPath;
+    
+    while (!readDirectory(dirPath).length) {
+        const name = getFilename(dirPath);
+        
+        if (name === '/')
+            break;
+        
+        nextParentDir = getParentDirectory(dirPath);
+        removeFile(dirPath);
+        dirPath = nextParentDir;
+    }
 };
 
 module.exports.moveFile = (filePath, dirPath) => {
@@ -237,22 +265,6 @@ function maybeRemoveFile(dirPath, filename) {
     fileToOverwrite.remove();
 }
 
-const createTypeProperty = (type) => objectProperty(stringLiteral('type'), stringLiteral(type));
-
-module.exports.createTypeProperty = createTypeProperty;
-
-const createFilesProperty = (files) => objectProperty(stringLiteral('files'), arrayExpression(files));
-
-module.exports.createFilesProperty = createFilesProperty;
-
-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);
     
@@ -281,14 +293,15 @@ module.exports.createFile = (dirPath, name, content) => {
 
 const getFiles = (dirPath) => getProperty(dirPath, 'files');
 
-module.exports.readDirectory = (dirPath) => {
+module.exports.readDirectory = readDirectory;
+function readDirectory(dirPath) {
     const fileType = getFileType(dirPath);
     
     if (fileType !== 'directory')
         return [];
     
     return getFiles(dirPath).get('value.elements');
-};
+}
 
 module.exports.createDirectory = createDirectory;
 
@@ -391,7 +404,9 @@ module.exports.createNestedDirectory = (path, name) => {
     
     const n = directories.length;
     
-    for (let i = directories.indexOf(lastDirectoryName) + 1; i < n; i++) {
+    let i = directories.indexOf(lastDirectoryName) + 1;
+    
+    for (; i < n; i++) {
         const name = basename(directories[i]);
         lastDirectoryPath = createDirectory(lastDirectoryPath, name);
     }
@@ -413,7 +428,9 @@ function getRootDirectory(path) {
     }
     
     return prevPath;
-}module.exports.init = maybeFS.init;
+}
+
+module.exports.init = maybeFS.init;
 module.exports.deinit = maybeFS.deinit;
 
 module.exports.pause = maybeFS.pause;

package/lib/property.js

@@ -0,0 +1,33 @@
+'use strict';
+
+const {types} = require('@putout/babel');
+const {
+    arrayExpression,
+    stringLiteral,
+    objectProperty,
+} = types;
+
+module.exports.createTypeProperty = (type) => {
+    const value = stringLiteral(type);
+    return createProperty('type', value);
+};
+
+module.exports.createFilesProperty = (files) => {
+    const value = arrayExpression(files);
+    return createProperty('files', value);
+};
+
+module.exports.createFilenameProperty = (filename) => {
+    const value = stringLiteral(filename);
+    return createProperty('filename', value);
+};
+
+module.exports.createContentProperty = (content) => {
+    const value = stringLiteral(content);
+    return createProperty('content', value);
+};
+
+function createProperty(name, value) {
+    const key = stringLiteral(name);
+    return objectProperty(key, value);
+}

package/package.json

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