Native modules are no longer included in outputFile

Callback now includes `nativeModules` Array, which includes paths to native	modules that were detected (but not included) while scanning the project Added `includeNodeModules` option to allow any code in node_modules to be	included in the project Resulting `outputFile` has some line comments removed Fixed up some regex to scan for `require(...)` expressions Added support for `module.parent` Updated README documentation Push to 1.4.0

Author: bminer

README.md

@@ -40,8 +40,12 @@ modConcat("./project/index.js", outputFile, function(err, files) {
 
 Note: These `require` statements should probably be wrapped in a
 try, catch block to prevent uncaught exceptions.
-- `cb` - Callback of the form `cb(err, files)` where `files` is an Array
-of files that have been included in the project.
+- `includeNodeModules` - Set to `true` if node_modules should also be
+included in the project.
+- `cb` - Callback of the form `cb(err, files, nativeModules)` where `files` is
+an Array of files that have been included in the project and
+`nativeModules` is an Array of native modules that were found (but not
+included) when scanning the project.
 
 ## Known limitations
 - Dynamic `require()` statements don't work

index.js

@@ -78,6 +78,8 @@ var header = fs.readFileSync(__dirname + "/lib/header.js").toString("utf8")
 
 Note: These `require` statements should probably be wrapped in a
 try, catch block to prevent uncaught exceptions.
+- `includeNodeModules` - Set to `true` if node_modules should be
+included in the `outputFile`
 - `cb` - Callback of the form `cb(err, files)` where `files` is an Array
 of files that have been included in the project.
 */
@@ -94,8 +96,22 @@ module.exports = function concat(entryModule, outputFile, opts, cb) {
 opts.excludeFiles[i] = path.resolve(opts.excludeFiles[i]);
 }
 }
+// Ensure that `includeNodeModules` will work properly
+var _nodeModulePaths;
+if(opts.includeNodeModules) {
+try {
+_nodeModulePaths = require("module")._nodeModulePaths;
+if(typeof _nodeModulePaths !== "function") {
+opts.includeNodeModules = false;
+}
+} catch(err) {
+opts.includeNodeModules = false;
+}
+}
 // A list of all of the files read and included in the output thus far
 var files = [];
+// A list of all of the native modules not included in the output thus far
+var nativeModules = [];
 // The file descriptor pointing to the `outputFile`
 var fd;
 
@@ -119,10 +135,10 @@ module.exports = function concat(entryModule, outputFile, opts, cb) {
 }).once("done", function(err) {
 if(fd) {
 fs.close(fd, function(closeErr) {
-cb(err || closeErr, files);
+cb(err || closeErr, files, nativeModules);
 });
 } else {
-cb(err, files);
+cb(err, files, nativeModules);
 }
 });
 
@@ -147,48 +163,83 @@ module.exports = function concat(entryModule, outputFile, opts, cb) {
 // Read file
 fs.readFile(filePath, {"encoding": "utf8"}, this);
 }, function processFile(code) {
+// Remove some line comments from code
+code = code.replace(/(?:\r\n?|\n)\s*\/\/.*/g, "");
 // Scan file for `require(...)`, `__dirname`, and `__filename`
 /* Quick notes about the somewhat intense `requireRegex`:
 - require('...') and require("...") is matched
 - The single or double quote matched is group 1
 - Whitespace can go anywhere
 - The module path matched is group 2
-- Backslashes in the module path are escaped (i.e. for Windows paths)
+- Backslashes are allowed as escape characters only if followed
+by another backlash (to support Windows paths)
 */
-var requireRegex = /require\s*\(\s*(["'])((?:(?=(\\?))\3.)*)\1\s*\)/g,
+var requireRegex = /require\s*\(\s*(["'])((?:(?:(?!\1)[^\\]|(?:\\\\)))*)\1\s*\)/g,
 dirnameRegex = /__dirname/g,
 filenameRegex = /__filename/g;
 code = code.replace(requireRegex, function(match, quote, modulePath) {
+// First thing is to replace "\\" with "\"
+modulePath = modulePath.replace("\\\\", "\\");
 // Check to see if this require path begins with "./" or "../" or "/"
 if(modulePath.match(/^\.?\.?\//) !== null) {
 try {
 modulePath = require.resolve(path.resolve(
 path.join(path.dirname(filePath), modulePath)
 ) );
-// Lookup this module's ID
-var index = files.indexOf(modulePath);
-if(index < 0) {
-// Not found; add this module to the project
-if(!opts.excludeFiles ||
-opts.excludeFiles.indexOf(modulePath) < 0)
-{
-index = files.push(modulePath) - 1;
-}
-else {
-// Ignore; do not replace
-return match;
-}
-}
-// Replace the `require` statement with `__require`
-return "__require(" + index + ")";
+// Include module in project at end of this function
 } catch(e) {
 // Ignore; do not replace
 return match;
 }
+} else if(opts.includeNodeModules) {
+var oldPaths = module.paths;
+/* Temporarily overwrite `module.paths` to make
+`require.resolve` work properly */
+module.paths = _nodeModulePaths(path.dirname(filePath) );
+try {
+var modulePath = require.resolve(modulePath);
+} catch(err) {
+// Module not found; do not replace
+return match;
+} finally {
+// Restore old `module.paths`
+module.paths = oldPaths;
+}
+// Detect core module
+if(modulePath.match(/^[a-z_]+$/) ) {
+// Core module; do not replace
+return match;
+}
+// Include module in project at end of this function
 } else {
 // Ignore; do not replace
 return match;
 }
+/* If we reached this point, we need to include `modulePath`
+in our project */
+// If this is a native module, abort
+if(path.extname(modulePath).toLowerCase() === ".node") {
+// This is a native module; do not replace
+nativeModules.push(modulePath);
+return match;
+}
+// Lookup this module's ID
+var index = files.indexOf(modulePath);
+if(index < 0) {
+// Not found; add this module to the project
+if(!opts.excludeFiles ||
+opts.excludeFiles.indexOf(modulePath) < 0)
+{
+index = files.push(modulePath) - 1;
+}
+else {
+// Ignore; do not replace
+return match;
+}
+}
+// Replace the `require` statement with `__require`
+var parentIndex = files.indexOf(filePath);
+return "__require(" + index + "," + parentIndex + ")";
 })
 // Replace `__dirname` with `__getDirname(...)`
 .replace(dirnameRegex, "__getDirname(" +

lib/header.js

@@ -12,13 +12,15 @@ var __modules = {},
 __moduleIsCached = {};
 /* If the module with the specified `uid` is cached, return it;
 otherwise, execute and cache it first. */
-function __require(uid) {
+function __require(uid, parentUid) {
 if(!__moduleIsCached[uid]) {
 // Populate the cache initially with an empty `exports` Object
 __modulesCache[uid] = {"exports": {}, "loaded": false};
 __moduleIsCached[uid] = true;
 if(uid === 0) {
-require.main = __modulesCache[uid];
+require.main = __modulesCache[0];
+} else {
+__modulesCache[uid].parent = __modulesCache[parentUid];
 }
 /* Note: if this module requires itself, or if its depenedencies
 require it, they will only see an empty Object for now */

package.json

@@ -1,6 +1,6 @@
 {
 "name": "node-module-concat",
-"version": "1.3.0",
+"version": "1.4.0",
 "description": "Node.js module concatenation library",
 "main": "index.js",
 "dependencies": {
@@ -19,6 +19,7 @@
 "module",
 "concatenate",
 "obfuscation",
+"obfuscate",
 "require"
 ],
 "author": "Blake Miner <miner.blake@gmail.com>",