v12.2.0 proposal

.eslintrc.js

@@ -184,7 +184,11 @@ module.exports = {
       },
       {
         selector: "CallExpression[callee.property.name='doesNotThrow']",
-        message: 'Please replace `assert.doesNotThrow()` and add a comment next to the code instead.',
+        message: 'Do not use `assert.doesNotThrow()`. Write the code without the wrapper and add a comment instead.',
+      },
+      {
+        selector: "CallExpression[callee.property.name='doesNotReject']",
+        message: 'Do not use `assert.doesNotReject()`. Write the code without the wrapper and add a comment instead.',
       },
       {
         selector: "CallExpression[callee.property.name='rejects'][arguments.length<2]",

.gitignore

@@ -42,8 +42,8 @@ coverage/
 /out
 
 # various stuff that VC++ produces/uses and is not in /out
-/Debug/
-/Release/
+/Debug
+/Release
 !doc/blog/**
 *.sln
 !nodemsi.sln

CHANGELOG.md

@@ -30,7 +30,8 @@ release.
 </tr>
 <tr>
     <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V12.md#12.1.0">12.1.0</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V12.md#12.2.0">12.2.0</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V12.md#12.1.0">12.1.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V12.md#12.0.0">12.0.0</a><br/>
     </td>
     <td valign="top">

LICENSE

@@ -74,6 +74,29 @@ The externally maintained libraries used by Node.js are:
     THE SOFTWARE.
   """
 
+- Acorn plugins, located at deps/acorn-plugins, is licensed as follows:
+  """
+    Copyright (C) 2017-2018 by Adrian Heine
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+  """
+
 - c-ares, located at deps/cares, is licensed as follows:
   """
     Copyright (c) 2007 - 2018, Daniel Stenberg with many contributors, see AUTHORS

Makefile

@@ -16,6 +16,7 @@ GTEST_FILTER ?= "*"
 GNUMAKEFLAGS += --no-print-directory
 GCOV ?= gcov
 PWD = $(CURDIR)
+BUILD_WITH ?= make
 
 ifdef JOBS
   PARALLEL_ARGS = -j $(JOBS)
@@ -95,13 +96,37 @@ help: ## Print help for targets with comments.
 # Without the check there is a race condition between the link being deleted
 # and recreated which can break the addons build when running test-ci
 # See comments on the build-addons target for some more info
+ifeq ($(BUILD_WITH), make)
 $(NODE_EXE): config.gypi out/Makefile
 	$(MAKE) -C out BUILDTYPE=Release V=$(V)
 	if [ ! -r $@ -o ! -L $@ ]; then ln -fs out/Release/$(NODE_EXE) $@; fi
 
 $(NODE_G_EXE): config.gypi out/Makefile
 	$(MAKE) -C out BUILDTYPE=Debug V=$(V)
 	if [ ! -r $@ -o ! -L $@ ]; then ln -fs out/Debug/$(NODE_EXE) $@; fi
+else
+ifeq ($(BUILD_WITH), ninja)
+ifeq ($(V),1)
+  NINJA_ARGS := $(NINJA_ARGS) -v
+endif
+ifdef JOBS
+  NINJA_ARGS := $(NINJA_ARGS) -j$(JOBS)
+else
+  NINJA_ARGS := $(NINJA_ARGS) $(filter -j%,$(MAKEFLAGS))
+endif
+$(NODE_EXE): config.gypi out/Release/build.ninja
+	ninja -C out/Release $(NINJA_ARGS)
+	if [ ! -r $@ -o ! -L $@ ]; then ln -fs out/Release/$(NODE_EXE) $@; fi
+
+$(NODE_G_EXE): config.gypi out/Debug/build.ninja
+	ninja -C out/Debug $(NINJA_ARGS)
+	if [ ! -r $@ -o ! -L $@ ]; then ln -fs out/Debug/$(NODE_EXE) $@; fi
+else
+$(NODE_EXE) $(NODE_G_EXE):
+	echo This Makefile currently only supports building with 'make' or 'ninja'
+endif
+endif
+
 
 ifeq ($(BUILDTYPE),Debug)
 CONFIG_FLAGS += --debug

README.md

@@ -185,6 +185,8 @@ For information about the governance of the Node.js project, see
 **Gabriel Schulhof** <gabriel.schulhof@intel.com>
 * [gireeshpunathil](https://github.com/gireeshpunathil) -
 **Gireesh Punathil** <gpunathi@in.ibm.com> (he/him)
+* [jasnell](https://github.com/jasnell) -
+**James M Snell** <jasnell@gmail.com> (he/him)
 * [joyeecheung](https://github.com/joyeecheung) -
 **Joyee Cheung** <joyeec9h3@gmail.com> (she/her)
 * [mcollina](https://github.com/mcollina) -
@@ -216,8 +218,6 @@ For information about the governance of the Node.js project, see
 **Fedor Indutny** <fedor.indutny@gmail.com>
 * [isaacs](https://github.com/isaacs) -
 **Isaac Z. Schlueter** <i@izs.me>
-* [jasnell](https://github.com/jasnell) -
-**James M Snell** <jasnell@gmail.com> (he/him)
 * [joshgav](https://github.com/joshgav) -
 **Josh Gavant** <josh.gavant@outlook.com>
 * [mscdex](https://github.com/mscdex) -
@@ -243,8 +243,6 @@ For information about the governance of the Node.js project, see
 **Anna Henningsen** <anna@addaleax.net> (she/her)
 * [ak239](https://github.com/ak239) -
 **Aleksei Koziatinskii** <ak239spb@gmail.com>
-* [andrasq](https://github.com/andrasq) -
-**Andras** <andras@kinvey.com>
 * [AndreasMadsen](https://github.com/AndreasMadsen) -
 **Andreas Madsen** <amwebdk@gmail.com> (he/him)
 * [AnnaMag](https://github.com/AnnaMag) -
@@ -279,6 +277,8 @@ For information about the governance of the Node.js project, see
 **Bartosz Sosnowski** <bartosz@janeasystems.com>
 * [calvinmetcalf](https://github.com/calvinmetcalf) -
 **Calvin Metcalf** <calvin.metcalf@gmail.com>
+* [cclauss](https://github.com/cclauss) -
+**Christian Clauss** <cclauss@me.com> (he/him)
 * [ChALkeR](https://github.com/ChALkeR) -
 **Сковорода Никита Андреевич** <chalkerx@gmail.com> (he/him)
 * [chrisdickinson](https://github.com/chrisdickinson) -
@@ -401,8 +401,6 @@ For information about the governance of the Node.js project, see
 **Ali Ijaz Sheikh** <ofrobots@google.com> (he/him)
 * [orangemocha](https://github.com/orangemocha) -
 **Alexis Campailla** <orangemocha@nodejs.org>
-* [othiym23](https://github.com/othiym23) -
-**Forrest L Norvell** <ogd@aoaioxxysz.net> (he/him)
 * [oyyd](https://github.com/oyyd) -
 **Ouyang Yadong** <oyydoibh@gmail.com> (he/him)
 * [pmq20](https://github.com/pmq20) -
@@ -447,8 +445,6 @@ For information about the governance of the Node.js project, see
 **Steven R Loomis** <srloomis@us.ibm.com>
 * [starkwang](https://github.com/starkwang) -
 **Weijia Wang** <starkwang@126.com>
-* [stefanmb](https://github.com/stefanmb) -
-**Stefan Budeanu** <stefan@budeanu.com>
 * [targos](https://github.com/targos) -
 **Michaël Zasso** <targos@protonmail.com> (he/him)
 * [thefourtheye](https://github.com/thefourtheye) -
@@ -471,8 +467,6 @@ For information about the governance of the Node.js project, see
 **Vladimir de Turckheim** <vlad2t@hotmail.com> (he/him)
 * [vkurchatkin](https://github.com/vkurchatkin) -
 **Vladimir Kurchatkin** <vladimir.kurchatkin@gmail.com>
-* [vsemozhetbyt](https://github.com/vsemozhetbyt) -
-**Vse Mozhet Byt** <vsemozhetbyt@gmail.com> (he/him)
 * [watilde](https://github.com/watilde) -
 **Daijiro Wachi** <daijiro.wachi@gmail.com> (he/him)
 * [watson](https://github.com/watson) -
@@ -492,6 +486,8 @@ For information about the governance of the Node.js project, see
 
 ### Collaborator Emeriti
 
+* [andrasq](https://github.com/andrasq) -
+**Andras** <andras@kinvey.com>
 * [imran-iq](https://github.com/imran-iq) -
 **Imran Iqbal** <imran@imraniqbal.org>
 * [isaacs](https://github.com/isaacs) -
@@ -508,6 +504,8 @@ For information about the governance of the Node.js project, see
 **Christopher Monsanto** <chris@monsan.to>
 * [Olegas](https://github.com/Olegas) -
 **Oleg Elifantiev** <oleg@elifantiev.ru>
+* [othiym23](https://github.com/othiym23) -
+**Forrest L Norvell** <ogd@aoaioxxysz.net> (he/him)
 * [petkaantonov](https://github.com/petkaantonov) -
 **Petka Antonov** <petka_antonov@hotmail.com>
 * [phillipj](https://github.com/phillipj) -
@@ -522,10 +520,14 @@ For information about the governance of the Node.js project, see
 **Robert Kowalski** <rok@kowalski.gd>
 * [romankl](https://github.com/romankl) -
 **Roman Klauke** <romaaan.git@gmail.com>
+* [stefanmb](https://github.com/stefanmb) -
+**Stefan Budeanu** <stefan@budeanu.com>
 * [tellnes](https://github.com/tellnes) -
 **Christian Tellnes** <christian@tellnes.no>
 * [tunniclm](https://github.com/tunniclm) -
 **Mike Tunnicliffe** <m.j.tunnicliffe@gmail.com>
+* [vsemozhetbyt](https://github.com/vsemozhetbyt) -
+**Vse Mozhet Byt** <vsemozhetbyt@gmail.com> (he/him)
 
 Collaborators follow the [COLLABORATOR_GUIDE.md](./COLLABORATOR_GUIDE.md) in
 maintaining the Node.js project.

benchmark/http/bench-parser.js

@@ -24,13 +24,14 @@ function main({ len, n }) {
     bench.start();
     for (var i = 0; i < n; i++) {
       parser.execute(header, 0, header.length);
-      parser.initialize(REQUEST, header);
+      parser.initialize(REQUEST, {});
     }
     bench.end(n);
   }
 
   function newParser(type) {
-    const parser = new HTTPParser(type);
+    const parser = new HTTPParser();
+    parser.initialize(type, {});
 
     parser.headers = [];
 

benchmark/misc/print.js

@@ -0,0 +1,59 @@
+'use strict';
+const common = require('../common.js');
+const { spawn } = require('child_process');
+
+const bench = common.createBenchmark(main, {
+  dur: [1],
+  code: ['1', '"string"', 'process.versions', 'process']
+});
+
+function spawnProcess(code) {
+  const cmd = process.execPath || process.argv[0];
+  const argv = ['-p', code];
+  return spawn(cmd, argv);
+}
+
+function start(state, code, bench, getNode) {
+  const node = getNode(code);
+  let stdout = '';
+  let stderr = '';
+
+  node.stdout.on('data', (data) => {
+    stdout += data;
+  });
+
+  node.stderr.on('data', (data) => {
+    stderr += data;
+  });
+
+  node.on('exit', (code) => {
+    if (code !== 0) {
+      console.error('------ stdout ------');
+      console.error(stdout);
+      console.error('------ stderr ------');
+      console.error(stderr);
+      throw new Error(`Error during node startup, exit code ${code}`);
+    }
+    state.throughput++;
+
+    if (state.go) {
+      start(state, code, bench, getNode);
+    } else {
+      bench.end(state.throughput);
+    }
+  });
+}
+
+function main({ dur, code }) {
+  const state = {
+    go: true,
+    throughput: 0
+  };
+
+  setTimeout(() => {
+    state.go = false;
+  }, dur * 1000);
+
+  bench.start();
+  start(state, code, bench, spawnProcess);
+}

benchmark/timers/timers-breadth-args.js

@@ -0,0 +1,42 @@
+'use strict';
+const common = require('../common.js');
+
+const bench = common.createBenchmark(main, {
+  n: [1e6],
+});
+
+function main({ n }) {
+  var j = 0;
+  function cb1(arg1) {
+    j++;
+    if (j === n)
+      bench.end(n);
+  }
+  function cb2(arg1, arg2) {
+    j++;
+    if (j === n)
+      bench.end(n);
+  }
+  function cb3(arg1, arg2, arg3) {
+    j++;
+    if (j === n)
+      bench.end(n);
+  }
+  function cb4(arg1, arg2, arg3, arg4) {
+    j++;
+    if (j === n)
+      bench.end(n);
+  }
+
+  bench.start();
+  for (var i = 0; i < n; i++) {
+    if (i % 4 === 0)
+      setTimeout(cb4, 1, 3.14, 1024, true, false);
+    else if (i % 3 === 0)
+      setTimeout(cb3, 1, 512, true, null);
+    else if (i % 2 === 0)
+      setTimeout(cb2, 1, false, 5.1);
+    else
+      setTimeout(cb1, 1, 0);
+  }
+}

common.gypi

@@ -38,7 +38,7 @@
 
     # Reset this number to 0 on major V8 upgrades.
     # Increment by one for each non-official patch applied to deps/v8.
-    'v8_embedder_string': '-node.16',
+    'v8_embedder_string': '-node.17',
 
     ##### V8 defaults for Node.js #####
 

configure

@@ -13,10 +13,10 @@ del _
 
 import sys
 from distutils.spawn import find_executable as which
-if sys.version_info[0] != 2 or sys.version_info[1] not in (6, 7):
-  sys.stderr.write('Please use either Python 2.6 or 2.7')
+if sys.version_info[:2] != (2, 7):
+  sys.stderr.write('Please use Python 2.7')
 
-  python2 = which('python2') or which('python2.6') or which('python2.7')
+  python2 = which('python2') or which('python2.7')
 
   if python2:
     sys.stderr.write(':\n\n')

configure.py

@@ -1627,23 +1627,35 @@ def make_bin_override():
       ' '.join([pipes.quote(arg) for arg in original_argv]) + '\n')
 os.chmod('config.status', 0o775)
 
+
 config = {
   'BUILDTYPE': 'Debug' if options.debug else 'Release',
-  'PYTHON': sys.executable,
   'NODE_TARGET_TYPE': variables['node_target_type'],
 }
 
+# Not needed for trivial case. Useless when it's a win32 path.
+if sys.executable != 'python' and ':\\' not in sys.executable:
+  config['PYTHON'] = sys.executable
+
 if options.prefix:
   config['PREFIX'] = options.prefix
 
-config = '\n'.join(['='.join(item) for item in config.items()]) + '\n'
+if options.use_ninja:
+  config['BUILD_WITH'] = 'ninja'
+
+config_lines = ['='.join((k,v)) for k,v in config.items()]
+# Add a blank string to get a blank line at the end.
+config_lines += ['']
+config_str = '\n'.join(config_lines)
 
 # On Windows there's no reason to search for a different python binary.
 bin_override = None if sys.platform == 'win32' else make_bin_override()
 if bin_override:
-  config = 'export PATH:=' + bin_override + ':$(PATH)\n' + config
+  config_str = 'export PATH:=' + bin_override + ':$(PATH)\n' + config_str
+
+write('config.mk', do_not_edit + config_str)
+
 
-write('config.mk', do_not_edit + config)
 
 gyp_args = ['--no-parallel', '-Dconfiguring_node=1']