vsn 0.1.35 → 0.1.38
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/demo/vsn.js +1 -1
- package/dist/Scope/ScopeDataAbstract.d.ts +1 -1
- package/dist/Scope/ScopeDataAbstract.js +11 -2
- package/dist/Scope/ScopeDataAbstract.js.map +1 -1
- package/dist/Scope/WrappedArray.d.ts +2 -0
- package/dist/Scope/WrappedArray.js +18 -0
- package/dist/Scope/WrappedArray.js.map +1 -1
- package/dist/Scope/properties/ArrayProperty.js +1 -1
- package/dist/Scope/properties/ArrayProperty.js.map +1 -1
- package/dist/Scope/properties/Property.d.ts +4 -0
- package/dist/Scope/properties/Property.js +20 -0
- package/dist/Scope/properties/Property.js.map +1 -1
- package/dist/Scope.d.ts +2 -1
- package/dist/Scope.js +25 -18
- package/dist/Scope.js.map +1 -1
- package/package.json +1 -1
- package/src/Scope/ScopeDataAbstract.ts +7 -2
- package/src/Scope/WrappedArray.ts +20 -0
- package/src/Scope/properties/ArrayProperty.ts +1 -1
- package/src/Scope/properties/Property.ts +24 -0
- package/src/Scope.ts +23 -19
- package/test/Scope/ScopeData.spec.ts +58 -0
- package/test/Scope/properties/ArrayProperty.spec.ts +8 -1
|
@@ -12,7 +12,7 @@ export declare class ScopeDataAbstract extends EventDispatcher {
|
|
|
12
12
|
hasProperty(name: string): boolean;
|
|
13
13
|
get keys(): string[];
|
|
14
14
|
setData(data: IScopeData): void;
|
|
15
|
-
getData(): IScopeData;
|
|
15
|
+
getData(...tags: string[]): IScopeData;
|
|
16
16
|
getProperties(): string[];
|
|
17
17
|
getProperty(name: string, create?: boolean): Property;
|
|
18
18
|
bindToProperties(event: string, properties: string[], callback: (...args: any[]) => any): void;
|
|
@@ -84,10 +84,19 @@ var ScopeDataAbstract = /** @class */ (function (_super) {
|
|
|
84
84
|
}
|
|
85
85
|
};
|
|
86
86
|
ScopeDataAbstract.prototype.getData = function () {
|
|
87
|
+
var tags = [];
|
|
88
|
+
for (var _i = 0; _i < arguments.length; _i++) {
|
|
89
|
+
tags[_i] = arguments[_i];
|
|
90
|
+
}
|
|
87
91
|
var data = {};
|
|
88
|
-
for (var
|
|
89
|
-
var key = _a
|
|
92
|
+
propLoop: for (var _a = 0, _b = this.getProperties(); _a < _b.length; _a++) {
|
|
93
|
+
var key = _b[_a];
|
|
90
94
|
var property = this['__' + key];
|
|
95
|
+
for (var _c = 0, tags_1 = tags; _c < tags_1.length; _c++) {
|
|
96
|
+
var tag = tags_1[_c];
|
|
97
|
+
if (!property.hasTag(tag))
|
|
98
|
+
continue propLoop;
|
|
99
|
+
}
|
|
91
100
|
if (this[key] == null || !property)
|
|
92
101
|
continue;
|
|
93
102
|
data[key] = property.getData();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScopeDataAbstract.js","sourceRoot":"","sources":["../../src/Scope/ScopeDataAbstract.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAAgE;AAChE,sDAAmD;AAMnD;IAAuC,qCAAe;IAKlD;QAAA,YACI,iBAAO,SAKV;QAHG,iDAAiD;QACjD,IAAG,CAAC,KAAI,CAAC,gBAAgB,CAAC;YACtB,KAAI,CAAC,cAAc,GAAG,EAAE,CAAC;;IACjC,CAAC;IAED,0CAAc,GAAd,UAAe,IAAY,EAAE,YAA4B,EAAE,MAAwB;QAAnF,iBAiCC;QAjC4B,6BAAA,EAAA,eAAoB,mBAAQ;QACrD,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;QACtB,IAAM,QAAQ,GAAG,IAAI,YAAY,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,EACrD,QAAQ,GAAG,MAAM,CAAC,wBAAwB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC3D,IAAI,CAAC,IAAI,GAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;QAC3B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE/B,kBAAkB;QAClB,IAAM,cAAc,GAAG;YACnB,OAAO,QAAQ,CAAC,KAAK,CAAC;QAC1B,CAAC,CAAC;QACF,IAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,cAAc,EACnD,cAAc,GAAG,UAAS,MAAW;YACjC,QAAQ,CAAC,KAAK,GAAG,MAAM,CAAC;QAC5B,CAAC,EACD,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,cAAc,CAAC;QAEtD,+BAA+B;QAC/B,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC;QAElB,6CAA6C;QAC7C,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE;YAC9B,GAAG,EAAE,MAAM;YACX,GAAG,EAAE,MAAM;YACX,UAAU,EAAE,IAAI;YAChB,YAAY,EAAE,IAAI;SACrB,CAAC,CAAC;QAEH,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE;YAAC,cAAc;iBAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;gBAAd,yBAAc;;YACjC,KAAI,CAAC,QAAQ,OAAb,KAAI,iBAAU,QAAQ,EAAE,IAAI,GAAK,IAAI,GAAE;YACvC,KAAI,CAAC,QAAQ,OAAb,KAAI,iBAAU,SAAS,GAAG,IAAI,GAAK,IAAI,GAAE;QAC7C,CAAC,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED,uCAAW,GAAX,UAAY,IAAY;QACpB,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IACpD,CAAC;IAED,sBAAI,mCAAI;aAAR;YACI,yBAAW,IAAI,CAAC,cAAc,EAAE;QACpC,CAAC;;;OAAA;IAED,mCAAO,GAAP,UAAQ,IAAgB;QACpB,IAAM,UAAU,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QACxC,KAAK,IAAM,GAAG,IAAI,IAAI,EAAE;YACpB,IAAI,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE;gBAC9B,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;aACzB;SACJ;IACL,CAAC;IAED,mCAAO,GAAP;
|
|
1
|
+
{"version":3,"file":"ScopeDataAbstract.js","sourceRoot":"","sources":["../../src/Scope/ScopeDataAbstract.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,8 @@ export declare class WrappedArray<T> extends Array<T> {
|
|
|
9
9
|
once(event: string, callback: EventDispatcherCallback): void;
|
|
10
10
|
push(...items: T[]): number;
|
|
11
11
|
remove(item: T): boolean;
|
|
12
|
+
pop(): T;
|
|
13
|
+
shift(): T;
|
|
12
14
|
splice(start: number, deleteCount?: number): T[];
|
|
13
15
|
concat(...items: any[]): T[];
|
|
14
16
|
filter(callback: (value: T, index: number, array: T[]) => boolean, thisArg?: any): T[];
|
|
@@ -76,6 +76,24 @@ var WrappedArray = /** @class */ (function (_super) {
|
|
|
76
76
|
this.splice(index, 1);
|
|
77
77
|
return true;
|
|
78
78
|
};
|
|
79
|
+
WrappedArray.prototype.pop = function () {
|
|
80
|
+
var item = _super.prototype.pop.call(this);
|
|
81
|
+
this.dispatch('pop', item);
|
|
82
|
+
this.dispatch('change', {
|
|
83
|
+
'removed': [item]
|
|
84
|
+
});
|
|
85
|
+
this.dispatch('remove', item);
|
|
86
|
+
return item;
|
|
87
|
+
};
|
|
88
|
+
WrappedArray.prototype.shift = function () {
|
|
89
|
+
var item = _super.prototype.shift.call(this);
|
|
90
|
+
this.dispatch('shift', item);
|
|
91
|
+
this.dispatch('change', {
|
|
92
|
+
'removed': [item]
|
|
93
|
+
});
|
|
94
|
+
this.dispatch('remove', item);
|
|
95
|
+
return item;
|
|
96
|
+
};
|
|
79
97
|
WrappedArray.prototype.splice = function (start, deleteCount) {
|
|
80
98
|
var removed = _super.prototype.splice.call(this, start, deleteCount);
|
|
81
99
|
this.dispatch('change', {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WrappedArray.js","sourceRoot":"","sources":["../../src/Scope/WrappedArray.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"WrappedArray.js","sourceRoot":"","sources":["../../src/Scope/WrappedArray.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,7 +27,7 @@ var ArrayProperty = /** @class */ (function (_super) {
|
|
|
27
27
|
__extends(ArrayProperty, _super);
|
|
28
28
|
function ArrayProperty(value, config) {
|
|
29
29
|
var _this = _super.call(this, new WrappedArray_1.WrappedArray(), config) || this;
|
|
30
|
-
_this.allKey = _this._value.dispatcher.all(_this.relayEvent, _this);
|
|
30
|
+
_this.allKey = _this._value.dispatcher.all(_this.relayEvent.bind(_this), _this);
|
|
31
31
|
if (value !== undefined) {
|
|
32
32
|
_this.value = value;
|
|
33
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArrayProperty.js","sourceRoot":"","sources":["../../../src/Scope/properties/ArrayProperty.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAqD;AACrD,gDAA6C;AAE7C;IAA4C,iCAAyB;IAIjE,uBAAY,KAAW,EAAE,MAAwB;QAAjD,YACI,kBAAM,IAAI,2BAAY,EAAO,EAAE,MAAM,CAAC,SAKzC;QAJG,KAAI,CAAC,MAAM,GAAG,KAAI,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,KAAI,CAAC,UAAU,EAAE,KAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"ArrayProperty.js","sourceRoot":"","sources":["../../../src/Scope/properties/ArrayProperty.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAqD;AACrD,gDAA6C;AAE7C;IAA4C,iCAAyB;IAIjE,uBAAY,KAAW,EAAE,MAAwB;QAAjD,YACI,kBAAM,IAAI,2BAAY,EAAO,EAAE,MAAM,CAAC,SAKzC;QAJG,KAAI,CAAC,MAAM,GAAG,KAAI,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,KAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAI,CAAC,EAAE,KAAI,CAAC,CAAC;QAC3E,IAAI,KAAK,KAAK,SAAS,EAAE;YACrB,KAAI,CAAC,KAAK,GAAG,KAAK,CAAC;SACtB;;IACL,CAAC;IAED,mCAAW,GAAX;QACI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACzC,iBAAM,WAAW,WAAE,CAAC;IACxB,CAAC;IAED,kCAAU,GAAV,UAAW,KAAK;QAAE,cAAO;aAAP,UAAO,EAAP,qBAAO,EAAP,IAAO;YAAP,6BAAO;;QACrB,IAAI,CAAC,QAAQ,OAAb,IAAI,iBAAU,QAAQ,GAAK,IAAI,GAAE;IACrC,CAAC;IAED,sBAAI,gCAAK;aAcT;YACI,OAAO,IAAI,CAAC,MAAM,CAAC;QACvB,CAAC;aAhBD,UAAU,CAAM;YACZ,IAAI,CAAC,CAAC,CAAC,YAAY,KAAK,CAAC;gBACrB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAEZ,IAAI,IAAI,CAAC,MAAM,YAAY,2BAAY,EAAE;gBACrC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAE1C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE;oBAC7B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aAC9B;iBAAM,IAAI,CAAC,YAAY,2BAAY,EAAE;gBAClC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;aACnB;QACL,CAAC;;;OAAA;IAKL,oBAAC;AAAD,CAAC,AAtCD,CAA4C,mBAAQ,GAsCnD;AAtCY,sCAAa"}
|
|
@@ -5,6 +5,7 @@ export interface IPropertyConfig {
|
|
|
5
5
|
type?: string;
|
|
6
6
|
default?: any;
|
|
7
7
|
validators?: TValidator[];
|
|
8
|
+
tags?: string[];
|
|
8
9
|
}
|
|
9
10
|
export declare class Property<T = any> extends EventDispatcher {
|
|
10
11
|
_type: string;
|
|
@@ -18,4 +19,7 @@ export declare class Property<T = any> extends EventDispatcher {
|
|
|
18
19
|
set type(type: string);
|
|
19
20
|
get type(): string;
|
|
20
21
|
validate(): any[];
|
|
22
|
+
addTag(tag: string): void;
|
|
23
|
+
removeTag(tag: string): void;
|
|
24
|
+
hasTag(tag: string): boolean;
|
|
21
25
|
}
|
|
@@ -95,6 +95,26 @@ var Property = /** @class */ (function (_super) {
|
|
|
95
95
|
}
|
|
96
96
|
return errors;
|
|
97
97
|
};
|
|
98
|
+
Property.prototype.addTag = function (tag) {
|
|
99
|
+
if (this.config.tags == undefined) {
|
|
100
|
+
this.config.tags = [];
|
|
101
|
+
}
|
|
102
|
+
if (this.config.tags.indexOf(tag) == -1) {
|
|
103
|
+
this.config.tags.push(tag);
|
|
104
|
+
}
|
|
105
|
+
};
|
|
106
|
+
Property.prototype.removeTag = function (tag) {
|
|
107
|
+
if (this.config.tags == undefined) {
|
|
108
|
+
return;
|
|
109
|
+
}
|
|
110
|
+
var index = this.config.tags.indexOf(tag);
|
|
111
|
+
if (index != -1) {
|
|
112
|
+
this.config.tags.splice(index, 1);
|
|
113
|
+
}
|
|
114
|
+
};
|
|
115
|
+
Property.prototype.hasTag = function (tag) {
|
|
116
|
+
return this.config.tags instanceof Array ? this.config.tags.indexOf(tag) !== -1 : false;
|
|
117
|
+
};
|
|
98
118
|
return Property;
|
|
99
119
|
}(EventDispatcher_1.EventDispatcher));
|
|
100
120
|
exports.Property = Property;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Property.js","sourceRoot":"","sources":["../../../src/Scope/properties/Property.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,yDAAsD;AACtD,2CAAwC;AAExC,SAAgB,QAAQ,CAAC,YAAuB,EAAE,MAAsB;IAA/C,6BAAA,EAAA,uBAAuB;IAAE,uBAAA,EAAA,WAAsB;IACpE,OAAO,UAAS,MAAW,EAAE,GAAW;QACpC,IAAG,MAAM,CAAC,cAAc,IAAI,SAAS,EAAE;YACnC,MAAM,CAAC,cAAc,GAAG,EAAE,CAAC;SAC9B;QAED,iDAAiD;QACjD,IAAG,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACvC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEpC,IAAM,MAAM,GAAG;YACX,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QAClC,CAAC,CAAC;QAEF,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,IAAI,GAAC,GAAG,GAAC,IAAI,EAAE;YACzC,GAAG,EAAE,MAAM;YACX,GAAG,EAAE,UAAA,CAAC,IAAK,CAAC;YACZ,UAAU,EAAC,KAAK;YAChB,YAAY,EAAE,IAAI;SACrB,CAAC,CAAC;IACP,CAAC,CAAA;AACL,CAAC;AArBD,4BAqBC;
|
|
1
|
+
{"version":3,"file":"Property.js","sourceRoot":"","sources":["../../../src/Scope/properties/Property.ts"],"names":[],"mappings":"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"}
|
package/dist/Scope.d.ts
CHANGED
|
@@ -3,10 +3,11 @@ import { ScopeReference } from "./Scope/ScopeReference";
|
|
|
3
3
|
import { ScopeData } from "./Scope/ScopeData";
|
|
4
4
|
export declare class Scope extends EventDispatcher {
|
|
5
5
|
wrapped: any;
|
|
6
|
-
protected
|
|
6
|
+
protected _data: ScopeData;
|
|
7
7
|
protected children: Scope[];
|
|
8
8
|
protected _parentScope: Scope;
|
|
9
9
|
constructor(parent?: Scope);
|
|
10
|
+
get data(): ScopeData;
|
|
10
11
|
get parentScope(): Scope;
|
|
11
12
|
set parentScope(scope: Scope);
|
|
12
13
|
addChild(scope: Scope): void;
|
package/dist/Scope.js
CHANGED
|
@@ -34,10 +34,17 @@ var Scope = /** @class */ (function (_super) {
|
|
|
34
34
|
if (parent)
|
|
35
35
|
_this.parentScope = parent;
|
|
36
36
|
_this.children = [];
|
|
37
|
-
_this.
|
|
38
|
-
_this.
|
|
37
|
+
_this._data = new DynamicScopeData_1.DynamicScopeData({});
|
|
38
|
+
_this._data.addRelay(_this);
|
|
39
39
|
return _this;
|
|
40
40
|
}
|
|
41
|
+
Object.defineProperty(Scope.prototype, "data", {
|
|
42
|
+
get: function () {
|
|
43
|
+
return this._data;
|
|
44
|
+
},
|
|
45
|
+
enumerable: false,
|
|
46
|
+
configurable: true
|
|
47
|
+
});
|
|
41
48
|
Object.defineProperty(Scope.prototype, "parentScope", {
|
|
42
49
|
get: function () {
|
|
43
50
|
return this._parentScope;
|
|
@@ -81,7 +88,7 @@ var Scope = /** @class */ (function (_super) {
|
|
|
81
88
|
};
|
|
82
89
|
Scope.prototype.get = function (key, searchParents) {
|
|
83
90
|
if (searchParents === void 0) { searchParents = true; }
|
|
84
|
-
var value = this.
|
|
91
|
+
var value = this._data[key];
|
|
85
92
|
if (value === undefined) {
|
|
86
93
|
if (searchParents && this.parentScope)
|
|
87
94
|
return this.parentScope.get(key, searchParents);
|
|
@@ -90,29 +97,29 @@ var Scope = /** @class */ (function (_super) {
|
|
|
90
97
|
return value;
|
|
91
98
|
};
|
|
92
99
|
Scope.prototype.set = function (key, value) {
|
|
93
|
-
if (!this.
|
|
94
|
-
this.
|
|
95
|
-
this.
|
|
100
|
+
if (!this._data.hasProperty(key))
|
|
101
|
+
this._data.createProperty(key);
|
|
102
|
+
this._data[key] = value;
|
|
96
103
|
};
|
|
97
104
|
Object.defineProperty(Scope.prototype, "keys", {
|
|
98
105
|
get: function () {
|
|
99
|
-
return this.
|
|
106
|
+
return this._data.keys;
|
|
100
107
|
},
|
|
101
108
|
enumerable: false,
|
|
102
109
|
configurable: true
|
|
103
110
|
});
|
|
104
111
|
Scope.prototype.has = function (key) {
|
|
105
|
-
return this.
|
|
112
|
+
return this._data.hasProperty(key);
|
|
106
113
|
};
|
|
107
114
|
Scope.prototype.setType = function (key, type) {
|
|
108
|
-
var property = this.
|
|
115
|
+
var property = this._data.getProperty(key, true);
|
|
109
116
|
property.type = type;
|
|
110
117
|
if (this.has(key))
|
|
111
118
|
this.set(key, this.get(key));
|
|
112
119
|
};
|
|
113
120
|
Scope.prototype.getType = function (key) {
|
|
114
|
-
var property = this.
|
|
115
|
-
return property.type;
|
|
121
|
+
var property = this._data.getProperty(key);
|
|
122
|
+
return property === null || property === void 0 ? void 0 : property.type;
|
|
116
123
|
};
|
|
117
124
|
Scope.prototype.extend = function (data) {
|
|
118
125
|
for (var _i = 0, data_1 = data; _i < data_1.length; _i++) {
|
|
@@ -121,7 +128,7 @@ var Scope = /** @class */ (function (_super) {
|
|
|
121
128
|
}
|
|
122
129
|
};
|
|
123
130
|
Scope.prototype.clear = function () {
|
|
124
|
-
for (var _i = 0, _a = this.
|
|
131
|
+
for (var _i = 0, _a = this._data.keys; _i < _a.length; _i++) {
|
|
125
132
|
var key = _a[_i];
|
|
126
133
|
if (['function', 'object'].indexOf(typeof this.get(key)) > -1)
|
|
127
134
|
continue;
|
|
@@ -137,17 +144,17 @@ var Scope = /** @class */ (function (_super) {
|
|
|
137
144
|
if (triggerUpdates === void 0) { triggerUpdates = false; }
|
|
138
145
|
if (updateFromWrapped === void 0) { updateFromWrapped = true; }
|
|
139
146
|
if (toWrap instanceof ScopeData_1.ScopeData) {
|
|
140
|
-
if (this.
|
|
141
|
-
this.
|
|
142
|
-
this.
|
|
147
|
+
if (this._data instanceof EventDispatcher_1.EventDispatcher) {
|
|
148
|
+
this._data.removeRelay(this);
|
|
149
|
+
this._data.deconstruct();
|
|
143
150
|
}
|
|
144
151
|
this.wrapped = toWrap;
|
|
145
|
-
this.
|
|
146
|
-
this.
|
|
152
|
+
this._data = toWrap;
|
|
153
|
+
this._data.addRelay(this);
|
|
147
154
|
return;
|
|
148
155
|
}
|
|
149
156
|
if (toWrap instanceof Scope)
|
|
150
|
-
toWrap = toWrap.
|
|
157
|
+
toWrap = toWrap._data;
|
|
151
158
|
if ([null, undefined].indexOf(this.wrapped) === -1)
|
|
152
159
|
throw Error("A scope can only wrap a single object");
|
|
153
160
|
if (!toWrap) {
|
package/dist/Scope.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Scope.js","sourceRoot":"","sources":["../src/Scope.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAAkD;AAClD,yDAAsD;AACtD,yDAAsD;AACtD,qDAAkD;AAClD,+CAA4C;AAC5C,6DAA0D;AAG1D;IAA2B,yBAAe;IAMtC,eACI,MAAc;QADlB,YAGI,iBAAO,SAMV;QALG,IAAI,MAAM;YACN,KAAI,CAAC,WAAW,GAAG,MAAM,CAAC;QAC9B,KAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,KAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"Scope.js","sourceRoot":"","sources":["../src/Scope.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -70,10 +70,15 @@ export class ScopeDataAbstract extends EventDispatcher {
|
|
|
70
70
|
}
|
|
71
71
|
}
|
|
72
72
|
|
|
73
|
-
getData(): IScopeData {
|
|
73
|
+
getData(...tags: string[]): IScopeData {
|
|
74
74
|
const data: IScopeData = {};
|
|
75
|
-
for (const key of this.getProperties()) {
|
|
75
|
+
propLoop: for (const key of this.getProperties()) {
|
|
76
76
|
const property = this['__'+key];
|
|
77
|
+
for (const tag of tags) {
|
|
78
|
+
if (!property.hasTag(tag))
|
|
79
|
+
continue propLoop;
|
|
80
|
+
}
|
|
81
|
+
|
|
77
82
|
if(this[key] == null || !property)
|
|
78
83
|
continue;
|
|
79
84
|
|
|
@@ -48,6 +48,26 @@ export class WrappedArray<T> extends Array<T> {
|
|
|
48
48
|
return true;
|
|
49
49
|
}
|
|
50
50
|
|
|
51
|
+
pop(): T {
|
|
52
|
+
const item: T = super.pop();
|
|
53
|
+
this.dispatch('pop', item);
|
|
54
|
+
this.dispatch('change', {
|
|
55
|
+
'removed': [item]
|
|
56
|
+
});
|
|
57
|
+
this.dispatch('remove', item);
|
|
58
|
+
return item;
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
shift(): T {
|
|
62
|
+
const item: T = super.shift();
|
|
63
|
+
this.dispatch('shift', item);
|
|
64
|
+
this.dispatch('change', {
|
|
65
|
+
'removed': [item]
|
|
66
|
+
});
|
|
67
|
+
this.dispatch('remove', item);
|
|
68
|
+
return item;
|
|
69
|
+
}
|
|
70
|
+
|
|
51
71
|
splice(start: number, deleteCount?: number): T[] {
|
|
52
72
|
const removed: T[] = super.splice(start, deleteCount);
|
|
53
73
|
|
|
@@ -7,7 +7,7 @@ export class ArrayProperty<T = any> extends Property<WrappedArray<T>> {
|
|
|
7
7
|
|
|
8
8
|
constructor(value?: any, config?: IPropertyConfig) {
|
|
9
9
|
super(new WrappedArray<any>(), config);
|
|
10
|
-
this.allKey = this._value.dispatcher.all(this.relayEvent, this);
|
|
10
|
+
this.allKey = this._value.dispatcher.all(this.relayEvent.bind(this), this);
|
|
11
11
|
if (value !== undefined) {
|
|
12
12
|
this.value = value;
|
|
13
13
|
}
|
|
@@ -30,6 +30,7 @@ export interface IPropertyConfig {
|
|
|
30
30
|
type?: string;
|
|
31
31
|
default?: any;
|
|
32
32
|
validators?: TValidator[];
|
|
33
|
+
tags?: string[];
|
|
33
34
|
}
|
|
34
35
|
|
|
35
36
|
export class Property<T = any> extends EventDispatcher {
|
|
@@ -87,4 +88,27 @@ export class Property<T = any> extends EventDispatcher {
|
|
|
87
88
|
|
|
88
89
|
return errors;
|
|
89
90
|
}
|
|
91
|
+
|
|
92
|
+
addTag(tag: string) {
|
|
93
|
+
if(this.config.tags == undefined) {
|
|
94
|
+
this.config.tags = [];
|
|
95
|
+
}
|
|
96
|
+
if(this.config.tags.indexOf(tag) == -1) {
|
|
97
|
+
this.config.tags.push(tag);
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
removeTag(tag: string) {
|
|
102
|
+
if(this.config.tags == undefined) {
|
|
103
|
+
return;
|
|
104
|
+
}
|
|
105
|
+
const index = this.config.tags.indexOf(tag);
|
|
106
|
+
if(index != -1) {
|
|
107
|
+
this.config.tags.splice(index, 1);
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
hasTag(tag: string) {
|
|
112
|
+
return this.config.tags instanceof Array ? this.config.tags.indexOf(tag) !== -1 : false;
|
|
113
|
+
}
|
|
90
114
|
}
|
package/src/Scope.ts
CHANGED
|
@@ -8,7 +8,7 @@ import {DynamicScopeData} from "./Scope/DynamicScopeData";
|
|
|
8
8
|
|
|
9
9
|
export class Scope extends EventDispatcher {
|
|
10
10
|
public wrapped: any;
|
|
11
|
-
protected
|
|
11
|
+
protected _data: ScopeData;
|
|
12
12
|
protected children: Scope[];
|
|
13
13
|
protected _parentScope: Scope;
|
|
14
14
|
|
|
@@ -19,8 +19,12 @@ export class Scope extends EventDispatcher {
|
|
|
19
19
|
if (parent)
|
|
20
20
|
this.parentScope = parent;
|
|
21
21
|
this.children = [];
|
|
22
|
-
this.
|
|
23
|
-
this.
|
|
22
|
+
this._data = new DynamicScopeData({});
|
|
23
|
+
this._data.addRelay(this);
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
public get data(): ScopeData {
|
|
27
|
+
return this._data;
|
|
24
28
|
}
|
|
25
29
|
|
|
26
30
|
public get parentScope(): Scope {
|
|
@@ -68,7 +72,7 @@ export class Scope extends EventDispatcher {
|
|
|
68
72
|
}
|
|
69
73
|
|
|
70
74
|
get(key: string, searchParents: boolean = true): any {
|
|
71
|
-
const value: any = this.
|
|
75
|
+
const value: any = this._data[key];
|
|
72
76
|
if (value === undefined) {
|
|
73
77
|
if (searchParents && this.parentScope)
|
|
74
78
|
return this.parentScope.get(key, searchParents);
|
|
@@ -80,29 +84,29 @@ export class Scope extends EventDispatcher {
|
|
|
80
84
|
}
|
|
81
85
|
|
|
82
86
|
set(key: string, value: any) {
|
|
83
|
-
if (!this.
|
|
84
|
-
this.
|
|
85
|
-
this.
|
|
87
|
+
if (!this._data.hasProperty(key))
|
|
88
|
+
this._data.createProperty(key);
|
|
89
|
+
this._data[key] = value;
|
|
86
90
|
}
|
|
87
91
|
|
|
88
92
|
get keys(): string[] {
|
|
89
|
-
return this.
|
|
93
|
+
return this._data.keys;
|
|
90
94
|
}
|
|
91
95
|
|
|
92
96
|
has(key: string): boolean {
|
|
93
|
-
return this.
|
|
97
|
+
return this._data.hasProperty(key);
|
|
94
98
|
}
|
|
95
99
|
|
|
96
100
|
setType(key: string, type: string) {
|
|
97
|
-
const property = this.
|
|
101
|
+
const property = this._data.getProperty(key, true);
|
|
98
102
|
property.type = type;
|
|
99
103
|
if (this.has(key))
|
|
100
104
|
this.set(key, this.get(key));
|
|
101
105
|
}
|
|
102
106
|
|
|
103
107
|
getType(key: string): string {
|
|
104
|
-
const property = this.
|
|
105
|
-
return property
|
|
108
|
+
const property = this._data.getProperty(key);
|
|
109
|
+
return property?.type;
|
|
106
110
|
}
|
|
107
111
|
|
|
108
112
|
extend(data) {
|
|
@@ -112,7 +116,7 @@ export class Scope extends EventDispatcher {
|
|
|
112
116
|
}
|
|
113
117
|
|
|
114
118
|
clear() {
|
|
115
|
-
for (const key of this.
|
|
119
|
+
for (const key of this._data.keys) {
|
|
116
120
|
if (['function', 'object'].indexOf(typeof this.get(key)) > -1) continue;
|
|
117
121
|
this.set(key, null);
|
|
118
122
|
}
|
|
@@ -125,18 +129,18 @@ export class Scope extends EventDispatcher {
|
|
|
125
129
|
|
|
126
130
|
public wrap(toWrap: any, triggerUpdates: boolean = false, updateFromWrapped: boolean = true) {
|
|
127
131
|
if (toWrap instanceof ScopeData) {
|
|
128
|
-
if (this.
|
|
129
|
-
this.
|
|
130
|
-
this.
|
|
132
|
+
if (this._data instanceof EventDispatcher) {
|
|
133
|
+
this._data.removeRelay(this);
|
|
134
|
+
this._data.deconstruct();
|
|
131
135
|
}
|
|
132
136
|
this.wrapped = toWrap;
|
|
133
|
-
this.
|
|
134
|
-
this.
|
|
137
|
+
this._data = toWrap;
|
|
138
|
+
this._data.addRelay(this);
|
|
135
139
|
return;
|
|
136
140
|
}
|
|
137
141
|
|
|
138
142
|
if (toWrap instanceof Scope)
|
|
139
|
-
toWrap = toWrap.
|
|
143
|
+
toWrap = toWrap._data;
|
|
140
144
|
|
|
141
145
|
if ([null, undefined].indexOf(this.wrapped) === -1)
|
|
142
146
|
throw Error("A scope can only wrap a single object");
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
import {ScopeData} from "../../src/Scope/ScopeData";
|
|
2
|
+
import {Property} from "../../src/Scope/properties/Property";
|
|
3
|
+
|
|
4
|
+
|
|
5
|
+
describe('ScopeData', () => {
|
|
6
|
+
it("should set tags correctly", async () => {
|
|
7
|
+
const data = new ScopeData();
|
|
8
|
+
data.createProperty('test', Property, {
|
|
9
|
+
tags: ['test']
|
|
10
|
+
});
|
|
11
|
+
|
|
12
|
+
data.createProperty('test_int', Property, {
|
|
13
|
+
tags: ['test']
|
|
14
|
+
});
|
|
15
|
+
|
|
16
|
+
data.createProperty('not_test', Property, {
|
|
17
|
+
tags: ['not_test']
|
|
18
|
+
});
|
|
19
|
+
|
|
20
|
+
data['test'] = 'test';
|
|
21
|
+
data['test_int'] = 1;
|
|
22
|
+
data['not_test'] = 'not_test';
|
|
23
|
+
|
|
24
|
+
const taggedTestData = data.getData('test');
|
|
25
|
+
expect(taggedTestData).toEqual({
|
|
26
|
+
test: 'test',
|
|
27
|
+
test_int: 1
|
|
28
|
+
});
|
|
29
|
+
|
|
30
|
+
const taggedNotTestData = data.getData('not_test');
|
|
31
|
+
expect(taggedNotTestData).toEqual({
|
|
32
|
+
not_test: 'not_test'
|
|
33
|
+
});
|
|
34
|
+
|
|
35
|
+
const allData = data.getData();
|
|
36
|
+
expect(allData).toEqual({
|
|
37
|
+
test: 'test',
|
|
38
|
+
test_int: 1,
|
|
39
|
+
not_test: 'not_test'
|
|
40
|
+
});
|
|
41
|
+
|
|
42
|
+
const notTestProp = data.getProperty('not_test');
|
|
43
|
+
notTestProp.addTag('test');
|
|
44
|
+
const taggedNotTestData2 = data.getData('test');
|
|
45
|
+
expect(taggedNotTestData2).toEqual({
|
|
46
|
+
test: 'test',
|
|
47
|
+
test_int: 1,
|
|
48
|
+
not_test: 'not_test'
|
|
49
|
+
});
|
|
50
|
+
|
|
51
|
+
notTestProp.removeTag('test');
|
|
52
|
+
const taggedNotTestData3 = data.getData('test');
|
|
53
|
+
expect(taggedNotTestData3).toEqual({
|
|
54
|
+
test: 'test',
|
|
55
|
+
test_int: 1
|
|
56
|
+
});
|
|
57
|
+
});
|
|
58
|
+
});
|
|
@@ -3,7 +3,7 @@ import {ArrayProperty} from "../../../src/Scope/properties/_imports";
|
|
|
3
3
|
import {WrappedArray} from "../../../src/vsn";
|
|
4
4
|
|
|
5
5
|
describe('ArrayProperty', () => {
|
|
6
|
-
it("
|
|
6
|
+
it("should do array things.", () => {
|
|
7
7
|
const d = new ScopeData();
|
|
8
8
|
d.createProperty('test', ArrayProperty);
|
|
9
9
|
d['test'] = [1, 2, 3];
|
|
@@ -12,5 +12,12 @@ describe('ArrayProperty', () => {
|
|
|
12
12
|
expect(d['test'].indexOf(2)).toBe(1);
|
|
13
13
|
expect(d['test'].indexOf(3)).toBe(2);
|
|
14
14
|
expect(d['test'].indexOf(4)).toBe(-1);
|
|
15
|
+
let calls = 0;
|
|
16
|
+
d.on('change:test', () => {
|
|
17
|
+
calls++;
|
|
18
|
+
});
|
|
19
|
+
d['test'].push(4);
|
|
20
|
+
expect(calls).toBeGreaterThanOrEqual(1); // push fires more than one event
|
|
21
|
+
expect(d['test'].indexOf(4)).toBe(3);
|
|
15
22
|
});
|
|
16
23
|
});
|