@quadnix/octo 0.0.16 → 0.0.18
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/README.md +4 -2
- package/dist/app.type.d.ts +14 -16
- package/dist/app.type.js.map +1 -1
- package/dist/decorators/action.decorator.js +29 -15
- package/dist/decorators/action.decorator.js.map +1 -1
- package/dist/decorators/anchor.decorator.js +5 -1
- package/dist/decorators/anchor.decorator.js.map +1 -1
- package/dist/decorators/container.d.ts +1 -1
- package/dist/decorators/enable-hook.decorator.d.ts +3 -0
- package/dist/decorators/enable-hook.decorator.js +13 -0
- package/dist/decorators/enable-hook.decorator.js.map +1 -0
- package/dist/decorators/factory.decorator.d.ts +1 -1
- package/dist/decorators/model.decorator.js +5 -1
- package/dist/decorators/model.decorator.js.map +1 -1
- package/dist/decorators/module.decorator.d.ts +36 -1
- package/dist/decorators/module.decorator.js +15 -5
- package/dist/decorators/module.decorator.js.map +1 -1
- package/dist/decorators/overlay.decorator.js +5 -1
- package/dist/decorators/overlay.decorator.js.map +1 -1
- package/dist/decorators/resource.decorator.js +5 -1
- package/dist/decorators/resource.decorator.js.map +1 -1
- package/dist/decorators/test-container.d.ts +13 -2
- package/dist/decorators/test-container.js +18 -3
- package/dist/decorators/test-container.js.map +1 -1
- package/dist/functions/dependency/{dependency.model.d.ts → dependency.d.ts} +2 -3
- package/dist/functions/dependency/{dependency.model.js → dependency.js} +1 -17
- package/dist/functions/dependency/dependency.js.map +1 -0
- package/dist/functions/diff/diff-metadata.d.ts +20 -0
- package/dist/functions/diff/{diff-metadata.model.js → diff-metadata.js} +2 -6
- package/dist/functions/diff/diff-metadata.js.map +1 -0
- package/dist/functions/diff/{diff.model.d.ts → diff.d.ts} +2 -2
- package/dist/functions/diff/{diff.model.js → diff.js} +16 -2
- package/dist/functions/diff/diff.js.map +1 -0
- package/dist/functions/diff/diff.utility.d.ts +3 -2
- package/dist/functions/diff/diff.utility.js +30 -5
- package/dist/functions/diff/diff.utility.js.map +1 -1
- package/dist/functions/hook/commit.hook.d.ts +11 -0
- package/dist/functions/hook/commit.hook.js +39 -0
- package/dist/functions/hook/commit.hook.js.map +1 -0
- package/dist/functions/hook/hook.interface.d.ts +8 -0
- package/dist/functions/hook/hook.interface.js +2 -0
- package/dist/functions/hook/hook.interface.js.map +1 -0
- package/dist/functions/hook/model-action.hook.d.ts +12 -0
- package/dist/functions/hook/model-action.hook.js +70 -0
- package/dist/functions/hook/model-action.hook.js.map +1 -0
- package/dist/functions/hook/resource-action.hook.d.ts +12 -0
- package/dist/functions/hook/resource-action.hook.js +49 -0
- package/dist/functions/hook/resource-action.hook.js.map +1 -0
- package/dist/index.d.ts +29 -28
- package/dist/index.js +9 -8
- package/dist/index.js.map +1 -1
- package/dist/main.d.ts +31 -0
- package/dist/main.js +111 -0
- package/dist/main.js.map +1 -0
- package/dist/models/app/app.interface.d.ts +1 -1
- package/dist/models/app/app.model.d.ts +5 -5
- package/dist/models/app/app.model.js +4 -11
- package/dist/models/app/app.model.js.map +1 -1
- package/dist/models/deployment/deployment.interface.d.ts +1 -1
- package/dist/models/deployment/deployment.model.d.ts +5 -3
- package/dist/models/deployment/deployment.model.js +5 -2
- package/dist/models/deployment/deployment.model.js.map +1 -1
- package/dist/models/environment/environment.interface.d.ts +1 -1
- package/dist/models/environment/environment.model.d.ts +5 -5
- package/dist/models/environment/environment.model.js +3 -3
- package/dist/models/environment/environment.model.js.map +1 -1
- package/dist/models/execution/execution.interface.d.ts +2 -2
- package/dist/models/execution/execution.model.d.ts +8 -9
- package/dist/models/execution/execution.model.js +53 -21
- package/dist/models/execution/execution.model.js.map +1 -1
- package/dist/models/image/image.interface.d.ts +1 -1
- package/dist/models/image/image.model.d.ts +5 -3
- package/dist/models/image/image.model.js +5 -6
- package/dist/models/image/image.model.js.map +1 -1
- package/dist/models/model-action.interface.d.ts +9 -0
- package/dist/models/model-action.interface.js +2 -0
- package/dist/models/model-action.interface.js.map +1 -0
- package/dist/models/model.abstract.d.ts +40 -14
- package/dist/models/model.abstract.js +167 -57
- package/dist/models/model.abstract.js.map +1 -1
- package/dist/models/model.interface.d.ts +4 -3
- package/dist/models/pipeline/pipeline.interface.d.ts +1 -1
- package/dist/models/pipeline/pipeline.model.d.ts +5 -5
- package/dist/models/pipeline/pipeline.model.js +4 -4
- package/dist/models/pipeline/pipeline.model.js.map +1 -1
- package/dist/models/region/region.interface.d.ts +1 -1
- package/dist/models/region/region.model.d.ts +7 -3
- package/dist/models/region/region.model.js +14 -1
- package/dist/models/region/region.model.js.map +1 -1
- package/dist/models/server/server.interface.d.ts +1 -3
- package/dist/models/server/server.model.d.ts +6 -6
- package/dist/models/server/server.model.js +7 -10
- package/dist/models/server/server.model.js.map +1 -1
- package/dist/models/service/service.interface.d.ts +1 -1
- package/dist/models/service/service.model.d.ts +4 -2
- package/dist/models/service/service.model.js +4 -1
- package/dist/models/service/service.model.js.map +1 -1
- package/dist/models/subnet/subnet.interface.d.ts +8 -0
- package/dist/models/subnet/subnet.interface.js +2 -0
- package/dist/models/subnet/subnet.interface.js.map +1 -0
- package/dist/models/subnet/subnet.model.d.ts +25 -0
- package/dist/models/subnet/subnet.model.js +98 -0
- package/dist/models/subnet/subnet.model.js.map +1 -0
- package/dist/modules/module.container.d.ts +25 -0
- package/dist/modules/module.container.js +122 -0
- package/dist/modules/module.container.js.map +1 -0
- package/dist/modules/module.interface.d.ts +3 -0
- package/dist/modules/module.interface.js.map +1 -0
- package/dist/modules/test-module.container.d.ts +28 -0
- package/dist/modules/test-module.container.js +67 -0
- package/dist/modules/test-module.container.js.map +1 -0
- package/dist/overlays/anchor.abstract.d.ts +4 -4
- package/dist/overlays/anchor.abstract.js +8 -11
- package/dist/overlays/anchor.abstract.js.map +1 -1
- package/dist/overlays/anchor.interface.d.ts +5 -2
- package/dist/overlays/overlay-data.repository.d.ts +7 -7
- package/dist/overlays/overlay-data.repository.js +19 -7
- package/dist/overlays/overlay-data.repository.js.map +1 -1
- package/dist/overlays/overlay.abstract.d.ts +15 -8
- package/dist/overlays/overlay.abstract.js +78 -12
- package/dist/overlays/overlay.abstract.js.map +1 -1
- package/dist/overlays/overlay.interface.d.ts +1 -1
- package/dist/overlays/overlay.service.d.ts +10 -6
- package/dist/overlays/overlay.service.js +19 -13
- package/dist/overlays/overlay.service.js.map +1 -1
- package/dist/resources/resource-action.interface.d.ts +2 -1
- package/dist/resources/resource-data.repository.d.ts +8 -8
- package/dist/resources/resource-data.repository.js +52 -34
- package/dist/resources/resource-data.repository.js.map +1 -1
- package/dist/resources/resource.abstract.d.ts +15 -12
- package/dist/resources/resource.abstract.js +34 -34
- package/dist/resources/resource.abstract.js.map +1 -1
- package/dist/resources/shared-resource.abstract.d.ts +1 -1
- package/dist/resources/shared-resource.abstract.js.map +1 -1
- package/dist/services/capture/capture.service.d.ts +13 -0
- package/dist/services/capture/capture.service.js +30 -0
- package/dist/services/capture/capture.service.js.map +1 -0
- package/dist/services/input/input.service.d.ts +13 -0
- package/dist/services/input/input.service.js +45 -0
- package/dist/services/input/input.service.js.map +1 -0
- package/dist/services/serialization/model/model-serialization.service.d.ts +9 -5
- package/dist/services/serialization/model/model-serialization.service.js +65 -44
- package/dist/services/serialization/model/model-serialization.service.js.map +1 -1
- package/dist/services/serialization/resource/resource-serialization.service.d.ts +8 -3
- package/dist/services/serialization/resource/resource-serialization.service.js +29 -11
- package/dist/services/serialization/resource/resource-serialization.service.js.map +1 -1
- package/dist/services/state-management/local.state-provider.d.ts +1 -1
- package/dist/services/state-management/local.state-provider.js +9 -1
- package/dist/services/state-management/local.state-provider.js.map +1 -1
- package/dist/services/state-management/state-management.service.d.ts +16 -1
- package/dist/services/state-management/state-management.service.js +52 -1
- package/dist/services/state-management/state-management.service.js.map +1 -1
- package/dist/services/state-management/test.state-provider.d.ts +7 -0
- package/dist/services/state-management/test.state-provider.js +13 -0
- package/dist/services/state-management/test.state-provider.js.map +1 -0
- package/dist/services/transaction/transaction.service.d.ts +18 -11
- package/dist/services/transaction/transaction.service.js +57 -40
- package/dist/services/transaction/transaction.service.js.map +1 -1
- package/dist/utilities/array/array.utility.d.ts +3 -0
- package/dist/utilities/array/array.utility.js +24 -0
- package/dist/utilities/array/array.utility.js.map +1 -0
- package/dist/utilities/cidr/cidr.utility.d.ts +7 -0
- package/dist/utilities/cidr/cidr.utility.js +48 -0
- package/dist/utilities/cidr/cidr.utility.js.map +1 -0
- package/dist/utilities/object/object.utility.d.ts +3 -0
- package/dist/utilities/object/object.utility.js +9 -0
- package/dist/utilities/object/object.utility.js.map +1 -0
- package/package.json +5 -1
- package/dist/functions/dependency/dependency.model.js.map +0 -1
- package/dist/functions/diff/diff-metadata.model.d.ts +0 -20
- package/dist/functions/diff/diff-metadata.model.js.map +0 -1
- package/dist/functions/diff/diff.model.js.map +0 -1
- package/dist/functions/module/module.abstract.d.ts +0 -12
- package/dist/functions/module/module.abstract.js +0 -39
- package/dist/functions/module/module.abstract.js.map +0 -1
- package/dist/functions/module/module.interface.d.ts +0 -4
- package/dist/functions/module/module.interface.js.map +0 -1
- package/dist/models/action.interface.d.ts +0 -9
- package/dist/models/action.interface.js +0 -2
- package/dist/models/action.interface.js.map +0 -1
- package/dist/models/support/support.interface.d.ts +0 -5
- package/dist/models/support/support.interface.js +0 -2
- package/dist/models/support/support.interface.js.map +0 -1
- package/dist/models/support/support.model.d.ts +0 -14
- package/dist/models/support/support.model.js +0 -52
- package/dist/models/support/support.model.js.map +0 -1
- /package/dist/{functions/module → modules}/module.interface.js +0 -0
|
@@ -16,7 +16,10 @@ let Service = class Service extends AModel {
|
|
|
16
16
|
super();
|
|
17
17
|
this.serviceId = serviceId;
|
|
18
18
|
}
|
|
19
|
-
|
|
19
|
+
async diffProperties(previous) {
|
|
20
|
+
return [];
|
|
21
|
+
}
|
|
22
|
+
setContext() {
|
|
20
23
|
const parents = this.getParents();
|
|
21
24
|
const app = parents['app'][0].to;
|
|
22
25
|
return [`${this.MODEL_NAME}=${this.serviceId}`, app.getContext()].join(',');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.model.js","sourceRoot":"","sources":["../../../src/models/service/service.model.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,qCAAqC,CAAC;
|
|
1
|
+
{"version":3,"file":"service.model.js","sourceRoot":"","sources":["../../../src/models/service/service.model.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,qCAAqC,CAAC;AAE5D,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAIvC,IAAM,OAAO,GAAb,MAAM,OAAQ,SAAQ,MAAyB;IAC3C,UAAU,GAAW,SAAS,CAAC;IAE/B,SAAS,CAAS;IAE3B,YAAY,SAAiB;QAC3B,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAGQ,KAAK,CAAC,cAAc,CAAC,QAAiB;QAC7C,OAAO,EAAE,CAAC;IACZ,CAAC;IAEQ,UAAU;QACjB,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAClC,MAAM,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACjC,OAAO,CAAC,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC9E,CAAC;IAEQ,KAAK;QACZ,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAC1D,CAAC;CACF,CAAA;AAxBY,OAAO;IADnB,KAAK,EAAE;;GACK,OAAO,CAwBnB"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { IModelReference } from '../model.interface.js';
|
|
2
|
+
import type { Subnet } from './subnet.model.js';
|
|
3
|
+
export interface ISubnet {
|
|
4
|
+
options: Subnet['options'];
|
|
5
|
+
region: IModelReference;
|
|
6
|
+
subnetId: Subnet['subnetId'];
|
|
7
|
+
subnetName: Subnet['subnetName'];
|
|
8
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"subnet.interface.js","sourceRoot":"","sources":["../../../src/models/subnet/subnet.interface.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import type { UnknownModel } from '../../app.type.js';
|
|
2
|
+
import { Diff } from '../../functions/diff/diff.js';
|
|
3
|
+
import { AModel } from '../model.abstract.js';
|
|
4
|
+
import { Region } from '../region/region.model.js';
|
|
5
|
+
import type { ISubnet } from './subnet.interface.js';
|
|
6
|
+
export declare enum SubnetType {
|
|
7
|
+
PUBLIC = "public",
|
|
8
|
+
PRIVATE = "private"
|
|
9
|
+
}
|
|
10
|
+
export declare class Subnet extends AModel<ISubnet, Subnet> {
|
|
11
|
+
readonly MODEL_NAME: string;
|
|
12
|
+
private options;
|
|
13
|
+
readonly subnetId: string;
|
|
14
|
+
readonly subnetName: string;
|
|
15
|
+
constructor(region: Region, name: string);
|
|
16
|
+
get disableSubnetIntraNetwork(): boolean;
|
|
17
|
+
set disableSubnetIntraNetwork(disableSubnetIntraNetwork: boolean);
|
|
18
|
+
get subnetType(): SubnetType;
|
|
19
|
+
set subnetType(subnetType: SubnetType);
|
|
20
|
+
diffProperties(previous: Subnet): Promise<Diff[]>;
|
|
21
|
+
setContext(): string;
|
|
22
|
+
synth(): ISubnet;
|
|
23
|
+
static unSynth(subnet: ISubnet, deReferenceContext: (context: string) => Promise<UnknownModel>): Promise<Subnet>;
|
|
24
|
+
updateNetworkingRules(subnet: Subnet, allowConnections: boolean): void;
|
|
25
|
+
}
|
|
@@ -0,0 +1,98 @@
|
|
|
1
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
2
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
3
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
4
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
5
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
|
+
};
|
|
7
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
|
+
};
|
|
10
|
+
var Subnet_1;
|
|
11
|
+
import { Model } from '../../decorators/model.decorator.js';
|
|
12
|
+
import { Diff, DiffAction } from '../../functions/diff/diff.js';
|
|
13
|
+
import { AModel } from '../model.abstract.js';
|
|
14
|
+
import { Region } from '../region/region.model.js';
|
|
15
|
+
export var SubnetType;
|
|
16
|
+
(function (SubnetType) {
|
|
17
|
+
SubnetType["PUBLIC"] = "public";
|
|
18
|
+
SubnetType["PRIVATE"] = "private";
|
|
19
|
+
})(SubnetType || (SubnetType = {}));
|
|
20
|
+
let Subnet = Subnet_1 = class Subnet extends AModel {
|
|
21
|
+
MODEL_NAME = 'subnet';
|
|
22
|
+
options = {
|
|
23
|
+
disableSubnetIntraNetwork: false,
|
|
24
|
+
subnetType: SubnetType.PRIVATE,
|
|
25
|
+
};
|
|
26
|
+
subnetId;
|
|
27
|
+
subnetName;
|
|
28
|
+
constructor(region, name) {
|
|
29
|
+
super();
|
|
30
|
+
this.subnetId = region.regionId + '-' + name;
|
|
31
|
+
this.subnetName = name;
|
|
32
|
+
}
|
|
33
|
+
get disableSubnetIntraNetwork() {
|
|
34
|
+
return this.options.disableSubnetIntraNetwork;
|
|
35
|
+
}
|
|
36
|
+
set disableSubnetIntraNetwork(disableSubnetIntraNetwork) {
|
|
37
|
+
this.options.disableSubnetIntraNetwork = disableSubnetIntraNetwork;
|
|
38
|
+
}
|
|
39
|
+
get subnetType() {
|
|
40
|
+
return this.options.subnetType;
|
|
41
|
+
}
|
|
42
|
+
set subnetType(subnetType) {
|
|
43
|
+
this.options.subnetType = subnetType || SubnetType.PRIVATE;
|
|
44
|
+
}
|
|
45
|
+
async diffProperties(previous) {
|
|
46
|
+
const diffs = [];
|
|
47
|
+
if (previous.disableSubnetIntraNetwork !== this.disableSubnetIntraNetwork) {
|
|
48
|
+
diffs.push(new Diff(this, DiffAction.UPDATE, 'disableSubnetIntraNetwork', this.disableSubnetIntraNetwork));
|
|
49
|
+
}
|
|
50
|
+
if (previous.subnetType !== this.subnetType) {
|
|
51
|
+
throw new Error('Change of subnet type is not supported!');
|
|
52
|
+
}
|
|
53
|
+
return diffs;
|
|
54
|
+
}
|
|
55
|
+
setContext() {
|
|
56
|
+
const parents = this.getParents();
|
|
57
|
+
const region = parents['region'][0].to;
|
|
58
|
+
return [`${this.MODEL_NAME}=${this.subnetId}`, region.getContext()].join(',');
|
|
59
|
+
}
|
|
60
|
+
synth() {
|
|
61
|
+
const parents = this.getParents();
|
|
62
|
+
const region = parents['region'][0].to;
|
|
63
|
+
return {
|
|
64
|
+
options: { disableSubnetIntraNetwork: this.disableSubnetIntraNetwork, subnetType: this.subnetType },
|
|
65
|
+
region: { context: region.getContext() },
|
|
66
|
+
subnetId: this.subnetId,
|
|
67
|
+
subnetName: this.subnetName,
|
|
68
|
+
};
|
|
69
|
+
}
|
|
70
|
+
static async unSynth(subnet, deReferenceContext) {
|
|
71
|
+
const region = (await deReferenceContext(subnet.region.context));
|
|
72
|
+
const newSubnet = new Subnet_1(region, subnet.subnetName);
|
|
73
|
+
newSubnet.disableSubnetIntraNetwork = subnet.options.disableSubnetIntraNetwork;
|
|
74
|
+
newSubnet.subnetType = subnet.options.subnetType;
|
|
75
|
+
return newSubnet;
|
|
76
|
+
}
|
|
77
|
+
updateNetworkingRules(subnet, allowConnections) {
|
|
78
|
+
const siblingDependencies = this.getSiblings('subnet');
|
|
79
|
+
if (!siblingDependencies['subnet'])
|
|
80
|
+
siblingDependencies['subnet'] = [];
|
|
81
|
+
const subnets = siblingDependencies['subnet'].map((d) => d.to);
|
|
82
|
+
if (allowConnections && !subnets.find((s) => s.subnetId === subnet.subnetId)) {
|
|
83
|
+
const { thisToThatDependency, thatToThisDependency } = this.addRelationship(subnet);
|
|
84
|
+
thisToThatDependency.addBehavior('subnetId', DiffAction.ADD, 'subnetId', DiffAction.ADD);
|
|
85
|
+
thisToThatDependency.addBehavior('subnetId', DiffAction.ADD, 'subnetId', DiffAction.UPDATE);
|
|
86
|
+
thatToThisDependency.addBehavior('subnetId', DiffAction.DELETE, 'subnetId', DiffAction.DELETE);
|
|
87
|
+
}
|
|
88
|
+
else if (!allowConnections && subnets.find((s) => s.subnetId === subnet.subnetId)) {
|
|
89
|
+
this.removeRelationship(subnet);
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
};
|
|
93
|
+
Subnet = Subnet_1 = __decorate([
|
|
94
|
+
Model(),
|
|
95
|
+
__metadata("design:paramtypes", [Region, String])
|
|
96
|
+
], Subnet);
|
|
97
|
+
export { Subnet };
|
|
98
|
+
//# sourceMappingURL=subnet.model.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"subnet.model.js","sourceRoot":"","sources":["../../../src/models/subnet/subnet.model.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { Constructable } from '../app.type.js';
|
|
2
|
+
import { type Module } from '../decorators/module.decorator.js';
|
|
3
|
+
import { CommitHook } from '../functions/hook/commit.hook.js';
|
|
4
|
+
import { ModelActionHook } from '../functions/hook/model-action.hook.js';
|
|
5
|
+
import { ResourceActionHook } from '../functions/hook/resource-action.hook.js';
|
|
6
|
+
import { IModule } from './module.interface.js';
|
|
7
|
+
export declare class ModuleContainer {
|
|
8
|
+
private readonly commitHook;
|
|
9
|
+
private readonly modelActionHook;
|
|
10
|
+
private readonly resourceActionHook;
|
|
11
|
+
private readonly modules;
|
|
12
|
+
private readonly outputs;
|
|
13
|
+
constructor(commitHook: CommitHook, modelActionHook: ModelActionHook, resourceActionHook: ResourceActionHook);
|
|
14
|
+
apply(): Promise<void>;
|
|
15
|
+
getModuleMetadata(module: Constructable<IModule<unknown>> | string): ModuleContainer['modules'][0] | undefined;
|
|
16
|
+
getModuleMetadataIndex(module: Constructable<IModule<unknown>> | string): number;
|
|
17
|
+
getOutput<T>(module: Constructable<IModule<T>> | string): T | undefined;
|
|
18
|
+
register(module: Constructable<IModule<unknown>>, properties: Parameters<typeof Module>[0]): void;
|
|
19
|
+
reset(): void;
|
|
20
|
+
private setApplyOrder;
|
|
21
|
+
}
|
|
22
|
+
export declare class ModuleContainerFactory {
|
|
23
|
+
private static instance;
|
|
24
|
+
static create(): Promise<ModuleContainer>;
|
|
25
|
+
}
|
|
@@ -0,0 +1,122 @@
|
|
|
1
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
2
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
3
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
4
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
5
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
|
+
};
|
|
7
|
+
import { Factory } from '../decorators/factory.decorator.js';
|
|
8
|
+
import { CommitHook } from '../functions/hook/commit.hook.js';
|
|
9
|
+
import { ModelActionHook } from '../functions/hook/model-action.hook.js';
|
|
10
|
+
import { ResourceActionHook } from '../functions/hook/resource-action.hook.js';
|
|
11
|
+
export class ModuleContainer {
|
|
12
|
+
commitHook;
|
|
13
|
+
modelActionHook;
|
|
14
|
+
resourceActionHook;
|
|
15
|
+
modules = [];
|
|
16
|
+
outputs = {};
|
|
17
|
+
constructor(commitHook, modelActionHook, resourceActionHook) {
|
|
18
|
+
this.commitHook = commitHook;
|
|
19
|
+
this.modelActionHook = modelActionHook;
|
|
20
|
+
this.resourceActionHook = resourceActionHook;
|
|
21
|
+
}
|
|
22
|
+
async apply() {
|
|
23
|
+
for (const moduleMetadata of this.modules) {
|
|
24
|
+
this.setApplyOrder(moduleMetadata);
|
|
25
|
+
}
|
|
26
|
+
this.modules.sort((a, b) => a.applyOrder - b.applyOrder);
|
|
27
|
+
for (const moduleMetadata of this.modules) {
|
|
28
|
+
if (moduleMetadata.applied || moduleMetadata.hidden) {
|
|
29
|
+
continue;
|
|
30
|
+
}
|
|
31
|
+
const { module, properties } = moduleMetadata;
|
|
32
|
+
this.commitHook.collectHooks([moduleMetadata]);
|
|
33
|
+
this.modelActionHook.collectHooks([moduleMetadata]);
|
|
34
|
+
this.resourceActionHook.collectHooks([moduleMetadata]);
|
|
35
|
+
const args = (properties.imports || []).reduce((accumulator, importedModule) => {
|
|
36
|
+
const name = typeof importedModule === 'string' ? importedModule : importedModule.name;
|
|
37
|
+
if (name in this.outputs) {
|
|
38
|
+
accumulator.push(this.outputs[name]);
|
|
39
|
+
}
|
|
40
|
+
return accumulator;
|
|
41
|
+
}, []);
|
|
42
|
+
for (const [i, { name, isArg }] of (properties.args || []).entries()) {
|
|
43
|
+
if (!isArg(args[i])) {
|
|
44
|
+
const message = `Module "${module.name}" requires an argument at [${i}] of type "${name}", but received "${typeof args[i]}"!`;
|
|
45
|
+
throw new Error(message);
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
const instance = new module(...args);
|
|
49
|
+
const output = await instance.onInit();
|
|
50
|
+
if (output) {
|
|
51
|
+
this.outputs[module.name] = output;
|
|
52
|
+
}
|
|
53
|
+
moduleMetadata.applied = true;
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
getModuleMetadata(module) {
|
|
57
|
+
const index = this.getModuleMetadataIndex(module);
|
|
58
|
+
return index === -1 ? undefined : this.modules[index];
|
|
59
|
+
}
|
|
60
|
+
getModuleMetadataIndex(module) {
|
|
61
|
+
const name = typeof module === 'string' ? module : module.name;
|
|
62
|
+
return this.modules.findIndex((m) => m.module.name === name);
|
|
63
|
+
}
|
|
64
|
+
getOutput(module) {
|
|
65
|
+
const name = typeof module === 'string' ? module : module.name;
|
|
66
|
+
return name in this.outputs ? this.outputs[name] : undefined;
|
|
67
|
+
}
|
|
68
|
+
register(module, properties) {
|
|
69
|
+
if (!this.modules.some((m) => m.module.name === module.name)) {
|
|
70
|
+
this.modules.push({ applied: false, applyOrder: -1, hidden: false, module, properties });
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
reset() {
|
|
74
|
+
this.commitHook.reset();
|
|
75
|
+
this.modelActionHook.reset();
|
|
76
|
+
this.resourceActionHook.reset();
|
|
77
|
+
for (const name in this.outputs) {
|
|
78
|
+
delete this.outputs[name];
|
|
79
|
+
}
|
|
80
|
+
this.modules.map((m) => {
|
|
81
|
+
m.applied = false;
|
|
82
|
+
m.applyOrder = -1;
|
|
83
|
+
m.hidden = false;
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
setApplyOrder(moduleMetadata, seen = []) {
|
|
87
|
+
if (moduleMetadata.applyOrder >= 0) {
|
|
88
|
+
return;
|
|
89
|
+
}
|
|
90
|
+
if (seen.find((m) => m.name === moduleMetadata.module.name)) {
|
|
91
|
+
throw new Error('Found circular dependencies in modules!');
|
|
92
|
+
}
|
|
93
|
+
const parentModuleApplyOrders = [-1];
|
|
94
|
+
for (const parent of moduleMetadata.properties.imports || []) {
|
|
95
|
+
const name = typeof parent === 'string' ? parent : parent.name;
|
|
96
|
+
const parentModuleMetadata = this.modules.find((m) => m.module.name === name);
|
|
97
|
+
if (!parentModuleMetadata) {
|
|
98
|
+
throw new Error(`Found unregistered module "${name}" while processing modules!`);
|
|
99
|
+
}
|
|
100
|
+
this.setApplyOrder(parentModuleMetadata, [...seen, parentModuleMetadata.module]);
|
|
101
|
+
parentModuleApplyOrders.push(parentModuleMetadata.applyOrder);
|
|
102
|
+
}
|
|
103
|
+
moduleMetadata.applyOrder = Math.max(...parentModuleApplyOrders) + 1;
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
let ModuleContainerFactory = class ModuleContainerFactory {
|
|
107
|
+
static instance;
|
|
108
|
+
static async create() {
|
|
109
|
+
if (!this.instance) {
|
|
110
|
+
const commitHook = CommitHook.getInstance();
|
|
111
|
+
const modelActionHook = ModelActionHook.getInstance();
|
|
112
|
+
const resourceActionHook = ResourceActionHook.getInstance();
|
|
113
|
+
this.instance = new ModuleContainer(commitHook, modelActionHook, resourceActionHook);
|
|
114
|
+
}
|
|
115
|
+
return this.instance;
|
|
116
|
+
}
|
|
117
|
+
};
|
|
118
|
+
ModuleContainerFactory = __decorate([
|
|
119
|
+
Factory(ModuleContainer)
|
|
120
|
+
], ModuleContainerFactory);
|
|
121
|
+
export { ModuleContainerFactory };
|
|
122
|
+
//# sourceMappingURL=module.container.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"module.container.js","sourceRoot":"","sources":["../../src/modules/module.container.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"module.interface.js","sourceRoot":"","sources":["../../src/modules/module.interface.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import type { Constructable } from '../app.type.js';
|
|
2
|
+
import type { Module } from '../decorators/module.decorator.js';
|
|
3
|
+
import type { DiffMetadata } from '../functions/diff/diff-metadata.js';
|
|
4
|
+
import type { App } from '../models/app/app.model.js';
|
|
5
|
+
import type { IStateProvider } from '../services/state-management/state-provider.interface.js';
|
|
6
|
+
import type { IModule } from './module.interface.js';
|
|
7
|
+
export declare class TestModuleContainer {
|
|
8
|
+
private readonly captures;
|
|
9
|
+
private readonly inputs;
|
|
10
|
+
private readonly octo;
|
|
11
|
+
constructor({ inputs, captures, }?: {
|
|
12
|
+
captures?: TestModuleContainer['captures'];
|
|
13
|
+
inputs?: TestModuleContainer['inputs'];
|
|
14
|
+
});
|
|
15
|
+
commit(app: App): Promise<{
|
|
16
|
+
modelDiffs: DiffMetadata[][];
|
|
17
|
+
modelTransaction: DiffMetadata[][];
|
|
18
|
+
resourceDiffs: DiffMetadata[][];
|
|
19
|
+
resourceTransaction: DiffMetadata[][];
|
|
20
|
+
}>;
|
|
21
|
+
initialize(stateProvider?: IStateProvider): Promise<void>;
|
|
22
|
+
load(modules: {
|
|
23
|
+
hidden?: boolean;
|
|
24
|
+
properties?: Parameters<typeof Module>[0];
|
|
25
|
+
type: Constructable<IModule<unknown>>;
|
|
26
|
+
}[]): Promise<void>;
|
|
27
|
+
reset(): Promise<void>;
|
|
28
|
+
}
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import { Container } from '../decorators/container.js';
|
|
2
|
+
import { Octo } from '../main.js';
|
|
3
|
+
import { TestStateProvider } from '../services/state-management/test.state-provider.js';
|
|
4
|
+
import { ModuleContainer } from './module.container.js';
|
|
5
|
+
export class TestModuleContainer {
|
|
6
|
+
captures = {};
|
|
7
|
+
inputs = {};
|
|
8
|
+
octo;
|
|
9
|
+
constructor({ inputs = {}, captures = {}, } = {}) {
|
|
10
|
+
this.captures = captures;
|
|
11
|
+
this.inputs = inputs;
|
|
12
|
+
this.octo = new Octo();
|
|
13
|
+
}
|
|
14
|
+
async commit(app) {
|
|
15
|
+
const generator = await this.octo.beginTransaction(app, {
|
|
16
|
+
enableResourceCapture: true,
|
|
17
|
+
yieldModelDiffs: true,
|
|
18
|
+
yieldModelTransaction: true,
|
|
19
|
+
yieldResourceDiffs: true,
|
|
20
|
+
yieldResourceTransaction: true,
|
|
21
|
+
});
|
|
22
|
+
const response = {
|
|
23
|
+
modelDiffs: (await generator.next()).value,
|
|
24
|
+
modelTransaction: (await generator.next()).value,
|
|
25
|
+
resourceDiffs: (await generator.next()).value,
|
|
26
|
+
resourceTransaction: (await generator.next()).value,
|
|
27
|
+
};
|
|
28
|
+
const modelTransactionResult = await generator.next();
|
|
29
|
+
await this.octo.commitTransaction(app, modelTransactionResult.value);
|
|
30
|
+
return response;
|
|
31
|
+
}
|
|
32
|
+
async initialize(stateProvider) {
|
|
33
|
+
if (stateProvider) {
|
|
34
|
+
await this.octo.initialize(stateProvider);
|
|
35
|
+
}
|
|
36
|
+
else {
|
|
37
|
+
await this.octo.initialize(new TestStateProvider());
|
|
38
|
+
}
|
|
39
|
+
for (const [key, value] of Object.entries(this.captures)) {
|
|
40
|
+
this.octo.registerCapture(key, value.properties, value.response);
|
|
41
|
+
}
|
|
42
|
+
this.octo.registerInputs(this.inputs);
|
|
43
|
+
}
|
|
44
|
+
async load(modules) {
|
|
45
|
+
const moduleContainer = await Container.get(ModuleContainer);
|
|
46
|
+
for (const moduleOverrides of modules) {
|
|
47
|
+
const moduleMetadataIndex = moduleContainer.getModuleMetadataIndex(moduleOverrides.type);
|
|
48
|
+
if (moduleMetadataIndex === -1) {
|
|
49
|
+
moduleContainer.register(moduleOverrides.type, moduleOverrides.properties || {});
|
|
50
|
+
}
|
|
51
|
+
const moduleMetadata = moduleContainer.getModuleMetadata(moduleOverrides.type);
|
|
52
|
+
moduleMetadata.module = moduleOverrides.type;
|
|
53
|
+
if (moduleOverrides.hidden !== undefined) {
|
|
54
|
+
moduleMetadata.hidden = moduleOverrides.hidden;
|
|
55
|
+
}
|
|
56
|
+
for (const [key, value] of Object.entries(moduleOverrides.properties || {})) {
|
|
57
|
+
moduleMetadata.properties[key] = value;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
await this.octo.compose();
|
|
61
|
+
}
|
|
62
|
+
async reset() {
|
|
63
|
+
const moduleContainer = await Container.get(ModuleContainer);
|
|
64
|
+
moduleContainer.reset();
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
//# sourceMappingURL=test-module.container.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"test-module.container.js","sourceRoot":"","sources":["../../src/modules/test-module.container.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import { UnknownModel } from '../app.type.js';
|
|
2
|
-
import { IAnchor } from './anchor.interface.js';
|
|
1
|
+
import type { UnknownModel } from '../app.type.js';
|
|
2
|
+
import type { IAnchor } from './anchor.interface.js';
|
|
3
3
|
export declare abstract class AAnchor {
|
|
4
4
|
readonly anchorId: string;
|
|
5
|
+
readonly properties: IAnchor['properties'];
|
|
5
6
|
private readonly parent;
|
|
6
|
-
protected constructor(anchorId: string, parent: UnknownModel);
|
|
7
|
+
protected constructor(anchorId: string, properties: IAnchor['properties'], parent: UnknownModel);
|
|
7
8
|
getParent(): UnknownModel;
|
|
8
9
|
synth(): IAnchor;
|
|
9
|
-
toJSON(): object;
|
|
10
10
|
static unSynth(deserializationClass: any, anchor: IAnchor, deReferenceContext: (context: string) => Promise<UnknownModel>): Promise<AAnchor>;
|
|
11
11
|
}
|
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
export class AAnchor {
|
|
2
2
|
anchorId;
|
|
3
|
+
properties;
|
|
3
4
|
parent;
|
|
4
|
-
constructor(anchorId, parent) {
|
|
5
|
+
constructor(anchorId, properties, parent) {
|
|
5
6
|
this.anchorId = anchorId;
|
|
7
|
+
this.properties = properties;
|
|
6
8
|
this.parent = parent;
|
|
7
|
-
if (parent.getAnchor(this.anchorId)) {
|
|
8
|
-
throw new Error('Anchor already exists!');
|
|
9
|
-
}
|
|
10
9
|
}
|
|
11
10
|
getParent() {
|
|
12
11
|
return this.parent;
|
|
@@ -15,19 +14,17 @@ export class AAnchor {
|
|
|
15
14
|
return {
|
|
16
15
|
anchorId: this.anchorId,
|
|
17
16
|
parent: { context: this.parent.getContext() },
|
|
18
|
-
|
|
19
|
-
}
|
|
20
|
-
toJSON() {
|
|
21
|
-
return {
|
|
22
|
-
anchorId: this.anchorId,
|
|
23
|
-
parent: this.parent.getContext(),
|
|
17
|
+
properties: JSON.parse(JSON.stringify(this.properties)),
|
|
24
18
|
};
|
|
25
19
|
}
|
|
26
20
|
static async unSynth(deserializationClass, anchor, deReferenceContext) {
|
|
27
21
|
const parent = await deReferenceContext(anchor.parent.context);
|
|
28
22
|
const newAnchor = parent.getAnchor(anchor.anchorId);
|
|
29
23
|
if (!newAnchor) {
|
|
30
|
-
return new deserializationClass(anchor.anchorId, parent);
|
|
24
|
+
return new deserializationClass(anchor.anchorId, anchor.properties, parent);
|
|
25
|
+
}
|
|
26
|
+
for (const [key, value] of Object.entries(anchor.properties)) {
|
|
27
|
+
newAnchor.properties[key] = JSON.parse(JSON.stringify(value));
|
|
31
28
|
}
|
|
32
29
|
return newAnchor;
|
|
33
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"anchor.abstract.js","sourceRoot":"","sources":["../../src/overlays/anchor.abstract.ts"],"names":[],"mappings":"AAGA,MAAM,OAAgB,OAAO;IAEhB;IACQ;
|
|
1
|
+
{"version":3,"file":"anchor.abstract.js","sourceRoot":"","sources":["../../src/overlays/anchor.abstract.ts"],"names":[],"mappings":"AAGA,MAAM,OAAgB,OAAO;IAEhB;IACA;IACQ;IAHnB,YACW,QAAgB,EAChB,UAAiC,EACzB,MAAoB;QAF5B,aAAQ,GAAR,QAAQ,CAAQ;QAChB,eAAU,GAAV,UAAU,CAAuB;QACzB,WAAM,GAAN,MAAM,CAAc;IACpC,CAAC;IAEJ,SAAS;QACP,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,KAAK;QACH,OAAO;YACL,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,MAAM,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE;YAC7C,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SACxD,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,OAAO,CAClB,oBAAyB,EACzB,MAAe,EACf,kBAA8D;QAE9D,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC/D,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACpD,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO,IAAI,oBAAoB,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAC9E,CAAC;QAED,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;YAC7D,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;QAChE,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;CACF"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
|
-
import { IModelReference } from '../models/model.interface.js';
|
|
2
|
-
import { AAnchor } from './anchor.abstract.js';
|
|
1
|
+
import type { IModelReference } from '../models/model.interface.js';
|
|
2
|
+
import type { AAnchor } from './anchor.abstract.js';
|
|
3
3
|
export interface IAnchor {
|
|
4
4
|
anchorId: AAnchor['anchorId'];
|
|
5
5
|
parent: IModelReference;
|
|
6
|
+
properties: {
|
|
7
|
+
[key: string]: unknown;
|
|
8
|
+
};
|
|
6
9
|
}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import { UnknownOverlay } from '../app.type.js';
|
|
2
|
-
import { Diff } from '../functions/diff/diff.
|
|
3
|
-
import { IOverlay } from './overlay.interface.js';
|
|
1
|
+
import { type UnknownOverlay } from '../app.type.js';
|
|
2
|
+
import { Diff } from '../functions/diff/diff.js';
|
|
3
|
+
import type { IOverlay } from './overlay.interface.js';
|
|
4
4
|
export declare class OverlayDataRepository {
|
|
5
|
-
private
|
|
6
|
-
private
|
|
5
|
+
private oldOverlays;
|
|
6
|
+
private newOverlays;
|
|
7
7
|
constructor(oldOverlays?: UnknownOverlay[], newOverlays?: UnknownOverlay[]);
|
|
8
8
|
add(overlay: UnknownOverlay): void;
|
|
9
|
-
diff(): Diff[]
|
|
9
|
+
diff(): Promise<Diff[]>;
|
|
10
10
|
getById(overlayId: IOverlay['overlayId']): UnknownOverlay | undefined;
|
|
11
11
|
getByProperties(filters?: {
|
|
12
12
|
key: string;
|
|
@@ -16,5 +16,5 @@ export declare class OverlayDataRepository {
|
|
|
16
16
|
}
|
|
17
17
|
export declare class OverlayDataRepositoryFactory {
|
|
18
18
|
private static instance;
|
|
19
|
-
static create(forceNew: boolean,
|
|
19
|
+
static create(forceNew: boolean, oldOverlays: UnknownOverlay[], newOverlays: UnknownOverlay[]): Promise<OverlayDataRepository>;
|
|
20
20
|
}
|
|
@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
6
6
|
};
|
|
7
7
|
import { ModelType } from '../app.type.js';
|
|
8
8
|
import { Factory } from '../decorators/factory.decorator.js';
|
|
9
|
-
import { Diff, DiffAction } from '../functions/diff/diff.
|
|
9
|
+
import { Diff, DiffAction } from '../functions/diff/diff.js';
|
|
10
10
|
export class OverlayDataRepository {
|
|
11
11
|
oldOverlays;
|
|
12
12
|
newOverlays;
|
|
@@ -23,12 +23,17 @@ export class OverlayDataRepository {
|
|
|
23
23
|
this.newOverlays.push(overlay);
|
|
24
24
|
}
|
|
25
25
|
}
|
|
26
|
-
diff() {
|
|
26
|
+
async diff() {
|
|
27
27
|
const diffs = [];
|
|
28
28
|
for (const overlay of this.oldOverlays) {
|
|
29
|
-
|
|
29
|
+
const newOverlay = this.newOverlays.find((o) => o.overlayId === overlay.overlayId);
|
|
30
|
+
if (!newOverlay || newOverlay.isMarkedDeleted()) {
|
|
30
31
|
diffs.push(new Diff(overlay, DiffAction.DELETE, 'overlayId', overlay.overlayId));
|
|
31
32
|
}
|
|
33
|
+
else {
|
|
34
|
+
const oDiff = await newOverlay.diff(overlay);
|
|
35
|
+
diffs.push(...oDiff);
|
|
36
|
+
}
|
|
32
37
|
}
|
|
33
38
|
for (const overlay of this.newOverlays) {
|
|
34
39
|
if (!this.oldOverlays.find((o) => o.overlayId === overlay.overlayId)) {
|
|
@@ -45,7 +50,10 @@ export class OverlayDataRepository {
|
|
|
45
50
|
}
|
|
46
51
|
remove(overlay) {
|
|
47
52
|
if (overlay.MODEL_TYPE !== ModelType.OVERLAY) {
|
|
48
|
-
throw new Error('
|
|
53
|
+
throw new Error('Removing non-overlay model!');
|
|
54
|
+
}
|
|
55
|
+
if (!overlay.isMarkedDeleted()) {
|
|
56
|
+
overlay.remove();
|
|
49
57
|
}
|
|
50
58
|
const overlayIndex = this.newOverlays.findIndex((o) => o.overlayId === overlay.overlayId);
|
|
51
59
|
if (overlayIndex > -1) {
|
|
@@ -55,9 +63,13 @@ export class OverlayDataRepository {
|
|
|
55
63
|
}
|
|
56
64
|
let OverlayDataRepositoryFactory = class OverlayDataRepositoryFactory {
|
|
57
65
|
static instance;
|
|
58
|
-
static async create(forceNew,
|
|
59
|
-
if (
|
|
60
|
-
this.instance = new OverlayDataRepository(
|
|
66
|
+
static async create(forceNew, oldOverlays, newOverlays) {
|
|
67
|
+
if (!this.instance) {
|
|
68
|
+
this.instance = new OverlayDataRepository(oldOverlays, newOverlays);
|
|
69
|
+
}
|
|
70
|
+
if (forceNew) {
|
|
71
|
+
const newInstance = new OverlayDataRepository(oldOverlays, newOverlays);
|
|
72
|
+
Object.keys(this.instance).forEach((key) => (this.instance[key] = newInstance[key]));
|
|
61
73
|
}
|
|
62
74
|
return this.instance;
|
|
63
75
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"overlay-data.repository.js","sourceRoot":"","sources":["../../src/overlays/overlay-data.repository.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"overlay-data.repository.js","sourceRoot":"","sources":["../../src/overlays/overlay-data.repository.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,SAAS,EAAuB,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAC7D,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAG7D,MAAM,OAAO,qBAAqB;IAEtB;IACA;IAFV,YACU,cAAgC,EAAE,EAClC,cAAgC,EAAE;QADlC,gBAAW,GAAX,WAAW,CAAuB;QAClC,gBAAW,GAAX,WAAW,CAAuB;QAE1C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAClC,CAAC;IAED,GAAG,CAAC,OAAuB;QACzB,IAAI,OAAO,CAAC,UAAU,KAAK,SAAS,CAAC,OAAO,EAAE,CAAC;YAC7C,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAC/C,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YACrC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACjC,CAAC;IACH,CAAC;IAED,KAAK,CAAC,IAAI;QACR,MAAM,KAAK,GAAW,EAAE,CAAC;QAEzB,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACvC,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;YACnF,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC,eAAe,EAAE,EAAE,CAAC;gBAChD,KAAK,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;YACnF,CAAC;iBAAM,CAAC;gBACN,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAC7C,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC;YACvB,CAAC;QACH,CAAC;QAED,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACvC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;gBACrE,KAAK,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,EAAE,WAAW,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;YAChF,CAAC;QACH,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,CAAC,SAAgC;QACtC,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC;IACjE,CAAC;IAED,eAAe,CAAC,UAAyC,EAAE;QACzD,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IAC/F,CAAC;IAED,MAAM,CAAC,OAAuB;QAC5B,IAAI,OAAO,CAAC,UAAU,KAAK,SAAS,CAAC,OAAO,EAAE,CAAC;YAC7C,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACjD,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC;YAC/B,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,CAAC;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;QAC1F,IAAI,YAAY,GAAG,CAAC,CAAC,EAAE,CAAC;YACtB,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC;CACF;AAGM,IAAM,4BAA4B,GAAlC,MAAM,4BAA4B;IAC/B,MAAM,CAAC,QAAQ,CAAwB;IAE/C,MAAM,CAAC,KAAK,CAAC,MAAM,CACjB,QAAiB,EACjB,WAA6B,EAC7B,WAA6B;QAE7B,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,IAAI,CAAC,QAAQ,GAAG,IAAI,qBAAqB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;QACtE,CAAC;QACD,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,WAAW,GAAG,IAAI,qBAAqB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;YACxE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACvF,CAAC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF,CAAA;AAjBY,4BAA4B;IADxC,OAAO,CAAwB,qBAAqB,CAAC;GACzC,4BAA4B,CAiBxC"}
|