fsevents 1.1.2 → 1.2.3

package/node_modules/node-pre-gyp/lib/package.js

@@ -8,14 +8,17 @@ var fs = require('fs');
 var path = require('path');
 var log = require('npmlog');
 var versioning = require('./util/versioning.js');
+var napi = require('./util/napi.js');
 var write = require('fs').createWriteStream;
 var existsAsync = fs.exists || path.exists;
 var mkdirp = require('mkdirp');
+var tar = require('tar');
 
 function _package(gyp, argv, callback) {
-    var pack = require('tar-pack').pack;
+    var packlist = require('npm-packlist');
     var package_json = JSON.parse(fs.readFileSync('./package.json'));
-    var opts = versioning.evaluate(package_json, gyp.opts);
+    var napi_build_version = napi.get_napi_build_version_from_command_args(argv);
+    var opts = versioning.evaluate(package_json, gyp.opts, napi_build_version);
     var from = opts.module_path;
     var binary_module = path.join(from,opts.module_name + '.node');
     existsAsync(binary_module,function(found) {
@@ -30,17 +33,21 @@ function _package(gyp, argv, callback) {
             return true;
         };
         mkdirp(path.dirname(tarball),function(err) {
-            if (err) throw err;
-            pack(from, { filter: filter_func })
-             .pipe(write(tarball))
-             .on('error', function(err) {
-                if (err)  console.error('['+package_json.name+'] ' + err.message);
-                return callback(err);
-             })
-             .on('close', function() {
-                log.info('package','Binary staged at "' + tarball + '"');
-                return callback();
-             });
+            from = path.dirname(from);
+            if (err) return callback(err);
+            packlist({ path: from }).then(function(files) {
+                tar.create({
+                    portable: true,
+                    gzip: true,
+                    onentry: filter_func,
+                    file: tarball,
+                    cwd: from
+                }, files, function(err) {
+                    if (err)  console.error('['+package_json.name+'] ' + err.message);
+                    else log.info('package','Binary staged at "' + tarball + '"');
+                    return callback(err);
+                });
+            }, callback);
         });
     });
 }

package/node_modules/node-pre-gyp/lib/pre-binding.js

@@ -1,6 +1,7 @@
 "use strict";
 
 var versioning = require('../lib/util/versioning.js');
+var napi = require('../lib/util/napi.js');
 var existsSync = require('fs').existsSync || require('path').existsSync;
 var path = require('path');
 
@@ -18,8 +19,12 @@ exports.find = function(package_json_path,opts) {
    }
    var package_json = require(package_json_path);
    versioning.validate_config(package_json);
+   var napi_build_version;
+   if (napi.get_napi_build_versions (package_json)) {
+       napi_build_version = napi.get_best_napi_build_version(package_json);
+   }
    opts = opts || {};
    if (!opts.module_root) opts.module_root = path.dirname(package_json_path);
-   var meta = versioning.evaluate(package_json,opts);
+   var meta = versioning.evaluate(package_json,opts,napi_build_version);
    return meta.module;
 };

package/node_modules/node-pre-gyp/lib/publish.js

@@ -8,6 +8,7 @@ var fs = require('fs');
 var path = require('path');
 var log = require('npmlog');
 var versioning = require('./util/versioning.js');
+var napi = require('./util/napi.js');
 var s3_setup = require('./util/s3_setup.js');
 var existsAsync = fs.exists || path.exists;
 var url = require('url');
