@finos/legend-graph 8.0.3 → 10.0.0

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/service/ServiceTest.ts

@@ -20,6 +20,7 @@ import { AtomicTest } from '../../test/Test.js';
 import type { ParameterValue } from './ParameterValue.js';
 
 export class ServiceTest extends AtomicTest implements Hashable {
+  serializationFormat: string | undefined;
   parameters: ParameterValue[] = [];
 
   get hashCode(): string {
@@ -28,6 +29,7 @@ export class ServiceTest extends AtomicTest implements Hashable {
       this.id,
       hashArray(this.assertions),
       hashArray(this.parameters),
+      this.serializationFormat ?? '',
     ]);
   }
 }

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

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

@@ -16,20 +16,19 @@
 
 import { CORE_HASH_STRUCTURE } from '../../../../../../../MetaModelConst.js';
 import { hashArray, type Hashable } from '@finos/legend-shared';
-import type { EnumerationMapping } from '../../../mapping/EnumerationMapping.js';
 import type { RawLambda } from '../../../../rawValueSpecification/RawLambda.js';
 import { AbstractFlatDataPropertyMapping } from './AbstractFlatDataPropertyMapping.js';
 import type { SetImplementation } from '../../../mapping/SetImplementation.js';
 import type { PropertyMappingsImplementation } from '../../../mapping/PropertyMappingsImplementation.js';
 import type { PropertyReference } from '../../../domain/PropertyReference.js';
 import type { PropertyMappingVisitor } from '../../../mapping/PropertyMapping.js';
