@parcel/workers 2.8.3 → 2.9.0

package/lib/child.js

@@ -4,72 +4,55 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Child = void 0;
-
 function _assert() {
   const data = _interopRequireDefault(require("assert"));
-
   _assert = function () {
     return data;
   };
-
   return data;
 }
-
 function _nullthrows() {
   const data = _interopRequireDefault(require("nullthrows"));
-
   _nullthrows = function () {
     return data;
   };
-
   return data;
 }
-
 function _logger() {
   const data = _interopRequireWildcard(require("@parcel/logger"));
-
   _logger = function () {
     return data;
   };
-
   return data;
 }
-
 function _diagnostic() {
   const data = _interopRequireWildcard(require("@parcel/diagnostic"));
-
   _diagnostic = function () {
     return data;
   };
-
   return data;
 }
-
 function _core() {
   const data = require("@parcel/core");
-
   _core = function () {
     return data;
   };
-
   return data;
 }
-
 var _bus = _interopRequireDefault(require("./bus"));
-
-var _Profiler = _interopRequireDefault(require("./Profiler"));
-
+function _profiler() {
+  const data = require("@parcel/profiler");
+  _profiler = function () {
+    return data;
+  };
+  return data;
+}
 var _Handle2 = _interopRequireDefault(require("./Handle"));
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 // The import of './Handle' should really be imported eagerly (with @babel/plugin-transform-modules-commonjs's lazy mode).
 const Handle = _Handle2.default;
-
 class Child {
   callQueue = [];
   maxConcurrentCalls = 10;
@@ -78,18 +61,21 @@ class Child {
   handles = new Map();
   sharedReferences = new Map();
   sharedReferencesByValue = new Map();
-
   constructor(ChildBackend) {
     this.child = new ChildBackend(m => {
       this.messageListener(m);
-    }, () => this.handleEnd()); // Monitior all logging events inside this child process and forward to
-    // the main process via the bus.
+    }, () => this.handleEnd());
 
+    // Monitior all logging events inside this child process and forward to
+    // the main process via the bus.
     this.loggerDisposable = _logger().default.onLog(event => {
       _bus.default.emit('logEvent', event);
     });
+    // .. and do the same for trace events
+    this.tracerDisposable = _profiler().tracer.onTrace(event => {
+      _bus.default.emit('traceEvent', event);
+    });
   }
