@finos/legend-graph 0.3.1 → 1.0.2

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,

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

@@ -31,24 +31,26 @@ import {
   FunctionType,
   LambdaFunctionInstanceValue,
 } from '../../../../../../../metamodels/pure/valueSpecification/LambdaFunction';
-import type { ExecutionContext } from '../../../../../../../metamodels/pure/valueSpecification/ExecutionContext';
 import {
+  type ExecutionContext,
   BaseExecutionContext,
   AnalyticsExecutionContext,
 } from '../../../../../../../metamodels/pure/valueSpecification/ExecutionContext';
 import { VariableExpression } from '../../../../../../../metamodels/pure/valueSpecification/VariableExpression';
 import { Class } from '../../../../../../../metamodels/pure/packageableElements/domain/Class';
-import type { GraphFetchTree } from '../../../../../../../metamodels/pure/valueSpecification/GraphFetchTree';
 import type { AbstractProperty } from '../../../../../../../metamodels/pure/packageableElements/domain/AbstractProperty';
 import {
+  type GraphFetchTree,
   PropertyGraphFetchTree,
   RootGraphFetchTree,
   PropertyGraphFetchTreeInstanceValue,
   RootGraphFetchTreeInstanceValue,
 } from '../../../../../../../metamodels/pure/valueSpecification/GraphFetchTree';
 import { ValueSpecification } from '../../../../../../../metamodels/pure/valueSpecification/ValueSpecification';
