@legendapp/state 0.9.1-alpha.11 → 0.9.1-alpha.12
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/index.d.ts +3 -4
- package/index.js +13 -14
- package/index.js.map +1 -1
- package/observableFns.d.ts +1 -0
- package/observableFns.js +13 -3
- package/observableFns.js.map +1 -1
- package/observableInterfaces.d.ts +2 -0
- package/package.json +1 -1
- package/react/useObservables.js +2 -3
- package/react/useObservables.js.map +1 -1
- package/observableListener.d.ts +0 -2
- package/observableListener.js +0 -14
- package/observableListener.js.map +0 -1
package/index.d.ts
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
export { configureObservable } from './configureObservable';
|
|
2
|
-
export {
|
|
3
|
-
export { prop, shallow, isObservable, isObservableEvent, merge, listen, unlisten } from './observableFns';
|
|
4
|
-
export { disposeListener } from './observableListener';
|
|
2
|
+
export { assigner, getter, observable, setter } from './observable';
|
|
5
3
|
export { observableBatcher } from './observableBatcher';
|
|
6
4
|
export { observableComputed } from './observableComputed';
|
|
7
5
|
export { observableEvent } from './observableEvent';
|
|
8
|
-
export {
|
|
6
|
+
export { disposeListener, isObservable, isObservableEvent, listen, merge, prop, shallow, unlisten, } from './observableFns';
|
|
9
7
|
export * from './observableInterfaces';
|
|
8
|
+
export { persistObservable } from './persistObservable';
|
package/index.js
CHANGED
|
@@ -14,31 +14,30 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.persistObservable = exports.
|
|
17
|
+
exports.persistObservable = exports.unlisten = exports.shallow = exports.prop = exports.merge = exports.listen = exports.isObservableEvent = exports.isObservable = exports.disposeListener = exports.observableEvent = exports.observableComputed = exports.observableBatcher = exports.setter = exports.observable = exports.getter = exports.assigner = exports.configureObservable = void 0;
|
|
18
18
|
var configureObservable_1 = require("./configureObservable");
|
|
19
19
|
Object.defineProperty(exports, "configureObservable", { enumerable: true, get: function () { return configureObservable_1.configureObservable; } });
|
|
20
20
|
var observable_1 = require("./observable");
|
|
21
|
+
Object.defineProperty(exports, "assigner", { enumerable: true, get: function () { return observable_1.assigner; } });
|
|
22
|
+
Object.defineProperty(exports, "getter", { enumerable: true, get: function () { return observable_1.getter; } });
|
|
21
23
|
Object.defineProperty(exports, "observable", { enumerable: true, get: function () { return observable_1.observable; } });
|
|
22
24
|
Object.defineProperty(exports, "setter", { enumerable: true, get: function () { return observable_1.setter; } });
|
|
23
|
-
Object.defineProperty(exports, "getter", { enumerable: true, get: function () { return observable_1.getter; } });
|
|
24
|
-
Object.defineProperty(exports, "assigner", { enumerable: true, get: function () { return observable_1.assigner; } });
|
|
25
|
-
var observableFns_1 = require("./observableFns");
|
|
26
|
-
Object.defineProperty(exports, "prop", { enumerable: true, get: function () { return observableFns_1.prop; } });
|
|
27
|
-
Object.defineProperty(exports, "shallow", { enumerable: true, get: function () { return observableFns_1.shallow; } });
|
|
28
|
-
Object.defineProperty(exports, "isObservable", { enumerable: true, get: function () { return observableFns_1.isObservable; } });
|
|
29
|
-
Object.defineProperty(exports, "isObservableEvent", { enumerable: true, get: function () { return observableFns_1.isObservableEvent; } });
|
|
30
|
-
Object.defineProperty(exports, "merge", { enumerable: true, get: function () { return observableFns_1.merge; } });
|
|
31
|
-
Object.defineProperty(exports, "listen", { enumerable: true, get: function () { return observableFns_1.listen; } });
|
|
32
|
-
Object.defineProperty(exports, "unlisten", { enumerable: true, get: function () { return observableFns_1.unlisten; } });
|
|
33
|
-
var observableListener_1 = require("./observableListener");
|
|
34
|
-
Object.defineProperty(exports, "disposeListener", { enumerable: true, get: function () { return observableListener_1.disposeListener; } });
|
|
35
25
|
var observableBatcher_1 = require("./observableBatcher");
|
|
36
26
|
Object.defineProperty(exports, "observableBatcher", { enumerable: true, get: function () { return observableBatcher_1.observableBatcher; } });
|
|
37
27
|
var observableComputed_1 = require("./observableComputed");
|
|
38
28
|
Object.defineProperty(exports, "observableComputed", { enumerable: true, get: function () { return observableComputed_1.observableComputed; } });
|
|
39
29
|
var observableEvent_1 = require("./observableEvent");
|
|
40
30
|
Object.defineProperty(exports, "observableEvent", { enumerable: true, get: function () { return observableEvent_1.observableEvent; } });
|
|
31
|
+
var observableFns_1 = require("./observableFns");
|
|
32
|
+
Object.defineProperty(exports, "disposeListener", { enumerable: true, get: function () { return observableFns_1.disposeListener; } });
|
|
33
|
+
Object.defineProperty(exports, "isObservable", { enumerable: true, get: function () { return observableFns_1.isObservable; } });
|
|
34
|
+
Object.defineProperty(exports, "isObservableEvent", { enumerable: true, get: function () { return observableFns_1.isObservableEvent; } });
|
|
35
|
+
Object.defineProperty(exports, "listen", { enumerable: true, get: function () { return observableFns_1.listen; } });
|
|
36
|
+
Object.defineProperty(exports, "merge", { enumerable: true, get: function () { return observableFns_1.merge; } });
|
|
37
|
+
Object.defineProperty(exports, "prop", { enumerable: true, get: function () { return observableFns_1.prop; } });
|
|
38
|
+
Object.defineProperty(exports, "shallow", { enumerable: true, get: function () { return observableFns_1.shallow; } });
|
|
39
|
+
Object.defineProperty(exports, "unlisten", { enumerable: true, get: function () { return observableFns_1.unlisten; } });
|
|
40
|
+
__exportStar(require("./observableInterfaces"), exports);
|
|
41
41
|
var persistObservable_1 = require("./persistObservable");
|
|
42
42
|
Object.defineProperty(exports, "persistObservable", { enumerable: true, get: function () { return persistObservable_1.persistObservable; } });
|
|
43
|
-
__exportStar(require("./observableInterfaces"), exports);
|
|
44
43
|
//# sourceMappingURL=index.js.map
|
package/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,6DAA4D;AAAnD,0HAAA,mBAAmB,OAAA;AAC5B,2CAAoE;AAA3D,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,6DAA4D;AAAnD,0HAAA,mBAAmB,OAAA;AAC5B,2CAAoE;AAA3D,sGAAA,QAAQ,OAAA;AAAE,oGAAA,MAAM,OAAA;AAAE,wGAAA,UAAU,OAAA;AAAE,oGAAA,MAAM,OAAA;AAC7C,yDAAwD;AAA/C,sHAAA,iBAAiB,OAAA;AAC1B,2DAA0D;AAAjD,wHAAA,kBAAkB,OAAA;AAC3B,qDAAoD;AAA3C,kHAAA,eAAe,OAAA;AACxB,iDASyB;AARrB,gHAAA,eAAe,OAAA;AACf,6GAAA,YAAY,OAAA;AACZ,kHAAA,iBAAiB,OAAA;AACjB,uGAAA,MAAM,OAAA;AACN,sGAAA,KAAK,OAAA;AACL,qGAAA,IAAI,OAAA;AACJ,wGAAA,OAAO,OAAA;AACP,yGAAA,QAAQ,OAAA;AAEZ,yDAAuC;AACvC,yDAAwD;AAA/C,sHAAA,iBAAiB,OAAA"}
|
package/observableFns.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { ObservableEventType, ListenerFn, ObservableChecker, ObservableListener, OnReturnValue, Observable, ObservableEvent } from './observableInterfaces';
|
|
2
2
|
export declare function notifyObservable<T>(target: ObservableChecker<T>, changedValue: T, prevValue: T, path: string[]): void;
|
|
3
|
+
export declare function disposeListener(listener: ObservableListener): void;
|
|
3
4
|
export declare function listenToObservableShallow<T>(obs: ObservableChecker<T>, callback: ListenerFn<T>): ObservableListener<T>;
|
|
4
5
|
export declare function listenToObservable<T>(obs: ObservableChecker<T>, callback: ListenerFn<T>, shallow?: boolean): ObservableListener<T>;
|
|
5
6
|
export declare function onEquals<T>(obs: ObservableChecker<T>, value: T, cb?: (value: T) => void): OnReturnValue<T>;
|
package/observableFns.js
CHANGED
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.merge = exports.isObservableEvent = exports.isObservable = exports.shallow = exports.prop = exports.getObservableFromPrimitive = exports.observableProp = exports.listen = exports._on = exports.unlisten = exports.onTrue = exports.onHasValue = exports.onEquals = exports.listenToObservable = exports.listenToObservableShallow = exports.notifyObservable = void 0;
|
|
3
|
+
exports.merge = exports.isObservableEvent = exports.isObservable = exports.shallow = exports.prop = exports.getObservableFromPrimitive = exports.observableProp = exports.listen = exports._on = exports.unlisten = exports.onTrue = exports.onHasValue = exports.onEquals = exports.listenToObservable = exports.listenToObservableShallow = exports.disposeListener = exports.notifyObservable = void 0;
|
|
4
4
|
const tools_1 = require("@legendapp/tools");
|
|
5
5
|
const globals_1 = require("./globals");
|
|
6
6
|
const observableBatcher_1 = require("./observableBatcher");
|
|
7
|
-
const observableListener_1 = require("./observableListener");
|
|
8
7
|
const observableState_1 = require("./observableState");
|
|
9
8
|
const { infos, skipNotifyFor, lastAccessedProxy } = observableState_1.state;
|
|
10
9
|
const symbolHasValue = Symbol('__hasValue');
|
|
@@ -36,6 +35,16 @@ function notifyObservable(target, changedValue, prevValue, path) {
|
|
|
36
35
|
_notify(target, { changedValue, prevValue, path });
|
|
37
36
|
}
|
|
38
37
|
exports.notifyObservable = notifyObservable;
|
|
38
|
+
function disposeListener(listener) {
|
|
39
|
+
if (listener && !listener.isDisposed) {
|
|
40
|
+
listener.isDisposed = true;
|
|
41
|
+
const info = observableState_1.state.infos.get(listener.target);
|
|
42
|
+
if (info.listeners) {
|
|
43
|
+
info.listeners.delete(listener);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
exports.disposeListener = disposeListener;
|
|
39
48
|
function listenToObservableShallow(obs, callback) {
|
|
40
49
|
return listenToObservable(obs, callback, /*shallow*/ true);
|
|
41
50
|
}
|
|
@@ -51,6 +60,7 @@ function listenToObservable(obs, callback, shallow) {
|
|
|
51
60
|
info.listeners = new Set();
|
|
52
61
|
}
|
|
53
62
|
const listener = { target: obs, callback, shallow };
|
|
63
|
+
listener.dispose = disposeListener.bind(listener, listener);
|
|
54
64
|
info.listeners.add(listener);
|
|
55
65
|
return listener;
|
|
56
66
|
}
|
|
@@ -70,7 +80,7 @@ function onEquals(obs, value, cb) {
|
|
|
70
80
|
isDone = true;
|
|
71
81
|
cb === null || cb === void 0 ? void 0 : cb(newValue);
|
|
72
82
|
resolve(value);
|
|
73
|
-
|
|
83
|
+
disposeListener(listener);
|
|
74
84
|
}
|
|
75
85
|
return isDone;
|
|
76
86
|
}
|
package/observableFns.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"observableFns.js","sourceRoot":"","sources":["../../src/observableFns.ts"],"names":[],"mappings":";;;AAAA,4CAA2D;AAC3D,uCAA2E;AAC3E,2DAAwD;AAWxD,
|
|
1
|
+
{"version":3,"file":"observableFns.js","sourceRoot":"","sources":["../../src/observableFns.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/react/useObservables.js
CHANGED
|
@@ -5,7 +5,6 @@ const tools_1 = require("@legendapp/tools");
|
|
|
5
5
|
const react_1 = require("@legendapp/tools/react");
|
|
6
6
|
const react_2 = require("react");
|
|
7
7
|
const observableFns_1 = require("../observableFns");
|
|
8
|
-
const observableListener_1 = require("../observableListener");
|
|
9
8
|
const observableState_1 = require("../observableState");
|
|
10
9
|
function getRawValue(obs) {
|
|
11
10
|
return obs && ((0, observableFns_1.isObservableEvent)(obs) ? undefined : (0, observableFns_1.isObservable)(obs) ? obs.get() : obs);
|
|
@@ -32,7 +31,7 @@ function useObservables(fn) {
|
|
|
32
31
|
// Dispose listeners on unmount
|
|
33
32
|
(0, react_2.useEffect)(() => () => {
|
|
34
33
|
if (ref.current.proxies) {
|
|
35
|
-
ref.current.proxies.forEach((p) =>
|
|
34
|
+
ref.current.proxies.forEach((p) => p[2].dispose());
|
|
36
35
|
ref.current.proxies = [];
|
|
37
36
|
}
|
|
38
37
|
}, []); // eslint-disable-line react-hooks/exhaustive-deps
|
|
@@ -73,7 +72,7 @@ const updateListeners = (ret, saved, onChange) => {
|
|
|
73
72
|
}
|
|
74
73
|
if (!found) {
|
|
75
74
|
saved.proxies.splice(i--, 1);
|
|
76
|
-
|
|
75
|
+
p[2].dispose();
|
|
77
76
|
}
|
|
78
77
|
}
|
|
79
78
|
// Listen to all tracked proxies
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useObservables.js","sourceRoot":"","sources":["../../../src/react/useObservables.ts"],"names":[],"mappings":";;;AAAA,4CAAqD;AACrD,kDAAwD;AACxD,iCAA0C;AAC1C,oDAAmE;
|
|
1
|
+
{"version":3,"file":"useObservables.js","sourceRoot":"","sources":["../../../src/react/useObservables.ts"],"names":[],"mappings":"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"}
|
package/observableListener.d.ts
DELETED
package/observableListener.js
DELETED
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.disposeListener = void 0;
|
|
4
|
-
const observableState_1 = require("./observableState");
|
|
5
|
-
function disposeListener(listener) {
|
|
6
|
-
if (listener) {
|
|
7
|
-
const info = observableState_1.state.infos.get(listener.target);
|
|
8
|
-
if (info.listeners) {
|
|
9
|
-
info.listeners.delete(listener);
|
|
10
|
-
}
|
|
11
|
-
}
|
|
12
|
-
}
|
|
13
|
-
exports.disposeListener = disposeListener;
|
|
14
|
-
//# sourceMappingURL=observableListener.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"observableListener.js","sourceRoot":"","sources":["../../src/observableListener.ts"],"names":[],"mappings":";;;AACA,uDAA0C;AAE1C,SAAgB,eAAe,CAAC,QAA4B;IACxD,IAAI,QAAQ,EAAE;QACV,MAAM,IAAI,GAAG,uBAAK,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC9C,IAAI,IAAI,CAAC,SAAS,EAAE;YAChB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;SACnC;KACJ;AACL,CAAC;AAPD,0CAOC"}
|