@@ -16,7 +17,8 @@ var config = require('rc')("node_pre_gyp",{acl:"public-read"});
 function publish(gyp, argv, callback) {
     var AWS = require("aws-sdk");
     var package_json = JSON.parse(fs.readFileSync('./package.json'));
-    var opts = versioning.evaluate(package_json, gyp.opts);
+    var napi_build_version = napi.get_napi_build_version_from_command_args(argv);
+    var opts = versioning.evaluate(package_json, gyp.opts, napi_build_version);
     var tarball = opts.staged_tarball;
     existsAsync(tarball,function(found) {
         if (!found) {

package/node_modules/node-pre-gyp/lib/rebuild.js

@@ -4,10 +4,18 @@ module.exports = exports = rebuild;
 
 exports.usage = 'Runs "clean" and "build" at once';
 
+var fs = require('fs');
+var napi = require('./util/napi.js');
+
 function rebuild (gyp, argv, callback) {
-  gyp.todo.unshift(
-      { name: 'clean', args: [] },
-      { name: 'build', args: ['rebuild'] }
-  );
+  var package_json = JSON.parse(fs.readFileSync('./package.json'));
+  var commands = [
+    { name: 'clean', args: [] },
+    { name: 'build', args: ['rebuild'] }
+    ];
+  commands = napi.expand_commands(package_json, commands);
+  for (var i = commands.length; i !== 0; i--) {
+    gyp.todo.unshift(commands[i-1]);
+  }
   process.nextTick(callback);
 }

package/node_modules/node-pre-gyp/lib/reinstall.js

@@ -4,10 +4,17 @@ module.exports = exports = rebuild;
 
 exports.usage = 'Runs "clean" and "install" at once';
 
+var fs = require('fs');
+var napi = require('./util/napi.js');
+
 function rebuild (gyp, argv, callback) {
+  var package_json = JSON.parse(fs.readFileSync('./package.json'));
+  var installArgs = [];
+  var napi_build_version = napi.get_best_napi_version(package_json);
+  if (napi_build_version != null) installArgs = [ napi.get_command_arg (napi_build_version) ];
   gyp.todo.unshift(
       { name: 'clean', args: [] },
-      { name: 'install', args: [] }
+      { name: 'install', args: installArgs }
   );
   process.nextTick(callback);
 }

package/node_modules/node-pre-gyp/lib/reveal.js

@@ -6,6 +6,7 @@ exports.usage = 'Reveals data on the versioned binary';
 
 var fs = require('fs');
 var versioning = require('./util/versioning.js');
+var napi = require('./util/napi.js');
 
 function unix_paths(key, val) {
     return val && val.replace ? val.replace(/\\/g, '/') : val;
@@ -13,12 +14,13 @@ function unix_paths(key, val) {
 
 function reveal(gyp, argv, callback) {
     var package_json = JSON.parse(fs.readFileSync('./package.json'));
-    var opts = versioning.evaluate(package_json, gyp.opts);
+    var napi_build_version = napi.get_napi_build_version_from_command_args(argv);
+    var opts = versioning.evaluate(package_json, gyp.opts, napi_build_version);
     var hit = false;
     // if a second arg is passed look to see
     // if it is a known option
     //console.log(JSON.stringify(gyp.opts,null,1))
-    var remain = gyp.opts.argv.remain.pop();
+    var remain = gyp.opts.argv.remain[gyp.opts.argv.remain.length-1];
     if (remain && opts.hasOwnProperty(remain)) {
         console.log(opts[remain].replace(/\\/g, '/'));
         hit = true;

package/node_modules/node-pre-gyp/lib/testbinary.js

@@ -9,6 +9,7 @@ var path = require('path');
 var log = require('npmlog');
 var cp = require('child_process');
 var versioning = require('./util/versioning.js');
+var napi = require('./util/napi.js');
 var path = require('path');
 
 function testbinary(gyp, argv, callback) {
@@ -16,7 +17,8 @@ function testbinary(gyp, argv, callback) {
     var options = {};
     var shell_cmd = process.execPath;
     var package_json = JSON.parse(fs.readFileSync('./package.json'));
-    var opts = versioning.evaluate(package_json, gyp.opts);
+    var napi_build_version = napi.get_napi_build_version_from_command_args(argv);
+    var opts = versioning.evaluate(package_json, gyp.opts, napi_build_version);
     // skip validation for runtimes we don't explicitly support (like electron)
     if (opts.runtime &&
         opts.runtime !== 'node-webkit' &&

package/node_modules/node-pre-gyp/lib/testpackage.js

@@ -9,32 +9,39 @@ var path = require('path');
 var log = require('npmlog');
 var existsAsync = fs.exists || path.exists;
 var versioning = require('./util/versioning.js');
+var napi = require('./util/napi.js');
 var testbinary = require('./testbinary.js');
-var read = require('fs').createReadStream;
-var zlib = require('zlib');
+var tar = require('tar');
+var mkdirp = require('mkdirp');
 
 function testpackage(gyp, argv, callback) {
     var package_json = JSON.parse(fs.readFileSync('./package.json'));
-    var opts = versioning.evaluate(package_json, gyp.opts);
+    var napi_build_version = napi.get_napi_build_version_from_command_args(argv);
+    var opts = versioning.evaluate(package_json, gyp.opts, napi_build_version);
     var tarball = opts.staged_tarball;
     existsAsync(tarball, function(found) {
         if (!found) {
             return callback(new Error("Cannot test package because " + tarball + " missing: run `node-pre-gyp package` first"));
         }
         var to = opts.module_path;
-        var gunzip = zlib.createGunzip();
-        var extracter = require('tar').Extract({ path: to, strip: 1 });
         function filter_func(entry) {
-            // ensure directories are +x
-            // https://github.com/mapnik/node-mapnik/issues/262
-            entry.props.mode |= (entry.props.mode >>> 2) & parseInt('0111',8);
-            log.info('install','unpacking ' + entry.path);
+            log.info('install','unpacking [' + entry.path + ']');
         }
-        gunzip.on('error', callback);
-        extracter.on('error', callback);
-        extracter.on('entry', filter_func);
-        extracter.on('end', function(err) {
-            if (err) return callback(err);
+
+        mkdirp(to, function(err) {
+            if (err) {
+                return callback(err);
+            } else {
+                tar.extract({
+                    file: tarball,
+                    cwd: to,
+                    strip: 1,
+                    onentry: filter_func
+                }).then(after_extract, callback);
+            }
+        });
+
+        function after_extract() {
             testbinary(gyp,argv,function(err) {
                 if (err) {
                     return callback(err);
@@ -43,7 +50,6 @@ function testpackage(gyp, argv, callback) {
                     return callback();
                 }
             });
-        });
-        read(tarball).pipe(gunzip).pipe(extracter);
+        }
     });
 }

package/node_modules/node-pre-gyp/lib/unpublish.js

@@ -7,6 +7,7 @@ exports.usage = 'Unpublishes pre-built binary (requires aws-sdk)';
 var fs = require('fs');
 var log = require('npmlog');
 var versioning = require('./util/versioning.js');
+var napi = require('./util/napi.js');
 var s3_setup = require('./util/s3_setup.js');
 var url = require('url');
 var config = require('rc')("node_pre_gyp",{acl:"public-read"});
@@ -14,7 +15,8 @@ var config = require('rc')("node_pre_gyp",{acl:"public-read"});
 function unpublish(gyp, argv, callback) {
     var AWS = require("aws-sdk");
     var package_json = JSON.parse(fs.readFileSync('./package.json'));
-    var opts = versioning.evaluate(package_json, gyp.opts);
+    var napi_build_version = napi.get_napi_build_version_from_command_args(argv);
+    var opts = versioning.evaluate(package_json, gyp.opts, napi_build_version);
     s3_setup.detect(opts.hosted_path,config);
     AWS.config.update(config);
     var key_name = url.resolve(config.prefix,opts.package_name);

package/node_modules/node-pre-gyp/lib/util/abi_crosswalk.json

@@ -1247,6 +1247,22 @@
     "node_abi": 46,
     "v8": "4.5"
   },
+  "4.8.4": {
+    "node_abi": 46,
+    "v8": "4.5"
+  },
+  "4.8.5": {
+    "node_abi": 46,
+    "v8": "4.5"
+  },
+  "4.8.6": {
+    "node_abi": 46,
+    "v8": "4.5"
+  },
+  "4.8.7": {
+    "node_abi": 46,
+    "v8": "4.5"
+  },
   "5.0.0": {
     "node_abi": 47,
     "v8": "4.6"
@@ -1415,6 +1431,54 @@
     "node_abi": 48,
     "v8": "5.1"
   },
+  "6.11.0": {
+    "node_abi": 48,
+    "v8": "5.1"
+  },
+  "6.11.1": {
+    "node_abi": 48,
+    "v8": "5.1"
+  },
+  "6.11.2": {
+    "node_abi": 48,
+    "v8": "5.1"
+  },
+  "6.11.3": {
+    "node_abi": 48,
+    "v8": "5.1"
+  },
+  "6.11.4": {
+    "node_abi": 48,
+    "v8": "5.1"
+  },
+  "6.11.5": {
+    "node_abi": 48,
+    "v8": "5.1"
+  },
+  "6.12.0": {
+    "node_abi": 48,
+    "v8": "5.1"
+  },
+  "6.12.1": {
+    "node_abi": 48,
+    "v8": "5.1"
+  },
+  "6.12.2": {
+    "node_abi": 48,
+    "v8": "5.1"
+  },
+  "6.12.3": {
+    "node_abi": 48,
+    "v8": "5.1"
+  },
+  "6.13.0": {
+    "node_abi": 48,
+    "v8": "5.1"
+  },
+  "6.13.1": {
+    "node_abi": 48,
+    "v8": "5.1"
+  },
   "7.0.0": {
     "node_abi": 51,
     "v8": "5.4"
@@ -1479,8 +1543,140 @@
     "node_abi": 51,
     "v8": "5.5"
   },
+  "7.10.1": {
+    "node_abi": 51,
+    "v8": "5.5"
+  },
   "8.0.0": {
     "node_abi": 57,
     "v8": "5.8"
+  },
+  "8.1.0": {
+    "node_abi": 57,
+    "v8": "5.8"
+  },
+  "8.1.1": {
+    "node_abi": 57,
+    "v8": "5.8"
+  },
+  "8.1.2": {
+    "node_abi": 57,
+    "v8": "5.8"
+  },
+  "8.1.3": {
+    "node_abi": 57,
+    "v8": "5.8"
+  },
+  "8.1.4": {
+    "node_abi": 57,
+    "v8": "5.8"
+  },
+  "8.2.0": {
+    "node_abi": 57,
+    "v8": "5.8"
+  },
+  "8.2.1": {
+    "node_abi": 57,
+    "v8": "5.8"
+  },
+  "8.3.0": {
+    "node_abi": 57,
+    "v8": "6.0"
+  },
+  "8.4.0": {
+    "node_abi": 57,
+    "v8": "6.0"
+  },
+  "8.5.0": {
+    "node_abi": 57,
+    "v8": "6.0"
+  },
+  "8.6.0": {
+    "node_abi": 57,
+    "v8": "6.0"
+  },
+  "8.7.0": {
+    "node_abi": 57,
+    "v8": "6.1"
+  },
+  "8.8.0": {
+    "node_abi": 57,
+    "v8": "6.1"
+  },
+  "8.8.1": {
+    "node_abi": 57,
+    "v8": "6.1"
+  },
+  "8.9.0": {
+    "node_abi": 57,
+    "v8": "6.1"
+  },
+  "8.9.1": {
+    "node_abi": 57,
+    "v8": "6.1"
+  },
+  "8.9.2": {
+    "node_abi": 57,
+    "v8": "6.1"
+  },
+  "8.9.3": {
+    "node_abi": 57,
+    "v8": "6.1"
+  },
+  "8.9.4": {
+    "node_abi": 57,
+    "v8": "6.1"
+  },
+  "8.10.0": {
+    "node_abi": 57,
+    "v8": "6.2"
+  },
+  "9.0.0": {
+    "node_abi": 59,
+    "v8": "6.2"
+  },
+  "9.1.0": {
+    "node_abi": 59,
+    "v8": "6.2"
+  },
+  "9.2.0": {
+    "node_abi": 59,
+    "v8": "6.2"
+  },
+  "9.2.1": {
+    "node_abi": 59,
+    "v8": "6.2"
+  },
+  "9.3.0": {
+    "node_abi": 59,
+    "v8": "6.2"
+  },
+  "9.4.0": {
+    "node_abi": 59,
+    "v8": "6.2"
+  },
+  "9.5.0": {
+    "node_abi": 59,
+    "v8": "6.2"
+  },
+  "9.6.0": {
+    "node_abi": 59,
+    "v8": "6.2"
+  },
+  "9.6.1": {
+    "node_abi": 59,
+    "v8": "6.2"
+  },
+  "9.7.0": {
+    "node_abi": 59,
+    "v8": "6.2"
+  },
+  "9.7.1": {
+    "node_abi": 59,
+    "v8": "6.2"
+  },
+  "9.8.0": {
+    "node_abi": 59,
+    "v8": "6.2"
   }
 }

package/node_modules/node-pre-gyp/lib/util/handle_gyp_opts.js

@@ -4,6 +4,7 @@ module.exports = exports = handle_gyp_opts;
 
 var fs = require('fs');
 var versioning = require('./versioning.js');
+var napi = require('./napi.js');
 
 /*
 
@@ -44,6 +45,9 @@ var share_with_node_gyp = [
   'module',
   'module_name',
   'module_path',
+  'napi_version',
+  'node_abi_napi',
+  'napi_build_version'
 ];
 
 function handle_gyp_opts(gyp, argv, callback) {
@@ -51,13 +55,15 @@ function handle_gyp_opts(gyp, argv, callback) {
     // Collect node-pre-gyp specific variables to pass to node-gyp
     var node_pre_gyp_options = [];
     // generate custom node-pre-gyp versioning info
-    var opts = versioning.evaluate(JSON.parse(fs.readFileSync('./package.json')), gyp.opts);
+    var napi_build_version = napi.get_napi_build_version_from_command_args(argv);
+    var opts = versioning.evaluate(JSON.parse(fs.readFileSync('./package.json')), gyp.opts, napi_build_version);
     share_with_node_gyp.forEach(function(key) {
         var val = opts[key];
         if (val) {
             node_pre_gyp_options.push('--' + key + '=' + val);
         } else {
-            return callback(new Error("Option " + key + " required but not found by node-pre-gyp"));
+            if (key !== 'napi_version' && key !== 'node_abi_napi' && key !== 'napi_build_version')
+                return callback(new Error("Option " + key + " required but not found by node-pre-gyp"));
         }
     });
 

package/node_modules/node-pre-gyp/lib/util/napi.js

@@ -0,0 +1,156 @@
+"use strict";
+
+var fs = require('fs');
+var rm = require('rimraf');
+
+module.exports = exports;
+
+var versionArray = process.version
+	.substr(1)
+	.replace(/-.*$/, '')
+	.split('.')
+	.map(function(item) {
+		return +item;
+	});
+
+var napi_multiple_commands = [
+	'build',
+	'clean',
+	'configure',
+	'package',
+	'publish',
+	'reveal',
+	'testbinary',
+	'testpackage',
+	'unpublish'
+];
+
+var napi_build_version_tag = 'napi_build_version=';
+
+module.exports.get_napi_version = function() {
+	// returns the non-zero numeric napi version or undefined if napi is not supported.
+	var version = process.versions.napi; // can be undefined
+	if (!version) { // this code should never need to be updated
+		if (versionArray[0] === 9 && versionArray[1] >= 3) version = 2; // 9.3.0+
+		else if (versionArray[0] === 8) version = 1; // 8.0.0+
+	}
+	return version;
+};
+
+module.exports.get_napi_version_as_string = function() {
+	// returns the napi version as a string or an empty string if napi is not supported.
+	var version = module.exports.get_napi_version();
+	return version ? ''+version : '';
+};
+
+module.exports.validate_package_json = function(package_json) { // return err
+	var binary = package_json.binary;
+	var module_path_ok = binary.module_path && binary.module_path.indexOf('{napi_build_version}') !== -1;
+	var remote_path_ok = binary.remote_path && binary.remote_path.indexOf('{napi_build_version}') !== -1;
+	var package_name_ok = binary.package_name && binary.package_name.indexOf('{napi_build_version}') !== -1;
+	var napi_build_versions = module.exports.get_napi_build_versions(package_json);
+
+	if (napi_build_versions) {
+		napi_build_versions.forEach(function(napi_build_version){
+			if (!(parseInt(napi_build_version,10) === napi_build_version && napi_build_version > 0)) {
+				throw new Error("All values specified in napi_versions must be positive integers.");
+			}
+		});
+	}
+
+	if (napi_build_versions && (!module_path_ok || (!remote_path_ok && !package_name_ok))) {
+		throw new Error("When napi_versions is specified; module_path and either remote_path or " +
+			"package_name must contain the substitution string '{napi_build_version}`.");
+	}
+
+	if ((module_path_ok || remote_path_ok || package_name_ok) && !napi_build_versions) {
+		throw new Error("When the substitution string '{napi_build_version}` is specified in " +
+			"module_path, remote_path, or package_name; napi_versions must also be specified.");
+	}
+
+	if (napi_build_versions && !module.exports.get_best_napi_build_version(package_json)) {
+		throw new Error(
+			'The N-API version of this Node instance is ' + module.exports.get_napi_version() + '. ' +
+			'This module supports N-API version(s) ' + module.exports.get_napi_build_versions(package_json) + '. ' +
+			'This Node instance cannot run this module.');
+	}
+
+};
+
+module.exports.expand_commands = function(package_json, commands) {
+	var expanded_commands = [];
+	var napi_build_versions = module.exports.get_napi_build_versions(package_json);
+	commands.forEach(function(command){
+		if (napi_build_versions && command.name === 'install') {
+			var napi_build_version = module.exports.get_best_napi_build_version(package_json);
+			var args = napi_build_version ? [ napi_build_version_tag+napi_build_version ] : [ ];
+			expanded_commands.push ({ name: command.name, args: args });
+		} else if (napi_build_versions && napi_multiple_commands.includes(command.name)) {
+			napi_build_versions.forEach(function(napi_build_version){
+				var args = command.args.slice();
+				args.push (napi_build_version_tag+napi_build_version);
+				expanded_commands.push ({ name: command.name, args: args });
+			});
+		} else {
+			expanded_commands.push (command);
+		}
+	});
+	return expanded_commands;
+};
+
+module.exports.get_napi_build_versions = function(package_json) {
+	var napi_build_versions = [];
+	if (package_json.binary && package_json.binary.napi_versions) { // remove duplicates
+		package_json.binary.napi_versions.forEach(function(napi_version) {
+			if (!napi_build_versions.includes(napi_version)) napi_build_versions.push(napi_version);
+		});
+	}
+	return napi_build_versions.length ? napi_build_versions : undefined;
+};
+
+module.exports.get_command_arg = function(napi_build_version) {
+	return napi_build_version_tag + napi_build_version;
+};
+
+module.exports.get_napi_build_version_from_command_args = function(command_args) {
+	for (var i = 0; i < command_args.length; i++) {
+		var arg = command_args[i];
+		if (arg.indexOf(napi_build_version_tag) === 0) {
+			return parseInt(arg.substr(napi_build_version_tag.length),10);
+		}
+	}
+	return undefined;
+};
+
+module.exports.swap_build_dir_out = function(napi_build_version) {
+	if (napi_build_version) {
+		rm.sync(module.exports.get_build_dir(napi_build_version));
+		fs.renameSync('build', module.exports.get_build_dir(napi_build_version));
+	}
+};
+
+module.exports.swap_build_dir_in = function(napi_build_version) {
+	if (napi_build_version) {
+		rm.sync('build');
+		fs.renameSync(module.exports.get_build_dir(napi_build_version), 'build');
+	}
+};
+
+module.exports.get_build_dir = function(napi_build_version) {
+	return 'build-tmp-napi-v'+napi_build_version;
+};
+
+module.exports.get_best_napi_build_version = function(package_json) {
+	var best_napi_build_version = 0;
+	var napi_build_versions = module.exports.get_napi_build_versions (package_json);
+	if (napi_build_versions) {
+		var our_napi_version = module.exports.get_napi_version();
+		napi_build_versions.forEach(function(napi_build_version){
+			if (napi_build_version > best_napi_build_version &&
+				napi_build_version <= our_napi_version) {
+				best_napi_build_version = napi_build_version;
+			}
+		});
+	}
+	return best_napi_build_version === 0 ? undefined : best_napi_build_version;
+};