@finos/legend-graph 31.1.9 → 31.2.0

package/src/graph-manager/protocol/pure/v1/transformation/pureGraph/to/helpers/V1_ValueSpecificationBuilderHelper.ts

@@ -102,6 +102,7 @@ import {
   KeyExpressionInstanceValue,
 } from '../../../../../../../../graph/metamodel/pure/valueSpecification/KeyExpressionInstanceValue.js';
 import { V1_SubTypeGraphFetchTree } from '../../../../model/valueSpecification/raw/classInstance/graph/V1_SubTypeGraphFetchTree.js';
+import { findMappingLocalProperty } from '../../../../../../../../graph/helpers/DSL_Mapping_Helper.js';
 
 const buildPrimtiveInstanceValue = (
   type: PRIMITIVE_TYPE,
@@ -120,15 +121,18 @@ export class V1_ValueSpecificationBuilder
   context: V1_GraphBuilderContext;
   processingContext: V1_ProcessingContext;
   openVariables: string[] = [];
+  checkFunctionName?: boolean | undefined;
 
   constructor(
     context: V1_GraphBuilderContext,
     processingContext: V1_ProcessingContext,
     openVariables: string[],
+    checkFunctionName?: boolean | undefined,
   ) {
     this.context = context;
     this.processingContext = processingContext;
     this.openVariables = openVariables;
+    this.checkFunctionName = checkFunctionName;
   }
 
   visit_INTERNAL__UnknownValueSpecfication(
@@ -246,6 +250,7 @@ export class V1_ValueSpecificationBuilder
       this.openVariables,
       this.context,
       this.processingContext,
+      this.checkFunctionName,
     );
     this.processingContext.pop();
 
@@ -628,7 +633,19 @@ export function V1_buildFunctionExpression(
   openVariables: string[],
   compileContext: V1_GraphBuilderContext,
   processingContext: V1_ProcessingContext,
+  // We don't want to throw error when we build valuespecification outside
+  // query context (for ex: while building execution plan)
+  checkFunctionName?: boolean | undefined,
 ): SimpleFunctionExpression {
+  if (checkFunctionName === false) {
+    return V1_buildGenericFunctionExpression(
+      functionName,
+      parameters,
+      openVariables,
+      compileContext,
+      processingContext,
+    );
+  }
   if (matchFunctionName(functionName, Object.values(SUPPORTED_FUNCTIONS))) {
     // NOTE: this is a catch-all builder that is only meant for basic function expression
     // such as and(), or(), etc. It will fail when type-inferencing/function-matching is required
@@ -688,6 +705,7 @@ export function V1_buildGraphFetchTree(
   parentClass: Class | undefined,
   openVariables: string[],
   processingContext: V1_ProcessingContext,
+  canResolveLocalProperty?: boolean | undefined,
 ): GraphFetchTree {
   if (graphFetchTree instanceof V1_PropertyGraphFetchTree) {
     return buildPropertyGraphFetchTree(
@@ -696,6 +714,7 @@ export function V1_buildGraphFetchTree(
       guaranteeNonNullable(parentClass),
       openVariables,
       processingContext,
+      canResolveLocalProperty,
     );
   } else if (graphFetchTree instanceof V1_RootGraphFetchTree) {
     return buildRootGraphFetchTree(
@@ -703,6 +722,7 @@ export function V1_buildGraphFetchTree(
       context,
       openVariables,
       processingContext,
+      canResolveLocalProperty,
     );
   } else if (graphFetchTree instanceof V1_SubTypeGraphFetchTree) {
     return buildSubTypeGraphFetchTree(
@@ -710,6 +730,7 @@ export function V1_buildGraphFetchTree(
       context,
       openVariables,
       processingContext,
+      canResolveLocalProperty,
     );
   }
   throw new UnsupportedOperationError(
@@ -734,6 +755,7 @@ function buildPropertyGraphFetchTree(
   parentClass: Class,
   openVariables: string[],
   processingContext: V1_ProcessingContext,
+  canResolveLocalProperty?: boolean | undefined,
 ): PropertyGraphFetchTree {
   let property: AbstractProperty;
   let pureParameters: ValueSpecification[] = [];
@@ -766,11 +788,38 @@ function buildPropertyGraphFetchTree(
     processingContext.flushVariable('this');
     processingContext.pop();
   } else {
-    property = V1_getAppliedProperty(
-      parentClass,
-      undefined,
-      propertyGraphFetchTree.property,
-    );
+    // While building property graph fetch tree, the Class of root graph
+    // fetch tree is passed as the parentClass of property graph fetch tree.
+    // This Class contains the properties of property graph fetch trees.
+    // But sometimes, a local property is missing in the parentClass and
+    // causing error in V1_getAppliedProperty.
+    // To fix this, we get the local property from PureModel context.graph
+    // mappings. The function findProperty() is used for this purpose.
+    if (canResolveLocalProperty) {
+      try {
+        property = V1_getAppliedProperty(
+          parentClass,
+          undefined,
+          propertyGraphFetchTree.property,
+        );
+      } catch (error) {
+        const newProperty = findMappingLocalProperty(
+          context.graph.mappings,
+          propertyGraphFetchTree.property,
+        );
+        if (newProperty) {
+          property = newProperty;
+        } else {
+          throw error;
+        }
+      }
+    } else {
+      property = V1_getAppliedProperty(
+        parentClass,
+        undefined,
+        propertyGraphFetchTree.property,
+      );
+    }
   }
   const _subType = propertyGraphFetchTree.subType
     ? context.resolveClass(propertyGraphFetchTree.subType)
@@ -790,6 +839,7 @@ function buildPropertyGraphFetchTree(
         _returnTypeClasss,
         openVariables,
         processingContext,
+        canResolveLocalProperty,
       ),
     );
   }
@@ -809,6 +859,7 @@ function buildRootGraphFetchTree(
   context: V1_GraphBuilderContext,
   openVariables: string[],
   processingContext: V1_ProcessingContext,
+  canResolveLocalProperty?: boolean | undefined,
 ): RootGraphFetchTree {
   const _class = context.resolveClass(rootGraphFetchTree.class);
   const subTreeChildren = rootGraphFetchTree.subTrees.map((subTree) =>
@@ -818,6 +869,7 @@ function buildRootGraphFetchTree(
       _class.value,
       openVariables,
       processingContext,
+      canResolveLocalProperty,
     ),
   );
   const subTypeTreeChildren = rootGraphFetchTree.subTypeTrees.map(
@@ -827,6 +879,7 @@ function buildRootGraphFetchTree(
         context,
         openVariables,
         processingContext,
+        canResolveLocalProperty,
       ),
   );
   const _rootGraphFetchTree = new RootGraphFetchTree(
@@ -842,6 +895,7 @@ function buildSubTypeGraphFetchTree(
   context: V1_GraphBuilderContext,
   openVariables: string[],
   processingContext: V1_ProcessingContext,
+  canResolveLocalProperty?: boolean | undefined,
 ): SubTypeGraphFetchTree {
   const subTypeClass = context.resolveClass(subTypeGraphFetchTree.subTypeClass);
   const children = subTypeGraphFetchTree.subTrees.map((subTree) =>
@@ -851,6 +905,7 @@ function buildSubTypeGraphFetchTree(
       subTypeClass.value,
       openVariables,
       processingContext,
+      canResolveLocalProperty,
     ),
   );
   const _subTypeGraphFetchTree = new SubTypeGraphFetchTree(

package/src/graph-manager/protocol/pure/v1/transformation/pureProtocol/serializationHelpers/V1_ValueSpecificationSerializer.ts

@@ -482,6 +482,12 @@ const propertyGraphFetchTreeModelSchema = (
         (val) => V1_deserializeGraphFetchTree(val, plugins),
       ),
     ),
+    subTypeTrees: list(
+      custom(
+        (val) => V1_serializeGraphFetchTree(val, plugins),
+        (val) => V1_deserializeGraphFetchTree(val, plugins),
+      ),
+    ),
     subType: optional(primitive()),
   });
 
@@ -501,7 +507,7 @@ const subTypeGraphFetchTreeModelSchema = (
     subTypeClass: primitive(),
   });
 
-function V1_serializeGraphFetchTree(
+export function V1_serializeGraphFetchTree(
   protocol: V1_GraphFetchTree,
   plugins: PureProtocolProcessorPlugin[],
 ): PlainObject<V1_GraphFetchTree> {
@@ -518,7 +524,7 @@ function V1_serializeGraphFetchTree(
   );
 }
 
-function V1_deserializeGraphFetchTree(
+export function V1_deserializeGraphFetchTree(
   json: PlainObject<V1_GraphFetchTree>,
   plugins: PureProtocolProcessorPlugin[],
 ): V1_GraphFetchTree {