@finos/legend-graph 8.0.3 → 9.0.0

package/src/graphManager/DSLMapping_PureGraphManagerPlugin_Extension.ts

@@ -24,18 +24,26 @@ import type { PureGraphManagerPlugin } from './PureGraphManagerPlugin.js';
 export type PureGrammarConnectionLabeler = (
   connection: Connection,
 ) => string | undefined;
+
 export type ConnectionObserver = (
   connection: Connection,
   context: ObserverContext,
 ) => Connection | undefined;
+
 export type SetImplementationObserver = (
   setImplementation: SetImplementation,
   context: ObserverContext,
 ) => SetImplementation | undefined;
+
 export type PropertyMappingObserver = (
   propertyMapping: PropertyMapping,
   context: ObserverContext,
 ) => PropertyMapping | undefined;
+
+export type PropertyMappingStubChecker = (
+  propertyMapping: PropertyMapping,
+) => boolean | undefined;
+
 export type MappingTestInputDataObserver = (
   inputData: InputData,
   context: ObserverContext,
@@ -55,4 +63,10 @@ export interface DSLMapping_PureGraphManagerPlugin_Extension
   getExtraPropertyMappingObservers?(): PropertyMappingObserver[];
 
   getExtraConnectionObservers?(): ConnectionObserver[];
+
+  /**
+   * Get the list of checkers which can verify if the specified property mapping is
+   * stubbed (potentially prunable) or not
+   */
+  getExtraPropertyMappingStubCheckers?(): PropertyMappingStubChecker[];
 }

package/src/graphManager/action/changeDetection/DSLMapping_ObserverHelper.ts

@@ -25,6 +25,7 @@ import type { AggregationAwarePropertyMapping } from '../../../models/metamodels
 import type { AggregationAwareSetImplementation } from '../../../models/metamodels/pure/packageableElements/mapping/aggregationAware/AggregationAwareSetImplementation.js';
 import type { AssociationImplementation } from '../../../models/metamodels/pure/packageableElements/mapping/AssociationImplementation.js';
 import type { EnumerationMapping } from '../../../models/metamodels/pure/packageableElements/mapping/EnumerationMapping.js';
