@parcel/events 2.0.0-nightly.130 → 2.0.0-nightly.1314

package/lib/Disposable.js

@@ -4,71 +4,44 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
-var _assert = _interopRequireDefault(require("assert"));
-
+function _assert() {
+  const data = _interopRequireDefault(require("assert"));
+  _assert = function () {
+    return data;
+  };
+  return data;
+}
 var _errors = require("./errors");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-function _classPrivateFieldGet(receiver, privateMap) { var descriptor = privateMap.get(receiver); if (!descriptor) { throw new TypeError("attempted to get private field on non-instance"); } if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; }
-
-function _classPrivateFieldSet(receiver, privateMap, value) { var descriptor = privateMap.get(receiver); if (!descriptor) { throw new TypeError("attempted to set private field on non-instance"); } if (descriptor.set) { descriptor.set.call(receiver, value); } else { if (!descriptor.writable) { throw new TypeError("attempted to set read only private field"); } descriptor.value = value; } return value; }
-
 /*
  * A general-purpose disposable class. It can normalize disposable-like values
  * (such as single functions or IDisposables), as well as hold multiple
  * disposable-like values to be disposed of at once.
  */
 class Disposable {
-  // ?Set<DisposableLike>
-  constructor(...disposables) {
-    _defineProperty(this, "disposed", false);
+  disposed = false;
+  #disposables /*: ?Set<DisposableLike> */;
 
-    _disposables.set(this, {
-      writable: true,
-      value: void 0
-    });
-
-    _classPrivateFieldSet(this, _disposables, new Set(disposables));
+  constructor(...disposables) {
+    this.#disposables = new Set(disposables);
   }
-
   add(...disposables) {
     if (this.disposed) {
       throw new _errors.AlreadyDisposedError('Cannot add new disposables after disposable has been disposed');
     }
-
-    (0, _assert.default)(_classPrivateFieldGet(this, _disposables) != null);
-
+    (0, _assert().default)(this.#disposables != null);
     for (let disposable of disposables) {
-      _classPrivateFieldGet(this, _disposables).add(disposable);
+      this.#disposables.add(disposable);
     }
   }
-
-  dispose() {
+  async dispose() {
     if (this.disposed) {
       return;
     }
-
-    (0, _assert.default)(_classPrivateFieldGet(this, _disposables) != null);
-
-    for (let disposable of _classPrivateFieldGet(this, _disposables)) {
-      if (typeof disposable === 'function') {
-        disposable();
-      } else {
-        disposable.dispose();
-      }
-    }
-
-    _classPrivateFieldSet(this, _disposables, null);
-
     this.disposed = true;
+    (0, _assert().default)(this.#disposables != null);
+    await Promise.all([...this.#disposables].map(disposable => typeof disposable === 'function' ? disposable() : disposable.dispose()));
+    this.#disposables = null;
   }
-
 }
-
-exports.default = Disposable;
-
-var _disposables = new WeakMap();
+exports.default = Disposable;

package/lib/ValueEmitter.js

@@ -4,84 +4,68 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _errors = require("./errors");
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 // Like an EventEmitter, but for only a single "event". This provides type-safety
 // for the values emitted. Rather than passing predetermined strings (which can
 // be misspelled), create an instance of ValueEmitter for every logical "event"
 // to be dispatched, and type it according to the type of value emitted.
 class ValueEmitter {
-  constructor() {
-    _defineProperty(this, "_listeners", []);
-
-    _defineProperty(this, "_disposed", false);
-  }
-
+  // An array of listeners. One might think a Set would be better for O(1) removal,
+  // but splicing a JS array gets pretty close, and copying the array (as is done
+  // in emit) is far faster than a Set copy: https://github.com/atom/event-kit/pull/39
+  _listeners = [];
+  _disposed = false;
   addListener(listener) {
     if (this._disposed) {
       throw new _errors.AlreadyDisposedError('Cannot add a listener since this ValueEmitter has been disposed');
     }
+    this._listeners.push(listener);
 
-    this._listeners.push(listener); // Close over a reference to this emitter in the disposable below, rather
+    // Close over a reference to this emitter in the disposable below, rather
     // than referencing `this` directly. This allows us to set it to null after
     // slicing out the listener.
     // This prevents anyone holding onto the disposable after disposal from
     // unintentionally retaining a reference to this emitter.
-
-
     let emitter = this;
     return {
       dispose() {
         if (emitter == null) {
           return;
         }
-
         if (emitter._disposed) {
           emitter = null;
           return;
         }
-
-        let listenerIndex = emitter._listeners.indexOf(listener);
-
+        let listeners = emitter._listeners;
+        let listenerIndex = listeners.indexOf(listener);
         if (listenerIndex > -1) {
-          emitter._listeners.splice(listenerIndex, 1);
+          listeners.splice(listenerIndex, 1);
         }
-
         emitter = null;
       }
-
     };
   }
-
   emit(value) {
     if (this._disposed) {
       throw new _errors.AlreadyDisposedError('Cannot emit since this ValueEmitter has been disposed');
-    } // Iterate over a copy of listeners. This prevents the following cases:
+    }
+
+    // Iterate over a copy of listeners. This prevents the following cases:
     // * When a listener callback can itself register a new listener and be
     //   emitted as part of this iteration.
     // * When a listener callback disposes of this emitter mid-emit, preventing
     //   other listeners from receiving the event.
-
-
     let listeners = this._listeners.slice();
-
     for (let i = 0; i < listeners.length; i++) {
       listeners[i](value);
     }
   }
-
   dispose() {
     if (this._disposed) {
       return;
     }
-
     this._listeners = [];
     this._disposed = true;
   }
-
 }
-
 exports.default = ValueEmitter;

package/lib/errors.js

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.AlreadyDisposedError = void 0;
-
 class AlreadyDisposedError extends Error {}
-
 exports.AlreadyDisposedError = AlreadyDisposedError;
 Object.defineProperty(AlreadyDisposedError.prototype, 'name', {
   value: 'AlreadyDisposedError'

package/lib/index.js

@@ -3,29 +3,25 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "Disposable", {
+Object.defineProperty(exports, "AlreadyDisposedError", {
   enumerable: true,
   get: function () {
-    return _Disposable.default;
+    return _errors.AlreadyDisposedError;
   }
 });
-Object.defineProperty(exports, "ValueEmitter", {
+Object.defineProperty(exports, "Disposable", {
   enumerable: true,
   get: function () {
-    return _ValueEmitter.default;
+    return _Disposable.default;
   }
 });
-Object.defineProperty(exports, "AlreadyDisposedError", {
+Object.defineProperty(exports, "ValueEmitter", {
   enumerable: true,
   get: function () {
-    return _errors.AlreadyDisposedError;
+    return _ValueEmitter.default;
   }
 });
-
 var _Disposable = _interopRequireDefault(require("./Disposable"));
-
 var _ValueEmitter = _interopRequireDefault(require("./ValueEmitter"));
-
 var _errors = require("./errors");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/package.json

@@ -1,10 +1,14 @@
 {
   "name": "@parcel/events",
-  "version": "2.0.0-nightly.130+870013ca",
+  "version": "2.0.0-nightly.1314+3ad435157",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
   },
+  "funding": {
+    "type": "opencollective",
+    "url": "https://opencollective.com/parcel"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/parcel-bundler/parcel.git"
@@ -12,7 +16,7 @@
   "main": "lib/index.js",
   "source": "src/index.js",
   "engines": {
-    "node": ">= 10.0.0"
+    "node": ">= 12.0.0"
   },
-  "gitHead": "870013cab1003cb422fd425af50c934407df9ecb"
+  "gitHead": "3ad435157d443da806c215d68ccf292b4e95ae0c"
 }

package/src/Disposable.js

@@ -14,7 +14,7 @@ type DisposableLike = IDisposable | (() => mixed);
  */
 export default class Disposable implements IDisposable {
   disposed: boolean = false;
-  #disposables; // ?Set<DisposableLike>
+  #disposables /*: ?Set<DisposableLike> */;
 
   constructor(...disposables: Array<DisposableLike>) {
     this.#disposables = new Set(disposables);
@@ -33,21 +33,20 @@ export default class Disposable implements IDisposable {
     }
   }
 
-  dispose(): void {
+  async dispose(): Promise<void> {
     if (this.disposed) {
       return;
     }
 
+    this.disposed = true;
+
     invariant(this.#disposables != null);
-    for (let disposable of this.#disposables) {
-      if (typeof disposable === 'function') {
-        disposable();
-      } else {
-        disposable.dispose();
-      }
-    }
+    await Promise.all(
+      [...this.#disposables].map(disposable =>
+        typeof disposable === 'function' ? disposable() : disposable.dispose(),
+      ),
+    );
 
     this.#disposables = null;
-    this.disposed = true;
   }
 }

package/src/ValueEmitter.js

@@ -41,9 +41,10 @@ export default class ValueEmitter<TValue> implements IDisposable {
           return;
         }
 
-        let listenerIndex = emitter._listeners.indexOf(listener);
+        let listeners = emitter._listeners;
+        let listenerIndex = listeners.indexOf(listener);
         if (listenerIndex > -1) {
-          emitter._listeners.splice(listenerIndex, 1);
+          listeners.splice(listenerIndex, 1);
         }
 
         emitter = null;

package/src/types.js

@@ -1,5 +1,8 @@
 // @flow strict-local
 
 export interface IDisposable {
-  dispose(): void;
+  /** This can return a Promise, as dispose() of all inner disposables are
+   * awaited in Disposable#dispose()
+   */
+  dispose(): mixed;
 }