some refactoring (#426)

OpenTOSCA · Oct 14, 2024 · 9507b2c · 9507b2c
1 parent 3bf4429
commit 9507b2c
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 10 deletions.
diff --git a/.idea/jsonSchemas.xml b/.idea/jsonSchemas.xml
diff --git a/src/graph/options.ts b/src/graph/options.ts
@@ -895,13 +895,6 @@ class ConstraintsOptions extends BaseOptions {
             this.uniqueOutput = this.raw.unique_output_constraint ?? this.constraints
             assert.isBoolean(this.uniqueOutput)
 
-            if (this.v3) {
-                this.requiredArtifact = this.raw.required_artifact_constraint ?? this.constraints
-            } else {
-                this.requiredArtifact = this.raw.required_artifact_constraint ?? this.constraints
-            }
-            assert.isBoolean(this.requiredArtifact)
-
             this.requiredIncomingRelation = this.raw.required_incoming_relation_constraint ?? this.constraints
             assert.isBoolean(this.requiredIncomingRelation)
         } else {
@@ -926,13 +919,17 @@ class ConstraintsOptions extends BaseOptions {
             this.uniqueOutput = this.raw.unique_output_constraint ?? this.raw.constraints ?? true
             assert.isBoolean(this.uniqueOutput)
 
-            this.requiredArtifact = this.raw.required_artifact_constraint ?? this.raw.constraints ?? true
-            assert.isBoolean(this.requiredArtifact)
-
             this.requiredIncomingRelation =
                 this.raw.required_incoming_relation_constraint ?? this.raw.constraints ?? false
             assert.isBoolean(this.requiredIncomingRelation)
         }
+
+        if (this.v3) {
+            this.requiredArtifact = this.raw.required_artifact_constraint ?? this.raw.constraints ?? true
+        } else {
+            this.requiredArtifact = this.raw.required_artifact_constraint ?? this.constraints
+        }
+        assert.isBoolean(this.requiredArtifact)
     }
 }
 

diff --git a/src/specification/variability.ts b/src/specification/variability.ts
@@ -92,6 +92,7 @@ export type NodeDefaultConditionMode =
     | 'outgoingnaive'
     | 'incomingnaive-artifact-host'
     | 'incomingnaive-artifactnaive-host'
+    | 'artifact-host'
 export type RelationDefaultConditionMode = 'source-target' | 'source' | 'target'
 export type TechnologyDefaultConditionMode = 'container' | 'other' | 'container-other'
 export type ArtifactDefaultConditionMode = 'container' | 'managed' | 'container-managed'

diff --git a/src/technologies/plugins/rules/index.ts b/src/technologies/plugins/rules/index.ts
@@ -148,6 +148,8 @@ export class TechnologyRulePlugin implements TechnologyPlugin {
                 rule,
             })
 
+            // TODO: hosting conditions should be combined by AND
+
             // TODO: merge then and else block
             if (rule.hosting.length !== 0) {
                 const output: LogicExpression[][] = []