added filtering of compositions by name option, fix name not appearing in stats

Author: benholloway

config/app.js

@@ -3,18 +3,27 @@
 /**
  * Create a list of webpack configurators, one for each application detected.
  * @param {function():Config} factory A factory for the webpack-configurator
- * @param {{appDir:string, buildDir:string, globals:object, unminified:boolean, port:number}} options An options hash
- * @returns {Array.<Config>} A list of ebpack-configurator instances, one for each application detected
+ * @param {{appDir:string, buildDir:string, names:Array, globals:object, unminified:boolean, port:number}} options
+ * @returns {Array.<Config>} A list of Webpack-configurator instances, one for each application detected
  */
 function app(factory, options) {
 
   // lazy import packages
   var path             = require('path'),
-      listCompositions = require('../lib/list-compositions');
+      listCompositions = require('../lib/list-compositions'),
+      appFilter        = require('../lib/app-filter');
 
   // there may be any number of compositions in subdirectories
-  return listCompositions(options.appDir)
-    .map(eachComposition);
+  var list = listCompositions(options.appDir, 'app')
+    .filter(appFilter(options.names));
+
+  // ensure at least one composition or webpack will crash with a cryptic error
+  if (list.length) {
+    return list.map(eachComposition);
+  }
+  else {
+    throw new Error('There are no compositions included in this build.');
+  }
 
   function eachComposition(composition, i) {
     var buildDir = path.join(options.buildDir, composition.directory),
@@ -28,6 +37,7 @@ function app(factory, options) {
           })
           .addMinification(!options.unminified)
           .merge({
+            name  : composition.namespace.join('.'),
             output: {
               path: path.resolve(buildDir)
             }

config/release.js

@@ -1,23 +1,34 @@
 'use strict';
 
 /**
- * Create a single webpack configurator for release.
- * @param {Config} configurator A webpack-configurator instance
- * @param {{appDir:string, releaseDir:string, globals:object, unminified:boolean, port:number}} options An options hash
- * @returns {Config} The given webpack-configurator instance
+ * Create a list of webpack configurators, one for each application detected.
+ * @param {function():Config} factory A factory for the webpack-configurator
+ * @param {{appDir:string, releaseDir:string, names:Array, globals:object, unminified:boolean, port:number}} options
+ * @returns {Array.<Config>} A list of Webpack-configurator instances, one for each application detected
  */
-function release(configurator, options) {
+function release(factory, options) {
 
   // lazy import packages
   var path             = require('path'),
-      listCompositions = require('../lib/list-compositions');
+      listCompositions = require('../lib/list-compositions'),
+      appFilter        = require('../lib/app-filter');
 
-  // only the primary application will be released
-  var composition = listCompositions(options.appDir)[0];
-  if (composition) {
-    return configurator
-      .addBrowserSync(options.releaseDir, options.port)
-      .addClean(options.releaseDir)
+  // there may be any number of compositions in subdirectories
+  var list = listCompositions(options.appDir, 'release')
+    .filter(appFilter(options.names));
+
+  // ensure at least one composition or webpack will crash with a cryptic error
+  if (list.length) {
+    return list.map(eachComposition);
+  }
+  else {
+    throw new Error('There are no compositions included in this build.');
+  }
+
+  function eachComposition(composition) {
+    var releaseDir = path.join(options.releaseDir, composition.directory);
+    return factory()
+      .addClean(releaseDir)
       .addComposition(composition, options.publicPath)
       .addConditionals({
         TEST   : false,
@@ -27,16 +38,13 @@ function release(configurator, options) {
       .addExternalChunkManifest()
       .addMinification(!options.unminified)
       .merge({
-        name  : 'release',
+        name  : composition.namespace.join('.'),
         output: {
-          path      : path.resolve(options.releaseDir),
+          path      : path.resolve(releaseDir),
           publicPath: options.publicPath
         }
       });
   }
-  else {
-    throw new Error('there are no compositions in the app directory');
-  }
 }
 
 module.exports = release;

index.js

@@ -12,6 +12,7 @@ const DEFAULT_OPTIONS = {
   testGlob  : '**/*.spec.js',
   port      : 55555,
   unminified: false,
+  names     : 'app*, release',
   publicPath: undefined,
   globals   : {},
   stats     : {
@@ -56,6 +57,6 @@ module.exports = multiConfigurator(DEFAULT_OPTIONS, configuratorFactory(OPERATOR
     .append(require('./config/test'))
     .append('common')
   .define('release')
-    .append(require('./config/release'))
+    .generate(require('./config/release'))
     .append('common')
   .create;

lib/app-filter.js

@@ -0,0 +1,33 @@
+'use strict';
+
+/**
+ * Create a filter for apps given a comma separated list.
+ * @param {string} names A comma separated list of names to include
+ * @returns {function} A composition filter function
+ */
+function appFilter(names) {
+  var list = Array.isArray(names) ? names.map(trim) : String(names).split(',').map(trim);
+
+  return function filter(composition) {
+    var actual = composition.namespace.join('.'),
+        result = list.some(testName);
+    console.log(result, list, composition);
+    return result;
+
+    function testName(name) {
+      if (name.slice(-1) === '*') {
+        var short = name.slice(0, -1);
+        return (actual.slice(0, short.length) === short);
+      }
+      else {
+        return (actual === name);
+      }
+    }
+  };
+
+  function trim(value) {
+    return String(value).trim();
+  }
+}
+
+module.exports = appFilter;

lib/list-compositions.js

@@ -7,9 +7,10 @@ var glob = require('glob');
 /**
  * Detect all compositions in the given base directory.
  * @param {string} appDir The directory to search for composition roots
+ * @param {string} [namespacePrefix] Optional prefix for the composition namespace
  * @returns {Array.<object>} A list of composition items
  */
-function compositions(appDir) {
+function compositions(appDir, namespacePrefix) {
   var files = glob.sync(appDir + '/**/index.html') || [];
   return files
     .map(fileToItem)
@@ -26,7 +27,7 @@ function compositions(appDir) {
 
     return {
       directory : directory,
-      namespace : namespace,
+      namespace : [].concat(namespacePrefix || []).concat(namespace),
       htmlFiles : file,
       indexFiles: glob.sync(posix + '/index.{js,css,scss}')
     };