jpf-mobx 1.0.37 → 1.0.39
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/dist/controls/custom/FileSelector/FileSelector.js +2 -2
- package/dist/controls/custom/FileSelector/FileSelector.js.map +1 -1
- package/dist/controls/kendo/Chart/Chart.d.ts +20 -0
- package/dist/controls/kendo/Chart/Chart.js +68 -0
- package/dist/controls/kendo/Chart/Chart.js.map +1 -1
- package/dist/controls/kendo/index.d.ts +1 -0
- package/dist/controls/kendo/index.js +1 -0
- package/dist/controls/kendo/index.js.map +1 -1
- package/dist/framework/properties.d.ts +1 -1
- package/dist/framework/properties.js +13 -11
- package/dist/framework/properties.js.map +1 -1
- package/package.json +1 -1
- package/src/controls/custom/FileSelector/FileSelector.ts +2 -3
- package/src/controls/kendo/Chart/Chart.ts +102 -86
- package/src/controls/kendo/index.ts +1 -1
- package/src/framework/properties.ts +16 -10
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileSelector.js","sourceRoot":"","sources":["../../../../src/controls/custom/FileSelector/FileSelector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAe,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAC1F,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAoB,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAmB,MAAM,wBAAwB,CAAC;AAOvE,MAAM,mBAAoB,SAAQ,OAAgC;IAC9D,YAAY,UAAmC;QAC3C,KAAK,CACD;YACI,OAAO,EAAE,KAAK;YACd,UAAU,EAAE,gBAAgB,CACxB,UAAU,EACV;gBACI,
|
|
1
|
+
{"version":3,"file":"FileSelector.js","sourceRoot":"","sources":["../../../../src/controls/custom/FileSelector/FileSelector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAe,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAC1F,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAoB,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAmB,MAAM,wBAAwB,CAAC;AAOvE,MAAM,mBAAoB,SAAQ,OAAgC;IAC9D,YAAY,UAAmC;QAC3C,KAAK,CACD;YACI,OAAO,EAAE,KAAK;YACd,UAAU,EAAE,gBAAgB,CACxB,UAAU,EACV;gBACI,WAAW,EAAE,cAAc;aAC9B,CACJ;SACJ,CACJ,CAAC;IACN,CAAC;IAES,KAAK;QACX,KAAK,CAAC,KAAK,EAAE,CAAC;QAEd,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC;QAElC,IAAI,SAAS,GAAG,YAAY,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,CAAC;QAE3D,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAEpC,IAAI,SAAS,CAAC,MAAM,EAAE;YAClB,MAAM,MAAM,GAAG,aAAa,CACxB,gBAAgB,CACZ,SAAS,CAAC,MAAM,EAChB;gBACI,cAAc,EAAE;oBACZ,KAAK,EAAE;wBACH,QAAQ,EAAE,GAAG,EAAE;4BACX,IAAI,UAAU,GAAG,QAAQ,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;4BACpD,UAAU,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;4BAC5C,SAAS,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;wBACxC,CAAC;qBACJ;iBACJ;aACJ,CACJ,CACJ,CAAC,MAAM,EAAE,CAAC;YAEX,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;SACpC;IACL,CAAC;CACJ;AAED,MAAM,UAAU,mBAAmB,CAAC,UAAmC;IACnE,OAAO,IAAI,mBAAmB,CAAC,UAAU,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,OAAO,sBAAuB,SAAQ,UAAU;IAClD,YAAY,UAAmC;QAC3C,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IACzC,CAAC;IACD,MAAM,CAAoB;IAC1B,SAAS,CAA4B;CACxC;AAED,eAAe,CACX,sBAAsB,CAAC,SAAS,CAAC,WAAW,EAC5C,mBAAmB,CACtB,CAAC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import * as kendo from "@progress/kendo-ui/js/kendo.dataviz.chart";
|
|
2
|
+
import { Element } from "../../../framework/element";
|
|
3
|
+
import { IProperties } from "../../../framework/properties";
|
|
4
|
+
import { Subscribable } from "../../../framework/observable";
|
|
5
|
+
export interface IChartProperties extends IProperties {
|
|
6
|
+
data?: Array<any> | Subscribable<Array<any>>;
|
|
7
|
+
chartArea?: kendo.dataviz.ui.ChartChartArea | undefined;
|
|
8
|
+
series?: kendo.dataviz.ui.ChartSeriesItem[] | Subscribable<kendo.dataviz.ui.ChartSeriesItem[]>;
|
|
9
|
+
categoryAxis?: kendo.dataviz.ui.ChartCategoryAxisItem | kendo.dataviz.ui.ChartCategoryAxisItem[] | Subscribable<kendo.dataviz.ui.ChartCategoryAxisItem | kendo.dataviz.ui.ChartCategoryAxisItem[]>;
|
|
10
|
+
valueAxis?: kendo.dataviz.ui.ChartValueAxisItem | kendo.dataviz.ui.ChartValueAxisItem[] | undefined;
|
|
11
|
+
legend?: kendo.dataviz.ui.ChartLegend | undefined;
|
|
12
|
+
}
|
|
13
|
+
declare class ChartElement extends Element<IChartProperties> {
|
|
14
|
+
constructor(properties: IChartProperties);
|
|
15
|
+
private chart;
|
|
16
|
+
private dataSource;
|
|
17
|
+
build(): void;
|
|
18
|
+
}
|
|
19
|
+
export declare function chartElement(properties: IChartProperties): ChartElement;
|
|
20
|
+
export {};
|
|
@@ -1 +1,69 @@
|
|
|
1
|
+
import * as kendo from "@progress/kendo-ui/js/kendo.dataviz.chart";
|
|
2
|
+
import { Element } from "../../../framework/element";
|
|
3
|
+
import { extendProperties } from "../../../framework/properties";
|
|
4
|
+
import { unwrap, isSubscribable, reaction } from "../../../framework/observable";
|
|
5
|
+
class ChartElement extends Element {
|
|
6
|
+
constructor(properties) {
|
|
7
|
+
super({
|
|
8
|
+
tagName: "div",
|
|
9
|
+
properties: extendProperties(properties, {
|
|
10
|
+
elementType: "KendoChart"
|
|
11
|
+
}, true)
|
|
12
|
+
});
|
|
13
|
+
}
|
|
14
|
+
chart;
|
|
15
|
+
dataSource;
|
|
16
|
+
build() {
|
|
17
|
+
super.build();
|
|
18
|
+
const viewModel = this.properties;
|
|
19
|
+
if (viewModel.data) {
|
|
20
|
+
this.dataSource = new kendo.data.DataSource({
|
|
21
|
+
data: unwrap(viewModel.data)
|
|
22
|
+
});
|
|
23
|
+
}
|
|
24
|
+
if (isSubscribable(viewModel.data)) {
|
|
25
|
+
this.disposers.push(reaction(() => {
|
|
26
|
+
return unwrap(viewModel.data);
|
|
27
|
+
}, (data) => {
|
|
28
|
+
this.dataSource.data(data);
|
|
29
|
+
}));
|
|
30
|
+
}
|
|
31
|
+
setTimeout(() => {
|
|
32
|
+
this.chart = new kendo.dataviz.ui.Chart(this.element, {
|
|
33
|
+
autoBind: false,
|
|
34
|
+
legend: viewModel.legend,
|
|
35
|
+
dataSource: this.dataSource,
|
|
36
|
+
chartArea: viewModel.chartArea,
|
|
37
|
+
series: unwrap(viewModel.series),
|
|
38
|
+
categoryAxis: unwrap(viewModel.categoryAxis),
|
|
39
|
+
valueAxis: viewModel.valueAxis
|
|
40
|
+
});
|
|
41
|
+
});
|
|
42
|
+
if (isSubscribable(viewModel.series)) {
|
|
43
|
+
this.disposers.push(reaction(() => {
|
|
44
|
+
return unwrap(viewModel.series);
|
|
45
|
+
}, (series) => {
|
|
46
|
+
if (this.chart) {
|
|
47
|
+
this.chart.setOptions({
|
|
48
|
+
series: series
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
}));
|
|
52
|
+
}
|
|
53
|
+
if (isSubscribable(viewModel.categoryAxis)) {
|
|
54
|
+
this.disposers.push(reaction(() => {
|
|
55
|
+
return unwrap(viewModel.categoryAxis);
|
|
56
|
+
}, (categoryAxis) => {
|
|
57
|
+
if (this.chart) {
|
|
58
|
+
this.chart.setOptions({
|
|
59
|
+
categoryAxis: categoryAxis
|
|
60
|
+
});
|
|
61
|
+
}
|
|
62
|
+
}));
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
export function chartElement(properties) {
|
|
67
|
+
return new ChartElement(properties);
|
|
68
|
+
}
|
|
1
69
|
//# sourceMappingURL=Chart.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Chart.js","sourceRoot":"","sources":["../../../../src/controls/kendo/Chart/Chart.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"Chart.js","sourceRoot":"","sources":["../../../../src/controls/kendo/Chart/Chart.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/controls/kendo/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/controls/kendo/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAE9B,cAAc,yBAAyB,CAAC;AAGxC,cAAc,aAAa,CAAC"}
|
|
@@ -37,5 +37,5 @@ export declare abstract class Properties implements IProperties {
|
|
|
37
37
|
elementType?: string;
|
|
38
38
|
focused?: boolean | Subscribable<boolean>;
|
|
39
39
|
}
|
|
40
|
-
export declare function extendProperties<TTarget = IProperties,
|
|
40
|
+
export declare function extendProperties<TTarget = IProperties, TOverwritingProperties = TTarget, TPreserveExistingProperties = TTarget>(target: TTarget, overWriteExistingProperties: TOverwritingProperties, preserveExisting?: TPreserveExistingProperties): TTarget;
|
|
41
41
|
export declare function applyBindings(properties: IProperties, element: HTMLElement, subscriptions: Array<IReactionDisposer>): void;
|
|
@@ -34,19 +34,21 @@ export class Properties {
|
|
|
34
34
|
elementType;
|
|
35
35
|
focused;
|
|
36
36
|
}
|
|
37
|
-
export function extendProperties(target,
|
|
38
|
-
if (
|
|
37
|
+
export function extendProperties(target, overWriteExistingProperties, preserveExisting) {
|
|
38
|
+
if (overWriteExistingProperties || preserveExisting) {
|
|
39
39
|
target = target || {};
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
target[key] =
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
40
|
+
if (overWriteExistingProperties) {
|
|
41
|
+
Object.keys(overWriteExistingProperties).forEach((key) => {
|
|
42
|
+
target[key] = overWriteExistingProperties[key];
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
if (preserveExisting) {
|
|
46
|
+
Object.keys(preserveExisting).forEach((key) => {
|
|
47
|
+
if (!preserveExisting.hasOwnProperty(key)) {
|
|
48
|
+
target[key] = preserveExisting[key];
|
|
47
49
|
}
|
|
48
|
-
}
|
|
49
|
-
}
|
|
50
|
+
});
|
|
51
|
+
}
|
|
50
52
|
}
|
|
51
53
|
return target;
|
|
52
54
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"properties.js","sourceRoot":"","sources":["../../src/framework/properties.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAmF,WAAW,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAGnJ,OAAO,EAAE,MAAM,EAAgB,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAC5E,OAAO,EAAE,OAAO,EAAqB,MAAM,MAAM,CAAC;AAMlD,MAAM,UAAU,sBAAsB,CAAC,MAAc,EAAE,OAAY;IAC/D,sBAAsB,CAClB,CAAC,MAAM,EAAE,EAAE;QACP,MAAM,uBAAuB,GAAG,MAAiC,CAAC;QAClE,IAAI,uBAAuB,CAAC,sBAAsB,IAAI,OAAO,uBAAuB,CAAC,sBAAsB,KAAK,UAAU,EAAE;YAExH,uBAAuB,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;SAC3D;IACL,CAAC,EACD,MAAM,CACT,CAAC;AACN,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,KAAK;IACnC,OAAO,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,WAAW,CAAC;AAC1D,CAAC;AAiBD,MAAM,OAAgB,UAAU;IAClB,aAAa,CAAc,MAAc,EAAE,UAAwB;QACzE,IAAI,UAAU,EAAE;YACZ,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;gBACzC,MAAM,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;YAC5C,CAAC,CAAC,CAAC;SACN;IACL,CAAC;IAED,UAAU,CAAuC;IACjD,UAAU,CAA+C;IACzD,KAAK,CAA6B;IAClC,OAAO,CAAmC;IAC1C,QAAQ,CAAmC;IAC3C,SAAS,CAA2B;IACpC,WAAW,CAAiC;IAC5C,wBAAwB,CAAW;IACnC,cAAc,CAAW;IACzB,cAAc,CAAkB;IAChC,WAAW,CAAU;IACrB,OAAO,CAAmC;CAC7C;AAKD,MAAM,UAAU,gBAAgB,
|
|
1
|
+
{"version":3,"file":"properties.js","sourceRoot":"","sources":["../../src/framework/properties.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,97 +1,113 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
import * as kendo from "@progress/kendo-ui/js/kendo.dataviz.chart";
|
|
2
|
+
import { Element } from "../../../framework/element";
|
|
3
|
+
import { IProperties, extendProperties } from "../../../framework/properties";
|
|
4
|
+
import { Subscribable, unwrap, isSubscribable, reaction } from "../../../framework/observable";
|
|
5
5
|
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
6
|
+
export interface IChartProperties extends IProperties {
|
|
7
|
+
data?: Array<any> | Subscribable<Array<any>>;
|
|
8
|
+
chartArea?: kendo.dataviz.ui.ChartChartArea | undefined;
|
|
9
|
+
series?: kendo.dataviz.ui.ChartSeriesItem[] | Subscribable<kendo.dataviz.ui.ChartSeriesItem[]>;
|
|
10
|
+
categoryAxis?: kendo.dataviz.ui.ChartCategoryAxisItem | kendo.dataviz.ui.ChartCategoryAxisItem[] | Subscribable<kendo.dataviz.ui.ChartCategoryAxisItem | kendo.dataviz.ui.ChartCategoryAxisItem[]>;
|
|
11
|
+
valueAxis?: kendo.dataviz.ui.ChartValueAxisItem | kendo.dataviz.ui.ChartValueAxisItem[] | undefined;
|
|
12
|
+
legend?: kendo.dataviz.ui.ChartLegend | undefined;
|
|
13
|
+
}
|
|
14
14
|
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
15
|
+
class ChartElement extends Element<IChartProperties>{
|
|
16
|
+
constructor(properties: IChartProperties) {
|
|
17
|
+
super(
|
|
18
|
+
{
|
|
19
|
+
tagName: "div",
|
|
20
|
+
properties: extendProperties(
|
|
21
|
+
properties,
|
|
22
|
+
{
|
|
23
|
+
elementType: "KendoChart"
|
|
24
|
+
},
|
|
25
|
+
true
|
|
26
|
+
)
|
|
27
|
+
}
|
|
28
|
+
);
|
|
29
|
+
}
|
|
29
30
|
|
|
30
|
-
|
|
31
|
-
|
|
31
|
+
private chart: kendo.dataviz.ui.Chart;
|
|
32
|
+
private dataSource: kendo.data.DataSource;
|
|
32
33
|
|
|
33
|
-
|
|
34
|
-
|
|
34
|
+
build(): void {
|
|
35
|
+
super.build();
|
|
35
36
|
|
|
36
|
-
|
|
37
|
+
const viewModel = this.properties;
|
|
37
38
|
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
39
|
+
if (viewModel.data) {
|
|
40
|
+
this.dataSource = new kendo.data.DataSource(
|
|
41
|
+
{
|
|
42
|
+
data: unwrap(viewModel.data)
|
|
43
|
+
}
|
|
44
|
+
);
|
|
45
|
+
}
|
|
45
46
|
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
47
|
+
if (isSubscribable(viewModel.data)) {
|
|
48
|
+
this.disposers.push(
|
|
49
|
+
reaction(
|
|
50
|
+
() => {
|
|
51
|
+
return unwrap(viewModel.data);
|
|
52
|
+
},
|
|
53
|
+
(data) => {
|
|
54
|
+
this.dataSource.data(data);
|
|
55
|
+
}
|
|
56
|
+
)
|
|
57
|
+
);
|
|
58
|
+
}
|
|
53
59
|
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
60
|
+
setTimeout(() => {
|
|
61
|
+
this.chart = new kendo.dataviz.ui.Chart(
|
|
62
|
+
this.element,
|
|
63
|
+
{
|
|
64
|
+
autoBind: false,
|
|
65
|
+
legend: viewModel.legend,
|
|
66
|
+
dataSource: this.dataSource,
|
|
67
|
+
chartArea: viewModel.chartArea,
|
|
68
|
+
series: unwrap(viewModel.series),
|
|
69
|
+
categoryAxis: unwrap(viewModel.categoryAxis),
|
|
70
|
+
valueAxis: viewModel.valueAxis
|
|
71
|
+
}
|
|
72
|
+
);
|
|
73
|
+
});
|
|
68
74
|
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
75
|
+
if (isSubscribable(viewModel.series)) {
|
|
76
|
+
this.disposers.push(
|
|
77
|
+
reaction(
|
|
78
|
+
() => {
|
|
79
|
+
return unwrap(viewModel.series);
|
|
80
|
+
},
|
|
81
|
+
(series) => {
|
|
82
|
+
if (this.chart) {
|
|
83
|
+
this.chart.setOptions({
|
|
84
|
+
series: series
|
|
85
|
+
});
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
)
|
|
89
|
+
);
|
|
90
|
+
}
|
|
80
91
|
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
92
|
+
if (isSubscribable(viewModel.categoryAxis)) {
|
|
93
|
+
this.disposers.push(
|
|
94
|
+
reaction(
|
|
95
|
+
() => {
|
|
96
|
+
return unwrap(viewModel.categoryAxis);
|
|
97
|
+
},
|
|
98
|
+
(categoryAxis) => {
|
|
99
|
+
if (this.chart) {
|
|
100
|
+
this.chart.setOptions({
|
|
101
|
+
categoryAxis: categoryAxis
|
|
102
|
+
});
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
)
|
|
106
|
+
);
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
}
|
|
94
110
|
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
111
|
+
export function chartElement(properties: IChartProperties) {
|
|
112
|
+
return new ChartElement(properties);
|
|
113
|
+
}
|
|
@@ -67,18 +67,24 @@ export abstract class Properties implements IProperties {
|
|
|
67
67
|
//#region Properties helper functions
|
|
68
68
|
|
|
69
69
|
|
|
70
|
-
export function extendProperties<TTarget = IProperties,
|
|
71
|
-
|
|
70
|
+
export function extendProperties<TTarget = IProperties, TOverwritingProperties = TTarget, TPreserveExistingProperties = TTarget>(target: TTarget, overWriteExistingProperties: TOverwritingProperties, preserveExisting?: TPreserveExistingProperties): TTarget {
|
|
71
|
+
|
|
72
|
+
if (overWriteExistingProperties || preserveExisting) {
|
|
72
73
|
target = target || {} as TTarget;
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
target[key] =
|
|
76
|
-
}
|
|
77
|
-
|
|
78
|
-
|
|
74
|
+
if (overWriteExistingProperties) {
|
|
75
|
+
Object.keys(overWriteExistingProperties).forEach((key) => {
|
|
76
|
+
target[key] = overWriteExistingProperties[key];
|
|
77
|
+
});
|
|
78
|
+
}
|
|
79
|
+
if (preserveExisting) {
|
|
80
|
+
Object.keys(preserveExisting).forEach((key) => {
|
|
81
|
+
//Check if the target object does not already have a property with the given key
|
|
82
|
+
if (!preserveExisting.hasOwnProperty(key)) {
|
|
83
|
+
target[key] = preserveExisting[key];
|
|
79
84
|
}
|
|
80
|
-
}
|
|
81
|
-
}
|
|
85
|
+
});
|
|
86
|
+
}
|
|
87
|
+
|
|
82
88
|
}
|
|
83
89
|
|
|
84
90
|
return target;
|