@quadnix/octo 0.0.16 → 0.0.18

package/dist/models/app/app.interface.d.ts

@@ -1,4 +1,4 @@
-import { App } from './app.model.js';
+import type { App } from './app.model.js';
 export interface IApp {
     name: App['name'];
 }

package/dist/models/app/app.model.d.ts

@@ -1,23 +1,23 @@
-import { UnknownModel } from '../../app.type.js';
+import type { UnknownModel } from '../../app.type.js';
+import type { Diff } from '../../functions/diff/diff.js';
 import { Image } from '../image/image.model.js';
 import { AModel } from '../model.abstract.js';
 import { Pipeline } from '../pipeline/pipeline.model.js';
 import { Region } from '../region/region.model.js';
 import { Server } from '../server/server.model.js';
 import { Service } from '../service/service.model.js';
-import { Support } from '../support/support.model.js';
-import { IApp } from './app.interface.js';
+import type { IApp } from './app.interface.js';
 export declare class App extends AModel<IApp, App> {
     readonly MODEL_NAME: string;
     readonly name: string;
     constructor(name: string);
+    diffProperties(): Promise<Diff[]>;
     addImage(image: Image): void;
     addPipeline(pipeline: Pipeline): void;
     addRegion(region: Region): void;
     addServer(server: Server): void;
     addService(service: Service): void;
-    addSupport(support: Support): void;
-    getContext(): string;
+    setContext(): string;
     synth(): IApp;
     static unSynth(app: IApp, deReferenceContext: (context: string) => Promise<UnknownModel>): Promise<App>;
 }

package/dist/models/app/app.model.js

@@ -17,6 +17,9 @@ let App = App_1 = class App extends AModel {
         super();
         this.name = name;
     }
+    async diffProperties() {
+        return [];
+    }
     addImage(image) {
         const childrenDependencies = this.getChildren('image');
         if (!childrenDependencies['image'])
@@ -67,17 +70,7 @@ let App = App_1 = class App extends AModel {
         }
         this.addChild('name', service, 'serviceId');
     }
