Refactored Concept class for better separation of metadata, compiled and values

core/sheerka_transform.py

@@ -26,6 +26,9 @@ class SheerkaTransformType(Enum):
     Node = 5
     Exception = 6
 
+    def __repr__(self):
+        return self.__class__.__name__ + "." + self.name
+
 
 class SheerkaTransform:
 
@@ -117,18 +120,24 @@ class SheerkaTransform:
 
         # transform metadata
         for prop in PROPERTIES_TO_SERIALIZE:
-            value = self.to_dict(getattr(obj.metadata, prop))
+            value = getattr(obj.metadata, prop)
             ref_value = getattr(ref.metadata, prop)
             if value != ref_value:
-                to_dict[prop] = value
+                to_dict["meta." + prop] = self.to_dict(value)
+
+        # transform value
+        for metadata, value in obj.values.items():
+            ref_value = ref.values[metadata] if metadata in ref.values else None
+            if value != ref_value:
+                to_dict[metadata.value] = self.to_dict(value)
 
         # transform properties
         for prop in obj.props:
-            value = self.to_dict(obj.props[prop].value)
+            value = obj.props[prop].value
             if prop not in ref.props or value != ref.props[prop].value:
                 if "props" not in to_dict:
                     to_dict["props"] = []
-                to_dict["props"].append((prop, value))
+                to_dict["props"].append((prop, self.to_dict(value)))
 
         return to_dict