@finos/legend-graph 0.3.0 → 1.0.1

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

@@ -22,6 +22,7 @@ import {
   assertNonNullable,
   guaranteeNonNullable,
   assertTrue,
+  LogEvent,
 } from '@finos/legend-shared';
 import { Stereotype } from '../../../../../../metamodels/pure/packageableElements/domain/Stereotype';
 import { Tag } from '../../../../../../metamodels/pure/packageableElements/domain/Tag';
@@ -93,10 +94,32 @@ export class V1_ProtocolToMetaModelGraphSecondPassBuilder
     const profile = this.context.graph.getProfile(
       this.context.graph.buildPath(element.package, element.name),
     );
-    profile.stereotypes = element.stereotypes.map(
-      (stereotype) => new Stereotype(profile, stereotype),
-    );
-    profile.tags = element.tags.map((tag) => new Tag(profile, tag));
+    const uniqueStereotypes = new Set<string>();
+    profile.stereotypes = element.stereotypes.map((stereotype) => {
+      if (uniqueStereotypes.has(stereotype)) {
+        /* @MARKER: Temporary until we resolve https://github.com/finos/legend-studio/issues/660 */
+        this.context.log.warn(
+          LogEvent.create(
+            `Found duplicated stereotype '${stereotype}' in profile '${element.path}'`,
+          ),
+        );
+      }
+      uniqueStereotypes.add(stereotype);
+      return new Stereotype(profile, stereotype);
+    });
+    const uniqueTags = new Set<string>();
+    profile.tags = element.tags.map((tag) => {
+      if (uniqueTags.has(tag)) {
+        /* @MARKER: Temporary until we resolve https://github.com/finos/legend-studio/issues/660 */
+        this.context.log.warn(
+          LogEvent.create(
+            `Found duplicated tag '${tag}' in profile '${element.path}'`,
+          ),
+        );
+      }
+      uniqueTags.add(tag);
+      return new Tag(profile, tag);
+    });
   }
 
   visit_Enumeration(element: V1_Enumeration): void {
@@ -108,11 +131,20 @@ export class V1_ProtocolToMetaModelGraphSecondPassBuilder
     enumeration.taggedValues = element.taggedValues
       .map((taggedValue) => V1_buildTaggedValue(taggedValue, this.context))
       .filter(isNonNullable);
+    const uniqueEnumValues = new Set<string>();
     enumeration.values = element.values.map((enumValue) => {
       assertNonEmptyString(
         enumValue.value,
         `Enum value 'value' field is missing or empty`,
       );
+      if (uniqueEnumValues.has(enumValue.value)) {
+        /* @MARKER: Temporary until we resolve https://github.com/finos/legend-studio/issues/660 */
+        this.context.log.warn(
+          LogEvent.create(
+            `Found duplicated value '${enumValue.value}' in enumeration '${enumeration.path}'`,
+          ),
+        );
+      }
       const _enum = new Enum(enumValue.value, enumeration);
       _enum.stereotypes = enumValue.stereotypes
         .map((stereotype) => this.context.resolveStereotype(stereotype))
@@ -120,6 +152,7 @@ export class V1_ProtocolToMetaModelGraphSecondPassBuilder
       _enum.taggedValues = enumValue.taggedValues
         .map((taggedValue) => V1_buildTaggedValue(taggedValue, this.context))
         .filter(isNonNullable);
+      uniqueEnumValues.add(enumValue.value);
       return _enum;
     });
   }

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

@@ -20,8 +20,9 @@ import {
   isNonNullable,
   assertErrorThrown,
   guaranteeNonNullable,
+  LogEvent,
 } from '@finos/legend-shared';
