Now defaults to throwing an Error when a required module is not found

`options.excludeNodeModules` can now be set to `true` or to an Array containing	modules to be excluded from the project `options.allowUnresolvedModules` can now be set to `true` to ignore modules that	could not be found. `stats.unresolvedModules` contains information about modules that could not be	found. Only relevant when `options.allowUnresolvedModules` is `true`. Better normalization of `options` in stream constructor Push to 2.1.0

Author: bminer

CHANGELOG.md

@@ -1,3 +1,12 @@
+# 2.1.0
+
+- Now defaults to throwing an Error when a required module is not found, but
+this behavior can be changed by setting `options.allowUnresolvedModules`
+- `options.excludeNodeModules` can now be set to `true` or to an Array
+containing modules to be excluded from the project
+- `stats.unresolvedModules` contains information about modules that could not
+be found. Only relevant when `options.allowUnresolvedModules` is `true`.
+
 # 2.0.0
 
 Almost a complete re-write of the original project.

README.md

@@ -50,8 +50,14 @@ of the concatenated project.
 
 Note: These `require` statements should probably be wrapped with a
 conditional or a try/catch block to prevent uncaught exceptions.
-- `excludeNodeModules` - Set to `true` if modules loaded from
-`node_modules` folders should be excluded from the project.
+- `excludeNodeModules` - (boolean or Array) Set to `true` if all modules
+loaded from `node_modules` folders should be excluded from the project.
+Alternatively, set to an Array of module names to be excluded from the
+project.
+
+For example, `require("foobar")` will not be replaced if
+`excludeNodeModules` is set to an Array containing `"foobar"` or if
+`excludeNodeModules` is set to `true`.
 - `extensions` - An Array of extensions that will be appended to the
 required module path to search for the module in the file system.
 Defaults to `[".js", ".json"]`.
@@ -95,6 +101,10 @@ of the concatenated project.
 `node_modules`, the `browser` field in the `package.json` file (if
 found) is used to determine which file to actually include in the
 project.
+- `allowUnresolvedModules` - Set to `true` to prevent unresolved modules
+from throwing an Error; instead, the `require(...)` expression will not
+be replaced, and the unresolved module will be added to
+`stats.unresolvedModules` (see below). Defaults to `false`.
 - Any [option supported by resolve.sync]
 (https://github.com/substack/node-resolve#resolvesyncid-opts) except
 `basedir` and `packageFilter`, which can be overwritten.
@@ -109,6 +119,11 @@ is no more data to consume. Properties include:
 - `files` - An Array of files included in the project
 - `addonsExcluded` - An Array of files excluded from the project because
 they are native C/C++ add-ons.
+- `unresolvedModules` - An Array of modules that could not be included in the
+project because they could not be found. Each element in the Array is an
+Object containing these properties:
+- `parent` - the full path of the file containing the require expression
+- `module` - the name or path to the module that could not be found
 
 **`modConcat(entryModule, outputPath, [options, cb])`**
 

index.js

@@ -53,11 +53,15 @@ if(require.main === module) {
 }
 modConcat(process.argv[2], process.argv[3], function(err, stats) {
 if(err) {
-console.error("Error", err.stack);
+console.error("An error occurred:\n", err.stack);
 process.exit(1);
 } else {
 console.log(stats.files.length + " files written to " +
 process.argv[3] + ".");
+if(stats.unresolvedModules.length) {
+console.log("The following modules could not be resolved:\n",
+stats.unresolvedModules);
+}
 console.log("Completed successfully.");
 }
 });

lib/moduleConcatStream.js

@@ -78,11 +78,19 @@ class ModuleConcatStream extends Readable {
 super(options);
 // Save options
 let opts = this._options = options || {};
-// Ensure that all paths have been resolved
-if(opts.excludeFiles) {
-for(var i = 0; i < opts.excludeFiles.length; i++) {
-opts.excludeFiles[i] = path.resolve(opts.excludeFiles[i]);
-}
+// Ensure that `opts.excludeFiles` is an Array
+if(!Array.isArray(opts.excludeFiles) ) {
+opts.excludeFiles = [];
+}
+// Ensure all excluded file paths are resolved
+for(var i = 0; i < opts.excludeFiles.length; i++) {
+opts.excludeFiles[i] = path.resolve(opts.excludeFiles[i]);
+}
+// Ensure `opts.excludeNodeModules` is either falsy, `true`, or an Array
+if(opts.excludeNodeModules && opts.excludeNodeModules !== true &&
+!Array.isArray(opts.excludeNodeModules) )
+{
+opts.excludeNodeModules = [opts.excludeNodeModules];
 }
 // Configure default file extensions
 if(!Array.isArray(opts.extensions) ) {
@@ -113,6 +121,8 @@ class ModuleConcatStream extends Readable {
 this._fileIndex = 0;
 // List of native C/C++ add-ons found that were excluded from the output
 this._addonsExcluded = [];
+// Object containing modules that could not be resolved
+this._unresolvedModules = [];
 // Flag indicating that the header has been written
 this._headerWritten = false;
 }
@@ -181,7 +191,14 @@ class ModuleConcatStream extends Readable {
 with "./" or "../" or "/"
 */
 if(this._options.excludeNodeModules &&
-modulePath.match(/^\.?\.?\//) == null)
+modulePath.match(/^\.?\.?\//) == null && (
+/* If `excludeNodeModules` is `true`, exclude all
+node_modules */
+this._options.excludeNodeModules === true ||
+/* Otherwise, only exclude the module if it appears in
+the Array of excluded modules */
+this._options.excludeNodeModules.indexOf(modulePath) >= 0
+) )
 {
 return match;
 }
@@ -205,8 +222,7 @@ class ModuleConcatStream extends Readable {
 var index = this._files.indexOf(modulePath);
 if(index < 0) {
 // Not added to project yet; try to add it
-if(!this._options.excludeFiles ||
-this._options.excludeFiles.indexOf(modulePath) < 0)
+if(this._options.excludeFiles.indexOf(modulePath) < 0)
 {
 // Not excluded, so we're good to go!
 index = this._files.push(modulePath) - 1;
@@ -220,8 +236,17 @@ class ModuleConcatStream extends Readable {
 var parentIndex = this._files.indexOf(filePath);
 return "__require(" + index + "," + parentIndex + ")";
 } catch(e) {
-// Could not resolve module path; do not replace
-return match;
+// Could not resolve module path
+if(this._options.allowUnresolvedModules) {
+this._unresolvedModules.push({
+"parent": filePath,
+"module": modulePath
+});
+return match;
+} else {
+// Unresolved modules are not allowed; throw the Error
+throw e;
+}
 }
 });
 // Handle `__dirname` and `__filename` replacement
@@ -261,7 +286,8 @@ class ModuleConcatStream extends Readable {
 } else {
 return {
 "files": this._files,
-"addonsExcluded": this._addonsExcluded
+"addonsExcluded": this._addonsExcluded,
+"unresolvedModules": this._unresolvedModules
 };
 }
 }

package.json

@@ -1,6 +1,6 @@
 {
 "name": "node-module-concat",
-"version": "2.0.0",
+"version": "2.1.0",
 "description": "Lightweight CommonJS module concatenation tool",
 "main": "index.js",
 "dependencies": {