references #316, to javascript, references #378, tests, file lifecycl…

…e module

lib/modules/file/init.js

@@ -1,33 +1,82 @@
 "use strict";
-var _initMultiAsset, _initSingleAsset,
-  __slice = [].slice;
-
-_initSingleAsset = function(config, options, next) {
-  var fileUtils;
-  fileUtils = require('../../util/file');
-  fileUtils.setFileFlags(config, options);
-  options.files = [
-    {
-      inputFileName: options.inputFile,
-      outputFileName: null,
-      inputFileText: null,
-      outputFileText: null
+
+var fileUtils = require( "../../util/file" );
+
+var _setFileFlags = function( config, options ) {
+  var exts = config.extensions;
+  var ext = options.extension;
+
+  options.isJavascript = false;
+  options.isCSS = false;
+  options.isVendor = false;
+  options.isJSNotVendor = false;
+  options.isCopy = false;
+  options.isTemplate = false;
+
+  if ( exts.template.indexOf( ext ) > -1 ) {
+    options.isTemplate = true;
+    options.isJavascript = true;
+    options.isJSNotVendor = true;
+  }
+
+  if ( exts.copy.indexOf( ext ) > -1 ) {
+    options.isCopy = true;
+  }
+
+  if (
+       exts.javascript.indexOf( ext ) > -1 ||
+       ( options.inputFile && fileUtils.isJavascript( options.inputFile ) )
+    ){
+    options.isJavascript = true;
+    if ( options.inputFile ) {
+      options.isVendor = fileUtils.isVendorJS( config, options.inputFile );
+      options.isJSNotVendor = !options.isVendor;
+    }
+  }
+
+  if (
+       exts.css.indexOf( ext ) > -1 ||
+       ( options.inputFile && fileUtils.isCSS( options.inputFile ) )
+    ){
+    options.isCSS = true;
+    if ( options.inputFile ) {
+      options.isVendor = fileUtils.isVendorCSS( config, options.inputFile );
     }
-  ];
-  return next();
+  }
 };
 
-_initMultiAsset = function(config, options, next) {
-  var fileUtils;
-  fileUtils = require('../../util/file');
-  fileUtils.setFileFlags(config, options);
-  options.files = [];
-  return next();
+var _initSingleAsset = function( config, options, next ) {
+  _setFileFlags( config, options );
+
+  options.files = [{
+    inputFileName:options.inputFile,
+    outputFileName:null,
+    inputFileText:null,
+    outputFileText:null
+  }];
+
+  next();
 };
 
-exports.registration = function(config, register) {
-  var e;
-  e = config.extensions;
-  register(['add', 'update', 'remove', 'cleanFile', 'buildExtension'], 'init', _initMultiAsset, __slice.call(e.template).concat(__slice.call(e.css)));
-  return register(['add', 'update', 'remove', 'cleanFile', 'buildFile'], 'init', _initSingleAsset, __slice.call(e.javascript).concat(__slice.call(e.copy), __slice.call(e.misc)));
+var _initMultiAsset = function( config, options, next ) {
+  _setFileFlags( config, options );
+  options.files = [];
+  next();
 };
+
+exports.registration = function( config, register ) {
+  var e = config.extensions;
+  register(
+    ["add", "update", "remove", "cleanFile", "buildExtension"],
+    "init",
+    _initMultiAsset,
+    [].concat.apply(e.template, e.css)
+  );
+
+  register(
+    ["add", "update", "remove", "cleanFile", "buildFile"],
+    "init",
+    _initSingleAsset,
+    [].concat.apply(e.javascript, e.copy, e.misc)
+  );
+};

lib/util/file.js

@@ -156,35 +156,3 @@ exports.readdirSyncRecursive = function(baseDir, excludes, excludeRegex, ignoreD
   };
   return readdirSyncRecursive(baseDir);
 };
-
-exports.setFileFlags = function(config, options) {
-  var ext, exts;
-  exts = config.extensions;
-  ext = options.extension;
-  options.isJavascript = false;
-  options.isCSS = false;
-  options.isVendor = false;
-  options.isJSNotVendor = false;
-  options.isCopy = false;
-  if (exts.template.indexOf(ext) > -1) {
-    options.isTemplate = true;
-    options.isJavascript = true;
-    options.isJSNotVendor = true;
-  }
-  if (exts.copy.indexOf(ext) > -1) {
-    options.isCopy = true;
-  }
-  if (exts.javascript.indexOf(ext) > -1 || (options.inputFile && isJavascript(options.inputFile))) {
-    options.isJavascript = true;
-    if (options.inputFile) {
-      options.isVendor = isVendorJS(config, options.inputFile);
-      options.isJSNotVendor = !options.isVendor;
-    }
-  }
-  if (exts.css.indexOf(ext) > -1 || (options.inputFile && isCSS(options.inputFile))) {
-    options.isCSS = true;
-    if (options.inputFile) {
-      return options.isVendor = isVendorCSS(config, options.inputFile);
-    }
-  }
-};

src/modules/file/init.js

@@ -0,0 +1,82 @@
+"use strict";
+
+var fileUtils = require( "../../util/file" );
+
+var _setFileFlags = function( config, options ) {
+  var exts = config.extensions;
+  var ext = options.extension;
+
+  options.isJavascript = false;
+  options.isCSS = false;
+  options.isVendor = false;
+  options.isJSNotVendor = false;
+  options.isCopy = false;
+  options.isTemplate = false;
+
+  if ( exts.template.indexOf( ext ) > -1 ) {
+    options.isTemplate = true;
+    options.isJavascript = true;
+    options.isJSNotVendor = true;
+  }
+
+  if ( exts.copy.indexOf( ext ) > -1 ) {
+    options.isCopy = true;
+  }
+
+  if (
+       exts.javascript.indexOf( ext ) > -1 ||
+       ( options.inputFile && fileUtils.isJavascript( options.inputFile ) )
+    ){
+    options.isJavascript = true;
+    if ( options.inputFile ) {
+      options.isVendor = fileUtils.isVendorJS( config, options.inputFile );
+      options.isJSNotVendor = !options.isVendor;
+    }
+  }
+
+  if (
+       exts.css.indexOf( ext ) > -1 ||
+       ( options.inputFile && fileUtils.isCSS( options.inputFile ) )
+    ){
+    options.isCSS = true;
+    if ( options.inputFile ) {
+      options.isVendor = fileUtils.isVendorCSS( config, options.inputFile );
+    }
+  }
+};
+
+var _initSingleAsset = function( config, options, next ) {
+  _setFileFlags( config, options );
+
+  options.files = [{
+    inputFileName:options.inputFile,
+    outputFileName:null,
+    inputFileText:null,
+    outputFileText:null
+  }];
+
+  next();
+};
+
+var _initMultiAsset = function( config, options, next ) {
+  _setFileFlags( config, options );
+  options.files = [];
+  next();
+};
+
+exports.registration = function( config, register ) {
+  var e = config.extensions;
+  register(
+    ["add", "update", "remove", "cleanFile", "buildExtension"],
+    "init",
+    _initMultiAsset,
+    [].concat.apply(e.template, e.css)
+  );
+
+  register(
+    ["add", "update", "remove", "cleanFile", "buildFile"],
+    "init",
+    _initSingleAsset,
+    [].concat.apply(e.javascript, e.copy, e.misc)
+  );
+};

src/util/file.coffee

@@ -98,33 +98,4 @@ exports.readdirSyncRecursive = (baseDir, excludes = [], excludeRegex, ignoreDire
       files = files.concat(readdirSyncRecursive(nextDirs.shift()))
     files
 
-  readdirSyncRecursive(baseDir)
-
-exports.setFileFlags = (config, options) ->
-  exts = config.extensions
-  ext = options.extension
-
-  options.isJavascript = false
-  options.isCSS = false
-  options.isVendor = false
-  options.isJSNotVendor = false
-  options.isCopy = false
-
-  if exts.template.indexOf(ext) > -1
-    options.isTemplate = true
-    options.isJavascript = true
-    options.isJSNotVendor = true
-
-  if exts.copy.indexOf(ext) > -1
-    options.isCopy = true
-
-  if exts.javascript.indexOf(ext) > -1 or (options.inputFile and isJavascript(options.inputFile))
-    options.isJavascript = true
-    if options.inputFile
-      options.isVendor = isVendorJS(config, options.inputFile)
-      options.isJSNotVendor = not options.isVendor
-
-  if exts.css.indexOf(ext) > -1 or (options.inputFile and isCSS(options.inputFile))
-    options.isCSS = true
-    if options.inputFile
-      options.isVendor = isVendorCSS(config, options.inputFile)
+  readdirSyncRecursive(baseDir)

test/unit-test.js

@@ -1,2 +1,3 @@
 require("./units/modules/file/write-test");
-require("./units/modules/file/read-test");
+require("./units/modules/file/read-test");
+require("./units/modules/file/init-test");