Fix pure to protocol to handle primitive types

finos · Nov 13, 2024 · 3ceff7c · 3ceff7c
1 parent 359259b
commit 3ceff7c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/...-compiled-core/src/main/resources/core/pure/protocol/v1_33_0/scan/buildBasePureModel.pure b/...-compiled-core/src/main/resources/core/pure/protocol/v1_33_0/scan/buildBasePureModel.pure
@@ -198,11 +198,14 @@ function <<access.protected>> meta::protocols::pure::v1_33_0::transformation::fr
 
 function  meta::protocols::pure::v1_33_0::transformation::fromPureGraph::findTypesFromPureInstanceSetImplementation(p:PureInstanceSetImplementation[1]):Type[*]
 {
-   let srcClass = $p.srcClass->cast(@Class<Any>);
-   $p.class->concatenate($srcClass)
-      ->concatenate($srcClass.constraints->map(c|$c.functionDefinition.expressionSequence->evaluateAndDeactivate()->map(e|$e->scan())))
-      ->concatenate($srcClass.constraints->map(c|$c.messageFunction.expressionSequence->evaluateAndDeactivate()->map(e|$e->scan())))
-      ->concatenate($p.propertyMappings->filter(x | $x->instanceOf(PurePropertyMapping))->cast(@PurePropertyMapping).transform.expressionSequence->evaluateAndDeactivate()->map(e|$e->scan()));
+  if($p.srcClass->isNotEmpty() && $p.srcClass->toOne()->instanceOf(Class),
+    | let srcClass = $p.srcClass->cast(@Class<Any>);
+      $p.class->concatenate($srcClass)
+        ->concatenate($srcClass.constraints->map(c|$c.functionDefinition.expressionSequence->evaluateAndDeactivate()->map(e|$e->scan())))
+        ->concatenate($srcClass.constraints->map(c|$c.messageFunction.expressionSequence->evaluateAndDeactivate()->map(e|$e->scan())))
+        ->concatenate($p.propertyMappings->filter(x | $x->instanceOf(PurePropertyMapping))->cast(@PurePropertyMapping).transform.expressionSequence->evaluateAndDeactivate()->map(e|$e->scan()));,
+    | $p.class->concatenate($p.srcClass);
+  )
 }
 
 function <<access.private>> meta::protocols::pure::v1_33_0::transformation::fromPureGraph::buildDomain(found:AllTypes[1], associations:Association[*], extensions:meta::pure::extension::Extension[*]):meta::protocols::pure::v1_33_0::metamodel::PackageableElement[*]

diff --git a/...e-compiled-core/src/main/resources/core/pure/protocol/vX_X_X/scan/buildBasePureModel.pure b/...e-compiled-core/src/main/resources/core/pure/protocol/vX_X_X/scan/buildBasePureModel.pure
@@ -198,11 +198,14 @@ function <<access.protected>> meta::protocols::pure::vX_X_X::transformation::fro
 
 function  meta::protocols::pure::vX_X_X::transformation::fromPureGraph::findTypesFromPureInstanceSetImplementation(p:PureInstanceSetImplementation[1]):Type[*]
 {
-   let srcClass = $p.srcClass->cast(@Class<Any>);
-   $p.class->concatenate($srcClass)
-      ->concatenate($srcClass.constraints->map(c|$c.functionDefinition.expressionSequence->evaluateAndDeactivate()->map(e|$e->scan())))
-      ->concatenate($srcClass.constraints->map(c|$c.messageFunction.expressionSequence->evaluateAndDeactivate()->map(e|$e->scan())))
-      ->concatenate($p.propertyMappings->filter(x | $x->instanceOf(PurePropertyMapping))->cast(@PurePropertyMapping).transform.expressionSequence->evaluateAndDeactivate()->map(e|$e->scan()));
+  if($p.srcClass->isNotEmpty() && $p.srcClass->toOne()->instanceOf(Class),
+    | let srcClass = $p.srcClass->cast(@Class<Any>);
+      $p.class->concatenate($srcClass)
+        ->concatenate($srcClass.constraints->map(c|$c.functionDefinition.expressionSequence->evaluateAndDeactivate()->map(e|$e->scan())))
+        ->concatenate($srcClass.constraints->map(c|$c.messageFunction.expressionSequence->evaluateAndDeactivate()->map(e|$e->scan())))
+        ->concatenate($p.propertyMappings->filter(x | $x->instanceOf(PurePropertyMapping))->cast(@PurePropertyMapping).transform.expressionSequence->evaluateAndDeactivate()->map(e|$e->scan()));,
+    | $p.class->concatenate($p.srcClass);
+  )
 }
 
 function <<access.private>> meta::protocols::pure::vX_X_X::transformation::fromPureGraph::buildDomain(found:AllTypes[1], associations:Association[*], extensions:meta::pure::extension::Extension[*]):meta::protocols::pure::vX_X_X::metamodel::PackageableElement[*]