-
   workerApi = {
     callMaster: (request, awaitResponse = true) => this.addCall(request, awaitResponse),
     createReverseHandle: fn => this.createReverseHandle(fn),
@@ -100,7 +86,6 @@ class Child {
     getSharedReference: ref => this.sharedReferences.get(ref),
     resolveSharedReference: value => this.sharedReferencesByValue.get(value)
   };
-
   messageListener(message) {
     if (message.type === 'response') {
       return this.handleResponse(message);
@@ -108,21 +93,17 @@ class Child {
       return this.handleRequest(message);
     }
   }
-
   send(data) {
     this.child.send(data);
   }
-
   async childInit(module, childId) {
     // $FlowFixMe this must be dynamic
     this.module = require(module);
     this.childId = childId;
-
     if (this.module.childInit != null) {
       await this.module.childInit();
     }
   }
-
   async handleRequest(data) {
     let {
       idx,
@@ -131,7 +112,6 @@ class Child {
       handle: handleId
     } = data;
     let child = (0, _nullthrows().default)(data.child);
-
     const responseFromContent = content => ({
       idx,
       child,
@@ -139,7 +119,6 @@ class Child {
       contentType: 'data',
       content
     });
-
     const errorResponseFromError = e => ({
       idx,
       child,
@@ -147,13 +126,10 @@ class Child {
       contentType: 'error',
       content: (0, _diagnostic().anyToDiagnostic)(e)
     });
-
     let result;
-
     if (handleId != null) {
       try {
         var _this$handles$get;
-
         let fn = (0, _nullthrows().default)((_this$handles$get = this.handles.get(handleId)) === null || _this$handles$get === void 0 ? void 0 : _this$handles$get.fn);
         result = responseFromContent(fn(...args));
       } catch (e) {
@@ -162,20 +138,20 @@ class Child {
     } else if (method === 'childInit') {
       try {
         let [moduleName, childOptions] = args;
-
         if (childOptions.shouldPatchConsole) {
           (0, _logger().patchConsole)();
         } else {
           (0, _logger().unpatchConsole)();
         }
-
+        if (childOptions.shouldTrace) {
+          _profiler().tracer.enable();
+        }
         result = responseFromContent(await this.childInit(moduleName, child));
       } catch (e) {
         result = errorResponseFromError(e);
       }
     } else if (method === 'startProfile') {
-      this.profiler = new _Profiler.default();
-
+      this.profiler = new (_profiler().SamplingProfiler)();
       try {
         result = responseFromContent(await this.profiler.startProfiling());
       } catch (e) {
@@ -191,14 +167,14 @@ class Child {
     } else if (method === 'takeHeapSnapshot') {
       try {
         let v8 = require('v8');
-
         result = responseFromContent(v8.writeHeapSnapshot('heap-' + args[0] + '-' + (this.childId ? 'worker' + this.childId : 'main') + '.heapsnapshot'));
       } catch (e) {
         result = errorResponseFromError(e);
       }
     } else if (method === 'createSharedReference') {
       let [ref, _value] = args;
-      let value = _value instanceof ArrayBuffer ? // In the case the value is pre-serialized as a buffer,
+      let value = _value instanceof ArrayBuffer ?
+      // In the case the value is pre-serialized as a buffer,
       // deserialize it.
       (0, _core().deserialize)(Buffer.from(_value)) : _value;
       this.sharedReferences.set(ref, value);
@@ -212,26 +188,24 @@ class Child {
       result = responseFromContent(null);
     } else {
       try {
-        result = responseFromContent( // $FlowFixMe
+        result = responseFromContent(
+        // $FlowFixMe
         await this.module[method](this.workerApi, ...args));
       } catch (e) {
         result = errorResponseFromError(e);
       }
     }
-
     try {
       this.send(result);
     } catch (e) {
       result = this.send(errorResponseFromError(e));
     }
   }
-
   handleResponse(data) {
     let idx = (0, _nullthrows().default)(data.idx);
     let contentType = data.contentType;
     let content = data.content;
     let call = (0, _nullthrows().default)(this.responseQueue.get(idx));
-
     if (contentType === 'error') {
       (0, _assert().default)(typeof content !== 'string');
       call.reject(new (_diagnostic().default)({
@@ -240,18 +214,18 @@ class Child {
     } else {
       call.resolve(content);
     }
+    this.responseQueue.delete(idx);
 
-    this.responseQueue.delete(idx); // Process the next call
-
+    // Process the next call
     this.processQueue();
-  } // Keep in mind to make sure responses to these calls are JSON.Stringify safe
-
+  }
 
+  // Keep in mind to make sure responses to these calls are JSON.Stringify safe
   addCall(request, awaitResponse = true) {
     var _promise;
-
     // $FlowFixMe
-    let call = { ...request,
+    let call = {
+      ...request,
       type: 'request',
       child: this.childId,
       // $FlowFixMe Added in Flow 0.121.0 upgrade in #4381
@@ -260,27 +234,22 @@ class Child {
       reject: () => {}
     };
     let promise;
-
     if (awaitResponse) {
       promise = new Promise((resolve, reject) => {
         call.resolve = resolve;
         call.reject = reject;
       });
     }
-
     this.callQueue.push(call);
     this.processQueue();
     return (_promise = promise) !== null && _promise !== void 0 ? _promise : Promise.resolve();
   }
-
   sendRequest(call) {
     let idx;
-
     if (call.awaitResponse) {
       idx = this.responseId++;
       this.responseQueue.set(idx, call);
     }
-
     this.send({
       idx,
       child: call.child,
@@ -292,21 +261,18 @@ class Child {
       awaitResponse: call.awaitResponse
     });
   }
-
   processQueue() {
     if (!this.callQueue.length) {
       return;
     }
-
     if (this.responseQueue.size < this.maxConcurrentCalls) {
       this.sendRequest(this.callQueue.shift());
     }
   }
-
   handleEnd() {
     this.loggerDisposable.dispose();
+    this.tracerDisposable.dispose();
   }
-
   createReverseHandle(fn) {
     let handle = new Handle({
       fn,
@@ -315,7 +281,5 @@ class Child {
     this.handles.set(handle.id, handle);
     return handle;
   }
-
 }
-
 exports.Child = Child;

package/lib/childState.js

@@ -10,7 +10,6 @@ exports.setChild = setChild;
 // This way, WorkerFarm can access the state without directly importing the child code.
 let child = null;
 exports.child = child;
-
 function setChild(c) {
   exports.child = child = c;
 }

package/lib/cpuCount.js

@@ -5,29 +5,21 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = getCores;
 exports.detectRealCores = detectRealCores;
-
 function _os() {
   const data = _interopRequireDefault(require("os"));
-
   _os = function () {
     return data;
   };
-
   return data;
 }
-
 function _child_process() {
   const data = require("child_process");
-
   _child_process = function () {
     return data;
   };
-
   return data;
 }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const exec = command => {
   try {
     let stdout = (0, _child_process().execSync)(command, {
@@ -40,50 +32,40 @@ const exec = command => {
     return '';
   }
 };
-
 function detectRealCores() {
   let platform = _os().default.platform();
-
   let amount = 0;
-
   if (platform === 'linux') {
     amount = parseInt(exec('lscpu -p | egrep -v "^#" | sort -u -t, -k 2,4 | wc -l'), 10);
   } else if (platform === 'darwin') {
     amount = parseInt(exec('sysctl -n hw.physicalcpu_max'), 10);
   } else if (platform === 'win32') {
     const str = exec('wmic cpu get NumberOfCores').match(/\d+/g);
-
     if (str !== null) {
       amount = parseInt(str.filter(n => n !== '')[0], 10);
     }
   }
-
   if (!amount || amount <= 0) {
     throw new Error('Could not detect cpu count!');
   }
-
   return amount;
 }
-
 let cores;
-
 function getCores(bypassCache = false) {
   // Do not re-run commands if we already have the count...
   if (cores && !bypassCache) {
     return cores;
   }
-
   try {
     cores = detectRealCores();
   } catch (e) {
     // Guess the amount of real cores
     cores = _os().default.cpus().filter((cpu, index) => !cpu.model.includes('Intel') || index % 2 === 1).length;
-  } // Another fallback
-
+  }
 
+  // Another fallback
   if (!cores) {
     cores = 1;
   }
-
   return cores;
 }

package/lib/index.js

@@ -16,73 +16,61 @@ Object.defineProperty(exports, "bus", {
   }
 });
 exports.default = void 0;
-
 function _assert() {
   const data = _interopRequireDefault(require("assert"));
-
   _assert = function () {
     return data;
   };
-
   return data;
 }
-
 var _WorkerFarm = _interopRequireWildcard(require("./WorkerFarm"));
-
 function _logger() {
   const data = _interopRequireDefault(require("@parcel/logger"));
-
   _logger = function () {
     return data;
   };
-
   return data;
 }
-
 var _bus = _interopRequireDefault(require("./bus"));
-
+function _profiler() {
+  const data = require("@parcel/profiler");
+  _profiler = function () {
+    return data;
+  };
+  return data;
+}
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 if (!_WorkerFarm.default.isWorker()) {
   // Forward all logger events originating from workers into the main process
   _bus.default.on('logEvent', e => {
     switch (e.level) {
       case 'info':
         _logger().default.info(e.diagnostics);
-
         break;
-
       case 'progress':
         (0, _assert().default)(typeof e.message === 'string');
-
         _logger().default.progress(e.message);
-
         break;
-
       case 'verbose':
         _logger().default.verbose(e.diagnostics);
-
         break;
-
       case 'warn':
         _logger().default.warn(e.diagnostics);
-
         break;
-
       case 'error':
         _logger().default.error(e.diagnostics);
-
         break;
-
       default:
         throw new Error('Unknown log level');
     }
   });
-}
 
+  // Forward all trace events originating from workers into the main process
+  _bus.default.on('traceEvent', e => {
+    _profiler().tracer.trace(e);
+  });
+}
 var _default = _WorkerFarm.default;
 exports.default = _default;

package/lib/process/ProcessChild.js

@@ -4,52 +4,38 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 function _nullthrows() {
   const data = _interopRequireDefault(require("nullthrows"));
-
   _nullthrows = function () {
     return data;
   };
-
   return data;
 }
-
 var _childState = require("../childState");
-
 var _child = require("../child");
-
 function _core() {
   const data = require("@parcel/core");
-
   _core = function () {
     return data;
   };
-
   return data;
 }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 class ProcessChild {
   constructor(onMessage, onExit) {
     if (!process.send) {
       throw new Error('Only create ProcessChild instances in a worker!');
     }
-
     this.onMessage = onMessage;
     this.onExit = onExit;
     process.on('message', data => this.handleMessage(data));
   }
-
   handleMessage(data) {
     if (data === 'die') {
       return this.stop();
     }
-
     this.onMessage((0, _core().deserialize)(Buffer.from(data, 'base64')));
   }
-
   send(data) {
     let processSend = (0, _nullthrows().default)(process.send).bind(process);
     processSend((0, _core().serialize)(data).toString('base64'), err => {
@@ -63,13 +49,10 @@ class ProcessChild {
       }
     });
   }
-
   stop() {
     this.onExit(0);
     process.exit();
   }
-
 }
-
 exports.default = ProcessChild;
 (0, _childState.setChild)(new _child.Child(ProcessChild));

package/lib/process/ProcessWorker.js

@@ -4,52 +4,38 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 function _child_process() {
   const data = _interopRequireDefault(require("child_process"));
-
   _child_process = function () {
     return data;
   };
-
   return data;
 }
-
 function _path() {
   const data = _interopRequireDefault(require("path"));
-
   _path = function () {
     return data;
   };
-
   return data;
 }
-
 function _core() {
   const data = require("@parcel/core");
-
   _core = function () {
     return data;
   };
-
   return data;
 }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const WORKER_PATH = _path().default.join(__dirname, 'ProcessChild.js');
-
 class ProcessWorker {
   processQueue = true;
   sendQueue = [];
-
   constructor(execArgv, onMessage, onError, onExit) {
     this.execArgv = execArgv;
     this.onMessage = onMessage;
     this.onError = onError;
     this.onExit = onExit;
   }
-
   start() {
     this.child = _child_process().default.fork(WORKER_PATH, process.argv, {
       execArgv: this.execArgv,
@@ -63,7 +49,6 @@ class ProcessWorker {
     this.child.on('error', this.onError);
     return Promise.resolve();
   }
-
   async stop() {
     this.child.send('die');
     let forceKill = setTimeout(() => this.child.kill('SIGINT'), 500);
@@ -72,34 +57,27 @@ class ProcessWorker {
     });
     clearTimeout(forceKill);
   }
-
   send(data) {
     if (!this.processQueue) {
       this.sendQueue.push(data);
       return;
     }
-
     let result = this.child.send((0, _core().serialize)(data).toString('base64'), error => {
       if (error && error instanceof Error) {
         // Ignore this, the workerfarm handles child errors
         return;
       }
-
       this.processQueue = true;
-
       if (this.sendQueue.length > 0) {
         let queueCopy = this.sendQueue.slice(0);
         this.sendQueue = [];
         queueCopy.forEach(entry => this.send(entry));
       }
     });
-
     if (!result || /^win/.test(process.platform)) {
       // Queue is handling too much messages throttle it
       this.processQueue = false;
     }
   }
-
 }
-
 exports.default = ProcessWorker;