@parcel/workers - npm Package Compare versions

Comparing version 2.0.0-alpha.2.1 to 2.0.0-alpha.3

lib/child.js

@@ -14,3 +14,3 @@ "use strict";
 
-var _utils = require("@parcel/utils");
+var _diagnostic = _interopRequireWildcard(require("@parcel/diagnostic"));
 
@@ -23,7 +23,9 @@ var _bus = _interopRequireDefault(require("./bus"));
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } }
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
 
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (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 }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { keys.push.apply(keys, Object.getOwnPropertySymbols(object)); } if (enumerableOnly) keys = keys.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
@@ -114,3 +116,3 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
       contentType: 'error',
-      content: (0, _utils.errorToJson)(e)
+      content: (0, _diagnostic.anyToDiagnostic)(e)
     });
@@ -180,3 +182,5 @@
       (0, _assert.default)(typeof content !== 'string');
-      call.reject((0, _utils.jsonToError)(content));
+      call.reject(new _diagnostic.default({
+        diagnostic: content
+      }));
     } else {
@@ -183,0 +187,0 @@ call.resolve(content);

lib/index.js

@@ -28,4 +28,6 @@ "use strict";
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } }
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
 
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (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 }; }
@@ -38,6 +40,4 @@
       case 'info':
-        (0, _assert.default)(typeof e.message === 'string');
+        _logger.default.info(e.diagnostics);
 
-        _logger.default.info(e.message);
-
         break;
@@ -53,10 +53,8 @@
       case 'verbose':
-        (0, _assert.default)(typeof e.message === 'string');
+        _logger.default.verbose(e.diagnostics);
 
-        _logger.default.verbose(e.message);
-
         break;
 
       case 'warn':
-        _logger.default.warn(e.message);
+        _logger.default.warn(e.diagnostics);
 
@@ -66,3 +64,3 @@ break;
       case 'error':
-        _logger.default.error(e.message);
+        _logger.default.error(e.diagnostics);
 
@@ -69,0 +67,0 @@ break;

lib/Worker.js

@@ -10,3 +10,3 @@ "use strict";
 
-var _utils = require("@parcel/utils");
+var _diagnostic = _interopRequireDefault(require("@parcel/diagnostic"));
 
@@ -124,3 +124,5 @@ var _backend = require("./backend");
       if (message.contentType === 'error') {
-        call.reject((0, _utils.jsonToError)(message.content));
+        call.reject(new _diagnostic.default({
+          diagnostic: message.content
+        }));
       } else {
@@ -127,0 +129,0 @@ call.resolve(message.content);

lib/WorkerFarm.js

@@ -22,2 +22,4 @@ "use strict";
 
+var _diagnostic = _interopRequireWildcard(require("@parcel/diagnostic"));
+
 var _Worker = _interopRequireDefault(require("./Worker"));
@@ -41,5 +43,9 @@
 
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (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 }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { keys.push.apply(keys, Object.getOwnPropertySymbols(object)); } if (enumerableOnly) keys = keys.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
@@ -257,3 +263,3 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
       contentType: 'error',
-      content: (0, _utils.errorToJson)(e)
+      content: (0, _diagnostic.anyToDiagnostic)(e)
     });
@@ -289,3 +295,5 @@
         if (result.contentType === 'error') {
-          throw (0, _utils.jsonToError)(result.content);
+          throw new _diagnostic.default({
+            diagnostic: result.content
+          });
         }
@@ -448,3 +456,6 @@
 
-    _logger.default.info(`Wrote profile to ${filename}`);
+    _logger.default.info({
+      origin: '@parcel/workers',
+      message: `Wrote profile to ${filename}`
+    });
   }
@@ -451,0 +462,0 @@

package.json

 {
   "name": "@parcel/workers",
-  "version": "2.0.0-alpha.2.1",
+  "version": "2.0.0-alpha.3",
   "description": "Blazing fast, zero configuration web application bundler",
-  "main": "lib/index.js",
   "license": "MIT",
+  "publishConfig": {
+    "access": "public"
+  },
   "repository": {
@@ -11,11 +13,11 @@ "type": "git",
   },
+  "main": "lib/index.js",
+  "source": "src/index.js",
   "engines": {
     "node": ">= 10.0.0"
   },
-  "publishConfig": {
-    "access": "public"
-  },
   "dependencies": {
-    "@parcel/logger": "^2.0.0-alpha.2.1",
-    "@parcel/utils": "^2.0.0-alpha.2.1",
+    "@parcel/diagnostic": "^2.0.0-alpha.3",
+    "@parcel/logger": "^2.0.0-alpha.3",
+    "@parcel/utils": "^2.0.0-alpha.3",
     "chrome-trace-event": "^1.0.2",
@@ -25,3 +27,3 @@ "nullthrows": "^1.1.1",
   },
-  "gitHead": "2c01341d81c41a70cb33acb51fff621353b3e494"
-}
+  "gitHead": "d4b611ac4495787fa31dac40dda15eedb6e31492"
+}

src/child.js

@@ -18,3 +18,3 @@ // @flow
 import Logger, {patchConsole} from '@parcel/logger';
-import {errorToJson, jsonToError} from '@parcel/utils';
+import ThrowableDiagnostic, {anyToDiagnostic} from '@parcel/diagnostic';
 import bus from './bus';
@@ -101,3 +101,3 @@ import Profiler from './Profiler';
       contentType: 'error',
-      content: errorToJson(e)
+      content: anyToDiagnostic(e)
     });
@@ -166,3 +166,3 @@
       invariant(typeof content !== 'string');