-import type { SimpleFunctionExpression } from '../../../../../../../metamodels/pure/valueSpecification/SimpleFunctionExpression';
-import { AbstractPropertyExpression } from '../../../../../../../metamodels/pure/valueSpecification/SimpleFunctionExpression';
+import {
+  type SimpleFunctionExpression,
+  AbstractPropertyExpression,
+} from '../../../../../../../metamodels/pure/valueSpecification/SimpleFunctionExpression';
 import { GenericType } from '../../../../../../../metamodels/pure/packageableElements/domain/GenericType';
 import { GenericTypeExplicitReference } from '../../../../../../../metamodels/pure/packageableElements/domain/GenericTypeReference';
 import {
@@ -868,6 +870,11 @@ export function V1_processProperty(
     inferredVariable?.genericType?.value.rawType;
   if (inferredVariable instanceof AbstractPropertyExpression) {
     inferredType = inferredVariable.func.genericType.value.rawType;
+  } else {
+    inferredType = V1_resolvePropertyExpressionTypeInference(
+      inferredVariable,
+      context,
+    );
   }
   if (inferredType instanceof Class) {
     const processedProperty = new AbstractPropertyExpression(
@@ -931,3 +938,21 @@ export function V1_buildFunctionExpression(
     `Can't find expression builder for function '${functionName}': no compatible function expression builder available from plugins`,
   );
 }
+
+export function V1_resolvePropertyExpressionTypeInference(
+  inferredVariable: ValueSpecification | undefined,
+  compileContext: V1_GraphBuilderContext,
+): Type | undefined {
+  const inferrers = compileContext.extensions.plugins.flatMap(
+    (plugin) => plugin.V1_getExtraPropertyExpressionTypeInferrers?.() ?? [],
+  );
+  for (const inferrer of inferrers) {
+    const inferredType = inferrer(inferredVariable);
+    if (inferredType) {
+      return inferredType;
+    }
+  }
+  throw new UnsupportedOperationError(
+    `Can't infer type for variable '${inferredVariable}': no compatible property expression type inferrer available from plugins`,
+  );
+}

package/src/models/protocols/pure/v1/transformation/pureProtocol/V1_PackageableElementSerialization.ts

@@ -15,8 +15,10 @@
  */
 
 import { serialize, deserialize } from 'serializr';
-import type { PlainObject } from '@finos/legend-shared';
-import { UnsupportedOperationError } from '@finos/legend-shared';
+import {
+  type PlainObject,
+  UnsupportedOperationError,
+} from '@finos/legend-shared';
 import type { V1_PackageableConnection } from '../../model/packageableElements/connection/V1_PackageableConnection';
 import type { V1_Association } from '../../model/packageableElements/domain/V1_Association';
 import type { V1_Class } from '../../model/packageableElements/domain/V1_Class';

package/src/models/protocols/pure/v1/transformation/pureProtocol/V1_PureProtocolSerialization.ts

@@ -25,8 +25,8 @@ import {
   deserialize,
   object,
 } from 'serializr';
-import type { PlainObject } from '@finos/legend-shared';
 import {
+  type PlainObject,
   usingConstantValueSchema,
   UnsupportedOperationError,
   assertErrorThrown,

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

@@ -15,6 +15,7 @@
  */
 
 import {
+  type ModelSchema,
   alias,
   createModelSchema,
   deserialize,
@@ -24,9 +25,8 @@ import {
   list,
   optional,
 } from 'serializr';
-import type { ModelSchema } from 'serializr';
-import type { PlainObject } from '@finos/legend-shared';
 import {
+  type PlainObject,
   usingConstantValueSchema,
   IllegalStateError,
   UnsupportedOperationError,
@@ -37,10 +37,12 @@ import type { V1_Connection } from '../../../model/packageableElements/connectio
 import { V1_JsonModelConnection } from '../../../model/packageableElements/store/modelToModel/connection/V1_JsonModelConnection';
 import { V1_XmlModelConnection } from '../../../model/packageableElements/store/modelToModel/connection/V1_XmlModelConnection';
 import { V1_FlatDataConnection } from '../../../model/packageableElements/store/flatData/connection/V1_FlatDataConnection';
-import type { V1_DatabaseConnection } from '../../../model/packageableElements/store/relational/connection/V1_RelationalDatabaseConnection';
-import { V1_RelationalDatabaseConnection } from '../../../model/packageableElements/store/relational/connection/V1_RelationalDatabaseConnection';
-import type { V1_DatasourceSpecification } from '../../../model/packageableElements/store/relational/connection/V1_DatasourceSpecification';
 import {
+  type V1_DatabaseConnection,
+  V1_RelationalDatabaseConnection,
+} from '../../../model/packageableElements/store/relational/connection/V1_RelationalDatabaseConnection';
+import {
+  type V1_DatasourceSpecification,
   V1_LocalH2DataSourceSpecification,
   V1_SnowflakeDatasourceSpecification,
   V1_BigQueryDatasourceSpecification,
@@ -48,8 +50,8 @@ import {
   V1_EmbeddedH2DatasourceSpecification,
   V1_RedshiftDatasourceSpecification,
 } 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,
@@ -57,6 +59,7 @@ import {
   V1_DelegatedKerberosAuthenticationStrategy,
   V1_TestDatabaseAuthenticationStrategy,
   V1_UserPasswordAuthenticationStrategy,
+  V1_UsernamePasswordAuthenticationStrategy,
 } from '../../../model/packageableElements/store/relational/connection/V1_AuthenticationStrategy';
 import type { PureProtocolProcessorPlugin } from '../../../../PureProtocolProcessorPlugin';
 import type { StoreRelational_PureProtocolProcessorPlugin_Extension } from '../../../../StoreRelational_PureProtocolProcessorPlugin_Extension';
@@ -285,6 +288,7 @@ enum V1_AuthenticationStrategyType {
   TEST = 'test',
   OAUTH = 'oauth',
   USER_PASSWORD = 'userPassword',
+  USERNAME_PASSWORD = 'userNamePassword',
 }
 
 const V1_delegatedKerberosAuthenticationStrategyModelSchema = createModelSchema(
@@ -337,6 +341,18 @@ const V1_GCPApplicationDefaultCredentialsAuthenticationStrategyModelSchema =
     ),
   });
 
+const V1_UsernamePasswordAuthenticationStrategyModelSchema = createModelSchema(
+  V1_UsernamePasswordAuthenticationStrategy,
+  {
+    _type: usingConstantValueSchema(
+      V1_AuthenticationStrategyType.USERNAME_PASSWORD,
+    ),
+    baseVaultReference: optional(primitive()),
+    userNameVaultReference: primitive(),
+    passwordVaultReference: primitive(),
+  },
+);
+
 const V1_oAuthAuthenticationStrategyModelSchema = createModelSchema(
   V1_OAuthAuthenticationStrategy,
   {
@@ -382,6 +398,11 @@ export const V1_serializeAuthenticationStrategy = (
       V1_userPasswordAuthenticationStrategyModelSchema,
       protocol,
     );
+  } else if (protocol instanceof V1_UsernamePasswordAuthenticationStrategy) {
+    return serialize(
+      V1_UsernamePasswordAuthenticationStrategyModelSchema,
+      protocol,
+    );
   }
   const extraConnectionAuthenticationStrategyProtocolSerializers =
     plugins.flatMap(
@@ -437,6 +458,11 @@ export const V1_deserializeAuthenticationStrategy = (
       );
     case V1_AuthenticationStrategyType.OAUTH:
       return deserialize(V1_oAuthAuthenticationStrategyModelSchema, json);
+    case V1_AuthenticationStrategyType.USERNAME_PASSWORD:
+      return deserialize(
+        V1_UsernamePasswordAuthenticationStrategyModelSchema,
+        json,
+      );
     default: {
       const extraConnectionAuthenticationStrategyProtocolDeserializers =
         plugins.flatMap(

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

@@ -25,8 +25,8 @@ import {
   alias,
   optional,
 } from 'serializr';
-import type { PlainObject } from '@finos/legend-shared';
 import {
+  type PlainObject,
   optionalCustom,
   usingConstantValueSchema,
   deserializeArray,
@@ -41,8 +41,8 @@ import { V1_Schema } from '../../../model/packageableElements/store/relational/m
 import { V1_Join } from '../../../model/packageableElements/store/relational/model/V1_Join';
 import { V1_Filter } from '../../../model/packageableElements/store/relational/model/V1_Filter';
 import { V1_Table } from '../../../model/packageableElements/store/relational/model/V1_Table';
-import type { V1_RelationalDataType } from '../../../model/packageableElements/store/relational/model/V1_RelationalDataType';
 import {
+  type V1_RelationalDataType,
   V1_VarChar,
   V1_Char,
   V1_VarBinary,
@@ -66,8 +66,8 @@ import { V1_FilterPointer } from '../../../model/packageableElements/store/relat
 import { V1_FilterMapping } from '../../../model/packageableElements/store/relational/mapping/V1_FilterMapping';
 import { V1_JoinPointer } from '../../../model/packageableElements/store/relational/model/V1_JoinPointer';
 import { V1_ColumnMapping } from '../../../model/packageableElements/store/relational/model/V1_ColumnMapping';
-import type { V1_RelationalOperationElement } from '../../../model/packageableElements/store/relational/model/V1_RelationalOperationElement';
 import {
+  type V1_RelationalOperationElement,
   V1_DynaFunc,
   V1_ElementWithJoins,
   V1_Literal,

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

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import type { ModelSchema } from 'serializr';
 import {
+  type ModelSchema,
   createModelSchema,
   list,
   primitive,
@@ -26,8 +26,8 @@ import {
   optional,
   raw,
 } from 'serializr';
-import type { PlainObject } from '@finos/legend-shared';
 import {
+  type PlainObject,
   usingConstantValueSchema,
   deserializeArray,
   assertTrue,
@@ -65,8 +65,8 @@ import {
   V1_tablePtrModelSchema,
 } from './V1_DatabaseSerializationHelper';
 import { V1_MappingInclude } from '../../../model/packageableElements/mapping/V1_MappingInclude';
-import type { V1_EnumValueMappingSourceValue } from '../../../model/packageableElements/mapping/V1_EnumValueMapping';
 import {
+  type V1_EnumValueMappingSourceValue,
   V1_EnumValueMappingEnumSourceValue,
   V1_EnumValueMappingIntegerSourceValue,
   V1_EnumValueMappingStringSourceValue,

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

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import type { PlainObject } from '@finos/legend-shared';
 import {
+  type PlainObject,
   optionalCustom,
   usingConstantValueSchema,
   UnsupportedOperationError,

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

@@ -23,13 +23,13 @@ import {
   primitive,
   list,
 } from 'serializr';
-import type { V1_Mapper } from '../../../model/packageableElements/store/relational/connection/postprocessor/V1_Mapper';
 import {
+  type V1_Mapper,
   V1_SchemaNameMapper,
   V1_TableNameMapper,
 } from '../../../model/packageableElements/store/relational/connection/postprocessor/V1_Mapper';
-import type { PlainObject } from '@finos/legend-shared';
 import {
+  type PlainObject,
   usingConstantValueSchema,
   UnsupportedOperationError,
   usingModelSchema,

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

@@ -25,8 +25,8 @@ import {
   custom,
   alias,
 } from 'serializr';
-import type { PlainObject } from '@finos/legend-shared';
 import {
+  type PlainObject,
   usingConstantValueSchema,
   UnsupportedOperationError,
   usingModelSchema,

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

@@ -23,16 +23,16 @@ import {
   deserialize,
   object,
 } from 'serializr';
-import type { PlainObject } from '@finos/legend-shared';
 import {
+  type PlainObject,
   usingConstantValueSchema,
   UnsupportedOperationError,
   usingModelSchema,
 } from '@finos/legend-shared';
 import { V1_packageableElementPointerDeserializerSchema } from '../../../transformation/pureProtocol/serializationHelpers/V1_CoreSerializationHelper';
 import { V1_PackageableRuntime } from '../../../model/packageableElements/runtime/V1_PackageableRuntime';
-import type { V1_Runtime } from '../../../model/packageableElements/runtime/V1_Runtime';
 import {
+  type V1_Runtime,
   V1_EngineRuntime,
   V1_IdentifiedConnection,
   V1_LegacyRuntime,

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

@@ -14,8 +14,10 @@
  * limitations under the License.
  */
 
-import type { PlainObject } from '@finos/legend-shared';
-import { usingConstantValueSchema } from '@finos/legend-shared';
+import {
+  type PlainObject,
+  usingConstantValueSchema,
+} from '@finos/legend-shared';
 import {
   createModelSchema,
   list,
@@ -25,8 +27,8 @@ import {
   primitive,
   serialize,
 } from 'serializr';
-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/pureProtocol/serializationHelpers/V1_ServiceSerializationHelper.ts

@@ -22,24 +22,24 @@ import {
   list,
   serialize,
 } from 'serializr';
-import type { PlainObject } from '@finos/legend-shared';
 import {
+  type PlainObject,
   usingConstantValueSchema,
   deserializeArray,
   UnsupportedOperationError,
   serializeArray,
   usingModelSchema,
 } from '@finos/legend-shared';
-import type { V1_ServiceExecution } from '../../../model/packageableElements/service/V1_ServiceExecution';
 import {
+  type V1_ServiceExecution,
   V1_KeyedExecutionParameter,
   V1_PureMultiExecution,
   V1_PureSingleExecution,
 } from '../../../model/packageableElements/service/V1_ServiceExecution';
 import { V1_Service } from '../../../model/packageableElements/service/V1_Service';
 import { V1_rawLambdaModelSchema } from './V1_RawValueSpecificationSerializationHelper';
-import type { V1_Runtime } from '../../../model/packageableElements/runtime/V1_Runtime';
 import {
+  type V1_Runtime,
   V1_EngineRuntime,
   V1_LegacyRuntime,
   V1_RuntimePointer,
@@ -48,8 +48,8 @@ import {
   V1_runtimePointerModelSchema,
   V1_RuntimeType,
 } from './V1_RuntimeSerializationHelper';
-import type { V1_ServiceTest } from '../../../model/packageableElements/service/V1_ServiceTest';
 import {
+  type V1_ServiceTest,
   V1_KeyedSingleExecutionTest,
   V1_MultiExecutionTest,
   V1_SingleExecutionTest,

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

@@ -23,8 +23,8 @@ import {
   serialize,
   optional,
 } from 'serializr';
-import type { PlainObject } from '@finos/legend-shared';
 import {
+  type PlainObject,
   usingConstantValueSchema,
   deserializeArray,
   assertTrue,
@@ -34,8 +34,8 @@ import {
 } from '@finos/legend-shared';
 import { V1_FlatData } from '../../../model/packageableElements/store/flatData/model/V1_FlatData';
 import { V1_FlatDataProperty } from '../../../model/packageableElements/store/flatData/model/V1_FlatDataProperty';
-import type { V1_FlatDataDataType } from '../../../model/packageableElements/store/flatData/model/V1_FlatDataDataType';
 import {
+  type V1_FlatDataDataType,
   V1_FlatDataDecimal,
   V1_FlatDataDate,
   V1_FlatDataDateTime,

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

@@ -24,8 +24,8 @@ import {
   deserialize,
   optional,
 } from 'serializr';
-import type { PlainObject } from '@finos/legend-shared';
 import {
+  type PlainObject,
   usingConstantValueSchema,
   UnsupportedOperationError,
   usingModelSchema,

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

@@ -23,8 +23,8 @@ import {
   list,
   optional,
 } from 'serializr';
-import type { PlainObject } from '@finos/legend-shared';
 import {
+  type PlainObject,
   optionalCustom,
   deserializeArray,
   serializeArray,