nodejs
diff --git a/Collapse file
‎doc/api/util.md‎
Copy file name to clipboardExpand all lines: doc/api/util.md
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff b/Collapse file
‎doc/api/util.md‎
Copy file name to clipboardExpand all lines: doc/api/util.md
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
diff --git a/Collapse file
‎lib/internal/util.js‎
Copy file name to clipboardExpand all lines: lib/internal/util.js
+9Lines changed: 9 additions & 0 deletions b/Collapse file
‎lib/internal/util.js‎
Copy file name to clipboardExpand all lines: lib/internal/util.js
+9Lines changed: 9 additions & 0 deletions
diff --git a/Collapse file
‎test/fixtures/deprecated-userland-class.js‎
Copy file name to clipboard
+12Lines changed: 12 additions & 0 deletions b/Collapse file
‎test/fixtures/deprecated-userland-class.js‎
Copy file name to clipboard
+12Lines changed: 12 additions & 0 deletions
diff --git a/Collapse file
‎test/fixtures/deprecated-userland-subclass.js‎
Copy file name to clipboard
+19Lines changed: 19 additions & 0 deletions b/Collapse file
‎test/fixtures/deprecated-userland-subclass.js‎
Copy file name to clipboard
+19Lines changed: 19 additions & 0 deletions
diff --git a/Collapse file
‎test/sequential/test-deprecation-flags.js‎
Copy file name to clipboardExpand all lines: test/sequential/test-deprecation-flags.js
+21-3Lines changed: 21 additions & 3 deletions b/Collapse file
‎test/sequential/test-deprecation-flags.js‎
Copy file name to clipboardExpand all lines: test/sequential/test-deprecation-flags.js
+21-3Lines changed: 21 additions & 3 deletions
@@ -46,7 +46,7 @@ environment variable. For example: `NODE_DEBUG=fs,net,tls`.
 
 ## util.deprecate(function, string)
 
-The `util.deprecate()` method wraps the given `function` in such a way that
+The `util.deprecate()` method wraps the given `function` or class in such a way that
 it is marked as deprecated.
 
 ```js
 
@@ -57,9 +57,18 @@ exports._deprecate = function(fn, msg) {
   var warned = false;
   function deprecated() {
     warned = exports.printDeprecationMessage(msg, warned, deprecated);
+    if (new.target) {
+      return Reflect.construct(fn, arguments, new.target);
+    }
     return fn.apply(this, arguments);
   }
 
+  // The wrapper will keep the same prototype as fn to maintain prototype chain
+  Object.setPrototypeOf(deprecated, fn);
+  if (fn.prototype) {
+    Object.setPrototypeOf(deprecated.prototype, fn.prototype);
+  }
+
   return deprecated;
 };
 
 
@@ -0,0 +1,12 @@
+const util = require('util');
+const assert = require('assert');
+
+class deprecatedClass {
+}
+
+const deprecated = util.deprecate(deprecatedClass, 'deprecatedClass is deprecated.');
+
+const instance = new deprecated();
+
+assert(instance instanceof deprecated);
+assert(instance instanceof deprecatedClass);
@@ -0,0 +1,19 @@
+const util = require('util');
+const assert = require('assert');
+
+class deprecatedClass {
+}
+
+const deprecated = util.deprecate(deprecatedClass, 'deprecatedClass is deprecated.');
+
+class subclass extends deprecated {
+  constructor() {
+    super();
+  }
+}
+
+const instance = new subclass();
+
+assert(instance instanceof subclass);
+assert(instance instanceof deprecated);
+assert(instance instanceof deprecatedClass);
@@ -5,8 +5,14 @@ const execFile = require('child_process').execFile;
 const depmod = require.resolve(common.fixturesDir + '/deprecated.js');
 const node = process.execPath;
 
-const depUserland =
-    require.resolve(common.fixturesDir + '/deprecated-userland-function.js');
+const depUserlandFunction =
+  require.resolve(common.fixturesDir + '/deprecated-userland-function.js');
+
+const depUserlandClass =
+  require.resolve(common.fixturesDir + '/deprecated-userland-class.js');
+
+const depUserlandSubClass =
+  require.resolve(common.fixturesDir + '/deprecated-userland-subclass.js');
 
 const normal = [depmod];
 const noDep = ['--no-deprecation', depmod];
@@ -39,10 +45,22 @@ execFile(node, traceDep, function(er, stdout, stderr) {
   console.log('trace ok');
 });
 
-execFile(node, [depUserland], function(er, stdout, stderr) {
+execFile(node, [depUserlandFunction], function(er, stdout, stderr) {
   console.error('normal: testing deprecated userland function');
   assert.equal(er, null);
   assert.equal(stdout, '');
   assert(/deprecatedFunction is deprecated/.test(stderr));
   console.error('normal: ok');
 });
+
+execFile(node, [depUserlandClass], function(er, stdout, stderr) {
+  assert.strictEqual(er, null);
+  assert.strictEqual(stdout, '');
+  assert(/deprecatedClass is deprecated/.test(stderr));
+});
+
+execFile(node, [depUserlandSubClass], function(er, stdout, stderr) {
+  assert.strictEqual(er, null);
+  assert.strictEqual(stdout, '');
+  assert(/deprecatedClass is deprecated/.test(stderr));
+});