-      call.reject(jsonToError(content));
+      call.reject(new ThrowableDiagnostic({diagnostic: content}));
     } else {
@@ -169,0 +169,0 @@ call.resolve(content);

src/index.js

@@ -13,4 +13,3 @@ // @flow
       case 'info':
-        invariant(typeof e.message === 'string');
-        Logger.info(e.message);
+        Logger.info(e.diagnostics);
         break;
@@ -22,10 +21,9 @@ case 'progress':
       case 'verbose':
-        invariant(typeof e.message === 'string');
-        Logger.verbose(e.message);
+        Logger.verbose(e.diagnostics);
         break;
       case 'warn':
-        Logger.warn(e.message);
+        Logger.warn(e.diagnostics);
         break;
       case 'error':
-        Logger.error(e.message);
+        Logger.error(e.diagnostics);
         break;
@@ -32,0 +30,0 @@ default:

src/types.js

 // @flow
-
+import type {Diagnostic} from '@parcel/diagnostic';
 import type {FilePath} from '@parcel/types';
-import type {JSONError} from '@parcel/utils';
 
@@ -43,3 +42,3 @@ export type LocationCallRequest = {|
   contentType: 'error',
-  content: JSONError
+  content: Diagnostic | Array<Diagnostic>
 |};
@@ -46,0 +45,0 @@

src/Worker.js

@@ -7,3 +7,3 @@ // @flow
 import EventEmitter from 'events';
-import {jsonToError} from '@parcel/utils';
+import ThrowableDiagnostic from '@parcel/diagnostic';
 import {getWorkerBackend} from './backend';
@@ -136,3 +136,3 @@
       if (message.contentType === 'error') {
-        call.reject(jsonToError(message.content));
+        call.reject(new ThrowableDiagnostic({diagnostic: message.content}));
       } else {
@@ -139,0 +139,0 @@ call.resolve(message.content);

src/WorkerFarm.js

@@ -19,4 +19,2 @@ // @flow
   deserialize,
-  errorToJson,
-  jsonToError,
   prepareForSerialization,
@@ -26,2 +24,3 @@ restoreDeserializedObject,
 } from '@parcel/utils';
+import ThrowableDiagnostic, {anyToDiagnostic} from '@parcel/diagnostic';
 import Worker, {type WorkerCall} from './Worker';
@@ -276,3 +275,3 @@ import cpuCount from './cpuCount';
       contentType: 'error',
-      content: errorToJson(e)
+      content: anyToDiagnostic(e)
     });
@@ -307,3 +306,3 @@
         if (result.contentType === 'error') {
-          throw jsonToError(result.content);
+          throw new ThrowableDiagnostic({diagnostic: result.content});
         }
@@ -473,3 +472,6 @@ return result.content;
 
-    logger.info(`Wrote profile to ${filename}`);
+    logger.info({
+      origin: '@parcel/workers',
+      message: `Wrote profile to ${filename}`
+    });
   }
@@ -476,0 +478,0 @@

test/integration/workerfarm/logging.js

@@ -8,4 +8,10 @@ const WorkerFarm = require('../../../').default;
     // always work.
-    Logger.info('omg it works');
-    Logger.error('errors objects dont work yet');
+    Logger.info({
+      origin: 'logging-worker',
+      message: 'omg it works'
+    });
+    Logger.error({
+      origin: 'logging-worker',
+      message: 'errors objects dont work yet'
+    });
   }
@@ -12,0 +18,0 @@ }

test/workerfarm.js

@@ -151,24 +151,49 @@ import Logger from '@parcel/logger';
         level: 'info',
-        message: 'one',
-        type: 'log'
+        type: 'log',
+        diagnostics: [
+          {
+            origin: 'console',
+            message: 'one'
+          }
+        ]
       },
       {
         level: 'info',
-        message: 'two',
-        type: 'log'
+        type: 'log',
+        diagnostics: [
+          {
+            origin: 'console',
+            message: 'two'
+          }
+        ]
       },
       {
         level: 'warn',
-        message: 'three',
-        type: 'log'
+        type: 'log',
+        diagnostics: [
+          {
+            origin: 'console',
+            message: 'three'
+          }
+        ]
       },
       {
         level: 'error',
-        message: 'four',
-        type: 'log'
+        type: 'log',
+        diagnostics: [
+          {
+            origin: 'console',
+            message: 'four'
+          }
+        ]
       },
       {
         level: 'verbose',
-        message: 'five',
-        type: 'log'
+        type: 'log',
+        diagnostics: [
+          {
+            message: 'five',
+            origin: 'console'
+          }
+        ]
       }
@@ -197,3 +222,8 @@ ]);
         level: 'info',
-        message: 'omg it works',
+        diagnostics: [
+          {
+            origin: 'logging-worker',
+            message: 'omg it works'
+          }
+        ],
         type: 'log'
@@ -203,3 +233,8 @@ },
         level: 'error',
-        message: 'errors objects dont work yet',
+        diagnostics: [
+          {
+            origin: 'logging-worker',
+            message: 'errors objects dont work yet'
+          }
+        ],
         type: 'log'
@@ -206,0 +241,0 @@ }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

95114

increased by3.43%

Number of package files

46

increased by2.22%

Lines of code

2957

increased by2.04%

Worsened metrics

Dependency count

6

increased by20%

Dependency changes

• + Added@parcel/diagnostic@^2.0.0-alpha.3

• Updated@parcel/logger@^2.0.0-alpha.3

• Updated@parcel/utils@^2.0.0-alpha.3