@live-change/dao 0.9.29 → 0.9.30
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/Observable.js +8 -8
- package/lib/ObservableList.js +12 -5
- package/lib/ObservableProxy.js +3 -3
- package/lib/ObservableValue.js +11 -5
- package/package.json +2 -2
package/lib/Observable.js
CHANGED
|
@@ -27,7 +27,7 @@ class Observable {
|
|
|
27
27
|
for(const observer of observersToFire) {
|
|
28
28
|
handled = this.fireObserver(observer, signal, ...args) || handled
|
|
29
29
|
}
|
|
30
|
-
if(signal
|
|
30
|
+
if(signal === 'error') {
|
|
31
31
|
let error = args[0]
|
|
32
32
|
handled = this.handleError(error) || handled
|
|
33
33
|
if(!handled) {
|
|
@@ -57,7 +57,7 @@ class Observable {
|
|
|
57
57
|
|
|
58
58
|
uncatch(errorObserver) {
|
|
59
59
|
let id = this.errorObservers.indexOf(errorObserver)
|
|
60
|
-
if(id
|
|
60
|
+
if(id === -1) throw new Error("error observer not found")
|
|
61
61
|
this.errorObservers.splice(id, 1)
|
|
62
62
|
}
|
|
63
63
|
|
|
@@ -67,13 +67,13 @@ class Observable {
|
|
|
67
67
|
}
|
|
68
68
|
unobserve(observer) {
|
|
69
69
|
let id = this.observers.indexOf(observer)
|
|
70
|
-
if(id
|
|
70
|
+
if(id === -1) throw new Error("observer not found")
|
|
71
71
|
this.observers.splice(id, 1)
|
|
72
72
|
if(this.isUseless()) this.dispose()
|
|
73
73
|
}
|
|
74
74
|
|
|
75
75
|
isUseless() {
|
|
76
|
-
return this.observers.length
|
|
76
|
+
return this.observers.length === 0
|
|
77
77
|
}
|
|
78
78
|
|
|
79
79
|
isDisposed() {
|
|
@@ -102,16 +102,16 @@ class Observable {
|
|
|
102
102
|
let errorObserver
|
|
103
103
|
|
|
104
104
|
const waitPromise = new Promise((resolve, reject) => {
|
|
105
|
-
errorObserver = (error) => {
|
|
106
|
-
console.log("ERROR SIGNAL", error)
|
|
107
|
-
console.trace("
|
|
105
|
+
errorObserver = (signal, error) => {
|
|
106
|
+
console.log("ERROR SIGNAL", error ?? signal)
|
|
107
|
+
console.trace("ERROR SIGNAL")
|
|
108
108
|
if(resultObserver) this.unobserve(resultObserver)
|
|
109
109
|
resultObserver = undefined
|
|
110
110
|
if(errorObserver) this.uncatch(errorObserver)
|
|
111
111
|
errorObserver = undefined
|
|
112
112
|
if(finished) return
|
|
113
113
|
finished = true
|
|
114
|
-
reject(error)
|
|
114
|
+
reject(error ?? signal)
|
|
115
115
|
}
|
|
116
116
|
if(!finished) this.catch(errorObserver)
|
|
117
117
|
resultObserver = (signal) => {
|
package/lib/ObservableList.js
CHANGED
|
@@ -21,7 +21,7 @@ class ObservableList extends Observable {
|
|
|
21
21
|
this.handleError(null)
|
|
22
22
|
if(list === this.list) return
|
|
23
23
|
try {
|
|
24
|
-
if (JSON.stringify(list)
|
|
24
|
+
if (JSON.stringify(list) === JSON.stringify(this.list)) return
|
|
25
25
|
} catch(e) {}
|
|
26
26
|
this.list = this.valueActivator ? this.valueActivator(list) : list
|
|
27
27
|
this.fireObservers('set', list)
|
|
@@ -167,7 +167,7 @@ class ObservableList extends Observable {
|
|
|
167
167
|
unbindProperty(object, property) {
|
|
168
168
|
for(let i = 0; i < this.properties.length; i++) {
|
|
169
169
|
const prop = this.properties[i]
|
|
170
|
-
if(prop[0]
|
|
170
|
+
if(prop[0] === object && prop[1] === property) {
|
|
171
171
|
this.properties.splice(i, 1)
|
|
172
172
|
i--
|
|
173
173
|
if(this.isUseless()) this.dispose()
|
|
@@ -185,7 +185,7 @@ class ObservableList extends Observable {
|
|
|
185
185
|
unbindErrorProperty(object, property) {
|
|
186
186
|
for(let i = 0; i < this.errorProperties.length; i++) {
|
|
187
187
|
const prop = this.errorProperties[i]
|
|
188
|
-
if(prop[0]
|
|
188
|
+
if(prop[0] === object && prop[1] === property) {
|
|
189
189
|
this.errorProperties.splice(i, 1)
|
|
190
190
|
i--
|
|
191
191
|
if(this.isUseless()) this.dispose()
|
|
@@ -206,8 +206,8 @@ class ObservableList extends Observable {
|
|
|
206
206
|
}
|
|
207
207
|
|
|
208
208
|
isUseless() {
|
|
209
|
-
return (this.observers.length
|
|
210
|
-
&& (this.errorProperties.length
|
|
209
|
+
return (this.observers.length === 0) && (this.properties.length === 0)
|
|
210
|
+
&& (this.errorProperties.length === 0)
|
|
211
211
|
}
|
|
212
212
|
|
|
213
213
|
save() {
|
|
@@ -298,6 +298,13 @@ class ObservableList extends Observable {
|
|
|
298
298
|
getError() {
|
|
299
299
|
return this.savedError
|
|
300
300
|
}
|
|
301
|
+
|
|
302
|
+
dispose() {
|
|
303
|
+
this.savedError = null
|
|
304
|
+
this.list = undefined
|
|
305
|
+
super.dispose()
|
|
306
|
+
}
|
|
307
|
+
|
|
301
308
|
}
|
|
302
309
|
|
|
303
310
|
export default ObservableList
|
package/lib/ObservableProxy.js
CHANGED
|
@@ -61,8 +61,8 @@ class ObservableProxy extends Observable {
|
|
|
61
61
|
}
|
|
62
62
|
|
|
63
63
|
isUseless() {
|
|
64
|
-
return (this.observers.length
|
|
65
|
-
&& (this.errorProperties.length
|
|
64
|
+
return (this.observers.length === 0) && (this.properties.length === 0)
|
|
65
|
+
&& (this.errorProperties.length === 0)
|
|
66
66
|
}
|
|
67
67
|
|
|
68
68
|
catch(...args) {
|
|
@@ -121,7 +121,7 @@ class ObservableProxy extends Observable {
|
|
|
121
121
|
unbindErrorProperty(object, property) {
|
|
122
122
|
for(var i = 0; i < this.errorProperties.length; i++) {
|
|
123
123
|
var prop = this.errorProperties[i]
|
|
124
|
-
if(prop[0]
|
|
124
|
+
if(prop[0] === object && prop[1] === property) {
|
|
125
125
|
this.errorProperties.splice(i,1)
|
|
126
126
|
if(this.observable) this.observable.unbindErrorProperty(object, property)
|
|
127
127
|
if(this.isUseless()) this.dispose()
|
package/lib/ObservableValue.js
CHANGED
|
@@ -20,7 +20,7 @@ class ObservableValue extends Observable {
|
|
|
20
20
|
this.handleError(null)
|
|
21
21
|
if(value === this.value) return;
|
|
22
22
|
try {
|
|
23
|
-
if (JSON.stringify(value)
|
|
23
|
+
if (JSON.stringify(value) === JSON.stringify(this.value)) return;
|
|
24
24
|
} catch(e) {}
|
|
25
25
|
this.value = value
|
|
26
26
|
this.fireObservers('set', value)
|
|
@@ -37,7 +37,7 @@ class ObservableValue extends Observable {
|
|
|
37
37
|
unbindProperty(object, property) {
|
|
38
38
|
for(let i = 0; i < this.properties.length; i++) {
|
|
39
39
|
let prop = this.properties[i]
|
|
40
|
-
if(prop[0]
|
|
40
|
+
if(prop[0] === object && prop[1] === property) {
|
|
41
41
|
this.properties.splice(i,1)
|
|
42
42
|
if(this.isUseless()) this.dispose()
|
|
43
43
|
return;
|
|
@@ -54,7 +54,7 @@ class ObservableValue extends Observable {
|
|
|
54
54
|
unbindErrorProperty(object, property) {
|
|
55
55
|
for(let i = 0; i < this.errorProperties.length; i++) {
|
|
56
56
|
let prop = this.errorProperties[i]
|
|
57
|
-
if(prop[0]
|
|
57
|
+
if(prop[0] === object && prop[1] === property) {
|
|
58
58
|
this.errorProperties.splice(i,1)
|
|
59
59
|
if(this.isUseless()) this.dispose()
|
|
60
60
|
return;
|
|
@@ -74,8 +74,8 @@ class ObservableValue extends Observable {
|
|
|
74
74
|
}
|
|
75
75
|
|
|
76
76
|
isUseless() {
|
|
77
|
-
return (this.observers.length
|
|
78
|
-
&& (this.errorProperties.length
|
|
77
|
+
return (this.observers.length === 0) && (this.properties.length === 0)
|
|
78
|
+
&& (this.errorProperties.length === 0)
|
|
79
79
|
}
|
|
80
80
|
|
|
81
81
|
save() {
|
|
@@ -165,6 +165,12 @@ class ObservableValue extends Observable {
|
|
|
165
165
|
getError() {
|
|
166
166
|
return this.savedError
|
|
167
167
|
}
|
|
168
|
+
|
|
169
|
+
dispose() {
|
|
170
|
+
this.savedError = null
|
|
171
|
+
this.value = undefined
|
|
172
|
+
super.dispose()
|
|
173
|
+
}
|
|
168
174
|
}
|
|
169
175
|
|
|
170
176
|
export default ObservableValue
|
package/package.json
CHANGED