Merge pull request #80 from realityking/es2015

Make use of ES2015 features

Author: mrjoelkemp

bin/cli.js

@@ -2,8 +2,8 @@
 
 'use strict';
 
-var dependencyTree = require('../');
-var program = require('commander');
+const dependencyTree = require('../');
+const program = require('commander');
 
 program
   .version(require('../package.json').version)
@@ -14,9 +14,9 @@ program
   .option('--list-form', 'output the list form of the tree (one element per line)')
   .parse(process.argv);
 
-var tree;
+let tree;
 
-var options = {
+const options = {
   filename: program.args[0],
   root: program.directory,
   config: program.requireConfig,

index.js

@@ -1,9 +1,11 @@
-var precinct = require('precinct');
-var path = require('path');
-var fs = require('fs');
-var cabinet = require('filing-cabinet');
-var debug = require('debug')('tree');
-var Config = require('./lib/Config');
+'use strict';
+
+const precinct = require('precinct');
+const path = require('path');
+const fs = require('fs');
+const cabinet = require('filing-cabinet');
+const debug = require('debug')('tree');
+const Config = require('./lib/Config');
 
 /**
  * Recursively find all dependencies (avoiding circular) traversing the entire dependency tree
@@ -22,20 +24,20 @@ var Config = require('./lib/Config');
  * @return {Object}
  */
 module.exports = function(options) {
-  var config = new Config(options);
+  const config = new Config(options);
 
   if (!fs.existsSync(config.filename)) {
     debug('file ' + config.filename + ' does not exist');
     return config.isListForm ? [] : {};
   }
 
-  var results = traverse(config);
+  const results = traverse(config);
   debug('traversal complete', results);
 
   dedupeNonExistent(config.nonExistent);
   debug('deduped list of nonExistent partials: ', config.nonExistent);
 
-  var tree;
+  let tree;
   if (config.isListForm) {
     debug('list form of results requested');
 
@@ -80,8 +82,8 @@ module.exports.toList = function(options) {
  * @return {Array}
  */
 module.exports._getDependencies = function(config) {
-  var dependencies;
-  var precinctOptions = config.detectiveConfig;
+  let dependencies;
+  const precinctOptions = config.detectiveConfig;
   precinctOptions.includeCore = false;
 
   try {
@@ -95,12 +97,12 @@ module.exports._getDependencies = function(config) {
     return [];
   }
 
-  var resolvedDependencies = [];
+  const resolvedDependencies = [];
 
-  for (var i = 0, l = dependencies.length; i < l; i++) {
-    var dep = dependencies[i];
+  for (let i = 0, l = dependencies.length; i < l; i++) {
+    const dep = dependencies[i];
 
-    var result = cabinet({
+    const result = cabinet({
       partial: dep,
       filename: config.filename,
       directory: config.directory,
@@ -116,7 +118,7 @@ module.exports._getDependencies = function(config) {
       continue;
     }
 
-    var exists = fs.existsSync(result);
+    const exists = fs.existsSync(result);
 
     if (!exists) {
       config.nonExistent.push(dep);
@@ -135,7 +137,7 @@ module.exports._getDependencies = function(config) {
  * @return {Object|String[]}
  */
 function traverse(config) {
-  var subTree = config.isListForm ? [] : {};
+  let subTree = config.isListForm ? [] : {};
 
   debug('traversing ' + config.filename);
 
@@ -144,7 +146,7 @@ function traverse(config) {
     return config.visited[config.filename];
   }
 
-  var dependencies = module.exports._getDependencies(config);
+  let dependencies = module.exports._getDependencies(config);
 
   debug('cabinet-resolved all dependencies: ', dependencies);
   // Prevents cycles by eagerly marking the current file as read
@@ -160,9 +162,9 @@ function traverse(config) {
     debug('filtered number of dependencies: ' + dependencies.length);
   }
 
-  for (var i = 0, l = dependencies.length; i < l; i++) {
-    var d = dependencies[i];
-    var localConfig = config.clone();
+  for (let i = 0, l = dependencies.length; i < l; i++) {
+    const d = dependencies[i];
+    const localConfig = config.clone();
     localConfig.filename = d;
 
     if (localConfig.isListForm) {
@@ -192,13 +194,13 @@ function traverse(config) {
  * @return {String[]}
  */
 function removeDups(list) {
-  var cache = {};
-  var unique = [];
+  const cache = new Set();
+  const unique = [];
 
   list.forEach(function(item) {
-    if (!cache[item]) {
+    if (!cache.has(item)) {
       unique.push(item);
-      cache[item] = true;
+      cache.add(item);
     }
   });
 
@@ -207,10 +209,10 @@ function removeDups(list) {
 
 // Mutate the list input to do a dereferenced modification of the user-supplied list
 function dedupeNonExistent(nonExistent) {
-  var deduped = removeDups(nonExistent);
+  const deduped = removeDups(nonExistent);
   nonExistent.length = deduped.length;
 
-  for (var i = 0, l = deduped.length; i < l; i++) {
+  for (let i = 0, l = deduped.length; i < l; i++) {
     nonExistent[i] = deduped[i];
   }
 }

lib/Config.js

@@ -1,33 +1,37 @@
-var path = require('path');
-var debug = require('debug')('tree');
+'use strict';
 
-function Config(options) {
-  this.filename = options.filename;
-  this.directory = options.directory || options.root;
-  this.visited = options.visited || {};
-  this.nonExistent = options.nonExistent || [];
-  this.isListForm = options.isListForm;
-  this.requireConfig = options.config || options.requireConfig;
-  this.webpackConfig = options.webpackConfig;
-  this.nodeModulesConfig = options.nodeModulesConfig;
-  this.detectiveConfig = options.detective || options.detectiveConfig || {};
+const path = require('path');
+const debug = require('debug')('tree');
 
-  this.filter = options.filter;
+class Config {
+  constructor(options) {
+    this.filename = options.filename;
+    this.directory = options.directory || options.root;
+    this.visited = options.visited || {};
+    this.nonExistent = options.nonExistent || [];
+    this.isListForm = options.isListForm;
+    this.requireConfig = options.config || options.requireConfig;
+    this.webpackConfig = options.webpackConfig;
+    this.nodeModulesConfig = options.nodeModulesConfig;
+    this.detectiveConfig = options.detective || options.detectiveConfig || {};
 
-  if (!this.filename) { throw new Error('filename not given'); }
-  if (!this.directory) { throw new Error('directory not given'); }
-  if (this.filter && typeof this.filter !== 'function') { throw new Error('filter must be a function'); }
+    this.filter = options.filter;
 
-  debug('given filename: ' + this.filename);
+    if (!this.filename) { throw new Error('filename not given'); }
+    if (!this.directory) { throw new Error('directory not given'); }
+    if (this.filter && typeof this.filter !== 'function') { throw new Error('filter must be a function'); }
 
-  this.filename = path.resolve(process.cwd(), this.filename);
+    debug('given filename: ' + this.filename);
 
-  debug('resolved filename: ' + this.filename);
-  debug('visited: ', this.visited);
-}
+    this.filename = path.resolve(process.cwd(), this.filename);
+
+    debug('resolved filename: ' + this.filename);
+    debug('visited: ', this.visited);
+  }
 
-Config.prototype.clone = function() {
-  return new Config(this);
-};
+  clone () {
+    return new Config(this);
+  }
+}
 
 module.exports = Config;

webpack.config.js

@@ -1,8 +1,10 @@
+'use strict';
+
 module.exports = {
   entry: './index.js',
   resolve: {
     alias: {
       F: './node_modules/filing-cabinet'
     }
   }
-};
+};