@finos/legend-graph 0.2.1 → 0.3.0

package/src/models/protocols/pure/v1/engine/V1_EngineServerClient.ts

@@ -45,6 +45,7 @@ import type { V1_ExecutionPlan } from '../model/executionPlan/V1_ExecutionPlan';
 import type { V1_LightQuery, V1_Query } from './query/V1_Query';
 import type { V1_ServiceStorage } from './service/V1_ServiceStorage';
 import type { GenerationMode } from '../../../../../graphManager/action/generation/GenerationConfigurationDescription';
+import type { V1_QuerySearchSpecification } from './query/V1_QuerySearchSpecification';
 
 enum CORE_ENGINE_TRACER_SPAN {
   GRAMMAR_TO_JSON = 'transform Pure code to protocol',
@@ -393,21 +394,15 @@ export class V1_EngineServerClient extends AbstractServerClient {
     `${this.queryBaseUrl ?? this.networkClient.baseUrl}/pure/v1/query${
       queryId ? `/${encodeURIComponent(queryId)}` : ''
     }`;
-  getQueries = (options?: {
-    search?: string | undefined;
-    projectCoordinates?: string[] | undefined;
-    showCurrentUserQueriesOnly?: boolean | undefined;
-    limit?: number | undefined;
-  }): Promise<PlainObject<V1_LightQuery>[]> =>
-    this.get(this._query(), undefined, undefined, {
-      search: options?.search,
-      projectCoordinates: options?.projectCoordinates,
-      showCurrentUserQueriesOnly: options?.showCurrentUserQueriesOnly,
-      limit: options?.limit,
-    });
+  searchQueries = (
+    searchSpecification: PlainObject<V1_QuerySearchSpecification>,
+  ): Promise<PlainObject<V1_LightQuery>[]> =>
+    this.post(`${this._query()}/search`, searchSpecification, undefined);
   getQuery = (queryId: string): Promise<PlainObject<V1_Query>> =>
     this.get(this._query(queryId));
-  createQuery = (query: V1_Query): Promise<PlainObject<V1_Query>> =>
+  createQuery = (
+    query: PlainObject<V1_Query>,
+  ): Promise<PlainObject<V1_Query>> =>
     this.postWithTracing(
       this.getTraceData(CORE_ENGINE_TRACER_SPAN.CREATE_QUERY),
       this._query(),
@@ -415,7 +410,7 @@ export class V1_EngineServerClient extends AbstractServerClient {
     );
   updateQuery = (
     queryId: string,
-    query: V1_Query,
+    query: PlainObject<V1_Query>,
   ): Promise<PlainObject<V1_Query>> =>
     this.putWithTracing(
       this.getTraceData(CORE_ENGINE_TRACER_SPAN.UPDATE_QUERY),

package/src/models/protocols/pure/v1/engine/generation/V1_FileGenerationInput.ts

@@ -16,17 +16,17 @@
 
 import { createModelSchema, optional, primitive, raw } from 'serializr';
 import { SerializationFactory } from '@finos/legend-shared';
-import type { V1_PureModelContextData } from '../../model/context/V1_PureModelContextData';
-import { V1_pureModelContextDataPropSchema } from '../../transformation/pureProtocol/V1_PureProtocolSerialization';
+import { V1_pureModelContextPropSchema } from '../../transformation/pureProtocol/V1_PureProtocolSerialization';
 import { PureClientVersion } from '../../../../../../graphManager/GraphManagerUtils';
+import type { V1_PureModelContext } from '../../model/context/V1_PureModelContext';
 
 export class V1_GenerateFileInput {
   clientVersion?: string | undefined;
-  model: V1_PureModelContextData;
+  model: V1_PureModelContext;
   config?: Record<PropertyKey, unknown> | undefined;
 
   constructor(
-    model: V1_PureModelContextData,
+    model: V1_PureModelContext,
     config?: Record<PropertyKey, unknown>,
   ) {
     this.clientVersion = PureClientVersion.V1_0_0;
@@ -37,7 +37,7 @@ export class V1_GenerateFileInput {
   static readonly serialization = new SerializationFactory(
     createModelSchema(V1_GenerateFileInput, {
       clientVersion: optional(primitive()),
-      model: V1_pureModelContextDataPropSchema,
+      model: V1_pureModelContextPropSchema,
       config: raw(),
     }),
   );

package/src/models/protocols/pure/v1/engine/query/V1_Query.ts

@@ -14,8 +14,14 @@
  * limitations under the License.
  */
 
-import { SerializationFactory } from '@finos/legend-shared';
-import { createModelSchema, optional, primitive } from 'serializr';
+import { SerializationFactory, usingModelSchema } from '@finos/legend-shared';
+import { createModelSchema, list, optional, primitive } from 'serializr';
+import type { V1_StereotypePtr } from '../../model/packageableElements/domain/V1_StereotypePtr';
+import type { V1_TaggedValue } from '../../model/packageableElements/domain/V1_TaggedValue';
+import {
+  V1_stereotypePtrSchema,
+  V1_taggedValueSchema,
+} from '../../transformation/pureProtocol/serializationHelpers/V1_DomainSerializationHelper';
 
 export class V1_Query {
   name!: string;
@@ -27,6 +33,8 @@ export class V1_Query {
   runtime!: string;
   content!: string;
   owner?: string | undefined;
+  taggedValues?: V1_TaggedValue[] | undefined;
+  stereotypes?: V1_StereotypePtr[] | undefined;
 
   static readonly serialization = new SerializationFactory(
     createModelSchema(V1_Query, {
@@ -38,6 +46,8 @@ export class V1_Query {
       name: primitive(),
       owner: optional(primitive()),
       runtime: primitive(),
+      stereotypes: optional(list(usingModelSchema(V1_stereotypePtrSchema))),
+      taggedValues: optional(list(usingModelSchema(V1_taggedValueSchema))),
       versionId: primitive(),
     }),
   );

package/src/models/protocols/pure/v1/engine/query/V1_QuerySearchSpecification.ts

@@ -0,0 +1,58 @@
+/**
+ * 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 { SerializationFactory, usingModelSchema } from '@finos/legend-shared';
+import { createModelSchema, list, optional, primitive } from 'serializr';
+import type { V1_StereotypePtr } from '../../model/packageableElements/domain/V1_StereotypePtr';
+import type { V1_TaggedValue } from '../../model/packageableElements/domain/V1_TaggedValue';
+import {
+  V1_stereotypePtrSchema,
+  V1_taggedValueSchema,
+} from '../../transformation/pureProtocol/serializationHelpers/V1_DomainSerializationHelper';
+
+export class V1_QueryProjectCoordinates {
+  groupId!: string;
+  artifactId!: string;
+
+  static readonly serialization = new SerializationFactory(
+    createModelSchema(V1_QueryProjectCoordinates, {
+      artifactId: primitive(),
+      groupId: primitive(),
+    }),
+  );
+}
+
+export class V1_QuerySearchSpecification {
+  searchTerm?: string | undefined;
+  projectCoordinates?: V1_QueryProjectCoordinates[] | undefined;
+  taggedValues?: V1_TaggedValue[] | undefined;
+  stereotypes?: V1_StereotypePtr[] | undefined;
+  limit?: number | undefined;
+  showCurrentUserQueriesOnly?: boolean | undefined;
+
+  static readonly serialization = new SerializationFactory(
+    createModelSchema(V1_QuerySearchSpecification, {
+      limit: optional(primitive()),
+      projectCoordinates: optional(
+        list(usingModelSchema(V1_QueryProjectCoordinates.serialization.schema)),
+      ),
+      searchTerm: optional(primitive()),
+      showCurrentUserQueriesOnly: optional(primitive()),
+      stereotypes: optional(list(usingModelSchema(V1_stereotypePtrSchema))),
+      taggedValues: optional(list(usingModelSchema(V1_taggedValueSchema))),
+    }),
+  );
+}

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_PureModelContextText.ts

@@ -0,0 +1,23 @@
+/**
+ * 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 { V1_PureModelContext } from '../../model/context/V1_PureModelContext';
+import type { V1_Protocol } from '../../model/V1_Protocol';
+
+export class V1_PureModelContextText extends V1_PureModelContext {
+  serializer?: V1_Protocol | undefined;
+  code?: string | undefined;
+}

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/model/packageableElements/store/relational/connection/V1_DatasourceSpecification.ts

@@ -84,6 +84,7 @@ export class V1_SnowflakeDatasourceSpecification
   nonProxyHosts?: string | undefined;
   organization?: string | undefined;
   accountType?: string | undefined;
+  role?: string | undefined;
 
   get hashCode(): string {
     return hashArray([
@@ -98,6 +99,7 @@ export class V1_SnowflakeDatasourceSpecification
       this.nonProxyHosts ?? '',
       this.organization ?? '',
       this.accountType ?? '',
+      this.role ?? '',
       this.quotedIdentifiersIgnoreCase?.toString() ?? '',
     ]);
   }

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

@@ -120,6 +120,7 @@ const transformSnowflakeDatasourceSpecification = (
   source.nonProxyHosts = metamodel.nonProxyHosts;
   source.organization = metamodel.organization;
   source.accountType = metamodel.accountType;
+  source.role = metamodel.role;
   return source;
 };
 

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 &&