report: warn on process.report object access

cjihrig · BridgeAR · commit 2be9e800f10b · 2019-03-12T21:04:23.000+01:00
Reduce the number of emitExperimentalWarning() call sites by making process.report emit a warning on access instead of each individual report function. PR-URL: #26414 Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Wyatt Preul <wpreul@gmail.com>
diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
@@ -40,7 +40,15 @@ function initializeReport() {
 return;
 }
 const { report } = require('internal/process/report');
- process.report = report;
+ const { emitExperimentalWarning } = require('internal/util');
+ Object.defineProperty(process, 'report', {
+ enumerable: false,
+ configurable: true,
+ get() {
+ emitExperimentalWarning('report');
+ return report;
+ }
+ });
 }
 
 function setupSignalHandlers() {
diff --git a/lib/internal/process/report.js b/lib/internal/process/report.js
@@ -1,8 +1,5 @@
 'use strict';
-const {
- convertToValidSignal,
- emitExperimentalWarning
-} = require('internal/util');
+const { convertToValidSignal } = require('internal/util');
 const {
 ERR_INVALID_ARG_TYPE,
 ERR_SYNTHETIC
@@ -11,8 +8,6 @@ const { validateString } = require('internal/validators');
 const nr = internalBinding('report');
 const report = {
 triggerReport(file, err) {
- emitExperimentalWarning('report');
-
 if (typeof file === 'object' && file !== null) {
 err = file;
 file = undefined;
@@ -27,8 +22,6 @@ const report = {
 return nr.triggerReport('JavaScript API', 'API', file, err.stack);
 },
 getReport(err) {
- emitExperimentalWarning('report');
-
 if (err === undefined)
 err = new ERR_SYNTHETIC();
 else if (err === null || typeof err !== 'object')
@@ -37,54 +30,42 @@ const report = {
 return nr.getReport(err.stack);
 },
 get directory() {
- emitExperimentalWarning('report');
 return nr.getDirectory();
 },
 set directory(dir) {
- emitExperimentalWarning('report');
 validateString(dir, 'directory');
 return nr.setDirectory(dir);
 },
 get filename() {
- emitExperimentalWarning('report');
 return nr.getFilename();
 },
 set filename(name) {
- emitExperimentalWarning('report');
 validateString(name, 'filename');
 return nr.setFilename(name);
 },
 get signal() {
- emitExperimentalWarning('report');
 return nr.getSignal();
 },
 set signal(sig) {
- emitExperimentalWarning('report');
 validateString(sig, 'signal');
 convertToValidSignal(sig); // Validate that the signal is recognized.
 removeSignalHandler();
 addSignalHandler(sig);
 return nr.setSignal(sig);
 },
 get reportOnFatalError() {
- emitExperimentalWarning('report');
 return nr.shouldReportOnFatalError();
 },
 set reportOnFatalError(trigger) {
- emitExperimentalWarning('report');
-
 if (typeof trigger !== 'boolean')
 throw new ERR_INVALID_ARG_TYPE('trigger', 'boolean', trigger);
 
 return nr.setReportOnFatalError(trigger);
 },
 get reportOnSignal() {
- emitExperimentalWarning('report');
 return nr.shouldReportOnSignal();
 },
 set reportOnSignal(trigger) {
- emitExperimentalWarning('report');
-
 if (typeof trigger !== 'boolean')
 throw new ERR_INVALID_ARG_TYPE('trigger', 'boolean', trigger);
 
@@ -93,12 +74,9 @@ const report = {
 addSignalHandler();
 },
 get reportOnUncaughtException() {
- emitExperimentalWarning('report');
 return nr.shouldReportOnUncaughtException();
 },
 set reportOnUncaughtException(trigger) {
- emitExperimentalWarning('report');
-
 if (typeof trigger !== 'boolean')
 throw new ERR_INVALID_ARG_TYPE('trigger', 'boolean', trigger);
 

-Original file line number
+Diff line change
 return;
+}
 const{ report }=require('internal/process/report');
 -process.report=report;
 +const{ emitExperimentalWarning }=require('internal/util');
 +Object.defineProperty(process,'report',{
 +enumerable: false,
 +configurable: true,
 +get(){
 +emitExperimentalWarning('report');
 +returnreport;
 +}
 +});
+}
 functionsetupSignalHandlers(){
-Original file line number
+Diff line change
@@ @@ -1,8 +1,5 @@ @@
 'use strict';
 -const{
 - convertToValidSignal,
 - emitExperimentalWarning
 -}=require('internal/util');
 +const{ convertToValidSignal }=require('internal/util');
 const{
 ERR_INVALID_ARG_TYPE,
 ERR_SYNTHETIC
 constnr=internalBinding('report');
 constreport={
 triggerReport(file,err){
 -emitExperimentalWarning('report');
+-
 if(typeoffile==='object'&&file!==null){
 err=file;
 file=undefined;
 returnnr.triggerReport('JavaScript API','API',file,err.stack);
 },
 getReport(err){
 -emitExperimentalWarning('report');
+-
 if(err===undefined)
 err=newERR_SYNTHETIC();
 elseif(err===null||typeoferr!=='object')
 returnnr.getReport(err.stack);
 },
 getdirectory(){
 -emitExperimentalWarning('report');
 returnnr.getDirectory();
 },
 setdirectory(dir){
 -emitExperimentalWarning('report');
 validateString(dir,'directory');
 returnnr.setDirectory(dir);
 },
 getfilename(){
 -emitExperimentalWarning('report');
 returnnr.getFilename();
 },
 setfilename(name){
 -emitExperimentalWarning('report');
 validateString(name,'filename');
 returnnr.setFilename(name);
 },
 getsignal(){
 -emitExperimentalWarning('report');
 returnnr.getSignal();
 },
 setsignal(sig){
 -emitExperimentalWarning('report');
 validateString(sig,'signal');
 convertToValidSignal(sig);// Validate that the signal is recognized.
 removeSignalHandler();
 addSignalHandler(sig);
 returnnr.setSignal(sig);
 },
 getreportOnFatalError(){
 -emitExperimentalWarning('report');
 returnnr.shouldReportOnFatalError();
 },
 setreportOnFatalError(trigger){
 -emitExperimentalWarning('report');
+-
 if(typeoftrigger!=='boolean')
 thrownewERR_INVALID_ARG_TYPE('trigger','boolean',trigger);
 returnnr.setReportOnFatalError(trigger);
 },
 getreportOnSignal(){
 -emitExperimentalWarning('report');
 returnnr.shouldReportOnSignal();
 },
 setreportOnSignal(trigger){
 -emitExperimentalWarning('report');
+-
 if(typeoftrigger!=='boolean')
 thrownewERR_INVALID_ARG_TYPE('trigger','boolean',trigger);
 addSignalHandler();
 },
 getreportOnUncaughtException(){
 -emitExperimentalWarning('report');
 returnnr.shouldReportOnUncaughtException();
 },
 setreportOnUncaughtException(trigger){
 -emitExperimentalWarning('report');
+-
 if(typeoftrigger!=='boolean')
 thrownewERR_INVALID_ARG_TYPE('trigger','boolean',trigger);