-import { CORE_ELEMENT_PATH } from '../../../../../../../MetaModelConst';
+import { CORE_PURE_PATH } from '../../../../../../../MetaModelConst';
 import { Class } from '../../../../../../metamodels/pure/packageableElements/domain/Class';
 import type { V1_GraphBuilderContext } from '../../../transformation/pureGraph/to/V1_GraphBuilderContext';
 import type {
@@ -86,12 +87,12 @@ export class V1_ProtocolToMetaModelGraphThirdPassBuilder
     );
     element.superTypes.forEach((type) => {
       // supertype `Any` will not be processed
-      if (type !== CORE_ELEMENT_PATH.ANY) {
+      if (type !== CORE_PURE_PATH.ANY) {
         try {
           const genricTypeReference = this.context.resolveGenericType(type);
           _class.addSuperType(genricTypeReference);
           if (genricTypeReference.ownerReference.value instanceof Class) {
-            genricTypeReference.ownerReference.value.addSubClass(_class);
+            genricTypeReference.ownerReference.value.addSubclass(_class);
           }
         } catch (error) {
           assertErrorThrown(error);
@@ -105,9 +106,19 @@ export class V1_ProtocolToMetaModelGraphThirdPassBuilder
         }
       }
     });
-    element.properties.forEach((property) =>
-      _class.properties.push(V1_buildProperty(property, this.context, _class)),
-    );
+    const uniqueProperties = new Set<string>();
+    element.properties.forEach((property) => {
+      if (uniqueProperties.has(property.name)) {
+        /* @MARKER: Temporary until we resolve https://github.com/finos/legend-studio/issues/660 */
+        this.context.log.warn(
+          LogEvent.create(
+            `Found duplicated property '${property.name}' in class '${_class.path}'`,
+          ),
+        );
+      }
+      _class.properties.push(V1_buildProperty(property, this.context, _class));
+      uniqueProperties.add(property.name);
+    });
   }
 
   visit_Association(element: V1_Association): void {
@@ -120,6 +131,14 @@ export class V1_ProtocolToMetaModelGraphThirdPassBuilder
     );
     const first = guaranteeNonNullable(element.properties[0]);
     const second = guaranteeNonNullable(element.properties[1]);
+    if (first.name === second.name) {
+      /* @MARKER: Temporary until we resolve https://github.com/finos/legend-studio/issues/660 */
+      this.context.log.warn(
+        LogEvent.create(
+          `Found duplicated property '${element.properties[0]?.name}' in association '${element.name}'`,
+        ),
+      );
+    }
     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

@@ -16,7 +16,6 @@
 
 import {
   LogEvent,
-  UnsupportedOperationError,
   assertNonNullable,
   assertNonEmptyString,
   guaranteeType,
@@ -37,10 +36,14 @@ import { Class } from '../../../../../../metamodels/pure/packageableElements/dom
 import type { Association } from '../../../../../../metamodels/pure/packageableElements/domain/Association';
 import type { TableAlias } from '../../../../../../metamodels/pure/packageableElements/store/relational/model/RelationalOperationElement';
 import { InferableMappingElementIdExplicitValue } from '../../../../../../metamodels/pure/packageableElements/mapping/InferableMappingElementId';
-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 } from '../../../../../../metamodels/pure/packageableElements/domain/PropertyReference';
+import {
+  type PackageableElementReference,
+  PackageableElementImplicitReference,
+} from '../../../../../../metamodels/pure/packageableElements/PackageableElementReference';
+import {
+  type PropertyReference,
+  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';
@@ -82,6 +85,7 @@ import {
   getClassMappingsByClass,
 } from '../../../../../../../helpers/MappingHelper';
 import { GraphBuilderError } from '../../../../../../../graphManager/GraphManagerUtils';
+import type { AbstractProperty } from '../../../../../../metamodels/pure/packageableElements/domain/AbstractProperty';
 
 const resolveRelationalPropertyMappingSource = (
   immediateParent: PropertyMappingsImplementation,
@@ -142,10 +146,6 @@ export class V1_ProtocolToMetaModelPropertyMappingBuilder
       protocol.property,
       `Pure instance property mapping 'property' field is missing`,
     );
-    assertNonEmptyString(
-      protocol.property.class,
-      `Pure instance property mapping 'property.class' field is missing or empty`,
-    );
     assertNonEmptyString(
       protocol.property.property,
       `Pure instance property mapping 'property.property' field is missing or empty`,
@@ -186,6 +186,10 @@ export class V1_ProtocolToMetaModelPropertyMappingBuilder
         localMappingProperty.type,
       ).value;
     } else {
+      assertNonEmptyString(
+        protocol.property.class,
+        `Pure instance property mapping 'property.class' field is missing or empty`,
+      );
       property = this.context.resolveProperty(protocol.property);
     }
     const propertyType = property.value.genericType.value.rawType;
