From 9c603075453441e4f400559e48a4fce319945af8 Mon Sep 17 00:00:00 2001
From: Marko Ristin <marko.ristin@gmail.com>
Date: Sat, 31 Aug 2024 13:22:04 +0200
Subject: [PATCH] Update to aas-core-meta, codegen, testgen f9cbdb3, b14237b2,
 5a705a0b1 (#51)

We update the development requirements to and re-generate everything
with:
* [aas-core-meta f9cbdb3],
* [aas-core-codegen b14237b2] and
* [aas-core3.0-testgen 5a705a0b1].

Notably, we propagate the fix for AASd-109 where we change the invariant
such that it checks for the consistency among properties even when
a ``value`` property is missing.

[aas-core-meta f9cbdb3]: https://github.com/aas-core-works/aas-core-meta/commit/f9cbdb3
[aas-core-codegen b14237b2]: https://github.com/aas-core-works/aas-core-codegen/commit/b14237b2
[aas-core3.0-testgen 5a705a0b1]: https://github.com/aas-core-works/aas-core3.0-testgen/commit/5a705a0b1
---
 dev_scripts/aas_core3/__init__.py     |  2 +-
 dev_scripts/aas_core3/verification.py | 20 ++++++++++----------
 dev_scripts/setup.py                  |  4 ++--
 src/verification.cpp                  | 20 ++++++++++----------
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/dev_scripts/aas_core3/__init__.py b/dev_scripts/aas_core3/__init__.py
index 208b45db..22650eee 100644
--- a/dev_scripts/aas_core3/__init__.py
+++ b/dev_scripts/aas_core3/__init__.py
@@ -3,5 +3,5 @@
 
 This copy is necessary so that we can decouple from ``aas-core*-python`` repository.
 
-The revision of aas-core-codegen was: 0f7345e1
+The revision of aas-core-codegen was: b14237b2
 """
diff --git a/dev_scripts/aas_core3/verification.py b/dev_scripts/aas_core3/verification.py
index a4fc6280..79926889 100644
--- a/dev_scripts/aas_core3/verification.py
+++ b/dev_scripts/aas_core3/verification.py
@@ -3426,21 +3426,21 @@ def transform_submodel_element_list(
         if not (
             not (
                 (
-                    (that.value is not None)
-                    and (
-                        (
-                            that.type_value_list_element == aas_types.AASSubmodelElements.PROPERTY
-                            or that.type_value_list_element == aas_types.AASSubmodelElements.RANGE
-                        )
-                    )
+                    that.type_value_list_element == aas_types.AASSubmodelElements.PROPERTY
+                    or that.type_value_list_element == aas_types.AASSubmodelElements.RANGE
                 )
             )
             or (
                 (
                     (that.value_type_list_element is not None)
-                    and properties_or_ranges_have_value_type(
-                        that.value,
-                        that.value_type_list_element
+                    and (
+                        (
+                            (that.value is None)
+                            or properties_or_ranges_have_value_type(
+                                that.value,
+                                that.value_type_list_element
+                            )
+                        )
                     )
                 )
             )
diff --git a/dev_scripts/setup.py b/dev_scripts/setup.py
index 7f7eb6b8..cb8c7a25 100644
--- a/dev_scripts/setup.py
+++ b/dev_scripts/setup.py
@@ -29,8 +29,8 @@
     keywords="asset administration shell code generation industry 4.0 industrie i4.0",
     install_requires=[
         "icontract>=2.6.1,<3",
-        "aas-core-meta@git+https://github.com/aas-core-works/aas-core-meta@31d6afd#egg=aas-core-meta",
-        "aas-core-codegen@git+https://github.com/aas-core-works/aas-core-codegen@0f7345e1#egg=aas-core-codegen",
+        "aas-core-meta@git+https://github.com/aas-core-works/aas-core-meta@f9cbdb3#egg=aas-core-meta",
+        "aas-core-codegen@git+https://github.com/aas-core-works/aas-core-codegen@b14237b2#egg=aas-core-codegen",
     ],
     # fmt: off
     extras_require={
diff --git a/src/verification.cpp b/src/verification.cpp
index 017a0b99..26c9f925 100644
--- a/src/verification.cpp
+++ b/src/verification.cpp
@@ -11551,19 +11551,19 @@ void OfSubmodelElementList::Execute() {
       case 15: {
         if (
           !((
-            (instance_->value().has_value())
-            && (
-              (
-                instance_->type_value_list_element() == types::AasSubmodelElements::kProperty
-                || instance_->type_value_list_element() == types::AasSubmodelElements::kRange
-              )
-            )
+            instance_->type_value_list_element() == types::AasSubmodelElements::kProperty
+            || instance_->type_value_list_element() == types::AasSubmodelElements::kRange
           ))
           || ((
             (instance_->value_type_list_element().has_value())
-            && PropertiesOrRangesHaveValueType(
-              (*(instance_->value())),
-              (*(instance_->value_type_list_element()))
+            && (
+              (
+                (!(instance_->value().has_value()))
+                || PropertiesOrRangesHaveValueType(
+                  (*(instance_->value())),
+                  (*(instance_->value_type_list_element()))
+                )
+              )
             )
           ))
         ) {