-    addSupport(support) {
-        const childrenDependencies = this.getChildren('support');
-        if (!childrenDependencies['support'])
-            childrenDependencies['support'] = [];
-        const supports = childrenDependencies['support'].map((d) => d.to);
-        if (supports.find((s) => s.serverKey === support.serverKey)) {
-            throw new Error('Support already exists!');
-        }
-        this.addChild('name', support, 'serverKey');
-    }
-    getContext() {
+    setContext() {
         return `${this.MODEL_NAME}=${this.name}`;
     }
     synth() {

package/dist/models/app/app.model.js.map

@@ -1 +1 @@
-{"version":3,"file":"app.model.js","sourceRoot":"","sources":["../../../src/models/app/app.model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"app.model.js","sourceRoot":"","sources":["../../../src/models/app/app.model.ts"],"names":[],"mappings":"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"}

package/dist/models/deployment/deployment.interface.d.ts

@@ -1,4 +1,4 @@
-import { Deployment } from './deployment.model.js';
+import type { Deployment } from './deployment.model.js';
 export interface IDeployment {
     deploymentTag: Deployment['deploymentTag'];
 }

package/dist/models/deployment/deployment.model.d.ts

@@ -1,11 +1,13 @@
-import { UnknownModel } from '../../app.type.js';
+import type { UnknownModel } from '../../app.type.js';
+import type { Diff } from '../../functions/diff/diff.js';
 import { AModel } from '../model.abstract.js';
-import { IDeployment } from './deployment.interface.js';
+import type { IDeployment } from './deployment.interface.js';
 export declare class Deployment extends AModel<IDeployment, Deployment> {
     readonly MODEL_NAME: string;
     readonly deploymentTag: string;
     constructor(deploymentTag: string);
-    getContext(): string;
+    diffProperties(): Promise<Diff[]>;
+    setContext(): string;
     synth(): IDeployment;
     static unSynth(deployment: IDeployment, deReferenceContext: (context: string) => Promise<UnknownModel>): Promise<Deployment>;
 }

package/dist/models/deployment/deployment.model.js

@@ -17,9 +17,12 @@ let Deployment = Deployment_1 = class Deployment extends AModel {
         super();
         this.deploymentTag = deploymentTag;
     }
-    getContext() {
+    async diffProperties() {
+        return [];
+    }
+    setContext() {
         const parents = this.getParents();
-        const parent = (parents['server'] || parents['support'])[0].to;
+        const parent = parents['server'][0].to;
         return [`${this.MODEL_NAME}=${this.deploymentTag}`, parent.getContext()].join(',');
     }
     synth() {

package/dist/models/deployment/deployment.model.js.map

@@ -1 +1 @@
-{"version":3,"file":"deployment.model.js","sourceRoot":"","sources":["../../../src/models/deployment/deployment.model.ts"],"names":[],"mappings":";;;;;;;;;;AAGA,OAAO,EAAE,KAAK,EAAE,MAAM,qCAAqC,CAAC;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAIvC,IAAM,UAAU,kBAAhB,MAAM,UAAW,SAAQ,MAA+B;IACpD,UAAU,GAAW,YAAY,CAAC;IAElC,aAAa,CAAS;IAE/B,YAAY,aAAqB;QAC/B,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACrC,CAAC;IAED,UAAU;QACR,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAClC,MAAM,MAAM,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/D,OAAO,CAAC,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACrF,CAAC;IAED,KAAK;QACH,OAAO;YACL,aAAa,EAAE,IAAI,CAAC,aAAa;SAClC,CAAC;IACJ,CAAC;IAED,MAAM,CAAU,KAAK,CAAC,OAAO,CAC3B,UAAuB,EACvB,kBAA8D;QAE9D,OAAO,IAAI,YAAU,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IAClD,CAAC;CACF,CAAA;AA5BY,UAAU;IADtB,KAAK,EAAE;;GACK,UAAU,CA4BtB"}
+{"version":3,"file":"deployment.model.js","sourceRoot":"","sources":["../../../src/models/deployment/deployment.model.ts"],"names":[],"mappings":";;;;;;;;;;AACA,OAAO,EAAE,KAAK,EAAE,MAAM,qCAAqC,CAAC;AAE5D,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAIvC,IAAM,UAAU,kBAAhB,MAAM,UAAW,SAAQ,MAA+B;IACpD,UAAU,GAAW,YAAY,CAAC;IAElC,aAAa,CAAS;IAE/B,YAAY,aAAqB;QAC/B,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACrC,CAAC;IAEQ,KAAK,CAAC,cAAc;QAC3B,OAAO,EAAE,CAAC;IACZ,CAAC;IAEQ,UAAU;QACjB,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAClC,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACvC,OAAO,CAAC,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACrF,CAAC;IAEQ,KAAK;QACZ,OAAO;YACL,aAAa,EAAE,IAAI,CAAC,aAAa;SAClC,CAAC;IACJ,CAAC;IAED,MAAM,CAAU,KAAK,CAAC,OAAO,CAC3B,UAAuB,EAEvB,kBAA8D;QAE9D,OAAO,IAAI,YAAU,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IAClD,CAAC;CACF,CAAA;AAjCY,UAAU;IADtB,KAAK,EAAE;;GACK,UAAU,CAiCtB"}

package/dist/models/environment/environment.interface.d.ts

@@ -1,4 +1,4 @@
-import { Environment } from './environment.model.js';
+import type { Environment } from './environment.model.js';
 export interface IEnvironment {
     environmentName: Environment['environmentName'];
     environmentVariables: {

package/dist/models/environment/environment.model.d.ts

@@ -1,14 +1,14 @@
-import { UnknownModel } from '../../app.type.js';
-import { Diff } from '../../functions/diff/diff.model.js';
+import type { UnknownModel } from '../../app.type.js';
+import type { Diff } from '../../functions/diff/diff.js';
 import { AModel } from '../model.abstract.js';
-import { IEnvironment } from './environment.interface.js';
+import type { IEnvironment } from './environment.interface.js';
 export declare class Environment extends AModel<IEnvironment, Environment> {
     readonly MODEL_NAME: string;
     readonly environmentName: string;
     readonly environmentVariables: Map<string, string>;
     constructor(environmentName: string);
-    diff(previous?: Environment): Promise<Diff[]>;
-    getContext(): string;
+    diffProperties(previous: Environment): Promise<Diff[]>;
+    setContext(): string;
     synth(): IEnvironment;
     static unSynth(environment: IEnvironment, deReferenceContext: (context: string) => Promise<UnknownModel>): Promise<Environment>;
 }

package/dist/models/environment/environment.model.js

@@ -19,10 +19,10 @@ let Environment = Environment_1 = class Environment extends AModel {
         super();
         this.environmentName = environmentName;
     }
-    async diff(previous) {
-        return DiffUtility.diffMap(previous || { environmentVariables: new Map() }, this, 'environmentVariables');
+    async diffProperties(previous) {
+        return DiffUtility.diffMap(previous, this, 'environmentVariables');
     }
-    getContext() {
+    setContext() {
         const parents = this.getParents();
         const region = parents['region'][0].to;
         return [`${this.MODEL_NAME}=${this.environmentName}`, region.getContext()].join(',');

package/dist/models/environment/environment.model.js.map

@@ -1 +1 @@
-{"version":3,"file":"environment.model.js","sourceRoot":"","sources":["../../../src/models/environment/environment.model.ts"],"names":[],"mappings":";;;;;;;;;;AAGA,OAAO,EAAE,KAAK,EAAE,MAAM,qCAAqC,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAEnE,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAIvC,IAAM,WAAW,mBAAjB,MAAM,WAAY,SAAQ,MAAiC;IACvD,UAAU,GAAW,aAAa,CAAC;IAEnC,eAAe,CAAS;IAExB,oBAAoB,GAAwB,IAAI,GAAG,EAAE,CAAC;IAE/D,YAAY,eAAuB;QACjC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IACzC,CAAC;IAEQ,KAAK,CAAC,IAAI,CAAC,QAAsB;QAExC,OAAO,WAAW,CAAC,OAAO,CACxB,QAAQ,IAAK,EAAE,oBAAoB,EAAE,IAAI,GAAG,EAAE,EAAkB,EAChE,IAAI,EACJ,sBAAsB,CACvB,CAAC;IACJ,CAAC;IAED,UAAU;QACR,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAClC,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACvC,OAAO,CAAC,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,eAAe,EAAE,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACvF,CAAC;IAED,KAAK;QACH,OAAO;YACL,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,oBAAoB,EAAE,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,oBAAoB,IAAI,IAAI,GAAG,EAAE,CAAC;SACjF,CAAC;IACJ,CAAC;IAED,MAAM,CAAU,KAAK,CAAC,OAAO,CAC3B,WAAyB,EACzB,kBAA8D;QAE9D,MAAM,cAAc,GAAG,IAAI,aAAW,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;QAEpE,KAAK,MAAM,GAAG,IAAI,WAAW,CAAC,oBAAoB,EAAE,CAAC;YACnD,cAAc,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,EAAE,WAAW,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC;QACtF,CAAC;QAED,OAAO,cAAc,CAAC;IACxB,CAAC;CACF,CAAA;AA9CY,WAAW;IADvB,KAAK,EAAE;;GACK,WAAW,CA8CvB"}
+{"version":3,"file":"environment.model.js","sourceRoot":"","sources":["../../../src/models/environment/environment.model.ts"],"names":[],"mappings":";;;;;;;;;;AACA,OAAO,EAAE,KAAK,EAAE,MAAM,qCAAqC,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAEnE,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAIvC,IAAM,WAAW,mBAAjB,MAAM,WAAY,SAAQ,MAAiC;IACvD,UAAU,GAAW,aAAa,CAAC;IAEnC,eAAe,CAAS;IAExB,oBAAoB,GAAwB,IAAI,GAAG,EAAE,CAAC;IAE/D,YAAY,eAAuB;QACjC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IACzC,CAAC;IAEQ,KAAK,CAAC,cAAc,CAAC,QAAqB;QACjD,OAAO,WAAW,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,sBAAsB,CAAC,CAAC;IACrE,CAAC;IAEQ,UAAU;QACjB,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAClC,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACvC,OAAO,CAAC,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,eAAe,EAAE,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACvF,CAAC;IAEQ,KAAK;QACZ,OAAO;YACL,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,oBAAoB,EAAE,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,oBAAoB,IAAI,IAAI,GAAG,EAAE,CAAC;SACjF,CAAC;IACJ,CAAC;IAED,MAAM,CAAU,KAAK,CAAC,OAAO,CAC3B,WAAyB,EAEzB,kBAA8D;QAE9D,MAAM,cAAc,GAAG,IAAI,aAAW,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;QAEpE,KAAK,MAAM,GAAG,IAAI,WAAW,CAAC,oBAAoB,EAAE,CAAC;YACnD,cAAc,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,EAAE,WAAW,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC;QACtF,CAAC;QAED,OAAO,cAAc,CAAC;IACxB,CAAC;CACF,CAAA;AA1CY,WAAW;IADvB,KAAK,EAAE;;GACK,WAAW,CA0CvB"}

package/dist/models/execution/execution.interface.d.ts

@@ -1,9 +1,9 @@
-import { IModelReference } from '../model.interface.js';
+import type { IModelReference } from '../model.interface.js';
 export interface IExecution {
     deployment: IModelReference;
     environment: IModelReference;
     environmentVariables: {
         [key: string]: string;
     };
-    image: IModelReference;
+    subnet: IModelReference;
 }

package/dist/models/execution/execution.model.d.ts

@@ -1,18 +1,17 @@
-import { UnknownModel } from '../../app.type.js';
-import { Diff } from '../../functions/diff/diff.model.js';
+import type { UnknownModel } from '../../app.type.js';
+import type { Diff } from '../../functions/diff/diff.js';
 import { Deployment } from '../deployment/deployment.model.js';
 import { Environment } from '../environment/environment.model.js';
-import { Image } from '../image/image.model.js';
 import { AModel } from '../model.abstract.js';
-import { IExecution } from './execution.interface.js';
+import { Subnet } from '../subnet/subnet.model.js';
+import type { IExecution } from './execution.interface.js';
 export declare class Execution extends AModel<IExecution, Execution> {
     readonly MODEL_NAME: string;
     readonly environmentVariables: Map<string, string>;
-    readonly executionId: string;
-    readonly image: Image;
-    constructor(deployment: Deployment, environment: Environment, image: Image);
-    diff(previous?: Execution): Promise<Diff[]>;
-    getContext(): string;
+    constructor(deployment: Deployment, environment: Environment, subnet: Subnet);
+    get executionId(): string;
+    diffProperties(previous: Execution): Promise<Diff[]>;
+    setContext(): string;
     synth(): IExecution;
     static unSynth(execution: IExecution, deReferenceContext: (context: string) => Promise<UnknownModel>): Promise<Execution>;
 }

package/dist/models/execution/execution.model.js

@@ -10,61 +10,93 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var Execution_1;
 import { Model } from '../../decorators/model.decorator.js';
 import { DiffUtility } from '../../functions/diff/diff.utility.js';
+import { ArrayUtility } from '../../utilities/array/array.utility.js';
 import { Deployment } from '../deployment/deployment.model.js';
 import { Environment } from '../environment/environment.model.js';
-import { Image } from '../image/image.model.js';
 import { AModel } from '../model.abstract.js';
+import { Subnet } from '../subnet/subnet.model.js';
 let Execution = Execution_1 = class Execution extends AModel {
     MODEL_NAME = 'execution';
     environmentVariables = new Map();
-    executionId;
-    image;
-    constructor(deployment, environment, image) {
+    constructor(deployment, environment, subnet) {
         super();
-        this.executionId = [deployment.deploymentTag, environment.environmentName].join('_');
-        if (deployment.getChild('execution', [{ key: 'executionId', value: this.executionId }]) ||
-            environment.getChild('execution', [{ key: 'executionId', value: this.executionId }])) {
+        const environmentRegions = environment.getParents('region')['region'] || [];
+        const subnetRegions = subnet.getParents('region')['region'] || [];
+        if (environmentRegions.length > 0 &&
+            subnetRegions.length > 0 &&
+            environmentRegions[0].to.regionId !== subnetRegions[0].to.regionId) {
+            throw new Error('Environment and Subnet must be in the same region!');
+        }
+        const deploymentExecutions = (deployment.getChildren('execution')['execution'] || []).map((d) => d.to);
+        const environmentExecutions = (environment.getChildren('execution')['execution'] || []).map((d) => d.to);
+        const subnetExecutions = (subnet.getChildren('execution')['execution'] || []).map((d) => d.to);
+        if (ArrayUtility.intersect((a, b) => {
+            return a.executionId === b.executionId;
+        }, deploymentExecutions, environmentExecutions, subnetExecutions).length > 0) {
             throw new Error('Execution already exists!');
         }
         deployment.addChild('deploymentTag', this, 'executionId');
         environment.addChild('environmentName', this, 'executionId');
-        this.image = image;
-        this.addRelationship('executionId', image, 'imageId');
+        subnet.addChild('subnetId', this, 'executionId');
+    }
+    get executionId() {
+        const parents = this.getParents();
+        const deployment = parents['deployment'][0].to;
+        const server = deployment.getParents()['server'][0].to;
+        const environment = parents['environment'][0].to;
+        const region = environment.getParents()['region'][0].to;
+        const subnet = parents['subnet'][0].to;
+        return [
+            server.serverKey,
+            deployment.deploymentTag,
+            region.regionId,
+            environment.environmentName,
+            subnet.subnetName,
+        ].join('-');
     }
-    async diff(previous) {
-        return DiffUtility.diffMap(previous || { environmentVariables: new Map() }, this, 'environmentVariables');
+    async diffProperties(previous) {
+        return DiffUtility.diffMap(previous, this, 'environmentVariables');
     }
-    getContext() {
+    setContext() {
         const parents = this.getParents();
         const deployment = parents['deployment'][0]['to'];
         const environment = parents['environment'][0]['to'];
-        return [`${this.MODEL_NAME}=${this.executionId}`, deployment.getContext(), environment.getContext()].join(',');
+        const subnet = parents['subnet'][0]['to'];
+        return [
+            `${this.MODEL_NAME}=${this.executionId}`,
+            deployment.getContext(),
+            environment.getContext(),
+            subnet.getContext(),
+        ].join(',');
     }
     synth() {
         const parents = this.getParents();
         const deployment = parents['deployment'][0]['to'];
         const environment = parents['environment'][0]['to'];
+        const subnet = parents['subnet'][0]['to'];
         return {
             deployment: { context: deployment.getContext() },
             environment: { context: environment.getContext() },
             environmentVariables: Object.fromEntries(this.environmentVariables || new Map()),
-            image: { context: this.image.getContext() },
+            subnet: { context: subnet.getContext() },
         };
     }
     static async unSynth(execution, deReferenceContext) {
-        const deployment = (await deReferenceContext(execution.deployment.context));
-        const environment = (await deReferenceContext(execution.environment.context));
-        const image = (await deReferenceContext(execution.image.context));
-        const newExecution = new Execution_1(deployment, environment, image);
-        for (const key in execution.environmentVariables) {
-            newExecution.environmentVariables.set(key, execution.environmentVariables[key]);
+        const [deployment, environment, subnet] = (await Promise.all([
+            deReferenceContext(execution.deployment.context),
+            deReferenceContext(execution.environment.context),
+            deReferenceContext(execution.subnet.context),
+        ]));
+        const newExecution = new Execution_1(deployment, environment, subnet);
+        for (const [key, value] of Object.entries(execution.environmentVariables)) {
+            newExecution.environmentVariables.set(key, value);
         }
         return newExecution;
     }
 };
 Execution = Execution_1 = __decorate([
     Model(),
-    __metadata("design:paramtypes", [Deployment, Environment, Image])
+    __metadata("design:paramtypes", [Deployment, Environment, Subnet])
 ], Execution);
 export { Execution };
 //# sourceMappingURL=execution.model.js.map

package/dist/models/execution/execution.model.js.map

@@ -1 +1 @@
-{"version":3,"file":"execution.model.js","sourceRoot":"","sources":["../../../src/models/execution/execution.model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"execution.model.js","sourceRoot":"","sources":["../../../src/models/execution/execution.model.ts"],"names":[],"mappings":"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"}

package/dist/models/image/image.interface.d.ts

@@ -1,4 +1,4 @@
-import { Image } from './image.model.js';
+import type { Image } from './image.model.js';
 export interface IImage {
     dockerOptions: Image['dockerOptions'];
     imageId: Image['imageId'];

package/dist/models/image/image.model.d.ts

@@ -1,6 +1,7 @@
-import { UnknownModel } from '../../app.type.js';
+import type { UnknownModel } from '../../app.type.js';
+import type { Diff } from '../../functions/diff/diff.js';
 import { AModel } from '../model.abstract.js';
-import { IImage } from './image.interface.js';
+import type { IImage } from './image.interface.js';
 export interface IImageDockerOptions {
     dockerfilePath: string;
     buildArgs?: {
@@ -15,7 +16,8 @@ export declare class Image extends AModel<IImage, Image> {
     readonly imageName: string;
     readonly imageTag: string;
     constructor(imageName: string, imageTag: string, options: IImageDockerOptions);
-    getContext(): string;
+    diffProperties(): Promise<Diff[]>;
+    setContext(): string;
     synth(): IImage;
     static unSynth(image: IImage, deReferenceContext: (context: string) => Promise<UnknownModel>): Promise<Image>;
 }

package/dist/models/image/image.model.js

@@ -25,18 +25,17 @@ let Image = Image_1 = class Image extends AModel {
         options.dockerfilePath = resolve(options.dockerfilePath);
         this.dockerOptions = options;
     }
-    getContext() {
+    async diffProperties() {
+        return [];
+    }
+    setContext() {
         const parents = this.getParents();
         const app = parents['app'][0].to;
         return [`${this.MODEL_NAME}=${this.imageId}`, app.getContext()].join(',');
     }
     synth() {
         return {
-            dockerOptions: {
-                buildArgs: { ...this.dockerOptions.buildArgs },
-                dockerfilePath: this.dockerOptions.dockerfilePath,
-                quiet: this.dockerOptions.quiet,
-            },
+            dockerOptions: JSON.parse(JSON.stringify(this.dockerOptions)),
             imageId: this.imageTag,
             imageName: this.imageName,
             imageTag: this.imageTag,

package/dist/models/image/image.model.js.map

@@ -1 +1 @@
-{"version":3,"file":"image.model.js","sourceRoot":"","sources":["../../../src/models/image/image.model.ts"],"names":[],"mappings":";;;;;;;;;;AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,OAAO,EAAE,KAAK,EAAE,MAAM,qCAAqC,CAAC;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAUvC,IAAM,KAAK,aAAX,MAAM,KAAM,SAAQ,MAAqB;IACrC,UAAU,GAAW,OAAO,CAAC;IAE7B,aAAa,CAAsB;IAEnC,OAAO,CAAS;IAEhB,SAAS,CAAS;IAElB,QAAQ,CAAS;IAE1B,YAAY,SAAiB,EAAE,QAAgB,EAAE,OAA4B;QAC3E,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,OAAO,GAAG,GAAG,SAAS,IAAI,QAAQ,EAAE,CAAC;QAC1C,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAEzB,OAAO,CAAC,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QACzD,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC;IAC/B,CAAC;IAED,UAAU;QACR,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,OAAO,EAAE,EAAE,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC5E,CAAC;IAED,KAAK;QACH,OAAO;YACL,aAAa,EAAE;gBACb,SAAS,EAAE,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE;gBAC9C,cAAc,EAAE,IAAI,CAAC,aAAa,CAAC,cAAc;gBACjD,KAAK,EAAE,IAAI,CAAC,aAAa,CAAC,KAAK;aAChC;YACD,OAAO,EAAE,IAAI,CAAC,QAAQ;YACtB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,QAAQ,EAAE,IAAI,CAAC,QAAQ;SACxB,CAAC;IACJ,CAAC;IAED,MAAM,CAAU,KAAK,CAAC,OAAO,CAC3B,KAAa,EACb,kBAA8D;QAE9D,OAAO,IAAI,OAAK,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,QAAQ,EAAE;YAChD,GAAG,KAAK,CAAC,aAAa;SACvB,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAhDY,KAAK;IADjB,KAAK,EAAE;;GACK,KAAK,CAgDjB"}
+{"version":3,"file":"image.model.js","sourceRoot":"","sources":["../../../src/models/image/image.model.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,OAAO,EAAE,KAAK,EAAE,MAAM,qCAAqC,CAAC;AAE5D,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAUvC,IAAM,KAAK,aAAX,MAAM,KAAM,SAAQ,MAAqB;IACrC,UAAU,GAAW,OAAO,CAAC;IAE7B,aAAa,CAAsB;IAEnC,OAAO,CAAS;IAEhB,SAAS,CAAS;IAElB,QAAQ,CAAS;IAE1B,YAAY,SAAiB,EAAE,QAAgB,EAAE,OAA4B;QAC3E,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,OAAO,GAAG,GAAG,SAAS,IAAI,QAAQ,EAAE,CAAC;QAC1C,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAEzB,OAAO,CAAC,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QACzD,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC;IAC/B,CAAC;IAEQ,KAAK,CAAC,cAAc;QAC3B,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,OAAO,EAAE,EAAE,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC5E,CAAC;IAEQ,KAAK;QACZ,OAAO;YACL,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAC7D,OAAO,EAAE,IAAI,CAAC,QAAQ;YACtB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,QAAQ,EAAE,IAAI,CAAC,QAAQ;SACxB,CAAC;IACJ,CAAC;IAED,MAAM,CAAU,KAAK,CAAC,OAAO,CAC3B,KAAa,EAEb,kBAA8D;QAE9D,OAAO,IAAI,OAAK,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,QAAQ,EAAE;YAChD,GAAG,KAAK,CAAC,aAAa;SACvB,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAjDY,KAAK;IADjB,KAAK,EAAE;;GACK,KAAK,CAiDjB"}

package/dist/models/model-action.interface.d.ts

@@ -0,0 +1,9 @@
+import type { ActionInputs, ActionOutputs } from '../app.type.js';
+import type { Diff } from '../functions/diff/diff.js';
+export interface IModelAction {
+    readonly ACTION_NAME: string;
+    collectInput(diff: Diff): Extract<keyof ActionInputs, string>[];
+    filter(diff: Diff): boolean;
+    handle(diff: Diff, actionInputs: ActionInputs, actionOutputs: ActionOutputs): Promise<ActionOutputs>;
+    revert(diff: Diff, actionInputs: ActionInputs, actionOutputs: ActionOutputs): Promise<ActionOutputs>;
+}

package/dist/models/model-action.interface.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=model-action.interface.js.map

package/dist/models/model-action.interface.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"model-action.interface.js","sourceRoot":"","sources":["../../src/models/model-action.interface.ts"],"names":[],"mappings":""}

package/dist/models/model.abstract.d.ts

@@ -1,34 +1,60 @@
-import { ModelType, UnknownModel } from '../app.type.js';
-import { Dependency } from '../functions/dependency/dependency.model.js';
-import { Diff } from '../functions/diff/diff.model.js';
-import { AAnchor } from '../overlays/anchor.abstract.js';
-import { IModel } from './model.interface.js';
+import { ModelType, type UnknownModel } from '../app.type.js';
+import { Dependency, type DependencyRelationship } from '../functions/dependency/dependency.js';
+import { Diff } from '../functions/diff/diff.js';
+import type { AAnchor } from '../overlays/anchor.abstract.js';
+import type { IModel } from './model.interface.js';
 export declare abstract class AModel<I, T> implements IModel<I, T> {
     abstract readonly MODEL_NAME: string;
     readonly MODEL_TYPE: ModelType;
-    protected readonly anchors: AAnchor[];
-    protected readonly dependencies: Dependency[];
-    addChild(onField: keyof T | string, child: UnknownModel, toField: string): void;
-    addRelationship(onField: keyof T | string, to: UnknownModel, toField: string): void;
+    private _deleteMarker;
+    private readonly anchors;
+    private context;
+    private readonly dependencies;
+    addAnchor(anchor: AAnchor): void;
+    addChild(onField: keyof T | string, child: UnknownModel, toField: string): {
+        childToParentDependency: Dependency;
+        parentToChildDependency: Dependency;
+    };
+    addRelationship(to: UnknownModel): {
+        thatToThisDependency: Dependency;
+        thisToThatDependency: Dependency;
+    };
+    deriveDependencyField(): string | undefined;
     diff(previous?: T): Promise<Diff[]>;
+    abstract diffProperties(previous: T): Promise<Diff[]>;
     getAncestors(): UnknownModel[];
-    getAnchor(anchorId: string): AAnchor | undefined;
-    getAnchors(): AAnchor[];
+    getAnchor(anchorId: string, parent?: UnknownModel): AAnchor | undefined;
+    getAnchorIndex(anchorId: string, parent?: UnknownModel): number;
+    getAnchors(filters?: {
+        key: string;
+        value: any;
+    }[]): AAnchor[];
     getBoundaryMembers(): UnknownModel[];
-    getChild(modelName: string, filters: {
+    getChild(modelName: string, filters?: {
         key: string;
         value: any;
     }[]): UnknownModel | undefined;
     getChildren(modelName?: string): {
         [key: string]: Dependency[];
     };
-    abstract getContext(): string;
+    getContext(): string;
+    getDependencies(to?: UnknownModel): Dependency[];
+    getDependency(to: UnknownModel, relationship: DependencyRelationship): Dependency | undefined;
+    getDependencyIndex(to: UnknownModel, relationship: DependencyRelationship): number;
     getParents(modelName?: string): {
         [key: string]: Dependency[];
     };
+    getSiblings(modelName?: string): {
+        [key: string]: Dependency[];
+    };
     hasAncestor(model: UnknownModel): boolean;
-    remove(ignoreDirectRelationships?: boolean, dryRun?: boolean): void;
+    isMarkedDeleted(): boolean;
+    remove(ignoreDirectRelationships?: boolean): void;
+    removeAllAnchors(): void;
+    removeAnchor(anchor: AAnchor): void;
+    removeDependency(dependencyIndex: number): void;
     removeRelationship(model: UnknownModel): void;
+    abstract setContext(): string;
     abstract synth(): I;
     static unSynth(...args: unknown[]): Promise<UnknownModel>;
 }