directory-tree 2.3.0 → 3.0.1

package/.github/workflows/node.js.yml

@@ -0,0 +1,31 @@
+# This workflow will do a clean install of node dependencies, cache/restore them, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: Node.js CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [12.x, 14.x, 16.x]
+        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v2
+      with:
+        node-version: ${{ matrix.node-version }}
+        cache: 'npm'
+    - run: npm ci
+    - run: npm run build --if-present
+    - run: npm test

package/.idea/encodings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>

package/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/node-directory-tree.iml" filepath="$PROJECT_DIR$/.idea/node-directory-tree.iml" />
+    </modules>
+  </component>
+</project>

package/.idea/node-directory-tree.iml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

package/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/mihneadb/node-directory-tree.svg)](https://travis-ci.org/mihneadb/node-directory-tree)
+[![Build Status](https://api.travis-ci.com/mihneadb/node-directory-tree.svg?branch=master)](https://api.travis-ci.com/mihneadb/node-directory-tree.svg?branch=master)
 
 # directory-tree
 
@@ -48,7 +48,7 @@ const dirTree = require('directory-tree');
 const filteredTree = dirTree('/some/path', {attributes:['mode', 'mtime']});
 ```
 
-The default attributes are `[name, size, extension, path]` for Files and `[name, size, path]` for Directories
+The default attributes are `[name, path]` for Files and `[name, path, children]` for Directories
 
 A callback function can be executed with each file that matches the extensions provided:
 
@@ -98,7 +98,7 @@ photos
         └── snowboard.jpg
 ```
 
-`directory-tree` will return this JS object:
+`directory-tree` with `attributes: ["size", "type", "extension"]`  will return this JS object:
 
 ```json
 {

package/index.d.ts

@@ -22,11 +22,11 @@ declare namespace directoryTree {
   export interface DirectoryTreeOptions {
     normalizePath ? : boolean;
     exclude ? : RegExp | RegExp[];
-    attributes ? : (keyof directoryTree.Stats)[];
+    attributes ? : (keyof Stats | "type" | "extension")[];
     extensions ? : RegExp;
     followSymlink ? : boolean;
   }
   export type DirectoryTreeCallback = (item: DirectoryTree, path: string, stats: Stats) => void;
 }
 
-export = directoryTree;
+export = directoryTree;

package/lib/directory-tree.js

@@ -80,7 +80,7 @@ function directoryTree (path, options, onEachFile, onEachDirectory) {
       options = { ...options, symlinks: [] };
     // Skip if a cyclic symbolic link has been found
     if (options.symlinks.find(ino => ino === lstat.ino)) {
-      return null; 
+      return null;
     } else {
       options.symlinks.push(lstat.ino);
     }
@@ -94,13 +94,20 @@ function directoryTree (path, options, onEachFile, onEachDirectory) {
     if (options.extensions && !options.extensions.test(ext))
       return null;
 
-    item.size = stats.size;  // File size in bytes
-    item.extension = ext;
-    item.type = constants.FILE;
 
     if (options.attributes) {
       options.attributes.forEach((attribute) => {
-        item[attribute] = stats[attribute];
+        switch (attribute) {
+          case 'extension':
+            item.extension = ext;
+            break;
+          case 'type':
+            item.type = constants.FILE;
+            break;
+          default:
+            item[attribute] = stats[attribute];
+            break;
+        }
       });
     }
 
@@ -112,16 +119,29 @@ function directoryTree (path, options, onEachFile, onEachDirectory) {
     let dirData = safeReadDirSync(path);
     if (dirData === null) return null;
 
+    item.children = dirData
+      .map(child => directoryTree(PATH.join(path, child), options, onEachFile, onEachDirectory))
+      .filter(e => !!e);
+
     if (options.attributes) {
       options.attributes.forEach((attribute) => {
-        item[attribute] = stats[attribute];
+        switch (attribute) {
+          case 'size':
+            item.size = item.children.reduce((prev, cur) => prev + cur.size, 0);
+            break;
+          case 'type':
+            item.type = constants.DIRECTORY;
+            break;
+          case 'extension':
+            break;
+          default:
+            item[attribute] = stats[attribute];
+            break;
+        }
+        
       });
     }
-    item.children = dirData
-      .map(child => directoryTree(PATH.join(path, child), options, onEachFile, onEachDirectory))
-      .filter(e => !!e);
-    item.size = item.children.reduce((prev, cur) => prev + cur.size, 0);
-    item.type = constants.DIRECTORY;
+
     if (onEachDirectory) {
       onEachDirectory(item, path, stats);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "directory-tree",
-  "version": "2.3.0",
+  "version": "3.0.1",
   "description": "Convert a directory tree to a JS object.",
   "repository": {
     "type": "git",