@@ -410,29 +414,59 @@ export class V1_ProtocolToMetaModelPropertyMappingBuilder
       protocol.relationalOperation,
       `Relational property mapping 'relationalOperation' field is missing`,
     );
-    if (protocol.localMappingProperty) {
-      throw new UnsupportedOperationError(
-        'Local mapping property is not supported',
-      );
-    }
     // NOTE: mapping for derived property is not supported
     let propertyOwner: Class | Association;
-    if (this.immediateParent instanceof AssociationImplementation) {
-      propertyOwner = this.immediateParent.association.value;
-    } else if (protocol.property.class) {
-      propertyOwner = this.context.resolveClass(protocol.property.class).value;
-    } else if (
-      this.immediateParent instanceof
-      EmbeddedRelationalInstanceSetImplementation
-    ) {
-      propertyOwner = this.immediateParent.class.value;
-    } else {
-      throw new GraphBuilderError(
-        `Can't find property owner class for property '${protocol.property.property}'`,
+    let property: AbstractProperty;
+    let localMapping: LocalMappingPropertyInfo | undefined;
+    if (protocol.localMappingProperty) {
+      const localMappingProperty = protocol.localMappingProperty;
+      const mappingClass = new MappingClass(
+        `${this.topParent?.parent.path}_${this.topParent?.id}${protocol.property.property}`,
+      );
+      const _multiplicity = this.context.graph.getMultiplicity(
+        localMappingProperty.multiplicity.lowerBound,
+        localMappingProperty.multiplicity.upperBound,
       );
+      const _property = new Property(
+        protocol.property.property,
+        _multiplicity,
+        this.context.resolveGenericType(localMappingProperty.type),
+        mappingClass,
+      );
+      property = PropertyImplicitReference.create(
+        PackageableElementImplicitReference.create(
+          mappingClass,
+          protocol.property.class,
+        ),
+        _property,
+      ).value;
+      localMapping = new LocalMappingPropertyInfo();
+      localMapping.localMappingProperty = true;
+      localMapping.localMappingPropertyMultiplicity = _multiplicity;
+      localMapping.localMappingPropertyType = this.context.resolveType(
+        localMappingProperty.type,
+      ).value;
+      propertyOwner = property.owner;
+    } else {
+      if (this.immediateParent instanceof AssociationImplementation) {
+        propertyOwner = this.immediateParent.association.value;
+      } else if (protocol.property.class) {
+        propertyOwner = this.context.resolveClass(
+          protocol.property.class,
+        ).value;
+      } else if (
+        this.immediateParent instanceof
+        EmbeddedRelationalInstanceSetImplementation
+      ) {
+        propertyOwner = this.immediateParent.class.value;
+      } else {
+        throw new GraphBuilderError(
+          `Can't find property owner class for property '${protocol.property.property}'`,
+        );
+      }
+      property = propertyOwner.getProperty(protocol.property.property);
     }
     // NOTE: mapping for derived property is not supported
-    const property = propertyOwner.getProperty(protocol.property.property);
     // since we are not doing embedded property mappings yet, the target must have already been added to the mapping
     const propertyType = property.genericType.value.rawType;
     let targetSetImplementation: SetImplementation | undefined;
@@ -522,6 +556,7 @@ export class V1_ProtocolToMetaModelPropertyMappingBuilder
       }
       relationalPropertyMapping.transformer = enumerationMapping;
     }
