@finos/legend-graph 1.2.1 → 2.0.1

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

@@ -0,0 +1,46 @@
+/**
+ * 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 { hashArray, type Hashable } from '@finos/legend-shared';
+import { CORE_HASH_STRUCTURE } from '../../../../../../../MetaModelConst';
+import { hashLambda } from '../../../../../../../MetaModelUtils';
+import type { V1_RawLambda } from '../../rawValueSpecification/V1_RawLambda';
+import type { V1_ClassMappingVisitor } from './V1_ClassMapping';
+import { V1_OperationClassMapping } from './V1_OperationClassMapping';
+
+export class V1_MergeOperationClassMapping
+  extends V1_OperationClassMapping
+  implements Hashable
+{
+  validationFunction!: V1_RawLambda; // @MARKER GENERATED MODEL DISCREPANCY --- Studio does not process lambda
+
+  override get hashCode(): string {
+    return hashArray([
+      CORE_HASH_STRUCTURE.OPERATION_SET_IMPLEMENTATION,
+      this.operation,
+      hashArray(this.parameters),
+      hashLambda(
+        this.validationFunction.parameters,
+        this.validationFunction.body,
+      ),
+    ]);
+  }
+  override accept_ClassMappingVisitor<T>(
+    visitor: V1_ClassMappingVisitor<T>,
+  ): T {
+    return visitor.visit_MergeOperationClassMapping(this);
+  }
+}

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

@@ -25,7 +25,7 @@ export enum V1_MappingOperationType {
   STORE_UNION = 'STORE_UNION',
   ROUTER_UNION = 'ROUTER_UNION',
   INHERITANCE = 'INHERITANCE',
-  // MERGE = 'MERGE',
+  MERGE = 'MERGE',
 }
 
 export class V1_OperationClassMapping

package/src/models/protocols/pure/v1/model/packageableElements/store/relational/connection/V1_DatasourceSpecification.ts

@@ -129,16 +129,22 @@ export class V1_RedshiftDatasourceSpecification
   extends V1_DatasourceSpecification
   implements Hashable
 {
+  clusterID!: string;
   databaseName!: string;
-  endpoint!: string;
+  host!: string;
   port!: number;
+  region!: string;
+  endpointURL!: string;
 
   get hashCode(): string {
     return hashArray([
       CORE_HASH_STRUCTURE.REDSHIFT_DATASOURCE_SPECIFICATION,
       this.databaseName,
-      this.endpoint,
+      this.endpointURL,
       this.port.toString(),
+      this.clusterID,
+      this.host,
+      this.region,
     ]);
   }
 }

package/src/models/protocols/pure/v1/model/packageableElements/store/relational/mapping/V1_RelationalPropertyMapping.ts

@@ -22,6 +22,7 @@ import {
 } from '../../../../../model/packageableElements/mapping/V1_PropertyMapping';
 import { hashObjectWithoutSourceInformation } from '../../../../../../../../../MetaModelUtils';
 import type { V1_RawRelationalOperationElement } from '../model/V1_RawRelationalOperationElement';
+import type { V1_BindingTransformer } from '../../../externalFormat/store/V1_BindingTransformer';
 
 export class V1_RelationalPropertyMapping
   extends V1_PropertyMapping
@@ -29,6 +30,7 @@ export class V1_RelationalPropertyMapping
 {
   enumMappingId?: string | undefined;
   relationalOperation!: V1_RawRelationalOperationElement; // @MARKER GENERATED MODEL DISCREPANCY --- Studio does not process relational operation element
+  bindingTransformer?: V1_BindingTransformer | undefined;
 
   accept_PropertyMappingVisitor<T>(visitor: V1_PropertyMappingVisitor<T>): T {
     return visitor.visit_RelationalPropertyMapping(this);
@@ -39,6 +41,7 @@ export class V1_RelationalPropertyMapping
       CORE_HASH_STRUCTURE.REALTIONAL_PROPERTY_MAPPING,
       super.hashCode,
       this.enumMappingId ?? '',
+      this.bindingTransformer ?? '',
       hashObjectWithoutSourceInformation(this.relationalOperation),
     ]);
   }

package/src/models/protocols/pure/v1/model/packageableElements/store/relational/model/V1_RelationalDataType.ts

@@ -158,3 +158,12 @@ export class V1_Other extends V1_RelationalDataType implements Hashable {
     return hashArray([CORE_HASH_STRUCTURE.RELATIONAL_DATATYPE_VARCHAR]);
   }
 }
+
+export class V1_SemiStructured
+  extends V1_RelationalDataType
+  implements Hashable
+{
+  get hashCode(): string {
+    return hashArray([CORE_HASH_STRUCTURE.RELATIONAL_DATATYPE_SEMISTRUCTURED]);
+  }
+}

package/src/models/protocols/pure/v1/model/valueSpecification/raw/V1_HackedUnit.ts

@@ -22,7 +22,7 @@ import {
 /**
  * @deprecated
  *
- * We might eventually make it similar to HackedClass where we make it a subclass of PackageableElementPtr
+ * We might eventually handle it in the same way we handled `HackedClass` where we make it a subclass of PackageableElementPtr
  */
 export class V1_HackedUnit extends V1_ValueSpecification {
   unitType!: string;

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

@@ -144,8 +144,11 @@ const transformRedshiftDatasourceSpecification = (
 ): V1_RedshiftDatasourceSpecification => {
   const source = new V1_RedshiftDatasourceSpecification();
   source.databaseName = metamodel.databaseName;
-  source.endpoint = metamodel.endpoint;
+  source.endpointURL = metamodel.endpointURL;
   source.port = metamodel.port;
+  source.clusterID = metamodel.clusterID;
+  source.host = metamodel.host;
+  source.region = metamodel.region;
   return source;
 };
 

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

@@ -35,6 +35,7 @@ import {
   TinyInt,
   SmallInt,
   BigInt,
+  SemiStructured,
 } from '../../../../../../metamodels/pure/packageableElements/store/relational/model/RelationalDataType';
 import {
   type TableAlias,
@@ -77,6 +78,7 @@ import {
   V1_VarBinary,
   V1_Binary,
   V1_Other,
+  V1_SemiStructured,
 } from '../../../model/packageableElements/store/relational/model/V1_RelationalDataType';
 import { V1_Database } from '../../../model/packageableElements/store/relational/model/V1_Database';
 import {
@@ -156,6 +158,8 @@ const transformRelationalDataType = (
     return new V1_Timestamp();
   } else if (type instanceof Other) {
     return new V1_Other();
+  } else if (type instanceof SemiStructured) {
+    return new V1_SemiStructured();
   }
   throw new UnsupportedOperationError(
     `Can't transform relational data type`,

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

@@ -15,6 +15,7 @@
  */
 
 import {
+  guaranteeNonEmptyString,
   IllegalStateError,
   isNonNullable,
   recursiveOmit,
@@ -146,6 +147,9 @@ 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';
+import { V1_BindingTransformer } from '../../../model/packageableElements/externalFormat/store/V1_BindingTransformer';
+import { V1_MergeOperationClassMapping } from '../../../model/packageableElements/mapping/V1_MergeOperationClassMapping';
+import { MergeOperationSetImplementation } from '../../../../../../metamodels/pure/packageableElements/mapping/MergeOperationSetImplementation';
 
 export const V1_transformPropertyReference = (
   element: PropertyReference,
@@ -488,6 +492,13 @@ const transformRelationalPropertyMapping = (
   propertyMapping.target = transformPropertyMappingTarget(
     element.targetSetImplementation,
   );
+  if (element.bindingTransformer?.binding) {
+    const bindingTransformer = new V1_BindingTransformer();
+    bindingTransformer.binding = guaranteeNonEmptyString(
+      element.bindingTransformer.binding.valueForSerialization,
+    );
+    propertyMapping.bindingTransformer = bindingTransformer;
+  }
   if (element.localMappingProperty) {
     propertyMapping.localMappingProperty = transformLocalPropertyInfo(
       element.localMappingProperty,
@@ -744,6 +755,8 @@ const transformOperationType = (
       return V1_MappingOperationType.STORE_UNION;
     case OperationType.INHERITANCE:
       return V1_MappingOperationType.INHERITANCE;
+    case OperationType.MERGE:
+      return V1_MappingOperationType.MERGE;
     default:
       throw new UnsupportedOperationError(
         `Can't transform operation type`,
@@ -769,6 +782,28 @@ const transformOperationSetImplementation = (
   return classMapping;
 };
 
+const transformMergeOperationSetImplementation = (
+  element: MergeOperationSetImplementation,
+  context: V1_GraphTransformerContext,
+): V1_MergeOperationClassMapping => {
+  const classMapping = new V1_MergeOperationClassMapping();
+  classMapping.class = V1_transformElementReference(element.class);
+  classMapping.id = mappingElementIdSerializer(element.id);
+  classMapping.operation = transformOperationType(element.operation);
+  classMapping.validationFunction =
+    element.validationFunction.accept_RawValueSpecificationVisitor(
+      new V1_RawValueSpecificationTransformer(context),
+    ) as V1_RawLambda;
+  classMapping.parameters = element.parameters.map(
+    (e) => e.setImplementation.value.id.value,
+  );
+  const root = transformMappingElementRoot(element.root);
+  if (root !== undefined) {
+    classMapping.root = root;
+  }
+  return classMapping;
+};
+
 const transformPureInstanceSetImplementation = (
   element: PureInstanceSetImplementation,
   context: V1_GraphTransformerContext,
@@ -1042,8 +1077,25 @@ export class V1_SetImplementationTransformer
   visit_OperationSetImplementation(
     setImplementation: OperationSetImplementation,
   ): V1_ClassMapping | undefined {
-    return transformOperationSetImplementation(setImplementation);
+    if (setImplementation instanceof MergeOperationSetImplementation) {
+      return transformMergeOperationSetImplementation(
+        setImplementation,
+        this.context,
+      );
+    } else {
+      return transformOperationSetImplementation(setImplementation);
+    }
   }
+
+  visit_MergeOperationSetImplementation(
+    setImplementation: MergeOperationSetImplementation,
+  ): V1_ClassMapping | undefined {
+    return transformMergeOperationSetImplementation(
+      setImplementation,
+      this.context,
+    );
+  }
+
   visit_PureInstanceSetImplementation(
     setImplementation: PureInstanceSetImplementation,
   ): V1_ClassMapping | undefined {

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

@@ -0,0 +1,40 @@
+/**
+ * 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 {
+  getSchemaSet,
+  getBinding,
+} from '../../../../../../../graphManager/DSLExternalFormat_GraphManagerHelper';
+import type { PackageableElementImplicitReference } from '../../../../../../metamodels/pure/packageableElements/PackageableElementReference';
+import type { SchemaSet } from '../../../../../../metamodels/pure/packageableElements/externalFormat/schemaSet/DSLExternalFormat_SchemaSet';
+import type { Binding } from '../../../../../../metamodels/pure/packageableElements/externalFormat/store/DSLExternalFormat_Binding';
+import type { V1_GraphBuilderContext } from './V1_GraphBuilderContext';
+
+export const V1_resolveSchemaSet = (
+  path: string,
+  context: V1_GraphBuilderContext,
+): PackageableElementImplicitReference<SchemaSet> =>
+  context.createImplicitPackageableElementReference(path, (_path: string) =>
+    getSchemaSet(_path, context.graph),
+  );
+
+export const V1_resolveBinding = (
+  path: string,
+  context: V1_GraphBuilderContext,
+): PackageableElementImplicitReference<Binding> =>
+  context.createImplicitPackageableElementReference(path, (_path: string) =>
+    getBinding(_path, context.graph),
+  );

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

@@ -48,6 +48,8 @@ import { V1_resolvePathsInRawLambda } from './helpers/V1_ValueSpecificationPathR
 import { V1_buildRelationalMappingFilter } from './helpers/V1_RelationalClassMappingBuilderHelper';
 import { toOptionalPackageableElementReference } from '../../../../../../metamodels/pure/packageableElements/PackageableElementReference';
 import type { DSLMapping_PureProtocolProcessorPlugin_Extension } from '../../../../DSLMapping_PureProtocolProcessorPlugin_Extension';
+import type { V1_MergeOperationClassMapping } from '../../../model/packageableElements/mapping/V1_MergeOperationClassMapping';
+import { MergeOperationSetImplementation } from '../../../../../../metamodels/pure/packageableElements/mapping/MergeOperationSetImplementation';
 
 export class V1_ProtocolToMetaModelClassMappingFirstPassBuilder
   implements V1_ClassMappingVisitor<SetImplementation>
@@ -108,6 +110,36 @@ export class V1_ProtocolToMetaModelClassMappingFirstPassBuilder
     );
   }
 
+  visit_MergeOperationClassMapping(
+    classMapping: V1_MergeOperationClassMapping,
+  ): SetImplementation {
+    assertNonEmptyString(
+      classMapping.class,
+      `Merge Operation class mapping 'class' field is missing or empty`,
+    );
+    assertNonNullable(
+      classMapping.root,
+      `Merge Operation class mapping 'root' field is missing`,
+    );
+    assertNonNullable(
+      classMapping.operation,
+      `Merge Operation class mapping operation is missing`,
+    );
+    const targetClass = this.context.resolveClass(classMapping.class);
+    return new MergeOperationSetImplementation(
+      V1_getInferredClassMappingId(targetClass.value, classMapping),
+      this.parent,
+      targetClass,
+      InferableMappingElementRootExplicitValue.create(classMapping.root),
+      getClassMappingOperationType(classMapping.operation),
+      V1_resolvePathsInRawLambda(
+        this.context,
+        classMapping.validationFunction.parameters,
+        classMapping.validationFunction.body,
+      ),
+    );
+  }
+
   visit_PureInstanceClassMapping(
     classMapping: V1_PureInstanceClassMapping,
   ): SetImplementation {

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

@@ -24,7 +24,7 @@ import {
   assertTrue,
   guaranteeNonNullable,
 } from '@finos/legend-shared';
-import { GRAPH_MANAGER_LOG_EVENT } from '../../../../../../../graphManager/GraphManagerLogEvent';
+import { GRAPH_MANAGER_EVENT } from '../../../../../../../graphManager/GraphManagerEvent';
 import type { Mapping } from '../../../../../../metamodels/pure/packageableElements/mapping/Mapping';
 import type { SetImplementation } from '../../../../../../metamodels/pure/packageableElements/mapping/SetImplementation';
 import type { PurePropertyMapping } from '../../../../../../metamodels/pure/packageableElements/store/modelToModel/mapping/PurePropertyMapping';
@@ -66,6 +66,7 @@ import {
   getOwnClassMappingById,
 } from '../../../../../../../helpers/MappingHelper';
 import type { DSLMapping_PureProtocolProcessorPlugin_Extension } from '../../../../DSLMapping_PureProtocolProcessorPlugin_Extension';
+import type { V1_MergeOperationClassMapping } from '../../../model/packageableElements/mapping/V1_MergeOperationClassMapping';
 
 export class V1_ProtocolToMetaModelClassMappingSecondPassBuilder
   implements V1_ClassMappingVisitor<void>
@@ -113,7 +114,7 @@ export class V1_ProtocolToMetaModelClassMappingSecondPassBuilder
         if (!setImplementation) {
           // TODO: we will get these cases sometimes since we haven't supported includedMappings
           this.context.log.debug(
-            LogEvent.create(GRAPH_MANAGER_LOG_EVENT.GRAPH_BUILDER_FAILURE),
+            LogEvent.create(GRAPH_MANAGER_EVENT.GRAPH_BUILDER_FAILURE),
             `Can't find class mapping with ID '${parameter}' in mapping '${this.parent.path}' (perhaps because we haven't supported included mappings)`,
           );
           return undefined;
@@ -128,6 +129,12 @@ export class V1_ProtocolToMetaModelClassMappingSecondPassBuilder
       .filter(isNonNullable);
   }
 
+  visit_MergeOperationClassMapping(
+    classMapping: V1_MergeOperationClassMapping,
+  ): void {
+    this.visit_OperationClassMapping(classMapping);
+  }
+
   visit_PureInstanceClassMapping(
     classMapping: V1_PureInstanceClassMapping,
   ): void {

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

@@ -22,7 +22,7 @@ import {
   guaranteeNonNullable,
   returnUndefOnError,
 } from '@finos/legend-shared';
-import { GRAPH_MANAGER_LOG_EVENT } from '../../../../../../../graphManager/GraphManagerLogEvent';
+import { GRAPH_MANAGER_EVENT } from '../../../../../../../graphManager/GraphManagerEvent';
 import type { PropertyMapping } from '../../../../../../metamodels/pure/packageableElements/mapping/PropertyMapping';
 import { PurePropertyMapping } from '../../../../../../metamodels/pure/packageableElements/store/modelToModel/mapping/PurePropertyMapping';
 import { RelationalPropertyMapping } from '../../../../../../metamodels/pure/packageableElements/store/relational/mapping/RelationalPropertyMapping';
@@ -89,7 +89,9 @@ import {
 } from '../../../../../../../helpers/MappingHelper';
 import { GraphBuilderError } from '../../../../../../../graphManager/GraphManagerUtils';
 import type { AbstractProperty } from '../../../../../../metamodels/pure/packageableElements/domain/AbstractProperty';
+import { BindingTransformer } from '../../../../../../metamodels/pure/packageableElements/externalFormat/store/BindingTransformer';
 import type { Mapping } from '../../../../../../metamodels/pure/packageableElements/mapping/Mapping';
+import { V1_resolveBinding } from './V1_DSLExternalFormat_GraphBuilderHelper';
 
 /* @MARKER: RELAXED GRAPH CHECK - See https://github.com/finos/legend-studio/issues/880 */
 const TEMPORARY__getClassMappingByIdOrReturnUnresolved = (
@@ -251,7 +253,7 @@ export class V1_ProtocolToMetaModelPropertyMappingBuilder
       if (!enumerationMapping) {
         // TODO: Since we don't support includedMappings, this will throw errors, but right now we can just make it undefined.
         this.context.log.debug(
-          LogEvent.create(GRAPH_MANAGER_LOG_EVENT.GRAPH_BUILDER_FAILURE),
+          LogEvent.create(GRAPH_MANAGER_EVENT.GRAPH_BUILDER_FAILURE),
           `Can't find enumeration mapping with ID '${protocol.enumMappingId}' in mapping '${topParent.parent.path}' (perhaps because we haven't supported included mappings)`,
         );
       }
@@ -331,7 +333,7 @@ export class V1_ProtocolToMetaModelPropertyMappingBuilder
       if (!enumerationMapping) {
         // TODO: Since we don't support includedMappings, this will throw errors, but right now we can just make it undefined.
         this.context.log.debug(
-          LogEvent.create(GRAPH_MANAGER_LOG_EVENT.GRAPH_BUILDER_FAILURE),
+          LogEvent.create(GRAPH_MANAGER_EVENT.GRAPH_BUILDER_FAILURE),
           `Can't find enumeration mapping with ID '${protocol.enumMappingId}' in mapping '${this.topParent?.parent.path} (perhaps because we haven't supported included mappings)`,
         );
       }
@@ -533,6 +535,15 @@ export class V1_ProtocolToMetaModelPropertyMappingBuilder
       sourceSetImplementation,
       targetSetImplementation,
     );
+    if (protocol.bindingTransformer?.binding) {
+      const bindingTransformer = new BindingTransformer();
+      const binding = V1_resolveBinding(
+        protocol.bindingTransformer.binding,
+        this.context,
+      );
+      bindingTransformer.binding = binding;
+      relationalPropertyMapping.bindingTransformer = bindingTransformer;
+    }
     // NOTE: we only need to use the raw form of the operation for the editor
     // but we need to process it anyway so we can:
     // 1. do analytics on table alias map
@@ -573,7 +584,7 @@ export class V1_ProtocolToMetaModelPropertyMappingBuilder
       if (!enumerationMapping) {
         // TODO: Since we don't support includedMappings, this will throw errors, but right now we can just make it undefined.
         this.context.log.debug(
-          LogEvent.create(GRAPH_MANAGER_LOG_EVENT.GRAPH_BUILDER_FAILURE),
+          LogEvent.create(GRAPH_MANAGER_EVENT.GRAPH_BUILDER_FAILURE),
           `Can't find enumeration mapping with ID '${protocol.enumMappingId}' in mapping '${this.topParent?.parent.path}' (perhaps because we haven't supported included mappings)`,
         );
       }

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

@@ -70,6 +70,7 @@ import {
   TinyInt,
   SmallInt,
   BigInt,
+  SemiStructured,
 } from '../../../../../../../metamodels/pure/packageableElements/store/relational/model/RelationalDataType';
 import { ColumnMapping } from '../../../../../../../metamodels/pure/packageableElements/store/relational/model/ColumnMapping';
 import { GroupByMapping } from '../../../../../../../metamodels/pure/packageableElements/store/relational/mapping/GroupByMapping';
@@ -103,6 +104,7 @@ import {
   V1_VarBinary,
   V1_Binary,
   V1_Other,
+  V1_SemiStructured,
 } from '../../../../model/packageableElements/store/relational/model/V1_RelationalDataType';
 import type { V1_View } from '../../../../model/packageableElements/store/relational/model/V1_View';
 import type { V1_Join } from '../../../../model/packageableElements/store/relational/model/V1_Join';
@@ -405,6 +407,8 @@ export const V1_transformDatabaseDataType = (
     return new Timestamp();
   } else if (dataType instanceof V1_Other) {
     return new Other();
+  } else if (dataType instanceof V1_SemiStructured) {
+    return new SemiStructured();
   }
   throw new UnsupportedOperationError(
     `Can't transform relational data type`,

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

@@ -183,17 +183,30 @@ export const V1_buildDatasourceSpecification = (
       `Redshift datasource specification 'databaseName' field is missing or empty`,
     );
     assertNonEmptyString(
-      protocol.endpoint,
-      `Redshift datasource specification 'endpoint' field is missing or empty`,
+      protocol.host,
+      `Redshift datasource specification 'host' field is missing or empty`,
     );
-    assertNonNullable(
-      protocol.port,
+    assertNonEmptyString(
+      protocol.port.toString(),
       `Redshift datasource specification 'port' field is missing or empty`,
     );
+    assertNonEmptyString(
+      protocol.clusterID,
+      `Redshift datasource specification 'clusterID' field is missing or empty`,
+    );
+
+    assertNonEmptyString(
+      protocol.region,
+      `Redshift datasource specification 'region' field is missing or empty`,
+    );
+
     const redshiftSpec = new RedshiftDatasourceSpecification(
       protocol.databaseName,
-      protocol.endpoint,
+      protocol.endpointURL,
       protocol.port,
+      protocol.host,
+      protocol.clusterID,
+      protocol.region,
     );
     return redshiftSpec;
   }

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

@@ -20,7 +20,7 @@ import {
   isNonNullable,
   uniq,
 } from '@finos/legend-shared';
-import { GRAPH_MANAGER_LOG_EVENT } from '../../../../../../../../graphManager/GraphManagerLogEvent';
+import { GRAPH_MANAGER_EVENT } from '../../../../../../../../graphManager/GraphManagerEvent';
 import {
   type Section,
   ImportAwareCodeSection,
@@ -52,7 +52,7 @@ export const V1_buildSection = (
         const element = context.graph.getNullableElement(_package, true);
         if (!(element instanceof Package)) {
           context.log.warn(
-            LogEvent.create(GRAPH_MANAGER_LOG_EVENT.GRAPH_BUILDER_FAILURE),
+            LogEvent.create(GRAPH_MANAGER_EVENT.GRAPH_BUILDER_FAILURE),
             `Can't find section import package '${_package}'`,
           );
         }
@@ -75,14 +75,14 @@ export const V1_buildSection = (
       const element = context.graph.getNullableElement(elementPath);
       if (!element) {
         context.log.warn(
-          LogEvent.create(GRAPH_MANAGER_LOG_EVENT.GRAPH_BUILDER_FAILURE),
+          LogEvent.create(GRAPH_MANAGER_EVENT.GRAPH_BUILDER_FAILURE),
           `Can't find section element '${elementPath}'`,
         );
         return element;
       }
       if (context.graph.getOwnSection(element.path)) {
         context.log.warn(
-          LogEvent.create(GRAPH_MANAGER_LOG_EVENT.GRAPH_BUILDER_FAILURE),
+          LogEvent.create(GRAPH_MANAGER_EVENT.GRAPH_BUILDER_FAILURE),
           `Found duplicated section element '${elementPath}'`,
         );
       } else {

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

@@ -21,7 +21,7 @@ import {
   assertType,
   assertNonNullable,
 } from '@finos/legend-shared';
-import { GRAPH_MANAGER_LOG_EVENT } from '../../../../../../../../graphManager/GraphManagerLogEvent';
+import { GRAPH_MANAGER_EVENT } from '../../../../../../../../graphManager/GraphManagerEvent';
 import {
   type Runtime,
   RuntimePointer,
@@ -159,7 +159,7 @@ export const V1_buildServiceTest = (
      */
     if (executionKeys.size) {
       context.log.error(
-        LogEvent.create(GRAPH_MANAGER_LOG_EVENT.GRAPH_BUILDER_FAILURE),
+        LogEvent.create(GRAPH_MANAGER_EVENT.GRAPH_BUILDER_FAILURE),
         new GraphBuilderError(
           `Execution(s) with key '${Array.from(executionKeys.values()).join(
             ', ',

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

@@ -866,16 +866,10 @@ export function V1_processProperty(
   } else {
     inferredVariable = processedParameters[0];
   }
-  let inferredType: Type | undefined =
-    inferredVariable?.genericType?.value.rawType;
-  if (inferredVariable instanceof AbstractPropertyExpression) {
-    inferredType = inferredVariable.func.genericType.value.rawType;
-  } else {
-    inferredType = V1_resolvePropertyExpressionTypeInference(
-      inferredVariable,
-      context,
-    );
-  }
+  const inferredType =
+    inferredVariable instanceof AbstractPropertyExpression
+      ? inferredVariable.func.genericType.value.rawType
+      : V1_resolvePropertyExpressionTypeInference(inferredVariable, context);
   if (inferredType instanceof Class) {
     const processedProperty = new AbstractPropertyExpression(
       '',

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

@@ -19,7 +19,7 @@ import {
   assertErrorThrown,
   returnUndefOnError,
 } from '@finos/legend-shared';
-import { GRAPH_MANAGER_LOG_EVENT } from '../../../../../../../../graphManager/GraphManagerLogEvent';
+import { GRAPH_MANAGER_EVENT } from '../../../../../../../../graphManager/GraphManagerEvent';
 import type { PackageableElement } from '../../../../../../../metamodels/pure/packageableElements/PackageableElement';
 import type { PackageableElementReference } from '../../../../../../../metamodels/pure/packageableElements/PackageableElementReference';
 import { RawLambda } from '../../../../../../../metamodels/pure/rawValueSpecification/RawLambda';
@@ -364,7 +364,7 @@ const V1_resolveLambdaElementPaths = (
     // return orginal lambda if anything goes wrong
     error.message = `Can't resolve element paths for lambda:\n${error.message}`;
     _context.log.warn(
-      LogEvent.create(GRAPH_MANAGER_LOG_EVENT.GRAPH_BUILDER_FAILURE),
+      LogEvent.create(GRAPH_MANAGER_EVENT.GRAPH_BUILDER_FAILURE),
       error,
     );
     return rawLambdaProtocol;

package/src/models/protocols/pure/v1/transformation/pureProtocol/serializationHelpers/V1_ConnectionSerializationHelper.ts

@@ -199,9 +199,12 @@ const redshiftDatasourceSpecificationModelSchema = createModelSchema(
   V1_RedshiftDatasourceSpecification,
   {
     _type: usingConstantValueSchema(V1_DatasourceSpecificationType.REDSHIFT),
+    clusterID: primitive(),
     databaseName: primitive(),
-    endpoint: primitive(),
+    endpointURL: optional(primitive()),
+    host: primitive(),
     port: primitive(),
+    region: primitive(),
   },
 );