@atlaspack/events 2.14.2-typescript-e769947a5.0 → 2.14.2-typescript-6de04fbae.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/Disposable.d.mts +10 -0
- package/lib/Disposable.js +37 -36
- package/lib/Disposable.mjs +32 -0
- package/lib/ValueEmitter.d.mts +8 -0
- package/lib/ValueEmitter.js +59 -58
- package/lib/ValueEmitter.mjs +62 -0
- package/lib/errors.d.mts +2 -0
- package/lib/errors.js +11 -7
- package/lib/errors.mjs +5 -0
- package/lib/index.d.mts +3 -0
- package/lib/index.js +25 -23
- package/lib/index.js.flow +26 -0
- package/lib/index.mjs +3 -0
- package/lib/types.d.mts +6 -0
- package/lib/types.js +4 -1
- package/lib/types.mjs +1 -0
- package/package.json +20 -4
- package/src/{Disposable.js → Disposable.mts} +4 -6
- package/src/{ValueEmitter.js → ValueEmitter.mts} +6 -8
- package/src/{errors.js → errors.mts} +0 -2
- package/src/index.mts +3 -0
- package/src/{types.js → types.mts} +1 -3
- package/test/{Disposable.test.js → Disposable.test.mts} +3 -5
- package/test/{ValueEmitter.test.js → ValueEmitter.test.mts} +4 -5
- package/tsconfig.json +4 -0
- package/src/index.js +0 -5
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import type { IDisposable } from './types.mts';
|
|
2
|
+
type DisposableLike = IDisposable | (() => (any | Promise<any>));
|
|
3
|
+
export default class Disposable implements IDisposable {
|
|
4
|
+
#private;
|
|
5
|
+
disposed: boolean;
|
|
6
|
+
constructor(...disposables: Array<DisposableLike>);
|
|
7
|
+
add(...disposables: Array<DisposableLike>): void;
|
|
8
|
+
dispose(): Promise<void>;
|
|
9
|
+
}
|
|
10
|
+
export {};
|
package/lib/Disposable.js
CHANGED
|
@@ -1,47 +1,48 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
3
2
|
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
|
|
3
|
+
value: true
|
|
5
4
|
});
|
|
6
|
-
exports
|
|
7
|
-
function _assert() {
|
|
8
|
-
const data = _interopRequireDefault(require("assert"));
|
|
9
|
-
_assert = function () {
|
|
10
|
-
return data;
|
|
11
|
-
};
|
|
12
|
-
return data;
|
|
13
|
-
}
|
|
14
|
-
var _errors = require("./errors");
|
|
15
|
-
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
16
|
-
/*
|
|
5
|
+
Object.defineProperty(exports, /*
|
|
17
6
|
* A general-purpose disposable class. It can normalize disposable-like values
|
|
18
7
|
* (such as single functions or IDisposables), as well as hold multiple
|
|
19
8
|
* disposable-like values to be disposed of at once.
|
|
20
|
-
*/
|
|
9
|
+
*/ "default", {
|
|
10
|
+
enumerable: true,
|
|
11
|
+
get: function() {
|
|
12
|
+
return Disposable;
|
|
13
|
+
}
|
|
14
|
+
});
|
|
15
|
+
const _assert = /*#__PURE__*/ _interop_require_default(require("assert"));
|
|
16
|
+
const _errors = require("./errors.mjs");
|
|
17
|
+
function _interop_require_default(obj) {
|
|
18
|
+
return obj && obj.__esModule ? obj : {
|
|
19
|
+
default: obj
|
|
20
|
+
};
|
|
21
|
+
}
|
|
21
22
|
class Disposable {
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
this.#disposables = new Set(disposables);
|
|
27
|
-
}
|
|
28
|
-
add(...disposables) {
|
|
29
|
-
if (this.disposed) {
|
|
30
|
-
throw new _errors.AlreadyDisposedError('Cannot add new disposables after disposable has been disposed');
|
|
23
|
+
disposed = false;
|
|
24
|
+
#disposables;
|
|
25
|
+
constructor(...disposables){
|
|
26
|
+
this.#disposables = new Set(disposables);
|
|
31
27
|
}
|
|
32
|
-
(
|
|
33
|
-
|
|
34
|
-
|
|
28
|
+
add(...disposables) {
|
|
29
|
+
if (this.disposed) {
|
|
30
|
+
throw new _errors.AlreadyDisposedError('Cannot add new disposables after disposable has been disposed');
|
|
31
|
+
}
|
|
32
|
+
(0, _assert.default)(this.#disposables != null);
|
|
33
|
+
for (let disposable of disposables){
|
|
34
|
+
this.#disposables.add(disposable);
|
|
35
|
+
}
|
|
35
36
|
}
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
37
|
+
async dispose() {
|
|
38
|
+
if (this.disposed) {
|
|
39
|
+
return;
|
|
40
|
+
}
|
|
41
|
+
this.disposed = true;
|
|
42
|
+
(0, _assert.default)(this.#disposables != null);
|
|
43
|
+
await Promise.all([
|
|
44
|
+
...this.#disposables
|
|
45
|
+
].map((disposable)=>typeof disposable === 'function' ? disposable() : disposable.dispose()));
|
|
46
|
+
this.#disposables = null;
|
|
40
47
|
}
|
|
41
|
-
this.disposed = true;
|
|
42
|
-
(0, _assert().default)(this.#disposables != null);
|
|
43
|
-
await Promise.all([...this.#disposables].map(disposable => typeof disposable === 'function' ? disposable() : disposable.dispose()));
|
|
44
|
-
this.#disposables = null;
|
|
45
|
-
}
|
|
46
48
|
}
|
|
47
|
-
exports.default = Disposable;
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import invariant from 'assert';
|
|
2
|
+
import { AlreadyDisposedError } from "./errors.mjs";
|
|
3
|
+
/*
|
|
4
|
+
* A general-purpose disposable class. It can normalize disposable-like values
|
|
5
|
+
* (such as single functions or IDisposables), as well as hold multiple
|
|
6
|
+
* disposable-like values to be disposed of at once.
|
|
7
|
+
*/
|
|
8
|
+
export default class Disposable {
|
|
9
|
+
disposed = false;
|
|
10
|
+
#disposables;
|
|
11
|
+
constructor(...disposables) {
|
|
12
|
+
this.#disposables = new Set(disposables);
|
|
13
|
+
}
|
|
14
|
+
add(...disposables) {
|
|
15
|
+
if (this.disposed) {
|
|
16
|
+
throw new AlreadyDisposedError('Cannot add new disposables after disposable has been disposed');
|
|
17
|
+
}
|
|
18
|
+
invariant(this.#disposables != null);
|
|
19
|
+
for (let disposable of disposables) {
|
|
20
|
+
this.#disposables.add(disposable);
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
async dispose() {
|
|
24
|
+
if (this.disposed) {
|
|
25
|
+
return;
|
|
26
|
+
}
|
|
27
|
+
this.disposed = true;
|
|
28
|
+
invariant(this.#disposables != null);
|
|
29
|
+
await Promise.all([...this.#disposables].map((disposable) => typeof disposable === 'function' ? disposable() : disposable.dispose()));
|
|
30
|
+
this.#disposables = null;
|
|
31
|
+
}
|
|
32
|
+
}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { IDisposable } from './types.mts';
|
|
2
|
+
export default class ValueEmitter<TValue> implements IDisposable {
|
|
3
|
+
_listeners: Array<(value: TValue) => (any | Promise<any>)>;
|
|
4
|
+
_disposed: boolean;
|
|
5
|
+
addListener(listener: (value: TValue) => (any | Promise<any>)): IDisposable;
|
|
6
|
+
emit(value: TValue): void;
|
|
7
|
+
dispose(): void;
|
|
8
|
+
}
|
package/lib/ValueEmitter.js
CHANGED
|
@@ -1,71 +1,72 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
3
2
|
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
|
|
3
|
+
value: true
|
|
5
4
|
});
|
|
6
|
-
exports.
|
|
7
|
-
var _errors = require("./errors");
|
|
8
|
-
// Like an EventEmitter, but for only a single "event". This provides type-safety
|
|
5
|
+
Object.defineProperty(exports, // Like an EventEmitter, but for only a single "event". This provides type-safety
|
|
9
6
|
// for the values emitted. Rather than passing predetermined strings (which can
|
|
10
7
|
// be misspelled), create an instance of ValueEmitter for every logical "event"
|
|
11
8
|
// to be dispatched, and type it according to the type of value emitted.
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
_listeners = [];
|
|
17
|
-
_disposed = false;
|
|
18
|
-
addListener(listener) {
|
|
19
|
-
if (this._disposed) {
|
|
20
|
-
throw new _errors.AlreadyDisposedError('Cannot add a listener since this ValueEmitter has been disposed');
|
|
9
|
+
"default", {
|
|
10
|
+
enumerable: true,
|
|
11
|
+
get: function() {
|
|
12
|
+
return ValueEmitter;
|
|
21
13
|
}
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
//
|
|
26
|
-
//
|
|
27
|
-
//
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
return;
|
|
14
|
+
});
|
|
15
|
+
const _errors = require("./errors.mjs");
|
|
16
|
+
class ValueEmitter {
|
|
17
|
+
// An array of listeners. One might think a Set would be better for O(1) removal,
|
|
18
|
+
// but splicing a JS array gets pretty close, and copying the array (as is done
|
|
19
|
+
// in emit) is far faster than a Set copy: https://github.com/atom/event-kit/pull/39
|
|
20
|
+
_listeners = [];
|
|
21
|
+
_disposed = false;
|
|
22
|
+
addListener(listener) {
|
|
23
|
+
if (this._disposed) {
|
|
24
|
+
throw new _errors.AlreadyDisposedError('Cannot add a listener since this ValueEmitter has been disposed');
|
|
34
25
|
}
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
26
|
+
this._listeners.push(listener);
|
|
27
|
+
// Close over a reference to this emitter in the disposable below, rather
|
|
28
|
+
// than referencing `this` directly. This allows us to set it to null after
|
|
29
|
+
// slicing out the listener.
|
|
30
|
+
// This prevents anyone holding onto the disposable after disposal from
|
|
31
|
+
// unintentionally retaining a reference to this emitter.
|
|
32
|
+
let emitter = this;
|
|
33
|
+
return {
|
|
34
|
+
dispose () {
|
|
35
|
+
if (emitter == null) {
|
|
36
|
+
return;
|
|
37
|
+
}
|
|
38
|
+
if (emitter._disposed) {
|
|
39
|
+
emitter = null;
|
|
40
|
+
return;
|
|
41
|
+
}
|
|
42
|
+
let listeners = emitter._listeners;
|
|
43
|
+
let listenerIndex = listeners.indexOf(listener);
|
|
44
|
+
if (listenerIndex > -1) {
|
|
45
|
+
listeners.splice(listenerIndex, 1);
|
|
46
|
+
}
|
|
47
|
+
emitter = null;
|
|
48
|
+
}
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
emit(value) {
|
|
52
|
+
if (this._disposed) {
|
|
53
|
+
throw new _errors.AlreadyDisposedError('Cannot emit since this ValueEmitter has been disposed');
|
|
38
54
|
}
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
55
|
+
// Iterate over a copy of listeners. This prevents the following cases:
|
|
56
|
+
// * When a listener callback can itself register a new listener and be
|
|
57
|
+
// emitted as part of this iteration.
|
|
58
|
+
// * When a listener callback disposes of this emitter mid-emit, preventing
|
|
59
|
+
// other listeners from receiving the event.
|
|
60
|
+
let listeners = this._listeners.slice();
|
|
61
|
+
for(let i = 0; i < listeners.length; i++){
|
|
62
|
+
listeners[i](value);
|
|
43
63
|
}
|
|
44
|
-
emitter = null;
|
|
45
|
-
}
|
|
46
|
-
};
|
|
47
|
-
}
|
|
48
|
-
emit(value) {
|
|
49
|
-
if (this._disposed) {
|
|
50
|
-
throw new _errors.AlreadyDisposedError('Cannot emit since this ValueEmitter has been disposed');
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
// Iterate over a copy of listeners. This prevents the following cases:
|
|
54
|
-
// * When a listener callback can itself register a new listener and be
|
|
55
|
-
// emitted as part of this iteration.
|
|
56
|
-
// * When a listener callback disposes of this emitter mid-emit, preventing
|
|
57
|
-
// other listeners from receiving the event.
|
|
58
|
-
let listeners = this._listeners.slice();
|
|
59
|
-
for (let i = 0; i < listeners.length; i++) {
|
|
60
|
-
listeners[i](value);
|
|
61
64
|
}
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
65
|
+
dispose() {
|
|
66
|
+
if (this._disposed) {
|
|
67
|
+
return;
|
|
68
|
+
}
|
|
69
|
+
this._listeners = [];
|
|
70
|
+
this._disposed = true;
|
|
66
71
|
}
|
|
67
|
-
this._listeners = [];
|
|
68
|
-
this._disposed = true;
|
|
69
|
-
}
|
|
70
72
|
}
|
|
71
|
-
exports.default = ValueEmitter;
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
import { AlreadyDisposedError } from "./errors.mjs";
|
|
2
|
+
// Like an EventEmitter, but for only a single "event". This provides type-safety
|
|
3
|
+
// for the values emitted. Rather than passing predetermined strings (which can
|
|
4
|
+
// be misspelled), create an instance of ValueEmitter for every logical "event"
|
|
5
|
+
// to be dispatched, and type it according to the type of value emitted.
|
|
6
|
+
export default class ValueEmitter {
|
|
7
|
+
// An array of listeners. One might think a Set would be better for O(1) removal,
|
|
8
|
+
// but splicing a JS array gets pretty close, and copying the array (as is done
|
|
9
|
+
// in emit) is far faster than a Set copy: https://github.com/atom/event-kit/pull/39
|
|
10
|
+
_listeners = [];
|
|
11
|
+
_disposed = false;
|
|
12
|
+
addListener(listener) {
|
|
13
|
+
if (this._disposed) {
|
|
14
|
+
throw new AlreadyDisposedError('Cannot add a listener since this ValueEmitter has been disposed');
|
|
15
|
+
}
|
|
16
|
+
this._listeners.push(listener);
|
|
17
|
+
// Close over a reference to this emitter in the disposable below, rather
|
|
18
|
+
// than referencing `this` directly. This allows us to set it to null after
|
|
19
|
+
// slicing out the listener.
|
|
20
|
+
// This prevents anyone holding onto the disposable after disposal from
|
|
21
|
+
// unintentionally retaining a reference to this emitter.
|
|
22
|
+
let emitter = this;
|
|
23
|
+
return {
|
|
24
|
+
dispose() {
|
|
25
|
+
if (emitter == null) {
|
|
26
|
+
return;
|
|
27
|
+
}
|
|
28
|
+
if (emitter._disposed) {
|
|
29
|
+
emitter = null;
|
|
30
|
+
return;
|
|
31
|
+
}
|
|
32
|
+
let listeners = emitter._listeners;
|
|
33
|
+
let listenerIndex = listeners.indexOf(listener);
|
|
34
|
+
if (listenerIndex > -1) {
|
|
35
|
+
listeners.splice(listenerIndex, 1);
|
|
36
|
+
}
|
|
37
|
+
emitter = null;
|
|
38
|
+
},
|
|
39
|
+
};
|
|
40
|
+
}
|
|
41
|
+
emit(value) {
|
|
42
|
+
if (this._disposed) {
|
|
43
|
+
throw new AlreadyDisposedError('Cannot emit since this ValueEmitter has been disposed');
|
|
44
|
+
}
|
|
45
|
+
// Iterate over a copy of listeners. This prevents the following cases:
|
|
46
|
+
// * When a listener callback can itself register a new listener and be
|
|
47
|
+
// emitted as part of this iteration.
|
|
48
|
+
// * When a listener callback disposes of this emitter mid-emit, preventing
|
|
49
|
+
// other listeners from receiving the event.
|
|
50
|
+
let listeners = this._listeners.slice();
|
|
51
|
+
for (let i = 0; i < listeners.length; i++) {
|
|
52
|
+
listeners[i](value);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
dispose() {
|
|
56
|
+
if (this._disposed) {
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
59
|
+
this._listeners = [];
|
|
60
|
+
this._disposed = true;
|
|
61
|
+
}
|
|
62
|
+
}
|
package/lib/errors.d.mts
ADDED
package/lib/errors.js
CHANGED
|
@@ -1,11 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
3
2
|
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
|
|
3
|
+
value: true
|
|
5
4
|
});
|
|
6
|
-
exports
|
|
7
|
-
|
|
8
|
-
|
|
5
|
+
Object.defineProperty(exports, "AlreadyDisposedError", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return AlreadyDisposedError;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
class AlreadyDisposedError extends Error {
|
|
12
|
+
}
|
|
9
13
|
Object.defineProperty(AlreadyDisposedError.prototype, 'name', {
|
|
10
|
-
|
|
11
|
-
});
|
|
14
|
+
value: 'AlreadyDisposedError'
|
|
15
|
+
});
|
package/lib/errors.mjs
ADDED
package/lib/index.d.mts
ADDED
package/lib/index.js
CHANGED
|
@@ -1,27 +1,29 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
3
2
|
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
|
|
3
|
+
value: true
|
|
5
4
|
});
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
5
|
+
function _export(target, all) {
|
|
6
|
+
for(var name in all)Object.defineProperty(target, name, {
|
|
7
|
+
enumerable: true,
|
|
8
|
+
get: all[name]
|
|
9
|
+
});
|
|
10
|
+
}
|
|
11
|
+
_export(exports, {
|
|
12
|
+
AlreadyDisposedError: function() {
|
|
13
|
+
return _errors.AlreadyDisposedError;
|
|
14
|
+
},
|
|
15
|
+
Disposable: function() {
|
|
16
|
+
return _Disposable.default;
|
|
17
|
+
},
|
|
18
|
+
ValueEmitter: function() {
|
|
19
|
+
return _ValueEmitter.default;
|
|
20
|
+
}
|
|
11
21
|
});
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
get: function () {
|
|
21
|
-
return _ValueEmitter.default;
|
|
22
|
-
}
|
|
23
|
-
});
|
|
24
|
-
var _Disposable = _interopRequireDefault(require("./Disposable"));
|
|
25
|
-
var _ValueEmitter = _interopRequireDefault(require("./ValueEmitter"));
|
|
26
|
-
var _errors = require("./errors");
|
|
27
|
-
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
22
|
+
const _Disposable = /*#__PURE__*/ _interop_require_default(require("./Disposable.mjs"));
|
|
23
|
+
const _ValueEmitter = /*#__PURE__*/ _interop_require_default(require("./ValueEmitter.mjs"));
|
|
24
|
+
const _errors = require("./errors.mjs");
|
|
25
|
+
function _interop_require_default(obj) {
|
|
26
|
+
return obj && obj.__esModule ? obj : {
|
|
27
|
+
default: obj
|
|
28
|
+
};
|
|
29
|
+
}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
// @flow
|
|
2
|
+
|
|
3
|
+
export interface IDisposable {
|
|
4
|
+
/** This can return a Promise, as dispose() of all inner disposables are
|
|
5
|
+
* awaited in Disposable#dispose()
|
|
6
|
+
*/
|
|
7
|
+
dispose(): mixed;
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
export type DisposableLike = IDisposable | (() => mixed);
|
|
11
|
+
|
|
12
|
+
declare export class Disposable implements IDisposable {
|
|
13
|
+
disposed: boolean;
|
|
14
|
+
add(...disposables: Array<DisposableLike>): void;
|
|
15
|
+
dispose(): Promise<void> ;
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
declare export class AlreadyDisposedError extends Error {
|
|
19
|
+
name: string
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
declare export class ValueEmitter<TValue> implements IDisposable {
|
|
23
|
+
addListener(listener: (value: TValue) => mixed): IDisposable;
|
|
24
|
+
emit(value: TValue): void;
|
|
25
|
+
dispose(): void;
|
|
26
|
+
}
|
package/lib/index.mjs
ADDED
package/lib/types.d.mts
ADDED
package/lib/types.js
CHANGED
package/lib/types.mjs
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
package/package.json
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaspack/events",
|
|
3
|
-
"version": "2.14.2-typescript-
|
|
3
|
+
"version": "2.14.2-typescript-6de04fbae.0",
|
|
4
4
|
"license": "(MIT OR Apache-2.0)",
|
|
5
|
+
"type": "commonjs",
|
|
5
6
|
"publishConfig": {
|
|
6
7
|
"access": "public"
|
|
7
8
|
},
|
|
@@ -10,10 +11,25 @@
|
|
|
10
11
|
"url": "https://github.com/atlassian-labs/atlaspack.git"
|
|
11
12
|
},
|
|
12
13
|
"main": "lib/index.js",
|
|
13
|
-
"
|
|
14
|
+
"types": "lib/index.d.mts",
|
|
14
15
|
"engines": {
|
|
15
16
|
"node": ">= 16.0.0"
|
|
16
17
|
},
|
|
17
|
-
"
|
|
18
|
-
|
|
18
|
+
"exports": {
|
|
19
|
+
".": {
|
|
20
|
+
"atlaspack::sources": "./src/index.mts",
|
|
21
|
+
"types": [
|
|
22
|
+
"./lib/index.d.mts",
|
|
23
|
+
"./src/index.mts"
|
|
24
|
+
],
|
|
25
|
+
"import": "./lib/index.mjs",
|
|
26
|
+
"require": "./lib/index.js",
|
|
27
|
+
"default": "./lib/index.js"
|
|
28
|
+
},
|
|
29
|
+
"./*": "./*"
|
|
30
|
+
},
|
|
31
|
+
"scripts": {
|
|
32
|
+
"build-tsc": "node ../../../scripts/build-tsc.mjs"
|
|
33
|
+
},
|
|
34
|
+
"gitHead": "6de04fbaeccfba1e7832c737f6318cbd603fc74d"
|
|
19
35
|
}
|
|
@@ -1,11 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
import type {IDisposable} from './types';
|
|
1
|
+
import type {IDisposable} from './types.mts';
|
|
4
2
|
|
|
5
3
|
import invariant from 'assert';
|
|
6
|
-
import {AlreadyDisposedError} from './errors';
|
|
4
|
+
import {AlreadyDisposedError} from './errors.mts';
|
|
7
5
|
|
|
8
|
-
type DisposableLike = IDisposable | (() =>
|
|
6
|
+
type DisposableLike = IDisposable | (() => (any | Promise<any>));
|
|
9
7
|
|
|
10
8
|
/*
|
|
11
9
|
* A general-purpose disposable class. It can normalize disposable-like values
|
|
@@ -14,7 +12,7 @@ type DisposableLike = IDisposable | (() => mixed);
|
|
|
14
12
|
*/
|
|
15
13
|
export default class Disposable implements IDisposable {
|
|
16
14
|
disposed: boolean = false;
|
|
17
|
-
#disposables
|
|
15
|
+
#disposables: Set<DisposableLike> | null;
|
|
18
16
|
|
|
19
17
|
constructor(...disposables: Array<DisposableLike>) {
|
|
20
18
|
this.#disposables = new Set(disposables);
|
|
@@ -1,8 +1,6 @@
|
|
|
1
|
-
|
|
1
|
+
import type {IDisposable} from './types.mts';
|
|
2
2
|
|
|
3
|
-
import
|
|
4
|
-
|
|
5
|
-
import {AlreadyDisposedError} from './errors';
|
|
3
|
+
import {AlreadyDisposedError} from './errors.mts';
|
|
6
4
|
|
|
7
5
|
// Like an EventEmitter, but for only a single "event". This provides type-safety
|
|
8
6
|
// for the values emitted. Rather than passing predetermined strings (which can
|
|
@@ -12,10 +10,10 @@ export default class ValueEmitter<TValue> implements IDisposable {
|
|
|
12
10
|
// An array of listeners. One might think a Set would be better for O(1) removal,
|
|
13
11
|
// but splicing a JS array gets pretty close, and copying the array (as is done
|
|
14
12
|
// in emit) is far faster than a Set copy: https://github.com/atom/event-kit/pull/39
|
|
15
|
-
_listeners: Array<(value: TValue) =>
|
|
13
|
+
_listeners: Array<(value: TValue) => (any | Promise<any>)> = [];
|
|
16
14
|
_disposed: boolean = false;
|
|
17
15
|
|
|
18
|
-
addListener(listener: (value: TValue) =>
|
|
16
|
+
addListener(listener: (value: TValue) => (any | Promise<any>)): IDisposable {
|
|
19
17
|
if (this._disposed) {
|
|
20
18
|
throw new AlreadyDisposedError(
|
|
21
19
|
'Cannot add a listener since this ValueEmitter has been disposed',
|
|
@@ -29,7 +27,7 @@ export default class ValueEmitter<TValue> implements IDisposable {
|
|
|
29
27
|
// slicing out the listener.
|
|
30
28
|
// This prevents anyone holding onto the disposable after disposal from
|
|
31
29
|
// unintentionally retaining a reference to this emitter.
|
|
32
|
-
let emitter = this;
|
|
30
|
+
let emitter: typeof this | null = this;
|
|
33
31
|
return {
|
|
34
32
|
dispose() {
|
|
35
33
|
if (emitter == null) {
|
|
@@ -70,7 +68,7 @@ export default class ValueEmitter<TValue> implements IDisposable {
|
|
|
70
68
|
}
|
|
71
69
|
}
|
|
72
70
|
|
|
73
|
-
dispose() {
|
|
71
|
+
dispose(): void {
|
|
74
72
|
if (this._disposed) {
|
|
75
73
|
return;
|
|
76
74
|
}
|
package/src/index.mts
ADDED
|
@@ -1,8 +1,6 @@
|
|
|
1
|
-
// @flow strict-local
|
|
2
|
-
|
|
3
1
|
import assert from 'assert';
|
|
4
|
-
import Disposable from '../src/Disposable';
|
|
5
|
-
import {AlreadyDisposedError} from '../src/errors';
|
|
2
|
+
import Disposable from '../src/Disposable.mts';
|
|
3
|
+
import {AlreadyDisposedError} from '../src/errors.mts';
|
|
6
4
|
|
|
7
5
|
describe('Disposable', () => {
|
|
8
6
|
it('can wrap an IDisposable', () => {
|
|
@@ -87,7 +85,7 @@ describe('Disposable', () => {
|
|
|
87
85
|
'does not dispose inner disposables more than once,' +
|
|
88
86
|
' and does not throw on subsequent disposals',
|
|
89
87
|
() => {
|
|
90
|
-
let disposed;
|
|
88
|
+
let disposed: Disposable | boolean;
|
|
91
89
|
let disposable = new Disposable(() => {
|
|
92
90
|
if (disposed) {
|
|
93
91
|
// $FlowFixMe
|
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
// @flow strict-local
|
|
2
|
-
|
|
3
1
|
import assert from 'assert';
|
|
4
|
-
import ValueEmitter from '../src/ValueEmitter';
|
|
5
|
-
import {AlreadyDisposedError} from '../src/errors';
|
|
2
|
+
import ValueEmitter from '../src/ValueEmitter.mts';
|
|
3
|
+
import {AlreadyDisposedError} from '../src/errors.mts';
|
|
4
|
+
import type { IDisposable } from '../src/types.mts';
|
|
6
5
|
|
|
7
6
|
describe('ValueEmitter', () => {
|
|
8
7
|
let emitter: ValueEmitter<number>;
|
|
@@ -38,7 +37,7 @@ describe('ValueEmitter', () => {
|
|
|
38
37
|
});
|
|
39
38
|
|
|
40
39
|
it('does not emit to listeners that were just registered', () => {
|
|
41
|
-
let innerDisposable;
|
|
40
|
+
let innerDisposable: IDisposable | undefined;
|
|
42
41
|
let disposable = emitter.addListener(() => {
|
|
43
42
|
innerDisposable = emitter.addListener(numberListener);
|
|
44
43
|
});
|
package/tsconfig.json
ADDED