@finos/legend-graph 0.2.0 → 0.2.5

package/src/GraphManagerState.ts

@@ -41,6 +41,8 @@ import type { SetImplementation } from './models/metamodels/pure/packageableElem
 import type { PackageableElement } from './models/metamodels/pure/packageableElements/PackageableElement';
 import { EmbeddedFlatDataPropertyMapping } from './models/metamodels/pure/packageableElements/store/flatData/mapping/EmbeddedFlatDataPropertyMapping';
 import { EmbeddedRelationalInstanceSetImplementation } from './models/metamodels/pure/packageableElements/store/relational/mapping/EmbeddedRelationalInstanceSetImplementation';
+import { InlineEmbeddedRelationalInstanceSetImplementation } from './models/metamodels/pure/packageableElements/store/relational/mapping/InlineEmbeddedRelationalInstanceSetImplementation';
+import { OtherwiseEmbeddedRelationalInstanceSetImplementation } from './models/metamodels/pure/packageableElements/store/relational/mapping/OtherwiseEmbeddedRelationalInstanceSetImplementation';
 import { getGraphManager } from './models/protocols/pure/Pure';
 
 export class GraphManagerState {
@@ -154,6 +156,35 @@ export class GraphManagerState {
     );
   }
 
+  getInstanceSetImplementationPropertyMappings(
+    instanceSetImpl: InstanceSetImplementation,
+  ): PropertyMapping[] {
+    if (
+      instanceSetImpl instanceof
+      InlineEmbeddedRelationalInstanceSetImplementation
+    ) {
+      return this.getMappingElementPropertyMappings(
+        instanceSetImpl.inlineSetImplementation,
+      );
+    } else if (
+      instanceSetImpl instanceof
+      OtherwiseEmbeddedRelationalInstanceSetImplementation
+    ) {
+      // NOTE: for now we will grab all property mappings from the main otherwise embedded mapping and the otherwise property mapping.
+      // In the future we may want to incorporate some smartness as to when the otherwise set implementation isinvoked.
+      const otherwiseSetImpl =
+        instanceSetImpl.otherwisePropertyMapping.targetSetImplementation;
+      const otherwisePropertyMappings = otherwiseSetImpl
+        ? this.getMappingElementPropertyMappings(otherwiseSetImpl)
+        : [];
+      return [
+        ...instanceSetImpl.propertyMappings,
+        ...otherwisePropertyMappings,
+      ];
+    }
+    return instanceSetImpl.propertyMappings;
+  }
+
   getMappingElementPropertyMappings(
     mappingElement:
       | EnumerationMapping
@@ -161,10 +192,10 @@ export class GraphManagerState {
       | AssociationImplementation,
   ): PropertyMapping[] {
     let mappedProperties: PropertyMapping[] = [];
-    if (
-      this.isInstanceSetImplementation(mappingElement) ||
-      mappingElement instanceof AssociationImplementation
-    ) {
+    if (this.isInstanceSetImplementation(mappingElement)) {
+      mappedProperties =
+        this.getInstanceSetImplementationPropertyMappings(mappingElement);
+    } else if (mappingElement instanceof AssociationImplementation) {
       mappedProperties = mappingElement.propertyMappings;
     } else if (mappingElement instanceof OperationSetImplementation) {
       mappedProperties = mappingElement.leafSetImplementations

package/src/graphManager/action/SourceInformationHelper.ts

@@ -17,7 +17,9 @@
 import { assertTrue } from '@finos/legend-shared';
 import type { SourceInformation } from './SourceInformation';
 
-const COORDINATE_DELIMITER = '__';
+// NOTE: @ is chosen because it is not part of identifier token in Pure grammar
+// TODO: handle the case of quote identifier e.g. model::something::'I have an @ in me'
+const COORDINATE_DELIMITER = '@';
 
 export const extractSourceInformationCoordinates = (
   sourceInformation: SourceInformation | undefined,

package/src/helpers/MappingResolutionHelper.ts

@@ -44,7 +44,7 @@ export const updateRootSetImplementationOnCreate = (
   if (classMappingsWithSimilarTarget.length) {
     setImp.setRoot(false);
     if (classMappingsWithSimilarTarget.length === 1) {
-      classMappingsWithSimilarTarget[0].setRoot(false);
+      (classMappingsWithSimilarTarget[0] as SetImplementation).setRoot(false);
     }
   } else {
     setImp.setRoot(true);
@@ -64,7 +64,7 @@ export const updateRootSetImplementationOnDelete = (
     setImp.class.value,
   ).filter((si) => si !== setImp);
   if (classMappingsWithSimilarTarget.length === 1) {
-    classMappingsWithSimilarTarget[0].setRoot(false);
+    (classMappingsWithSimilarTarget[0] as SetImplementation).setRoot(false);
   }
 };
 
@@ -98,7 +98,7 @@ export const findRootSetImplementation = (
   // if there is not root set, and only one set implementation is found, we assume that is the root
   if (
     classMappingsWithSimilarTarget.length === 1 &&
-    classMappingsWithSimilarTarget[0].root.value === false
+    classMappingsWithSimilarTarget[0]?.root.value === false
   ) {
     classMappingsWithSimilarTarget[0].setRoot(true);
     return classMappingsWithSimilarTarget[0];

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

@@ -105,7 +105,7 @@ export class Association
       idx !== -1,
       `Can't find property '${property.name}' in association '${this.path}'`,
     );
-    return this.properties[(idx + 1) % 2];
+    return guaranteeNonNullable(this.properties[(idx + 1) % 2]);
   };
   getPropertyAssociatedClass = (property: AbstractProperty): Class => {
     if (property instanceof Property) {

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

@@ -15,7 +15,12 @@
  */
 
 import { observable, action, computed, makeObservable } from 'mobx';
-import { uuid, isNumber, hashArray } from '@finos/legend-shared';
+import {
+  uuid,
+  isNumber,
+  hashArray,
+  guaranteeNonNullable,
+} from '@finos/legend-shared';
 import {
   CORE_HASH_STRUCTURE,
   PRIMITIVE_TYPE,
@@ -82,7 +87,7 @@ export class EnumValueMapping implements Hashable, Stubable {
     val: Enum | string | undefined,
     sourceType: Type | undefined,
   ): void {
-    const sourceValue = this.sourceValues[idx];
+    const sourceValue = guaranteeNonNullable(this.sourceValues[idx]);
     // If the source type is an enumeration but the value does NOT match an enum value (most likely user is mid typing an enum value)
     // we move on to update the source value with the string value
     if (

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

@@ -135,7 +135,6 @@ export enum BASIC_SET_IMPLEMENTATION_TYPE {
   INSTANCE = 'instance',
 }
 
-/* @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 enum SET_IMPLEMENTATION_TYPE {
   OPERATION = 'operation',
   PUREINSTANCE = 'pureInstance',

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

@@ -167,7 +167,9 @@ export class JoinTreeNode {
  */
 export const extractLine = (joinTreeNode: JoinTreeNode): JoinTreeNode[] =>
   [joinTreeNode].concat(
-    joinTreeNode.children.length ? extractLine(joinTreeNode.children[0]) : [],
+    joinTreeNode.children.length
+      ? extractLine(joinTreeNode.children[0] as JoinTreeNode)
+      : [],
   );
 
 export class RelationalOperationElementWithJoin extends RelationalOperationElement {

package/src/models/protocols/pure/v1/V1_PureGraphManager.ts

@@ -135,7 +135,7 @@ import { V1_GenerationSpecification } from './model/packageableElements/generati
 import { V1_Mapping } from './model/packageableElements/mapping/V1_Mapping';
 import { V1_ConcreteFunctionDefinition } from './model/packageableElements/function/V1_ConcreteFunctionDefinition';
 import { V1_PureModelContextComposite } from './model/context/V1_PureModelContextComposite';
-import { V1_AlloySdlc } from './model/context/V1_AlloySdlc';
+import { V1_AlloySDLC } from './model/context/V1_SDLC';
 import { V1_Protocol } from './model/V1_Protocol';
 import type { V1_PureModelContext } from './model/context/V1_PureModelContext';
 import type { V1_ElementBuilder } from './transformation/pureGraph/to/V1_ElementBuilder';
@@ -1965,7 +1965,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
         break;
       }
       case ServiceExecutionMode.SEMI_INTERACTIVE: {
-        const sdlcInfo = new V1_AlloySdlc(groupdId, artifactId, version);
+        const sdlcInfo = new V1_AlloySDLC(groupdId, artifactId, version);
         const pointer = new V1_PureModelContextPointer(protocol, sdlcInfo);
         // data
         const data = new V1_PureModelContextData();
@@ -1991,7 +1991,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
         break;
       }
       case ServiceExecutionMode.PROD: {
-        const sdlcInfo = new V1_AlloySdlc(groupdId, artifactId, version);
+        const sdlcInfo = new V1_AlloySDLC(groupdId, artifactId, version);
         const pointer = new V1_PureModelContextPointer(protocol, sdlcInfo);
         sdlcInfo.packageableElementPointers = [
           new V1_PackageableElementPointer(

package/src/models/protocols/pure/v1/model/context/V1_PureModelContextPointer.ts

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-import type { V1_Sdlc } from '../../model/context/V1_AlloySdlc';
+import type { V1_SDLC } from './V1_SDLC';
 import type { V1_Protocol } from '../../model/V1_Protocol';
 import { V1_PureModelContext } from './V1_PureModelContext';
 
 export class V1_PureModelContextPointer extends V1_PureModelContext {
   serializer: V1_Protocol;
-  sdlcInfo?: V1_Sdlc | undefined;
+  sdlcInfo?: V1_SDLC | undefined;
 
-  constructor(protocol: V1_Protocol, sdlc?: V1_Sdlc) {
+  constructor(protocol: V1_Protocol, sdlc?: V1_SDLC) {
     super();
     this.serializer = protocol;
     this.sdlcInfo = sdlc;

package/src/models/protocols/pure/v1/model/context/{V1_AlloySdlc.ts → V1_SDLC.ts}

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import type { V1_PackageableElementPointer } from '../../model/packageableElements/V1_PackageableElement';
+import type { V1_PackageableElementPointer } from '../packageableElements/V1_PackageableElement';
 
-export abstract class V1_Sdlc {
+export abstract class V1_SDLC {
   baseVersion = 'latest';
   version: string;
   packageableElementPointers: V1_PackageableElementPointer[] = [];
@@ -26,7 +26,7 @@ export abstract class V1_Sdlc {
   }
 }
 
-export class V1_AlloySdlc extends V1_Sdlc {
+export class V1_AlloySDLC extends V1_SDLC {
   groupId: string;
   artifactId: string;
 

package/src/models/protocols/pure/v1/model/packageableElements/mapping/V1_ClassMapping.ts

@@ -25,7 +25,6 @@ import type { V1_OperationClassMapping } from './V1_OperationClassMapping';
 import type { V1_PureInstanceClassMapping } from '../../../model/packageableElements/store/modelToModel/mapping/V1_PureInstanceClassMapping';
 import type { V1_RootFlatDataClassMapping } from '../../../model/packageableElements/store/flatData/mapping/V1_RootFlatDataClassMapping';
 
-/* @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 V1_ClassMappingVisitor<T> {
   visit_ClassMapping(classMapping: V1_ClassMapping): T;
   visit_OperationClassMapping(classMapping: V1_OperationClassMapping): T;

package/src/models/protocols/pure/v1/transformation/pureGraph/from/V1_DatabaseTransformer.ts

@@ -174,7 +174,8 @@ export const V1_transformTableAliasToTablePointer = (
   tablePtr.database = options?.TEMPORARY__resolveToFullPath
     ? tableAlias.relation.ownerReference.value.path
     : tableAlias.relation.ownerReference.valueForSerialization ?? '';
-  /* @MARKER: GRAMMAR ROUNDTRIP --- omit this information during protocol transformation as it can be interpreted while building the graph */
+  // FIXME: Sometimes, we interpret this, so to maintain roundtrip stability, we need to handle this differrently
+  // See https://github.com/finos/legend-studio/issues/295
   tablePtr.mainTableDb = tablePtr.database;
   tablePtr.schema = tableAlias.isSelfJoinTarget
     ? SELF_JOIN_SCHEMA_NAME
@@ -188,7 +189,8 @@ export const V1_transformTableAliasToTablePointer = (
 export const V1_transformTableToTablePointer = (table: Table): V1_TablePtr => {
   const tablePtr = new V1_TablePtr();
   tablePtr.database = table.schema.owner.path;
-  /* @MARKER: GRAMMAR ROUNDTRIP --- omit this information during protocol transformation as it can be interpreted while building the graph */
+  // FIXME: Sometimes, we interpret this, so to maintain roundtrip stability, we need to handle this differrently
+  // See https://github.com/finos/legend-studio/issues/295
   tablePtr.mainTableDb = tablePtr.database;
   tablePtr.schema = table.schema.name;
   tablePtr.table = table.name;

package/src/models/protocols/pure/v1/transformation/pureGraph/from/V1_MappingTransformer.ts

@@ -141,6 +141,7 @@ import type { V1_GraphTransformerContext } from './V1_GraphTransformerContext';
 import { toJS } from 'mobx';
 import type { DSLMapping_PureProtocolProcessorPlugin_Extension } from '../../../../DSLMapping_PureProtocolProcessorPlugin_Extension';
 import type { InstanceSetImplementation } from '../../../../../../metamodels/pure/packageableElements/mapping/InstanceSetImplementation';
+import type { SubstituteStore } from '../../../../../../metamodels/pure/packageableElements/mapping/SubstituteStore';
 
 export const V1_transformPropertyReference = (
   element: PropertyReference,
@@ -308,7 +309,7 @@ const transformMappingTest = (
   return test;
 };
 
-// Include V1_Mapping
+// Include Mapping
 
 const transformMappingInclude = (
   element: MappingInclude,
@@ -316,15 +317,17 @@ const transformMappingInclude = (
   const mappingInclude = new V1_MappingInclude();
   mappingInclude.includedMapping = element.included.valueForSerialization ?? '';
   mappingInclude.sourceDatabasePath = element.storeSubstitutions.length
-    ? element.storeSubstitutions[0].original.valueForSerialization ?? ''
+    ? (element.storeSubstitutions[0] as SubstituteStore).original
+        .valueForSerialization ?? ''
     : undefined;
   mappingInclude.targetDatabasePath = element.storeSubstitutions.length
-    ? element.storeSubstitutions[0].substitute.valueForSerialization ?? ''
+    ? (element.storeSubstitutions[0] as SubstituteStore).substitute
+        .valueForSerialization ?? ''
     : undefined;
   return mappingInclude;
 };
 
-// Class V1_Mapping
+// Class Mapping
 
 const transformOptionalPropertyMappingTransformer = (
   value: EnumerationMapping | undefined,

package/src/models/protocols/pure/v1/transformation/pureGraph/from/V1_ValueSpecificationTransformer.ts

@@ -112,7 +112,7 @@ class V1_ValueSpecificationTransformer
     valueSpecification: RootGraphFetchTreeInstanceValue,
   ): V1_ValueSpecification {
     return V1_transformGraphFetchTree(
-      valueSpecification.values[0],
+      guaranteeNonNullable(valueSpecification.values[0]),
       this.inScope,
       this.open,
       this.isParameter,
@@ -124,7 +124,7 @@ class V1_ValueSpecificationTransformer
     valueSpecification: PropertyGraphFetchTreeInstanceValue,
   ): V1_ValueSpecification {
     return V1_transformGraphFetchTree(
-      valueSpecification.values[0],
+      guaranteeNonNullable(valueSpecification.values[0]),
       this.inScope,
       this.open,
       this.isParameter,
@@ -200,6 +200,7 @@ class V1_ValueSpecificationTransformer
       }
       case PRIMITIVE_TYPE.LATESTDATE: {
         const cPrimitiveType = new V1_CLatestDate();
+        cPrimitiveType.multiplicity = multiplicity;
         return cPrimitiveType;
       }
       default:
@@ -252,7 +253,7 @@ class V1_ValueSpecificationTransformer
     valueSpecification: EnumValueInstanceValue,
   ): V1_ValueSpecification {
     const _enumValue = new V1_EnumValue();
-    const _enum = valueSpecification.values[0].value;
+    const _enum = guaranteeNonNullable(valueSpecification.values[0]).value;
     _enumValue.value = _enum.name;
     _enumValue.fullPath = _enum.owner.path;
     return _enumValue;

package/src/models/protocols/pure/v1/transformation/pureGraph/to/V1_ExecutionPlanBuilder.ts

@@ -96,19 +96,45 @@ const parseDataType = (val: string): RelationalDataType => {
       return new Other();
     default: {
       if (val.match(/^VARCHAR\(\d+\)$/)) {
-        return new VarChar(getTypeParams(val)[0]);
+        return new VarChar(
+          guaranteeNonNullable(
+            getTypeParams(val)[0],
+            `VARCHAR type size is missing`,
+          ),
+        );
       } else if (val.match(/^CHAR\(\d+\)$/)) {
-        return new Char(getTypeParams(val)[0]);
+        return new Char(
+          guaranteeNonNullable(
+            getTypeParams(val)[0],
+            `VAR type size is missing`,
+          ),
+        );
       } else if (val.match(/^VARBINARY\(\d+\)$/)) {
-        return new VarBinary(getTypeParams(val)[0]);
+        return new VarBinary(
+          guaranteeNonNullable(
+            getTypeParams(val)[0],
+            `VARBINARY type size is missing`,
+          ),
+        );
       } else if (val.match(/^BINARY\(\d+\)$/)) {
-        return new Binary(getTypeParams(val)[0]);
+        return new Binary(
+          guaranteeNonNullable(
+            getTypeParams(val)[0],
+            `BINARY type size is missing`,
+          ),
+        );
       } else if (val.match(/^DECIMAL\(\d+\)$/)) {
         const params = getTypeParams(val);
-        return new Decimal(params[0], params[1]);
+        return new Decimal(
+          guaranteeNonNullable(params[0], `Decimal type precision is missing`),
+          guaranteeNonNullable(params[1], `Decimal type scale is missing`),
+        );
       } else if (val.match(/^NUMERIC\(\d+\)$/)) {
         const params = getTypeParams(val);
-        return new Numeric(params[0], params[1]);
+        return new Numeric(
+          guaranteeNonNullable(params[0], `Decimal type precision is missing`),
+          guaranteeNonNullable(params[1], `Decimal type scale is missing`),
+        );
       }
       throw new UnsupportedOperationError(`Can't parse data type '${val}'`);
     }

package/src/models/protocols/pure/v1/transformation/pureGraph/to/V1_GraphBuilderContext.ts

@@ -21,6 +21,7 @@ import {
 import type { Log } from '@finos/legend-shared';
 import {
   uniq,
+  guaranteeNonNullable,
   assertNonEmptyString,
   guaranteeType,
 } from '@finos/legend-shared';
@@ -161,7 +162,7 @@ export class V1_GraphBuilderContext {
           isFullPath: true,
         };
       case 1:
-        return Array.from(results.values())[0];
+        return guaranteeNonNullable(Array.from(results.values())[0]);
       default:
         throw new GraphBuilderError(
           undefined,

package/src/models/protocols/pure/v1/transformation/pureGraph/to/V1_ProtocolToMetaModelClassMappingSecondPassBuilder.ts

@@ -22,6 +22,7 @@ import {
   guaranteeType,
   assertNonEmptyString,
   assertTrue,
+  guaranteeNonNullable,
 } from '@finos/legend-shared';
 import { GRAPH_MANAGER_LOG_EVENT } from '../../../../../../../graphManager/GraphManagerLogEvent';
 import type { Mapping } from '../../../../../../metamodels/pure/packageableElements/mapping/Mapping';
@@ -154,7 +155,7 @@ export class V1_ProtocolToMetaModelClassMappingSecondPassBuilder
             this.context,
             pureInstanceSetImplementation,
             pureInstanceSetImplementation,
-            this.parent.enumerationMappings,
+            getAllEnumerationMappings(this.parent),
           ),
         ),
       ) as PurePropertyMapping[];
@@ -270,7 +271,9 @@ export class V1_ProtocolToMetaModelClassMappingSecondPassBuilder
       );
       mainTableAlias = new TableAlias();
       mainTableAlias.name = '';
-      mainTableAlias.relation = Array.from(tables.values())[0];
+      mainTableAlias.relation = guaranteeNonNullable(
+        Array.from(tables.values())[0],
+      );
       mainTableAlias.database = Array.from(dbs.values())[0];
       rootRelationalInstanceSetImplementation.mainTableAlias = mainTableAlias;
     }
@@ -315,7 +318,7 @@ export class V1_ProtocolToMetaModelClassMappingSecondPassBuilder
             this.context,
             aggragetionAwareInstanceSetImplementation,
             aggragetionAwareInstanceSetImplementation,
-            this.parent.enumerationMappings,
+            getAllEnumerationMappings(this.parent),
             new Map<string, TableAlias>(),
             [
               ...getAllClassMappings(mapping),

package/src/models/protocols/pure/v1/transformation/pureGraph/to/V1_ProtocolToMetaModelGraphThirdPassBuilder.ts

@@ -19,6 +19,7 @@ import {
   assertTrue,
   isNonNullable,
   assertErrorThrown,
+  guaranteeNonNullable,
 } from '@finos/legend-shared';
 import { CORE_ELEMENT_PATH } from '../../../../../../../MetaModelConst';
 import { Class } from '../../../../../../metamodels/pure/packageableElements/domain/Class';
@@ -117,8 +118,8 @@ export class V1_ProtocolToMetaModelGraphThirdPassBuilder
     const association = this.context.graph.getAssociation(
       this.context.graph.buildPath(element.package, element.name),
     );
-    const first = element.properties[0];
-    const second = element.properties[1];
+    const first = guaranteeNonNullable(element.properties[0]);
+    const second = guaranteeNonNullable(element.properties[1]);
     association.setProperties([
       V1_buildAssociationProperty(first, second, this.context, association),
       V1_buildAssociationProperty(second, first, this.context, association),

package/src/models/protocols/pure/v1/transformation/pureGraph/to/V1_ProtocolToMetaModelPropertyMappingBuilder.ts

@@ -40,10 +40,7 @@ import { InferableMappingElementIdExplicitValue } from '../../../../../../metamo
 import type { PackageableElementReference } from '../../../../../../metamodels/pure/packageableElements/PackageableElementReference';
 import { PackageableElementImplicitReference } from '../../../../../../metamodels/pure/packageableElements/PackageableElementReference';
 import type { PropertyReference } from '../../../../../../metamodels/pure/packageableElements/domain/PropertyReference';
-import {
-  PropertyImplicitReference,
-  PropertyExplicitReference,
-} from '../../../../../../metamodels/pure/packageableElements/domain/PropertyReference';
+import { PropertyImplicitReference } from '../../../../../../metamodels/pure/packageableElements/domain/PropertyReference';
 import { RootRelationalInstanceSetImplementation } from '../../../../../../metamodels/pure/packageableElements/store/relational/mapping/RootRelationalInstanceSetImplementation';
 import { OtherwiseEmbeddedRelationalInstanceSetImplementation } from '../../../../../../metamodels/pure/packageableElements/store/relational/mapping/OtherwiseEmbeddedRelationalInstanceSetImplementation';
 import { EmbeddedRelationalInstanceSetImplementation } from '../../../../../../metamodels/pure/packageableElements/store/relational/mapping/EmbeddedRelationalInstanceSetImplementation';
@@ -80,6 +77,7 @@ import {
 import { V1_transformRelationalOperationElement } from '../from/V1_DatabaseTransformer';
 import { V1_GraphTransformerContextBuilder } from '../from/V1_GraphTransformerContext';
 import {
+  getAllEnumerationMappings,
   getClassMappingById,
   getClassMappingsByClass,
 } from '../../../../../../../helpers/MappingHelper';
@@ -638,7 +636,9 @@ export class V1_ProtocolToMetaModelPropertyMappingBuilder
             this.context,
             embedded,
             this.topParent,
-            this.topParent?.parent.enumerationMappings ?? [],
+            this.topParent?.parent
+              ? getAllEnumerationMappings(this.topParent.parent)
+              : [],
             this.tableAliasMap,
           ),
         ),
@@ -696,7 +696,9 @@ export class V1_ProtocolToMetaModelPropertyMappingBuilder
             this.context,
             otherwiseEmbedded,
             this.topParent,
-            this.topParent?.parent.enumerationMappings ?? [],
+            this.topParent?.parent
+              ? getAllEnumerationMappings(this.topParent.parent)
+              : [],
             this.tableAliasMap,
           ),
         ),
@@ -707,7 +709,9 @@ export class V1_ProtocolToMetaModelPropertyMappingBuilder
           this.context,
           otherwiseEmbedded,
           this.topParent,
-          this.topParent?.parent.enumerationMappings ?? [],
+          this.topParent?.parent
+            ? getAllEnumerationMappings(this.topParent.parent)
+            : [],
           this.tableAliasMap,
         ),
       ),
@@ -750,10 +754,13 @@ export class V1_ProtocolToMetaModelPropertyMappingBuilder
     );
     const xStorePropertyMapping = new XStorePropertyMapping(
       xStoreParent,
-      // NOTE: this should be `implicit` because this comes from an association
-      // that we should have inferred. But we need to test the impact of changing it to `implicit`.
-      // This might cause bugs in the future.
-      PropertyExplicitReference.create(property),
+      PropertyImplicitReference.create(
+        PackageableElementImplicitReference.create(
+          _association,
+          protocol.property.class,
+        ),
+        property,
+      ),
       guaranteeNonNullable(sourceSetImplementation),
       targetSetImplementation,
     );

package/src/models/protocols/pure/v1/transformation/pureGraph/to/helpers/V1_AssociationMappingHelper.ts

@@ -27,6 +27,7 @@ import { V1_ProtocolToMetaModelPropertyMappingBuilder } from '../../../../transf
 import type { V1_AssociationMapping } from '../../../../model/packageableElements/mapping/V1_AssociationMapping';
 import { V1_XStoreAssociationMapping } from '../../../../model/packageableElements/mapping/xStore/V1_XStoreAssociationMapping';
 import { XStoreAssociationImplementation } from '../../../../../../../metamodels/pure/packageableElements/mapping/xStore/XStoreAssociationImplementation';
+import { getAllEnumerationMappings } from '../../../../../../../../helpers/MappingHelper';
 
 const getInferredAssociationMappingId = (
   _association: Association,
@@ -63,7 +64,7 @@ const buildRelationalAssociationMapping = (
           context,
           relationalAssociationImplementation,
           undefined,
-          parentMapping.enumerationMappings,
+          getAllEnumerationMappings(parentMapping),
           undefined,
           allClassMappings,
         ),
@@ -96,7 +97,7 @@ const buildXStoreAssociationMapping = (
           context,
           xStoreAssociationImplementation,
           undefined,
-          parentMapping.enumerationMappings,
+          getAllEnumerationMappings(parentMapping),
           undefined,
           allClassMappings,
           xStoreAssociationImplementation,

package/src/models/protocols/pure/v1/transformation/pureGraph/to/helpers/V1_DatabaseBuilderHelper.ts

@@ -218,7 +218,10 @@ const buildJoinTreeNode = (
   joins: { joinReference: JoinReference; joinType?: JoinType | undefined }[],
   context: V1_GraphBuilderContext,
 ): JoinTreeNode => {
-  const joinWithJoinType = joins[0];
+  const joinWithJoinType = guaranteeNonNullable(
+    joins[0],
+    `Can't build join tree node: at least one child node is expected`,
+  );
   const res = new JoinTreeNode(
     joinWithJoinType.joinReference,
     joinWithJoinType.joinType,
@@ -599,7 +602,7 @@ export const V1_buildDatabaseJoin = (
       selfJoinTargets.length !== 0,
       `Can't build join of 1 table, unless it is a self-join. Please use the '{target}' notation in order to define a directed self-join`,
     );
-    const existingAlias = aliases[0];
+    const existingAlias = aliases[0] as TableAlias;
     const existingAliasName = existingAlias.name;
     const existingRelationalElement = existingAlias.relation;
     const tableAlias = new TableAlias();
@@ -628,8 +631,14 @@ export const V1_buildDatabaseJoin = (
     });
   }
   join.aliases = [
-    new Pair<TableAlias, TableAlias>(aliases[0], aliases[1]),
-    new Pair<TableAlias, TableAlias>(aliases[1], aliases[0]),
+    new Pair<TableAlias, TableAlias>(
+      aliases[0] as TableAlias,
+      aliases[1] as TableAlias,
+    ),
+    new Pair<TableAlias, TableAlias>(
+      aliases[1] as TableAlias,
+      aliases[0] as TableAlias,
+    ),
   ];
   join.owner = database;
   return join;

package/src/models/protocols/pure/v1/transformation/pureGraph/to/helpers/V1_DomainBuilderHelper.ts

@@ -248,7 +248,8 @@ const isCompatibleDerivedProperty = (
 ): boolean =>
   o.name === name &&
   Array.isArray(o.parameters) &&
-  o.parameters.length === params.length;
+  // We add 1 to account for the `this` parameter in the derived property
+  o.parameters.length + 1 === params.length;
 
 export const V1_getAppliedProperty = (
   parentClass: Class,

package/src/models/protocols/pure/v1/transformation/pureGraph/to/helpers/V1_MappingBuilderHelper.ts

@@ -303,7 +303,9 @@ export const V1_resolveClassMappingRoot = (mapping: Mapping): void => {
   Array.from(classToSetImplMap.entries()).forEach((entries) => {
     const _classMappings = entries[1];
     if (_classMappings.size === 1) {
-      const classMapping = Array.from(_classMappings.values())[0];
+      const classMapping = Array.from(
+        _classMappings.values(),
+      )[0] as SetImplementation;
       // ensure you are only altering current mapping
       if (
         classMapping.root.value === false &&

package/src/models/protocols/pure/v1/transformation/pureGraph/to/helpers/V1_ProcessingContext.ts

@@ -43,20 +43,24 @@ export class V1_ProcessingContext {
     return this.tags;
   }
 
-  getLastInferredVariableList(): Map<string, ValueSpecification> {
-    return this.inferredVariableList[this.inferredVariableList.length - 1];
+  private get lastInferredVariableList():
+    | Map<string, ValueSpecification>
+    | undefined {
+    return this.inferredVariableList.length
+      ? this.inferredVariableList[this.inferredVariableList.length - 1]
+      : undefined;
   }
 
   addInferredVariables(name: string, variable: ValueSpecification): void {
     if (!this.inferredVariableList.length) {
       this.addVariableToNewLevel(name, variable);
     } else {
-      this.getLastInferredVariableList().set(name, variable);
+      this.lastInferredVariableList?.set(name, variable);
     }
   }
 
   flushVariable(name: string): void {
-    this.getLastInferredVariableList().delete(name);
+    this.lastInferredVariableList?.delete(name);
   }
 
   removeLastVariableLevel(): void {