+    relationalPropertyMapping.localMappingProperty = localMapping;
     return relationalPropertyMapping;
   }
 

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

@@ -38,12 +38,10 @@ import {
   SELF_JOIN_ALIAS_PREFIX,
 } from '../../../../../../../metamodels/pure/packageableElements/store/relational/model/Join';
 import { Filter } from '../../../../../../../metamodels/pure/packageableElements/store/relational/model/Filter';
-import type {
-  JoinType,
-  RelationalOperationElement,
-  Relation,
-} from '../../../../../../../metamodels/pure/packageableElements/store/relational/model/RelationalOperationElement';
 import {
+  type JoinType,
+  type RelationalOperationElement,
+  type Relation,
   Literal,
   LiteralList,
   DynaFunction,
@@ -53,8 +51,8 @@ import {
   RelationalOperationElementWithJoin,
   getJoinType,
 } from '../../../../../../../metamodels/pure/packageableElements/store/relational/model/RelationalOperationElement';
-import type { RelationalDataType } from '../../../../../../../metamodels/pure/packageableElements/store/relational/model/RelationalDataType';
 import {
+  type RelationalDataType,
   Real,
   Binary,
   Bit,
@@ -86,8 +84,8 @@ import type { V1_GraphBuilderContext } from '../../../../transformation/pureGrap
 import type { V1_Schema } from '../../../../model/packageableElements/store/relational/model/V1_Schema';
 import type { V1_Table } from '../../../../model/packageableElements/store/relational/model/V1_Table';
 import type { V1_Column } from '../../../../model/packageableElements/store/relational/model/V1_Column';
-import type { V1_RelationalDataType } from '../../../../model/packageableElements/store/relational/model/V1_RelationalDataType';
 import {
+  type V1_RelationalDataType,
   V1_VarChar,
   V1_SmallInt,
   V1_Integer,

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

@@ -23,8 +23,10 @@ import {
 } from '@finos/legend-shared';
 import type { Class } from '../../../../../../../metamodels/pure/packageableElements/domain/Class';
 import type { Association } from '../../../../../../../metamodels/pure/packageableElements/domain/Association';
-import type { Measure } from '../../../../../../../metamodels/pure/packageableElements/domain/Measure';
-import { Unit } from '../../../../../../../metamodels/pure/packageableElements/domain/Measure';
+import {
+  type Measure,
+  Unit,
+} from '../../../../../../../metamodels/pure/packageableElements/domain/Measure';
 import { Property } from '../../../../../../../metamodels/pure/packageableElements/domain/Property';
 import { DerivedProperty } from '../../../../../../../metamodels/pure/packageableElements/domain/DerivedProperty';
 import { RawVariableExpression } from '../../../../../../../metamodels/pure/rawValueSpecification/RawVariableExpression';

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

@@ -17,8 +17,10 @@
 import { returnUndefOnError } from '@finos/legend-shared';
 import { ConfigurationProperty } from '../../../../../../../metamodels/pure/packageableElements/fileGeneration/ConfigurationProperty';
 import type { PackageableElement } from '../../../../../../../metamodels/pure/packageableElements/PackageableElement';
-import type { PackageableElementReference } from '../../../../../../../metamodels/pure/packageableElements/PackageableElementReference';
-import { PackageableElementExplicitReference } from '../../../../../../../metamodels/pure/packageableElements/PackageableElementReference';
+import {
+  type PackageableElementReference,
+  PackageableElementExplicitReference,
+} from '../../../../../../../metamodels/pure/packageableElements/PackageableElementReference';
 import type { V1_GraphBuilderContext } from '../../../../transformation/pureGraph/to/V1_GraphBuilderContext';
 import type { V1_ConfigurationProperty } from '../../../../model/packageableElements/fileGeneration/V1_ConfigurationProperty';
 

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

@@ -26,8 +26,8 @@ import {
 } from '@finos/legend-shared';
 import { PRIMITIVE_TYPE } from '../../../../../../../../MetaModelConst';
 import { FlatDataSection } from '../../../../../../../metamodels/pure/packageableElements/store/flatData/model/FlatDataSection';
-import type { FlatDataDataType } from '../../../../../../../metamodels/pure/packageableElements/store/flatData/model/FlatDataDataType';
 import {
+  type FlatDataDataType,
   FlatDataString,
   FlatDataBoolean,
   FlatDataNumber,
@@ -45,11 +45,9 @@ import type { FlatData } from '../../../../../../../metamodels/pure/packageableE
 import { FlatDataProperty } from '../../../../../../../metamodels/pure/packageableElements/store/flatData/model/FlatDataProperty';
 import type { V1_GraphBuilderContext } from '../../../../transformation/pureGraph/to/V1_GraphBuilderContext';
 import type { V1_FlatDataSection } from '../../../../model/packageableElements/store/flatData/model/V1_FlatDataSection';
-import type {
-  V1_FlatDataDataType,
-  V1_FlatDataRecordField,
-} from '../../../../model/packageableElements/store/flatData/model/V1_FlatDataDataType';
 import {
+  type V1_FlatDataDataType,
+  type V1_FlatDataRecordField,
   V1_FlatDataString,
   V1_FlatDataBoolean,
   V1_FlatDataNumber,

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

@@ -42,16 +42,20 @@ import { FlatDataInputData } from '../../../../../../../metamodels/pure/packagea
 import { ExpectedOutputMappingTestAssert } from '../../../../../../../metamodels/pure/packageableElements/mapping/ExpectedOutputMappingTestAssert';
 import type { Class } from '../../../../../../../metamodels/pure/packageableElements/domain/Class';
 import { InferableMappingElementIdImplicitValue } from '../../../../../../../metamodels/pure/packageableElements/mapping/InferableMappingElementId';
-import type { PackageableElementImplicitReference } from '../../../../../../../metamodels/pure/packageableElements/PackageableElementReference';
-import { toOptionalPackageableElementReference } from '../../../../../../../metamodels/pure/packageableElements/PackageableElementReference';
+import {
+  type PackageableElementImplicitReference,
+  toOptionalPackageableElementReference,
+} from '../../../../../../../metamodels/pure/packageableElements/PackageableElementReference';
 import { EnumValueImplicitReference } from '../../../../../../../metamodels/pure/packageableElements/domain/EnumValueReference';
 import { MappingInclude } from '../../../../../../../metamodels/pure/packageableElements/mapping/MappingInclude';
 import { SubstituteStore } from '../../../../../../../metamodels/pure/packageableElements/mapping/SubstituteStore';
 import type { SetImplementation } from '../../../../../../../metamodels/pure/packageableElements/mapping/SetImplementation';
 import { InferableMappingElementRootImplicitValue } from '../../../../../../../metamodels/pure/packageableElements/mapping/InferableMappingElementRoot';
 import type { V1_GraphBuilderContext } from '../../../../transformation/pureGraph/to/V1_GraphBuilderContext';
-import type { V1_EnumValueMapping } from '../../../../model/packageableElements/mapping/V1_EnumValueMapping';
-import { V1_getEnumValueMappingSourceValueType } from '../../../../model/packageableElements/mapping/V1_EnumValueMapping';
+import {
+  type V1_EnumValueMapping,
+  V1_getEnumValueMappingSourceValueType,
+} from '../../../../model/packageableElements/mapping/V1_EnumValueMapping';
 import type { V1_EnumerationMapping } from '../../../../model/packageableElements/mapping/V1_EnumerationMapping';
 import type { V1_MappingTest } from '../../../../model/packageableElements/mapping/V1_MappingTest';
 import { V1_ExpectedOutputMappingTestAssert } from '../../../../model/packageableElements/mapping/V1_ExpectedOutputMappingTestAssert';

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

@@ -16,16 +16,16 @@
 
 import type { PostProcessor } from '../../../../../../../metamodels/pure/packageableElements/store/relational/connection/postprocessor/PostProcessor';
 import { MapperPostProcessor } from '../../../../../../../metamodels/pure/packageableElements/store/relational/connection/postprocessor/MapperPostProcessor';
-import type { Mapper } from '../../../../../../../metamodels/pure/packageableElements/store/relational/connection/postprocessor/Mapper';
 import { V1_MapperPostProcessor } from '../../../../model/packageableElements/store/relational/connection/postprocessor/V1_MapperPostProcessor';
 import type { V1_PostProcessor } from '../../../../model/packageableElements/store/relational/connection/postprocessor/V1_PostProcessor';
 import { UnsupportedOperationError } from '@finos/legend-shared';
-import type { V1_Mapper } from '../../../../model/packageableElements/store/relational/connection/postprocessor/V1_Mapper';
 import {
+  type V1_Mapper,
   V1_TableNameMapper,
   V1_SchemaNameMapper,
 } from '../../../../model/packageableElements/store/relational/connection/postprocessor/V1_Mapper';
 import {
+  type Mapper,
   SchemaNameMapper,
   TableNameMapper,
 } from '../../../../../../../metamodels/pure/packageableElements/store/relational/connection/postprocessor/Mapper';

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

@@ -21,8 +21,10 @@ import type { SetImplementation } from '../../../../../../../metamodels/pure/pac
 import type { RelationalPropertyMapping } from '../../../../../../../metamodels/pure/packageableElements/store/relational/mapping/RelationalPropertyMapping';
 import type { Mapping } from '../../../../../../../metamodels/pure/packageableElements/mapping/Mapping';
 import type { EnumerationMapping } from '../../../../../../../metamodels/pure/packageableElements/mapping/EnumerationMapping';
-import type { TableAlias } from '../../../../../../../metamodels/pure/packageableElements/store/relational/model/RelationalOperationElement';
-import { TableAliasColumn } from '../../../../../../../metamodels/pure/packageableElements/store/relational/model/RelationalOperationElement';
+import {
+  type TableAlias,
+  TableAliasColumn,
+} from '../../../../../../../metamodels/pure/packageableElements/store/relational/model/RelationalOperationElement';
 import type { Column } from '../../../../../../../metamodels/pure/packageableElements/store/relational/model/Column';
 import { Table } from '../../../../../../../metamodels/pure/packageableElements/store/relational/model/Table';
 import { View } from '../../../../../../../metamodels/pure/packageableElements/store/relational/model/View';

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

@@ -20,8 +20,8 @@ import {
   assertNonNullable,
   guaranteeNonEmptyString,
 } from '@finos/legend-shared';
-import type { DatasourceSpecification } from '../../../../../../../metamodels/pure/packageableElements/store/relational/connection/DatasourceSpecification';
 import {
+  type DatasourceSpecification,
   LocalH2DatasourceSpecification,
   StaticDatasourceSpecification,
   EmbeddedH2DatasourceSpecification,
@@ -29,10 +29,11 @@ import {
   RedshiftDatasourceSpecification,
   BigQueryDatasourceSpecification,
 } from '../../../../../../../metamodels/pure/packageableElements/store/relational/connection/DatasourceSpecification';
-import type { AuthenticationStrategy } from '../../../../../../../metamodels/pure/packageableElements/store/relational/connection/AuthenticationStrategy';
 import {
+  type AuthenticationStrategy,
   SnowflakePublicAuthenticationStrategy,
   GCPApplicationDefaultCredentialsAuthenticationStrategy,
+  UsernamePasswordAuthenticationStrategy,
   OAuthAuthenticationStrategy,
   DefaultH2AuthenticationStrategy,
   DelegatedKerberosAuthenticationStrategy,
@@ -40,8 +41,8 @@ import {
   UserPasswordAuthenticationStrategy,
 } from '../../../../../../../metamodels/pure/packageableElements/store/relational/connection/AuthenticationStrategy';
 import type { V1_GraphBuilderContext } from '../../../../transformation/pureGraph/to/V1_GraphBuilderContext';
-import type { V1_DatasourceSpecification } from '../../../../model/packageableElements/store/relational/connection/V1_DatasourceSpecification';
 import {
+  type V1_DatasourceSpecification,
   V1_LocalH2DataSourceSpecification,
   V1_StaticDatasourceSpecification,
   V1_EmbeddedH2DatasourceSpecification,
@@ -49,8 +50,8 @@ import {
   V1_RedshiftDatasourceSpecification,
   V1_BigQueryDatasourceSpecification,
 } from '../../../../model/packageableElements/store/relational/connection/V1_DatasourceSpecification';
-import type { V1_AuthenticationStrategy } from '../../../../model/packageableElements/store/relational/connection/V1_AuthenticationStrategy';
 import {
+  type V1_AuthenticationStrategy,
   V1_SnowflakePublicAuthenticationStrategy,
   V1_GCPApplicationDefaultCredentialsAuthenticationStrategy,
   V1_OAuthAuthenticationStrategy,
@@ -58,6 +59,7 @@ import {
   V1_DelegatedKerberosAuthenticationStrategy,
   V1_TestDatabaseAuthenticationStrategy,
   V1_UserPasswordAuthenticationStrategy,
+  V1_UsernamePasswordAuthenticationStrategy,
 } from '../../../../model/packageableElements/store/relational/connection/V1_AuthenticationStrategy';
 import type { StoreRelational_PureProtocolProcessorPlugin_Extension } from '../../../../../StoreRelational_PureProtocolProcessorPlugin_Extension';
 
@@ -249,6 +251,22 @@ export const V1_buildAuthenticationStrategy = (
       protocol.userName,
       protocol.passwordVaultReference,
     );
+  } else if (protocol instanceof V1_UsernamePasswordAuthenticationStrategy) {
+    assertNonEmptyString(
+      protocol.userNameVaultReference,
+      `Username password authentication strategy 'userNameVaultReference' field is missing or empty`,
+    );
+    assertNonEmptyString(
+      protocol.passwordVaultReference,
+      `Username password authentication strategy 'passwordVaultReference' field is missing or empty`,
+    );
+
+    const metamodel = new UsernamePasswordAuthenticationStrategy(
+      protocol.userNameVaultReference,
+      protocol.passwordVaultReference,
+    );
+    metamodel.baseVaultReference = protocol.baseVaultReference;
+    return metamodel;
   }
   const extraConnectionAuthenticationStrategyBuilders =
     context.extensions.plugins.flatMap(

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

@@ -18,8 +18,10 @@ import { guaranteeType } from '@finos/legend-shared';
 import type { InstanceSetImplementation } from '../../../../../../../metamodels/pure/packageableElements/mapping/InstanceSetImplementation';
 import { RootRelationalInstanceSetImplementation } from '../../../../../../../metamodels/pure/packageableElements/store/relational/mapping/RootRelationalInstanceSetImplementation';
 import { EmbeddedRelationalInstanceSetImplementation } from '../../../../../../../metamodels/pure/packageableElements/store/relational/mapping/EmbeddedRelationalInstanceSetImplementation';
-import type { PackageableElementReference } from '../../../../../../../metamodels/pure/packageableElements/PackageableElementReference';
-import { PackageableElementImplicitReference } from '../../../../../../../metamodels/pure/packageableElements/PackageableElementReference';
+import {
+  type PackageableElementReference,
+  PackageableElementImplicitReference,
+} from '../../../../../../../metamodels/pure/packageableElements/PackageableElementReference';
 import { InferableMappingElementIdExplicitValue } from '../../../../../../../metamodels/pure/packageableElements/mapping/InferableMappingElementId';
 import type { Property } from '../../../../../../../metamodels/pure/packageableElements/domain/Property';
 import { Class } from '../../../../../../../metamodels/pure/packageableElements/domain/Class';

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

@@ -21,8 +21,8 @@ import {
   uniq,
 } from '@finos/legend-shared';
 import { GRAPH_MANAGER_LOG_EVENT } from '../../../../../../../../graphManager/GraphManagerLogEvent';
-import type { Section } from '../../../../../../../metamodels/pure/packageableElements/section/Section';
 import {
+  type Section,
   ImportAwareCodeSection,
   DefaultCodeSection,
 } from '../../../../../../../metamodels/pure/packageableElements/section/Section';
@@ -30,8 +30,8 @@ import type { SectionIndex } from '../../../../../../../metamodels/pure/packagea
 import { Package } from '../../../../../../../metamodels/pure/packageableElements/domain/Package';
 import { PackageableElementExplicitReference } from '../../../../../../../metamodels/pure/packageableElements/PackageableElementReference';
 import type { V1_GraphBuilderContext } from '../../../../transformation/pureGraph/to/V1_GraphBuilderContext';
-import type { V1_Section } from '../../../../model/packageableElements/section/V1_Section';
 import {
+  type V1_Section,
   V1_ImportAwareCodeSection,
   V1_DefaultCodeSection,
 } from '../../../../model/packageableElements/section/V1_Section';

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

@@ -22,35 +22,37 @@ import {
   assertNonNullable,
 } from '@finos/legend-shared';
 import { GRAPH_MANAGER_LOG_EVENT } from '../../../../../../../../graphManager/GraphManagerLogEvent';
-import type { Runtime } from '../../../../../../../metamodels/pure/packageableElements/runtime/Runtime';
-import { RuntimePointer } from '../../../../../../../metamodels/pure/packageableElements/runtime/Runtime';
+import {
+  type Runtime,
+  RuntimePointer,
+} from '../../../../../../../metamodels/pure/packageableElements/runtime/Runtime';
 import type { Service } from '../../../../../../../metamodels/pure/packageableElements/service/Service';
-import type { ServiceTest } from '../../../../../../../metamodels/pure/packageableElements/service/ServiceTest';
 import {
+  type ServiceTest,
   SingleExecutionTest,
   MultiExecutionTest,
   TestContainer,
   KeyedSingleExecutionTest,
 } from '../../../../../../../metamodels/pure/packageableElements/service/ServiceTest';
-import type { ServiceExecution } from '../../../../../../../metamodels/pure/packageableElements/service/ServiceExecution';
 import {
+  type ServiceExecution,
   PureSingleExecution,
   PureMultiExecution,
   KeyedExecutionParameter,
 } from '../../../../../../../metamodels/pure/packageableElements/service/ServiceExecution';
 import type { V1_GraphBuilderContext } from '../../../../transformation/pureGraph/to/V1_GraphBuilderContext';
-import type { V1_ServiceTest } from '../../../../model/packageableElements/service/V1_ServiceTest';
 import {
+  type V1_ServiceTest,
   V1_SingleExecutionTest,
   V1_MultiExecutionTest,
 } from '../../../../model/packageableElements/service/V1_ServiceTest';
-import type { V1_ServiceExecution } from '../../../../model/packageableElements/service/V1_ServiceExecution';
 import {
+  type V1_ServiceExecution,
   V1_PureSingleExecution,
   V1_PureMultiExecution,
 } from '../../../../model/packageableElements/service/V1_ServiceExecution';
-import type { V1_Runtime } from '../../../../model/packageableElements/runtime/V1_Runtime';
 import {
+  type V1_Runtime,
   V1_RuntimePointer,
   V1_EngineRuntime,
   V1_LegacyRuntime,