+import { OptionalEnumerationMappingExplicitReference } from '../../../mapping/EnumerationMappingReference.js';
 
 export class FlatDataPropertyMapping
   extends AbstractFlatDataPropertyMapping
   implements Hashable
 {
-  // TODO: convert to reference
-  transformer?: EnumerationMapping | undefined;
+  transformer = OptionalEnumerationMappingExplicitReference.create(undefined);
   /**
    * Studio does not process value specification, they are left in raw JSON form
    *
@@ -52,7 +51,7 @@ export class FlatDataPropertyMapping
     return hashArray([
       CORE_HASH_STRUCTURE.FLAT_DATA_PROPERTY_MAPPING,
       super.hashCode,
-      this.transformer?.id.value ?? '',
+      this.transformer.valueForSerialization ?? '',
       this.transform,
     ]);
   }

package/src/models/metamodels/pure/packageableElements/store/flatData/model/FlatData.ts

@@ -27,7 +27,9 @@ export class FlatData extends Store implements Hashable {
     return hashArray([
       CORE_HASH_STRUCTURE.FLAT_DATA,
       this.path,
-      hashArray(this.includes.map((include) => include.hashValue)),
+      hashArray(
+        this.includes.map((include) => include.valueForSerialization ?? ''),
+      ),
       hashArray(this.sections),
     ]);
   }

package/src/models/metamodels/pure/packageableElements/store/flatData/model/FlatDataSectionReference.ts

@@ -41,7 +41,7 @@ export abstract class FlatDataSectionReference extends ReferenceWithOwner {
   get pointerHashCode(): string {
     return [
       CORE_HASH_STRUCTURE.FLAT_DATA_SECTION_POINTER,
-      this.ownerReference.hashValue,
+      this.ownerReference.valueForSerialization ?? '',
       this.value.name,
     ]
       .map(hashString)

package/src/models/metamodels/pure/packageableElements/store/modelToModel/connection/JsonModelConnection.ts

@@ -48,7 +48,7 @@ export class JsonModelConnection
   get hashCode(): string {
     return hashArray([
       CORE_HASH_STRUCTURE.JSON_MODEL_CONNECTION,
-      this.class.hashValue,
+      this.class.valueForSerialization ?? '',
       this.url,
     ]);
   }

package/src/models/metamodels/pure/packageableElements/store/modelToModel/connection/ModelChainConnection.ts

@@ -40,7 +40,7 @@ export class ModelChainConnection extends Connection {
   get hashCode(): string {
     return hashArray([
       CORE_HASH_STRUCTURE.MODEL_CHAIN_CONNECTION,
-      hashArray(this.mappings.map((m) => m.hashValue)),
+      hashArray(this.mappings.map((m) => m.valueForSerialization ?? '')),
     ]);
   }
 }

package/src/models/metamodels/pure/packageableElements/store/modelToModel/connection/XmlModelConnection.ts

@@ -43,7 +43,7 @@ export class XmlModelConnection
   get hashCode(): string {
     return hashArray([
       CORE_HASH_STRUCTURE.XML_MODEL_CONNECTION,
-      this.class.hashValue,
+      this.class.valueForSerialization ?? '',
       this.url,
     ]);
   }

package/src/models/metamodels/pure/packageableElements/store/modelToModel/mapping/ObjectInputData.ts

@@ -54,7 +54,7 @@ export class ObjectInputData extends InputData implements Hashable {
   get hashCode(): string {
     return hashArray([
       CORE_HASH_STRUCTURE.OBJECT_INPUT_DATA,
-      this.sourceClass.hashValue,
+      this.sourceClass.valueForSerialization ?? '',
       this.inputType,
       this.data,
     ]);

package/src/models/metamodels/pure/packageableElements/store/modelToModel/mapping/PureInstanceSetImplementation.ts

@@ -63,6 +63,7 @@ export class PureInstanceSetImplementation
         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) =>
             // TODO: use `isStubbed_RawLambda` when we move this out of the metamodel
             Boolean(propertyMapping.transform.parameters) ||

package/src/models/metamodels/pure/packageableElements/store/modelToModel/mapping/PurePropertyMapping.ts

@@ -20,15 +20,14 @@ import {
   type PropertyMappingVisitor,
   PropertyMapping,
 } from '../../../mapping/PropertyMapping.js';
-import type { EnumerationMapping } from '../../../mapping/EnumerationMapping.js';
 import type { PropertyReference } from '../../../domain/PropertyReference.js';
 import type { SetImplementation } from '../../../mapping/SetImplementation.js';
 import type { PropertyMappingsImplementation } from '../../../mapping/PropertyMappingsImplementation.js';
 import type { RawLambda } from '../../../../rawValueSpecification/RawLambda.js';
+import { OptionalEnumerationMappingExplicitReference } from '../../../mapping/EnumerationMappingReference.js';
 
 export class PurePropertyMapping extends PropertyMapping implements Hashable {
-  // TODO: convert to reference
-  transformer?: EnumerationMapping | undefined;
+  transformer = OptionalEnumerationMappingExplicitReference.create(undefined);
   /**
    * Studio does not process value specification, they are left in raw JSON form
    *
@@ -54,7 +53,7 @@ export class PurePropertyMapping extends PropertyMapping implements Hashable {
     return hashArray([
       CORE_HASH_STRUCTURE.PURE_PROPERTY_MAPPING,
       super.hashCode,
-      this.transformer?.id.value ?? '',
+      this.transformer.valueForSerialization ?? '',
       this.transform,
       Boolean(this.explodeProperty).toString(),
     ]);

package/src/models/metamodels/pure/packageableElements/store/relational/connection/RelationalDatabaseConnection.ts

@@ -26,8 +26,13 @@ import type { Database } from '../model/Database.js';
 import type { PackageableElementReference } from '../../../PackageableElementReference.js';
 import type { PostProcessor } from './postprocessor/PostProcessor.js';
 
-// TODO: to be modularized or handled differently
-// See https://github.com/finos/legend-studio/issues/946
+/**
+ * TODO: to be modularized or handled differently
+ *
+ * @modularize
+ * See https://github.com/finos/legend-studio/issues/946
+ * See https://github.com/finos/legend-studio/issues/65
+ */
 export enum DatabaseType {
   DB2 = 'DB2',
   H2 = 'H2',
@@ -81,7 +86,7 @@ export class RelationalDatabaseConnection extends DatabaseConnection {
   get hashCode(): string {
     return hashArray([
       CORE_HASH_STRUCTURE.RELATIONAL_DATABASE_CONNECTION,
-      this.store.hashValue,
+      this.store.valueForSerialization ?? '',
       this.timeZone ?? '',
       this.quoteIdentifiers?.toString() ?? '',
       this.datasourceSpecification,

package/src/models/metamodels/pure/packageableElements/store/relational/mapping/EmbeddedRelationalInstanceSetImplementation.ts

@@ -89,13 +89,14 @@ export class EmbeddedRelationalInstanceSetImplementation
     return hashArray([
       CORE_HASH_STRUCTURE.EMBEDDED_REALTIONAL_PROPERTY_MAPPING,
       super.hashCode,
-      this.class.hashValue,
+      this.class.valueForSerialization ?? '',
       hashArray(this.primaryKey),
       // skip `root` since we disregard it in embedded property mappings
       hashArray(
         this.propertyMappings.filter((propertyMapping) => {
           // 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
           if (propertyMapping instanceof RelationalPropertyMapping) {
             // TODO: use `isStubbed_RawRelationalOperationElement` when we move this out of the metamodel
             return !isEmpty(propertyMapping.relationalOperation);

package/src/models/metamodels/pure/packageableElements/store/relational/mapping/FilterMapping.ts

@@ -39,7 +39,7 @@ export class FilterMapping implements Hashable {
   get hashCode(): string {
     return hashArray([
       CORE_HASH_STRUCTURE.FILTER_MAPPING,
-      this.filter.ownerReference.hashValue,
+      this.filter.ownerReference.valueForSerialization ?? '',
       this.filter.value.name,
       hashArray(this.joinTreeNode ? extractLine(this.joinTreeNode) : []),
     ]);

package/src/models/metamodels/pure/packageableElements/store/relational/mapping/RelationalInputData.ts

@@ -44,7 +44,7 @@ export class RelationalInputData extends InputData implements Hashable {
   get hashCode(): string {
     return hashArray([
       CORE_HASH_STRUCTURE.RELATIONAL_INPUT_DATA,
-      this.database.hashValue,
+      this.database.valueForSerialization ?? '',
       this.data,
       this.inputType,
     ]);

package/src/models/metamodels/pure/packageableElements/store/relational/mapping/RelationalInstanceSetImplementation.ts

@@ -40,6 +40,7 @@ export class RelationalInstanceSetImplementation
         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 RelationalPropertyMapping) {
               // TODO: use `isStubbed_RawRelationalOperationElement` when we move this out of the metamodel

package/src/models/metamodels/pure/packageableElements/store/relational/mapping/RelationalPropertyMapping.ts

@@ -16,7 +16,6 @@
 
 import { CORE_HASH_STRUCTURE } from '../../../../../../../MetaModelConst.js';
 import { hashArray, type Hashable } from '@finos/legend-shared';
-import type { EnumerationMapping } from '../../../mapping/EnumerationMapping.js';
 import {
   type PropertyMappingVisitor,
   PropertyMapping,
@@ -24,13 +23,13 @@ import {
 import { hashObjectWithoutSourceInformation } from '../../../../../../../MetaModelUtils.js';
 import type { RawRelationalOperationElement } from '../model/RawRelationalOperationElement.js';
 import type { BindingTransformer } from '../../../externalFormat/store/DSLExternalFormat_BindingTransformer.js';
+import { OptionalEnumerationMappingExplicitReference } from '../../../mapping/EnumerationMappingReference.js';
 
 export class RelationalPropertyMapping
   extends PropertyMapping
   implements Hashable
 {
-  // TODO: convert to reference
-  transformer?: EnumerationMapping | undefined;
+  transformer = OptionalEnumerationMappingExplicitReference.create(undefined);
   /**
    * Studio does not process value specification, they are left in raw JSON form
    *
@@ -47,7 +46,7 @@ export class RelationalPropertyMapping
     return hashArray([
       CORE_HASH_STRUCTURE.REALTIONAL_PROPERTY_MAPPING,
       super.hashCode,
-      this.transformer?.id.value ?? '',
+      this.transformer.valueForSerialization ?? '',
       this.bindingTransformer ?? '',
       hashObjectWithoutSourceInformation(this.relationalOperation),
     ]);

package/src/models/metamodels/pure/packageableElements/store/relational/model/Database.ts

@@ -31,7 +31,9 @@ export class Database extends Store implements Hashable {
     return hashArray([
       CORE_HASH_STRUCTURE.DATABASE,
       this.path,
-      hashArray(this.includes.map((include) => include.hashValue)),
+      hashArray(
+        this.includes.map((include) => include.valueForSerialization ?? ''),
+      ),
       hashArray(this.schemas),
       hashArray(this.joins),
       hashArray(this.filters),

package/src/models/metamodels/pure/packageableElements/store/relational/model/RelationalOperationElement.ts

@@ -101,7 +101,7 @@ export class JoinTreeNode {
   get hashCode(): string {
     return hashArray([
       CORE_HASH_STRUCTURE.DATABASE_JOIN,
-      this.join.ownerReference.hashValue,
+      this.join.ownerReference.valueForSerialization ?? '',
       this.join.value.name,
       this.joinType ?? '',
     ]);

package/src/models/metamodels/pure/packageableElements/store/relational/model/TableReference.ts

@@ -49,7 +49,7 @@ export abstract class TableReference extends NamedRelationalReference {
   get pointerHashCode(): string {
     return [
       CORE_HASH_STRUCTURE.RELATIONAL_OPERATION_TABLE_POINTER,
-      this.ownerReference.hashValue,
+      this.ownerReference.valueForSerialization ?? '',
       this.value.schema.name,
       this.value.name,
     ]
@@ -60,7 +60,7 @@ export abstract class TableReference extends NamedRelationalReference {
   get selfJoinPointerHashCode(): string {
     return [
       CORE_HASH_STRUCTURE.RELATIONAL_OPERATION_TABLE_POINTER,
-      this.ownerReference.hashValue,
+      this.ownerReference.valueForSerialization ?? '',
       SELF_JOIN_SCHEMA_NAME,
       SELF_JOIN_TABLE_NAME,
     ]

package/src/models/metamodels/pure/packageableElements/store/relational/model/ViewReference.ts

@@ -40,7 +40,7 @@ export abstract class ViewReference extends NamedRelationalReference {
   get pointerHashCode(): string {
     return [
       CORE_HASH_STRUCTURE.RELATIONAL_OPERATION_TABLE_POINTER,
-      this.ownerReference.hashValue,
+      this.ownerReference.valueForSerialization ?? '',
       this.value.schema.name,
       this.value.name,
     ]
@@ -51,7 +51,7 @@ export abstract class ViewReference extends NamedRelationalReference {
   get selfJoinPointerHashCode(): string {
     return [
       CORE_HASH_STRUCTURE.RELATIONAL_OPERATION_TABLE_POINTER,
-      this.ownerReference.hashValue,
+      this.ownerReference.valueForSerialization ?? '',
       SELF_JOIN_SCHEMA_NAME,
       SELF_JOIN_TABLE_NAME,
     ]