+import type { OptionalEnumerationMappingReference } from '../../../models/metamodels/pure/packageableElements/mapping/EnumerationMappingReference.js';
 import type {
   EnumValueMapping,
   SourceValue,
@@ -130,6 +131,33 @@ export const observe_Abstract_Store = (metamodel: Store): void => {
 
 // ------------------------------------- Mapping -------------------------------------
 
+export const observe_OptionalEnumerationMappingReference = skipObserved(
+  (
+    metamodel: OptionalEnumerationMappingReference,
+  ): OptionalEnumerationMappingReference => {
+    makeObservable(metamodel, {
+      value: observable,
+      valueForSerialization: computed,
+    });
+
+    observe_OptionalPackageableElementReference(metamodel.ownerReference);
+
+    return metamodel;
+  },
+);
+
+export const observe_SetImplementationReference = skipObserved(
+  (metamodel: SetImplementationReference): SetImplementationReference => {
+    makeObservable(metamodel, {
+      value: observable,
+    });
+
+    observe_PackageableElementReference(metamodel.ownerReference);
+
+    return metamodel;
+  },
+);
+
 export const observe_LocalMappingPropertyInfo = skipObserved(
   (metamodel: LocalMappingPropertyInfo): LocalMappingPropertyInfo => {
     makeObservable(metamodel, {
@@ -174,7 +202,7 @@ export const observe_PurePropertyMapping = skipObservedWithContext(
       hashCode: computed,
     });
 
-    // TODO transformer?: EnumerationMapping | undefined;
+    observe_OptionalEnumerationMappingReference(metamodel.transformer);
     observe_RawLambda(metamodel.transform);
 
     return metamodel;
@@ -188,6 +216,24 @@ class PropertyMappingObserver implements PropertyMappingVisitor<void> {
     this.observerContext = observerContext;
   }
 
+  visit_PropertyMapping(propertyMapping: PropertyMapping): void {
+    const extraPropertyMappingObservers = this.observerContext.plugins.flatMap(
+      (plugin) =>
+        (
+          plugin as DSLMapping_PureGraphManagerPlugin_Extension
+        ).getExtraPropertyMappingObservers?.() ?? [],
+    );
+    for (const observer of extraPropertyMappingObservers) {
+      const observedPropertyMapping = observer(
+        propertyMapping,
+        this.observerContext,
+      );
+      if (observedPropertyMapping) {
+        return;
+      }
+    }
+  }
+
   visit_PurePropertyMapping(propertyMapping: PurePropertyMapping): void {
     observe_PurePropertyMapping(propertyMapping, this.observerContext);
   }
@@ -319,18 +365,6 @@ export const observe_Abstract_InstanceSetImplementation = (
   );
 };
 
-export const observe_SetImplementationReference = skipObserved(
-  (metamodel: SetImplementationReference): SetImplementationReference => {
-    makeObservable(metamodel, {
-      value: observable,
-    });
-
-    observe_PackageableElementReference(metamodel.ownerReference);
-
-    return metamodel;
-  },
-);
-
 export const observe_SetImplementationContainer = skipObserved(
   (metamodel: SetImplementationContainer): SetImplementationContainer => {
     makeObservable(metamodel, {});

package/src/graphManager/action/creation/DSLMapping_ModelCreatorHelper.ts

@@ -23,7 +23,8 @@ import type { StoreConnections } from '../../../models/metamodels/pure/packageab
 export const stub_Mapping = (): Mapping => new Mapping('');
 
 export const isStubbed_EnumValueMapping = (value: EnumValueMapping): boolean =>
-  !value.sourceValues.filter(isNonNullable).length;
+  !value.sourceValues.filter((sourceValue) => isNonNullable(sourceValue.value))
+    .length;
 
 export const isStubbed_StoreConnections = (value: StoreConnections): boolean =>
   !value.storeConnections.length;

package/src/graphManager/action/validation/DSLMapping_ValidationHelper.ts

@@ -47,8 +47,7 @@ export const DEPRECATED__validate_MappingTestAssert = (
         ])
       : undefined;
   }
-  /* @MARKER: NEW CLASS MAPPING TYPE SUPPORT --- consider adding class mapping type handler here whenever support for a new one is added to the app */
-  // TODO: we might need to modularize this
+  // NOTE: technically we need to modularize these, but they are deprecated, so we will leave them alone for now
   return undefined;
 };
 
@@ -84,8 +83,7 @@ export const DEPRECATED__validate_InputData = (
   } else if (metamodel instanceof FlatDataInputData) {
     return DEPRECATED__validate_FlatDataInputData(metamodel);
   }
-  /* @MARKER: NEW CLASS MAPPING TYPE SUPPORT --- consider adding class mapping type handler here whenever support for a new one is added to the app */
-  // TODO: we might need to modularize this
+  // NOTE: technically we need to modularize these, but they are deprecated, so we will leave them alone for now
   return undefined;
 };
 

package/src/index.ts

@@ -239,10 +239,7 @@ export { V1_RawLambda } from './models/protocols/pure/v1/model/rawValueSpecifica
 export { V1_ProcessingContext } from './models/protocols/pure/v1/transformation/pureGraph/to/helpers/V1_ProcessingContext.js';
 export { V1_ProtocolToMetaModelConnectionBuilder } from './models/protocols/pure/v1/transformation/pureGraph/to/V1_ProtocolToMetaModelConnectionBuilder.js';
 export * from './models/protocols/pure/v1/transformation/pureGraph/from/V1_GraphTransformerContext.js';
-export {
-  V1_initPackageableElement,
-  V1_transformElementReference,
-} from './models/protocols/pure/v1/transformation/pureGraph/from/V1_CoreTransformerHelper.js';
+export * from './models/protocols/pure/v1/transformation/pureGraph/from/V1_CoreTransformerHelper.js';
 export {
   V1_RawValueSpecificationTransformer,
   V1_transformRawLambda,
@@ -324,7 +321,11 @@ export * from './graphManager/action/creation/DSLMapping_ModelCreatorHelper.js';
 export * from './graphManager/action/creation/RawValueSpecificationCreatorHelper.js';
 export * from './graphManager/action/creation/StoreRelational_ModelCreatorHelper.js';
 
-// --------------------------------------------- TO BE MODULARIZED --------------------------------------------------
+// --------------------------------------------- DSL --------------------------------------------------
+/**
+ * @modularize
+ * See https://github.com/finos/legend-studio/issues/65
+ */
 
 export * from './DSLMapping_Exports.js';
 export * from './DSLService_Exports.js';

package/src/models/metamodels/pure/data/EmbeddedData.ts

@@ -41,7 +41,7 @@ export class DataElementReference extends EmbeddedData implements Hashable {
   get hashCode(): string {
     return hashArray([
       CORE_HASH_STRUCTURE.DATA_ELEMENT_REFERENCE,
-      this.dataElement.hashValue,
+      this.dataElement.valueForSerialization ?? '',
     ]);
   }
   accept_EmbeddedDataVisitor<T>(visitor: EmbeddedDataVisitor<T>): T {

package/src/models/metamodels/pure/executionPlan/nodes/ExecutionNode.ts

@@ -14,10 +14,13 @@
  * limitations under the License.
  */
 
+import { uuid } from '@finos/legend-shared';
 import type { Multiplicity } from '../../packageableElements/domain/Multiplicity.js';
 import type { ResultType } from '../result/ResultType.js';
 
 export class ExecutionNode {
+  readonly _UUID = uuid();
+
   // fromCluster : ClusteredValueSpecification[0..1];
   resultType!: ResultType;
   resultSizeRange?: Multiplicity | undefined;

package/src/models/metamodels/pure/packageableElements/PackageableElementReference.ts

@@ -30,10 +30,6 @@ export abstract class PackageableElementReference<
   }
 
   abstract get valueForSerialization(): string | undefined;
-
-  get hashValue(): string {
-    return this.valueForSerialization ?? '';
-  }
 }
 
 export class PackageableElementExplicitReference<
@@ -252,7 +248,7 @@ export class OptionalPackageableElementImplicitReference<
   }
 }
 
-export const toOptionalPackageableElementReference = <
+export const optionalizePackageableElementReference = <
   V extends PackageableElement,
 >(
   reference: PackageableElementReference<V> | undefined,

package/src/models/metamodels/pure/packageableElements/connection/Connection.ts

@@ -67,7 +67,7 @@ export class ConnectionPointer extends Connection implements Hashable {
   get hashCode(): string {
     return hashArray([
       CORE_HASH_STRUCTURE.CONNECTION_POINTER,
-      this.packageableConnection.hashValue,
+      this.packageableConnection.valueForSerialization ?? '',
     ]);
   }
 

package/src/models/metamodels/pure/packageableElements/domain/Class.ts

@@ -81,7 +81,9 @@ export class Class extends Type implements Hashable {
       hashArray(this.properties),
       hashArray(this.derivedProperties),
       hashArray(
-        this.generalizations.map((gen) => gen.ownerReference.hashValue),
+        this.generalizations.map(
+          (gen) => gen.ownerReference.valueForSerialization ?? '',
+        ),
       ),
       hashArray(this.constraints),
       hashArray(this.stereotypes.map((val) => val.pointerHashCode)),

package/src/models/metamodels/pure/packageableElements/domain/ConcreteFunctionDefinition.ts

@@ -58,7 +58,7 @@ export class ConcreteFunctionDefinition
       CORE_HASH_STRUCTURE.FUNCTION,
       this.path,
       hashArray(this.parameters),
-      this.returnType.hashValue,
+      this.returnType.valueForSerialization ?? '',
       hashArray(this.taggedValues),
       hashArray(this.stereotypes.map((val) => val.pointerHashCode)),
       hashRawLambda(undefined, this.expressionSequence),

package/src/models/metamodels/pure/packageableElements/domain/DerivedProperty.ts

@@ -65,7 +65,7 @@ export class DerivedProperty
       CORE_HASH_STRUCTURE.DERIVED_PROPERTY,
       this.name,
       this.multiplicity,
-      this.genericType.ownerReference.hashValue,
+      this.genericType.ownerReference.valueForSerialization ?? '',
       hashArray(this.stereotypes.map((val) => val.pointerHashCode)),
       hashArray(this.taggedValues),
       hashRawLambda(this.parameters, this.body),

package/src/models/metamodels/pure/packageableElements/domain/Property.ts

@@ -50,7 +50,7 @@ export class Property implements AbstractProperty, AnnotatedElement, Hashable {
       CORE_HASH_STRUCTURE.PROPERTY,
       this.name,
       this.multiplicity,
-      this.genericType.ownerReference.hashValue,
+      this.genericType.ownerReference.valueForSerialization ?? '',
       hashArray(this.stereotypes.map((val) => val.pointerHashCode)),
       hashArray(this.taggedValues),
     ]);

package/src/models/metamodels/pure/packageableElements/domain/PropertyReference.ts

@@ -46,7 +46,7 @@ export abstract class PropertyReference extends ReferenceWithOwner {
     return [
       CORE_HASH_STRUCTURE.PROPERTY_POINTER,
       this.value.name,
-      this.ownerReference.hashValue,
+      this.ownerReference.valueForSerialization ?? '',
     ]
       .map(hashString)
       .join(',');

package/src/models/metamodels/pure/packageableElements/domain/StereotypeReference.ts

@@ -42,7 +42,7 @@ export abstract class StereotypeReference extends ReferenceWithOwner {
     return [
       CORE_HASH_STRUCTURE.STEREOTYPE_POINTER,
       this.value.value,
-      this.ownerReference.hashValue,
+      this.ownerReference.valueForSerialization ?? '',
     ]
       .map(hashString)
       .join(',');

package/src/models/metamodels/pure/packageableElements/domain/TagReference.ts

@@ -42,7 +42,7 @@ export abstract class TagReference extends ReferenceWithOwner {
     return [
       CORE_HASH_STRUCTURE.TAG_POINTER,
       this.value.value,
-      this.ownerReference.hashValue,
+      this.ownerReference.valueForSerialization ?? '',
     ]
       .map(hashString)
       .join(',');

package/src/models/metamodels/pure/packageableElements/externalFormat/connection/DSLExternalFormat_ExternalFormatConnection.ts

@@ -31,7 +31,7 @@ export class ExternalFormatConnection extends Connection implements Hashable {
   get hashCode(): string {
     return hashArray([
       DSL_EXTERNAL_FORMAT_HASH_STRUCTURE.EXTERNAL_FORMAT_CONNECTION,
-      this.store.hashValue,
+      this.store.valueForSerialization ?? '',
       this.externalSource,
     ]);
   }

package/src/models/metamodels/pure/packageableElements/externalFormat/store/DSLExternalFormat_BindingTransformer.ts

@@ -25,7 +25,7 @@ export class BindingTransformer implements Hashable {
   get hashCode(): string {
     return hashArray([
       CORE_HASH_STRUCTURE.BINDING_TRANSFORMER,
-      this.binding.hashValue,
+      this.binding.valueForSerialization ?? '',
     ]);
   }
 }

package/src/models/metamodels/pure/packageableElements/externalFormat/store/DSLExternalFormat_ModelUnit.ts

@@ -29,10 +29,14 @@ export class ModelUnit implements Hashable {
     return hashArray([
       DSL_EXTERNAL_FORMAT_HASH_STRUCTURE.MODEL_UNIT,
       hashArray(
-        this.packageableElementIncludes.map((element) => element.hashValue),
+        this.packageableElementIncludes.map(
+          (element) => element.valueForSerialization ?? '',
+        ),
       ),
       hashArray(
-        this.packageableElementExcludes.map((element) => element.hashValue),
+        this.packageableElementExcludes.map(
+          (element) => element.valueForSerialization ?? '',
+        ),
       ),
     ]);
   }

package/src/models/metamodels/pure/packageableElements/fileGeneration/FileGenerationSpecification.ts

@@ -43,7 +43,7 @@ export class FileGenerationSpecification
       hashArray(
         this.scopeElements.map((element) =>
           element instanceof PackageableElementReference
-            ? element.hashValue
+            ? element.valueForSerialization ?? ''
             : element,
         ),
       ),

package/src/models/metamodels/pure/packageableElements/generationSpecification/GenerationSpecification.ts

@@ -44,7 +44,7 @@ export class GenerationTreeNode implements Hashable {
   get hashCode(): string {
     return hashArray([
       CORE_HASH_STRUCTURE.GENERATION_TREE_NODE,
-      this.generationElement.hashValue,
+      this.generationElement.valueForSerialization ?? '',
       this.id,
     ]);
   }
@@ -72,7 +72,7 @@ export class GenerationSpecification
         this.fileGenerations.map((fileGeneration) =>
           hashElementPointer(
             PackageableElementPointerType.FILE_GENERATION,
-            fileGeneration.hashValue,
+            fileGeneration.valueForSerialization ?? '',
           ),
         ),
       ),

package/src/models/metamodels/pure/packageableElements/mapping/AssociationImplementation.ts

@@ -52,7 +52,7 @@ export abstract class AssociationImplementation
       CORE_HASH_STRUCTURE.ASSOCIATION_IMPLEMENTATION,
       this.association.value.path,
       this.id.valueForSerialization ?? '',
-      hashArray(this.stores.map((e) => e.hashValue)),
+      hashArray(this.stores.map((e) => e.valueForSerialization ?? '')),
     ]);
   }
 }

package/src/models/metamodels/pure/packageableElements/mapping/EnumValueMapping.ts

@@ -25,12 +25,14 @@ import { CORE_HASH_STRUCTURE } from '../../../../../MetaModelConst.js';
 import { Enum } from '../domain/Enum.js';
 import type { EnumValueReference } from '../domain/EnumValueReference.js';
 
+export type SourceValueType = Enum | string | number | undefined;
+
 export class SourceValue {
   readonly _UUID = uuid();
 
-  value: Enum | string | number | undefined;
+  value: SourceValueType;
 
-  constructor(value: Enum | string | number | undefined) {
+  constructor(value: SourceValueType) {
     this.value = value;
   }
 }

package/src/models/metamodels/pure/packageableElements/mapping/EnumerationMapping.ts

@@ -50,7 +50,7 @@ export class EnumerationMapping implements Hashable {
     return hashArray([
       CORE_HASH_STRUCTURE.ENUMERATION_MAPPING,
       this.id.valueForSerialization ?? '',
-      this.enumeration.hashValue,
+      this.enumeration.valueForSerialization ?? '',
       // If there are no enum value mapping, source type means nothing since it's not in the protocol anyway
       this.enumValueMappings.filter(
         // TODO: use `isStubbed_EnumValueMapping` when we refactor hashing

package/src/models/metamodels/pure/packageableElements/mapping/EnumerationMappingReference.ts

@@ -0,0 +1,61 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  type OptionalPackageableElementReference,
+  OptionalPackageableElementExplicitReference,
+} from '../PackageableElementReference.js';
+import type { Mapping } from './Mapping.js';
+import type { EnumerationMapping } from './EnumerationMapping.js';
+import { OptionalReferenceWithOwner } from '../../Reference.js';
+
+export abstract class OptionalEnumerationMappingReference extends OptionalReferenceWithOwner {
+  override readonly ownerReference: OptionalPackageableElementReference<Mapping>;
+  value?: EnumerationMapping | undefined;
+
+  protected constructor(
+    ownerReference: OptionalPackageableElementReference<Mapping>,
+    value: EnumerationMapping | undefined,
+  ) {
+    super(ownerReference);
+    this.ownerReference = ownerReference;
+    this.value = value;
+  }
+
+  abstract get valueForSerialization(): string | undefined;
+}
+
+export class OptionalEnumerationMappingExplicitReference extends OptionalEnumerationMappingReference {
+  override readonly ownerReference: OptionalPackageableElementReference<Mapping>;
+
+  private constructor(value: EnumerationMapping | undefined) {
+    const ownerReference = OptionalPackageableElementExplicitReference.create(
+      value?._PARENT,
+    );
+    super(ownerReference, value);
+    this.ownerReference = ownerReference;
+  }
+
+  static create(
+    value: EnumerationMapping | undefined,
+  ): OptionalEnumerationMappingExplicitReference {
+    return new OptionalEnumerationMappingExplicitReference(value);
+  }
+
+  get valueForSerialization(): string | undefined {
+    return this.value?.id.value;
+  }
+}

package/src/models/metamodels/pure/packageableElements/mapping/LocalMappingPropertyInfo.ts

@@ -28,7 +28,7 @@ export class LocalMappingPropertyInfo implements Hashable {
   get hashCode(): string {
     return hashArray([
       CORE_HASH_STRUCTURE.LOCAL_MAPPING_PROPERTY,
-      this.localMappingPropertyType.hashValue,
+      this.localMappingPropertyType.valueForSerialization ?? '',
       this.localMappingPropertyMultiplicity,
     ]);
   }

package/src/models/metamodels/pure/packageableElements/mapping/MappingInclude.ts

@@ -34,11 +34,11 @@ export class MappingInclude {
   get hashCode(): string {
     return hashArray([
       CORE_HASH_STRUCTURE.MAPPING_INCLUDE,
-      this.included.hashValue,
-      getNullableFirstElement(this.storeSubstitutions)?.original.hashValue ??
-        '',
-      getNullableFirstElement(this.storeSubstitutions)?.substitute.hashValue ??
-        '',
+      this.included.valueForSerialization ?? '',
+      getNullableFirstElement(this.storeSubstitutions)?.original
+        .valueForSerialization ?? '',
+      getNullableFirstElement(this.storeSubstitutions)?.substitute
+        .valueForSerialization ?? '',
     ]);
   }
 }

package/src/models/metamodels/pure/packageableElements/mapping/PropertyMapping.ts

@@ -30,8 +30,8 @@ import type { AggregationAwarePropertyMapping } from './aggregationAware/Aggrega
 import type { XStorePropertyMapping } from './xStore/XStorePropertyMapping.js';
 import type { LocalMappingPropertyInfo } from './LocalMappingPropertyInfo.js';
 
-/* @MARKER: NEW CLASS MAPPING TYPE SUPPORT --- consider adding class mapping type handler here whenever support for a new one is added to the app */
 export interface PropertyMappingVisitor<T> {
+  visit_PropertyMapping(propertyMapping: PropertyMapping): T;
   visit_PurePropertyMapping(propertyMapping: PurePropertyMapping): T;
   visit_FlatDataPropertyMapping(propertyMapping: FlatDataPropertyMapping): T;
   visit_EmbeddedFlatDataPropertyMapping(

package/src/models/metamodels/pure/packageableElements/mapping/SetImplementation.ts

@@ -92,7 +92,7 @@ export abstract class SetImplementation
     return hashArray([
       CORE_HASH_STRUCTURE.SET_IMPLEMENTATION,
       this.id.valueForSerialization ?? '',
-      this.class.hashValue,
+      this.class.valueForSerialization ?? '',
       this.root.valueForSerialization.toString(),
       this.superSetImplementationId ?? '',
     ]);

package/src/models/metamodels/pure/packageableElements/runtime/Runtime.ts

@@ -59,7 +59,7 @@ export class StoreConnections implements Hashable {
       CORE_HASH_STRUCTURE.STORE_CONNECTIONS,
       hashElementPointer(
         PackageableElementPointerType.STORE,
-        this.store.hashValue,
+        this.store.valueForSerialization ?? '',
       ),
       hashArray(this.storeConnections),
     ]);
@@ -81,7 +81,7 @@ export class EngineRuntime extends Runtime implements Hashable {
         this.mappings.map((mapping) =>
           hashElementPointer(
             PackageableElementPointerType.MAPPING,
-            mapping.hashValue,
+            mapping.valueForSerialization ?? '',
           ),
         ),
       ),
@@ -108,7 +108,7 @@ export class RuntimePointer extends Runtime implements Hashable {
   get hashCode(): string {
     return hashArray([
       CORE_HASH_STRUCTURE.RUNTIME_POINTER,
-      this.packageableRuntime.hashValue,
+      this.packageableRuntime.valueForSerialization ?? '',
     ]);
   }
 }

package/src/models/metamodels/pure/packageableElements/section/Section.ts

@@ -36,7 +36,7 @@ export abstract class Section implements Hashable {
     return hashArray([
       CORE_HASH_STRUCTURE.SECTION,
       this.parserName,
-      hashArray(this.elements.map((e) => e.hashValue)),
+      hashArray(this.elements.map((e) => e.valueForSerialization ?? '')),
     ]);
   }
 }
@@ -48,7 +48,7 @@ export class ImportAwareCodeSection extends Section {
     return hashArray([
       CORE_HASH_STRUCTURE.IMPORT_AWARE_CODE_SECTION,
       super.hashCode,
-      hashArray(this.imports.map((e) => e.hashValue)),
+      hashArray(this.imports.map((e) => e.valueForSerialization ?? '')),
     ]);
   }
 }

package/src/models/metamodels/pure/packageableElements/service/ServiceExecution.ts

@@ -66,7 +66,7 @@ export class PureSingleExecution extends PureExecution implements Hashable {
     return hashArray([
       CORE_HASH_STRUCTURE.SERVICE_PURE_SINGLE_EXECUTION,
       super.hashCode,
-      this.mapping.hashValue,
+      this.mapping.valueForSerialization ?? '',
       this.runtime,
     ]);
   }
@@ -93,7 +93,7 @@ export class KeyedExecutionParameter implements Hashable {
     return hashArray([
       CORE_HASH_STRUCTURE.SERVICE_KEYED_EXECUTION_PARAMETER,
       this.key,
-      this.mapping.hashValue,
+      this.mapping.valueForSerialization ?? '',
       this.runtime,
     ]);
   }

package/src/models/metamodels/pure/packageableElements/store/flatData/connection/FlatDataConnection.ts

@@ -43,7 +43,7 @@ export class FlatDataConnection extends Connection implements Hashable {
   get hashCode(): string {
     return hashArray([
       CORE_HASH_STRUCTURE.FLAT_DATA_CONNECTION,
-      this.store.hashValue,
+      this.store.valueForSerialization ?? '',
       this.url,
     ]);
   }

package/src/models/metamodels/pure/packageableElements/store/flatData/mapping/EmbeddedFlatDataPropertyMapping.ts

@@ -88,6 +88,7 @@ export class EmbeddedFlatDataPropertyMapping
         this.propertyMappings.filter(
           // TODO: we should also handle of other property mapping types
           // using some form of extension mechanism
+          // This is a rather optimistic check as we make assumption on the type of property mapping included here
           (propertyMapping) => {
             if (propertyMapping instanceof FlatDataPropertyMapping) {
               // TODO: use `isStubbed_RawLambda` when we move this out of the metamodel

package/src/models/metamodels/pure/packageableElements/store/flatData/mapping/FlatDataInputData.ts

@@ -42,7 +42,7 @@ export class FlatDataInputData extends InputData implements Hashable {
       CORE_HASH_STRUCTURE.FLAT_DATA_INPUT_DATA,
       hashElementPointer(
         PackageableElementPointerType.STORE,
-        this.sourceFlatData.hashValue,
+        this.sourceFlatData.valueForSerialization ?? '',
       ),
       this.data,
     ]);

package/src/models/metamodels/pure/packageableElements/store/flatData/mapping/FlatDataInstanceSetImplementation.ts

@@ -56,13 +56,14 @@ export class FlatDataInstanceSetImplementation
     return hashArray([
       CORE_HASH_STRUCTURE.FLAT_DATA_INSTANCE_SET_IMPLEMENTATION,
       super.hashCode,
-      this.sourceRootRecordType.ownerReference.hashValue,
+      this.sourceRootRecordType.ownerReference.valueForSerialization ?? '',
       this.sourceRootRecordType.value._OWNER.name,
       this.filter ?? '',
       hashArray(
         this.propertyMappings.filter(
           // TODO: we should also handle of other property mapping types
           // using some form of extension mechanism
+          // This is a rather optimistic check as we make assumption on the type of property mapping included here
           (propertyMapping) => {
             if (propertyMapping instanceof FlatDataPropertyMapping) {
               // TODO: use `isStubbed_RawLambda` when we move this out of the metamodel