@finos/legend-graph 24.0.1 → 25.0.0

package/src/graphManager/protocol/pure/v1/transformation/pureGraph/to/helpers/V1_RelationalConnectionBuilderHelper.ts

@@ -30,6 +30,8 @@ import {
   RedshiftDatasourceSpecification,
   BigQueryDatasourceSpecification,
   SpannerDatasourceSpecification,
+  TrinoDatasourceSpecification,
+  TrinoSslSpecification,
 } from '../../../../../../../../graph/metamodel/pure/packageableElements/store/relational/connection/DatasourceSpecification.js';
 import {
   type AuthenticationStrategy,
@@ -42,6 +44,7 @@ import {
   DelegatedKerberosAuthenticationStrategy,
   GCPWorkloadIdentityFederationAuthenticationStrategy,
   MiddleTierUsernamePasswordAuthenticationStrategy,
+  TrinoDelegatedKerberosAuthenticationStrategy,
 } from '../../../../../../../../graph/metamodel/pure/packageableElements/store/relational/connection/AuthenticationStrategy.js';
 import type { V1_GraphBuilderContext } from '../../../../transformation/pureGraph/to/V1_GraphBuilderContext.js';
 import {
@@ -54,6 +57,7 @@ import {
   V1_RedshiftDatasourceSpecification,
   V1_BigQueryDatasourceSpecification,
   V1_SpannerDatasourceSpecification,
+  V1_TrinoDatasourceSpecification,
 } from '../../../../model/packageableElements/store/relational/connection/V1_DatasourceSpecification.js';
 import {
   type V1_AuthenticationStrategy,
@@ -66,6 +70,7 @@ import {
   V1_UsernamePasswordAuthenticationStrategy,
   V1_GCPWorkloadIdentityFederationAuthenticationStrategy,
   V1_MiddleTierUsernamePasswordAuthenticationStrategy,
+  V1_TrinoDelegatedKerberosAuthenticationStrategy,
 } from '../../../../model/packageableElements/store/relational/connection/V1_AuthenticationStrategy.js';
 import type { STO_Relational_PureProtocolProcessorPlugin_Extension } from '../../../../../extensions/STO_Relational_PureProtocolProcessorPlugin_Extension.js';
 
@@ -239,6 +244,35 @@ export const V1_buildDatasourceSpecification = (
       protocol.proxyPort,
     );
     return spannerSpec;
+  } else if (protocol instanceof V1_TrinoDatasourceSpecification) {
+    assertNonEmptyString(
+      protocol.host,
+      `Trino datasource specification 'host' field is missing or empty`,
+    );
+    assertNonNullable(
+      protocol.port,
+      `Trino datasource specification 'port' field is missing or empty`,
+    );
+    assertNonNullable(
+      protocol.sslSpecification.ssl,
+      `Trino datasource specification 'ssl' field is missing or empty`,
+    );
+    const sslSpecification = new TrinoSslSpecification(
+      protocol.sslSpecification.ssl,
+    );
+    sslSpecification.trustStorePathVaultReference =
+      protocol.sslSpecification.trustStorePathVaultReference;
+    sslSpecification.trustStorePasswordVaultReference =
+      protocol.sslSpecification.trustStorePasswordVaultReference;
+    const trinoSpec = new TrinoDatasourceSpecification(
+      protocol.host,
+      protocol.port,
+      sslSpecification,
+    );
+    trinoSpec.catalog = protocol.catalog;
+    trinoSpec.schema = protocol.schema;
+    trinoSpec.clientTags = protocol.clientTags;
+    return trinoSpec;
   }
   const extraConnectionDatasourceSpecificationBuilders =
     context.extensions.plugins.flatMap(
@@ -345,6 +379,18 @@ export const V1_buildAuthenticationStrategy = (
     return new MiddleTierUsernamePasswordAuthenticationStrategy(
       protocol.vaultReference,
     );
+  } else if (
+    protocol instanceof V1_TrinoDelegatedKerberosAuthenticationStrategy
+  ) {
+    assertNonEmptyString(
+      protocol.kerberosRemoteServiceName,
+      `Trino delegated kerberos authentication strategy 'kerberosRemoteServiceName' field is missing or empty`,
+    );
+
+    return new TrinoDelegatedKerberosAuthenticationStrategy(
+      protocol.kerberosRemoteServiceName,
+      protocol.kerberosUseCanonicalHostname,
+    );
   }
 
   const extraConnectionAuthenticationStrategyBuilders =

package/src/graphManager/protocol/pure/v1/transformation/pureGraph/to/helpers/V1_ValueSpecificationBuilderHelper.ts

@@ -215,7 +215,8 @@ export class V1_ValueSpecificationBuilder
       this.processingContext,
     );
     this.processingContext.pop();
-    return func[0];
+
+    return func;
   }
 
   visit_AppliedProperty(
@@ -553,25 +554,20 @@ export const V1_buildGenericFunctionExpression = (
   openVariables: string[],
   compileContext: V1_GraphBuilderContext,
   processingContext: V1_ProcessingContext,
-): [SimpleFunctionExpression, ValueSpecification[]] => {
-  const processedParams = parameters.map((parameter) =>
-    parameter.accept_ValueSpecificationVisitor(
-      new V1_ValueSpecificationBuilder(
-        compileContext,
-        processingContext,
-        openVariables,
+): SimpleFunctionExpression =>
+  V1_buildBaseSimpleFunctionExpression(
+    parameters.map((parameter) =>
+      parameter.accept_ValueSpecificationVisitor(
+        new V1_ValueSpecificationBuilder(
+          compileContext,
+          processingContext,
+          openVariables,
+        ),
       ),
     ),
+    functionName,
+    compileContext,
   );
-  return [
-    V1_buildBaseSimpleFunctionExpression(
-      processedParams,
-      functionName,
-      compileContext,
-    ),
-    processedParams,
-  ];
-};
 /**
  * This is fairly similar to how engine does function matching in a way.
  * Notice that Studio core should not attempt to do any function inferencing/matching
@@ -586,7 +582,7 @@ export function V1_buildFunctionExpression(
   openVariables: string[],
   compileContext: V1_GraphBuilderContext,
   processingContext: V1_ProcessingContext,
-): [SimpleFunctionExpression, ValueSpecification[]] {
+): SimpleFunctionExpression {
   if (
     matchFunctionName(functionName, [
       SUPPORTED_FUNCTIONS.TODAY,
@@ -600,7 +596,7 @@ export function V1_buildFunctionExpression(
       compileContext,
       processingContext,
     );
-    expression[0].genericType = GenericTypeExplicitReference.create(
+    expression.genericType = GenericTypeExplicitReference.create(
       new GenericType(PrimitiveType.STRICTDATE),
     );
     return expression;
@@ -612,7 +608,7 @@ export function V1_buildFunctionExpression(
       compileContext,
       processingContext,
     );
-    expression[0].genericType = GenericTypeExplicitReference.create(
+    expression.genericType = GenericTypeExplicitReference.create(
       new GenericType(PrimitiveType.DATETIME),
     );
     return expression;
@@ -632,7 +628,7 @@ export function V1_buildFunctionExpression(
       compileContext,
       processingContext,
     );
-    expression[0].genericType = GenericTypeExplicitReference.create(
+    expression.genericType = GenericTypeExplicitReference.create(
       new GenericType(PrimitiveType.DATE),
     );
     return expression;

package/src/graphManager/protocol/pure/v1/transformation/pureProtocol/V1_PackageableElementSerialization.ts

@@ -100,6 +100,11 @@ import {
   V1_dataElementModelSchema,
   V1_DATA_ELEMENT_PROTOCOL_TYPE,
 } from './serializationHelpers/V1_DataElementSerializationHelper.js';
+import {
+  V1_executionEnvModelSchema,
+  V1_EXECUTION_ENVIRONMENT_ELEMENT_PROTOCOL_TYPE,
+} from './serializationHelpers/V1_ExecutionEnvironmentSerializationHelper.js';
+import type { V1_ExecutionEnvironmentInstance } from '../../model/packageableElements/service/V1_ExecutionEnvironmentInstance.js';
 
 class V1_PackageableElementSerializer
   implements V1_PackageableElementVisitor<PlainObject<V1_PackageableElement>>
@@ -174,6 +179,12 @@ class V1_PackageableElementSerializer
     return serialize(V1_serviceModelSchema(this.plugins), element);
   }
 
+  visit_ExecutionEnvironmentInstance(
+    element: V1_ExecutionEnvironmentInstance,
+  ): PlainObject<V1_ExecutionEnvironmentInstance> {
+    return serialize(V1_executionEnvModelSchema, element);
+  }
+
   visit_PackageableRuntime(
     element: V1_PackageableRuntime,
   ): PlainObject<V1_PackageableElement> {
@@ -268,6 +279,8 @@ export const V1_deserializePackageableElement = (
         return deserialize(V1_mappingModelSchema(plugins), json);
       case V1_SERVICE_ELEMENT_PROTOCOL_TYPE:
         return deserialize(V1_serviceModelSchema(plugins), json);
+      case V1_EXECUTION_ENVIRONMENT_ELEMENT_PROTOCOL_TYPE:
+        return deserialize(V1_executionEnvModelSchema, json);
       case V1_PACKAGEABLE_CONNECTION_ELEMENT_PROTOCOL_TYPE:
         return deserialize(V1_packageableConnectionModelSchema(plugins), json);
       case V1_PACKAGEABLE_RUNTIME_ELEMENT_PROTOCOL_TYPE:

package/src/graphManager/protocol/pure/v1/transformation/pureProtocol/serializationHelpers/V1_ConnectionSerializationHelper.ts

@@ -28,6 +28,7 @@ import {
 import {
   type PlainObject,
   usingConstantValueSchema,
+  usingModelSchema,
   IllegalStateError,
   UnsupportedOperationError,
   customEquivalentList,
@@ -52,6 +53,8 @@ import {
   V1_EmbeddedH2DatasourceSpecification,
   V1_RedshiftDatasourceSpecification,
   V1_SpannerDatasourceSpecification,
+  V1_TrinoDatasourceSpecification,
+  V1_TrinoSslSpecification,
 } from '../../../model/packageableElements/store/relational/connection/V1_DatasourceSpecification.js';
 import {
   type V1_AuthenticationStrategy,
@@ -64,6 +67,7 @@ import {
   V1_UsernamePasswordAuthenticationStrategy,
   V1_GCPWorkloadIdentityFederationAuthenticationStrategy,
   V1_MiddleTierUsernamePasswordAuthenticationStrategy,
+  V1_TrinoDelegatedKerberosAuthenticationStrategy,
 } from '../../../model/packageableElements/store/relational/connection/V1_AuthenticationStrategy.js';
 import type { PureProtocolProcessorPlugin } from '../../../../PureProtocolProcessorPlugin.js';
 import type { STO_Relational_PureProtocolProcessorPlugin_Extension } from '../../../../extensions/STO_Relational_PureProtocolProcessorPlugin_Extension.js';
@@ -163,6 +167,7 @@ enum V1_DatasourceSpecificationType {
   REDSHIFT = 'redshift',
   BIGQUERY = 'bigQuery',
   SPANNER = 'spanner',
+  TRINO = 'Trino',
 }
 
 const staticDatasourceSpecificationModelSchema = createModelSchema(
@@ -260,6 +265,28 @@ const spannerDatasourceSpecificationModelSchema = createModelSchema(
   },
 );
 
+const trinoSslSpecificationModelSchema = createModelSchema(
+  V1_TrinoSslSpecification,
+  {
+    ssl: primitive(),
+    trustStorePathVaultReference: optional(primitive()),
+    trustStorePasswordVaultReference: optional(primitive()),
+  },
+);
+
+const trinoDatasourceSpecificationModelSchema = createModelSchema(
+  V1_TrinoDatasourceSpecification,
+  {
+    _type: usingConstantValueSchema(V1_DatasourceSpecificationType.TRINO),
+    host: primitive(),
+    port: primitive(),
+    catalog: optional(primitive()),
+    schema: optional(primitive()),
+    clientTags: optional(primitive()),
+    sslSpecification: usingModelSchema(trinoSslSpecificationModelSchema),
+  },
+);
+
 export const V1_serializeDatasourceSpecification = (
   protocol: V1_DatasourceSpecification,
   plugins: PureProtocolProcessorPlugin[],
@@ -280,6 +307,8 @@ export const V1_serializeDatasourceSpecification = (
     return serialize(redshiftDatasourceSpecificationModelSchema, protocol);
   } else if (protocol instanceof V1_SpannerDatasourceSpecification) {
     return serialize(spannerDatasourceSpecificationModelSchema, protocol);
+  } else if (protocol instanceof V1_TrinoDatasourceSpecification) {
+    return serialize(trinoDatasourceSpecificationModelSchema, protocol);
   }
   const extraConnectionDatasourceSpecificationProtocolSerializers =
     plugins.flatMap(
@@ -322,6 +351,8 @@ export const V1_deserializeDatasourceSpecification = (
       return deserialize(redshiftDatasourceSpecificationModelSchema, json);
     case V1_DatasourceSpecificationType.SPANNER:
       return deserialize(spannerDatasourceSpecificationModelSchema, json);
+    case V1_DatasourceSpecificationType.TRINO:
+      return deserialize(trinoDatasourceSpecificationModelSchema, json);
     default: {
       const extraConnectionDatasourceSpecificationProtocolDeserializers =
         plugins.flatMap(
@@ -356,6 +387,7 @@ enum V1_AuthenticationStrategyType {
   USERNAME_PASSWORD = 'userNamePassword',
   GCP_WORKLOAD_IDENTITY_FEDERATION = 'gcpWorkloadIdentityFederation',
   MIDDLE_TIER_USERNAME_PASSWORD = 'middleTierUserNamePassword',
+  TRINO_DELEGATED_KERBEROS = 'TrinoDelegatedKerberosAuth',
 }
 
 const V1_delegatedKerberosAuthenticationStrategyModelSchema = createModelSchema(
@@ -429,6 +461,15 @@ const V1_UsernamePasswordAuthenticationStrategyModelSchema = createModelSchema(
   },
 );
 
+const V1_TrinoDelegatedKerberosAuthenticationStrategyModelSchema =
+  createModelSchema(V1_TrinoDelegatedKerberosAuthenticationStrategy, {
+    _type: usingConstantValueSchema(
+      V1_AuthenticationStrategyType.TRINO_DELEGATED_KERBEROS,
+    ),
+    kerberosRemoteServiceName: primitive(),
+    kerberosUseCanonicalHostname: optional(primitive()),
+  });
+
 const V1_oAuthAuthenticationStrategyModelSchema = createModelSchema(
   V1_OAuthAuthenticationStrategy,
   {
@@ -485,6 +526,13 @@ export const V1_serializeAuthenticationStrategy = (
       V1_MiddleTierUsernamePasswordAuthenticationStrategyModelSchema,
       protocol,
     );
+  } else if (
+    protocol instanceof V1_TrinoDelegatedKerberosAuthenticationStrategy
+  ) {
+    return serialize(
+      V1_TrinoDelegatedKerberosAuthenticationStrategyModelSchema,
+      protocol,
+    );
   }
   const extraConnectionAuthenticationStrategyProtocolSerializers =
     plugins.flatMap(
@@ -547,6 +595,8 @@ export const V1_deserializeAuthenticationStrategy = (
         V1_MiddleTierUsernamePasswordAuthenticationStrategyModelSchema,
         json,
       );
+    case V1_AuthenticationStrategyType.TRINO_DELEGATED_KERBEROS:
+      return deserialize(V1_TrinoDelegatedKerberosAuthenticationStrategy, json);
     default: {
       const extraConnectionAuthenticationStrategyProtocolDeserializers =
         plugins.flatMap(

package/src/graphManager/protocol/pure/v1/transformation/pureProtocol/serializationHelpers/V1_CoreSerializationHelper.ts

@@ -34,7 +34,7 @@ export const V1_packageableElementPointerDeserializerSchema = createModelSchema(
   V1_PackageableElementPointer,
   {
     path: primitive(),
-    type: primitive(),
+    type: optional(primitive()),
   },
 );
 

package/src/graphManager/protocol/pure/v1/transformation/pureProtocol/serializationHelpers/V1_ExecutionEnvironmentSerializationHelper.ts

@@ -0,0 +1,122 @@
+/**
+ * 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 {
+  type PlainObject,
+  usingConstantValueSchema,
+  usingModelSchema,
+  UnsupportedOperationError,
+} from '@finos/legend-shared';
+import {
+  createModelSchema,
+  custom,
+  primitive,
+  list,
+  deserialize,
+  serialize,
+} from 'serializr';
+import {
+  V1_ExecutionEnvironmentInstance,
+  V1_MultiExecutionParameters,
+  V1_SingleExecutionParameters,
+  type V1_ExecutionParameters,
+} from '../../../model/packageableElements/service/V1_ExecutionEnvironmentInstance.js';
+import {
+  V1_deserializeRuntime,
+  V1_serializeRuntime,
+} from './V1_RuntimeSerializationHelper.js';
+
+export const V1_EXECUTION_ENVIRONMENT_ELEMENT_PROTOCOL_TYPE =
+  'executionEnvironmentInstance';
+
+enum V1_ExecEnvirParameterType {
+  PURE_SINGLE_EXECUTION = 'singleExecutionParameters',
+  PURE_MULTI_EXECUTION = 'multiExecutionParameters',
+}
+
+const V1_singleExecutionParametersModelSchema = createModelSchema(
+  V1_SingleExecutionParameters,
+  {
+    _type: usingConstantValueSchema(
+      V1_ExecEnvirParameterType.PURE_SINGLE_EXECUTION,
+    ),
+    key: primitive(),
+    mapping: primitive(),
+    runtime: custom(
+      (val) => V1_serializeRuntime(val),
+      (val) => V1_deserializeRuntime(val),
+    ),
+  },
+);
+
+export const V1_multiExecutionParametersmodelSchema = createModelSchema(
+  V1_MultiExecutionParameters,
+  {
+    _type: usingConstantValueSchema(
+      V1_ExecEnvirParameterType.PURE_MULTI_EXECUTION,
+    ),
+    masterKey: primitive(),
+    singleExecutionParameters: list(
+      usingModelSchema(V1_singleExecutionParametersModelSchema),
+    ),
+  },
+);
+
+const V1_serializeExecutionParameters = (
+  protocol: V1_ExecutionParameters,
+): PlainObject<V1_ExecutionParameters> => {
+  if (protocol instanceof V1_SingleExecutionParameters) {
+    return serialize(V1_singleExecutionParametersModelSchema, protocol);
+  } else if (protocol instanceof V1_MultiExecutionParameters) {
+    return serialize(V1_multiExecutionParametersmodelSchema, protocol);
+  }
+  throw new UnsupportedOperationError(
+    `Can't serialize excution env exec parameters`,
+    protocol,
+  );
+};
+
+const V1_deserializeExecutionParameters = (
+  json: PlainObject<V1_ExecutionParameters>,
+): V1_ExecutionParameters => {
+  switch (json._type) {
+    case V1_ExecEnvirParameterType.PURE_SINGLE_EXECUTION:
+      return deserialize(V1_singleExecutionParametersModelSchema, json);
+    case V1_ExecEnvirParameterType.PURE_MULTI_EXECUTION:
+      return deserialize(V1_multiExecutionParametersmodelSchema, json);
+    default:
+      throw new UnsupportedOperationError(
+        `Can't deserialize execution parameters of type '${json._type}'`,
+      );
+  }
+};
+
+export const V1_executionEnvModelSchema = createModelSchema(
+  V1_ExecutionEnvironmentInstance,
+  {
+    _type: usingConstantValueSchema(
+      V1_EXECUTION_ENVIRONMENT_ELEMENT_PROTOCOL_TYPE,
+    ),
+    name: primitive(),
+    executionParameters: list(
+      custom(
+        (val) => V1_serializeExecutionParameters(val),
+        (val) => V1_deserializeExecutionParameters(val),
+      ),
+    ),
+    package: primitive(),
+  },
+);

package/src/graphManager/protocol/pure/v1/transformation/pureProtocol/serializationHelpers/V1_RuntimeSerializationHelper.ts

@@ -109,9 +109,28 @@ export const V1_serializeRuntime = (
   } else if (protocol instanceof V1_RuntimePointer) {
     return serialize(V1_runtimePointerModelSchema, protocol);
   }
+  // NOTE: we don't want to serialize legacy runtime as we no longer want to circulate it any further
   throw new UnsupportedOperationError(`Can't serialize runtime`, protocol);
 };
 
+export const V1_deserializeRuntime = (
+  json: PlainObject<V1_Runtime>,
+): V1_Runtime => {
+  switch (json._type) {
+    case V1_RuntimeType.RUNTIME_POINTER:
+      return deserialize(V1_runtimePointerModelSchema, json);
+    case V1_RuntimeType.ENGINE_RUNTIME:
+      return deserialize(V1_EngineRuntime, json);
+    case V1_RuntimeType.LEGACY_RUNTIME:
+    case undefined:
+      return deserialize(V1_LegacyRuntime, json);
+    default:
+      throw new UnsupportedOperationError(
+        `Can't deeserialize runtime of type '${json._type}'`,
+      );
+  }
+};
+
 export const V1_packageableRuntimeModelSchema = createModelSchema(
   V1_PackageableRuntime,
   {

package/src/graphManager/protocol/pure/v1/transformation/pureProtocol/serializationHelpers/V1_ServiceSerializationHelper.ts

@@ -44,13 +44,7 @@ import {
 import { V1_Service } from '../../../model/packageableElements/service/V1_Service.js';
 import { V1_rawLambdaModelSchema } from './V1_RawValueSpecificationSerializationHelper.js';
 import {
-  type V1_Runtime,
-  V1_EngineRuntime,
-  V1_LegacyRuntime,
-} from '../../../model/packageableElements/runtime/V1_Runtime.js';
-import {
-  V1_runtimePointerModelSchema,
-  V1_RuntimeType,
+  V1_deserializeRuntime,
   V1_serializeRuntime,
 } from './V1_RuntimeSerializationHelper.js';
 import { V1_ServiceTest } from '../../../model/packageableElements/service/V1_ServiceTest.js';
@@ -179,22 +173,6 @@ export const V1_serviceTestSuiteModelSchema = (
     ),
   });
 
-const V1_deserializeRuntime = (json: PlainObject<V1_Runtime>): V1_Runtime => {
-  switch (json._type) {
-    case V1_RuntimeType.RUNTIME_POINTER:
-      return deserialize(V1_runtimePointerModelSchema, json);
-    case V1_RuntimeType.ENGINE_RUNTIME:
-      return deserialize(V1_EngineRuntime, json);
-    case V1_RuntimeType.LEGACY_RUNTIME:
-    case undefined:
-      return deserialize(V1_LegacyRuntime, json);
-    default:
-      throw new UnsupportedOperationError(
-        `Can't deeserialize runtime value of type '${json._type}'`,
-      );
-  }
-};
-
 const pureSingleExecutionModelSchema = createModelSchema(
   V1_PureSingleExecution,
   {
@@ -203,10 +181,7 @@ const pureSingleExecutionModelSchema = createModelSchema(
     ),
     func: usingModelSchema(V1_rawLambdaModelSchema),
     mapping: optional(primitive()),
-    runtime: optionalCustom(
-      (val) => V1_serializeRuntime(val),
-      (val) => V1_deserializeRuntime(val),
-    ),
+    runtime: optionalCustom(V1_serializeRuntime, V1_deserializeRuntime),
   },
 );
 
@@ -215,10 +190,7 @@ const keyedExecutionParamaterModelSchema = createModelSchema(
   {
     key: primitive(),
     mapping: primitive(),
-    runtime: custom(
-      (val) => V1_serializeRuntime(val),
-      (val) => V1_deserializeRuntime(val),
-    ),
+    runtime: optionalCustom(V1_serializeRuntime, V1_deserializeRuntime),
   },
 );
 

package/src/graphManager/protocol/pure/v1/transformation/pureProtocol/serializationHelpers/executionPlan/V1_ExecutionPlanSerializationHelper.ts

@@ -77,7 +77,7 @@ const TDSResultTypeModelSchema = createModelSchema(V1_TDSResultType, {
   tdsColumns: list(usingModelSchema(TDSColumnModelSchema)),
 });
 
-const V1_serializeExecutionResultType = (
+const V1_serializeResultType = (
   protocol: V1_ResultType,
 ): PlainObject<V1_ResultType> => {
   if (protocol instanceof V1_DataTypeResultType) {
@@ -91,7 +91,7 @@ const V1_serializeExecutionResultType = (
   );
 };
 
-const V1_deserializeExecutionResultType = (
+const V1_deserializeResultType = (
   json: PlainObject<V1_ResultType>,
 ): V1_ResultType => {
   switch (json._type) {
@@ -120,16 +120,10 @@ const relationalTDSInstantationExecutionNodeModelSchema = createModelSchema(
       V1_ExecutionNodeType.RELATIONAL_TDS_INSTANTIATION,
     ),
     executionNodes: list(
-      custom(
-        (val) => V1_serializeExecutionNode(val),
-        (val) => V1_deserializeExecutionNode(val),
-      ),
+      custom(V1_serializeExecutionNode, V1_deserializeExecutionNode),
     ),
     resultSizeRange: usingModelSchema(V1_multiplicitySchema),
-    resultType: custom(
-      (val) => V1_serializeExecutionResultType(val),
-      (val) => V1_deserializeExecutionResultType(val),
-    ),
+    resultType: custom(V1_serializeResultType, V1_deserializeResultType),
   },
 );
 
@@ -141,8 +135,8 @@ const SQLResultColumnModelSchema = createModelSchema(V1_SQLResultColumn, {
 const SQLExecutionNodeModelSchema = createModelSchema(V1_SQLExecutionNode, {
   _type: usingConstantValueSchema(V1_ExecutionNodeType.SQL),
   connection: custom(
-    (val) => V1_serializeDatabaseConnectionValue(val),
-    (val) => V1_deserializeDatabaseConnectionValue(val),
+    V1_serializeDatabaseConnectionValue,
+    V1_deserializeDatabaseConnectionValue,
   ),
   executionNodes: customList(
     V1_serializeExecutionNode,
@@ -152,10 +146,7 @@ const SQLExecutionNodeModelSchema = createModelSchema(V1_SQLExecutionNode, {
   onConnectionCloseRollbackQuery: optional(primitive()),
   resultColumns: list(usingModelSchema(SQLResultColumnModelSchema)),
   resultSizeRange: usingModelSchema(V1_multiplicitySchema),
-  resultType: custom(
-    (val) => V1_serializeExecutionResultType(val),
-    (val) => V1_deserializeExecutionResultType(val),
-  ),
+  resultType: custom(V1_serializeResultType, V1_deserializeResultType),
   sqlQuery: primitive(),
 });
 
@@ -209,8 +200,8 @@ const SimpleExecutionPlanModelSchema = createModelSchema(
     authDependent: primitive(),
     kerberos: optional(primitive()),
     rootExecutionNode: custom(
-      (val) => V1_serializeExecutionNode(val),
-      (val) => V1_deserializeExecutionNode(val),
+      V1_serializeExecutionNode,
+      V1_deserializeExecutionNode,
     ),
     serializer: usingModelSchema(V1_Protocol.serialization.schema),
     templateFunctions: list(primitive()),

package/src/index.ts

@@ -69,7 +69,7 @@ export {
   TagReference,
   TagExplicitReference,
 } from './graph/metamodel/pure/packageableElements/domain/TagReference.js';
-
+export * from './graph/metamodel/pure/packageableElements/service/ExecutionEnvironmentInstance.js';
 // --------------------------------------------- VALUE SPECIFICATION --------------------------------------------------
 
 // metamodels
@@ -203,12 +203,11 @@ export * from './graphManager/action/generation/DatabaseBuilderInput.js';
 export * from './graphManager/action/generation/GenerationConfigurationDescription.js';
 export { GenerationOutput } from './graphManager/action/generation/GenerationOutput.js';
 export { ServiceExecutionMode } from './graphManager/action/service/ServiceExecutionMode.js';
-export { ServiceRegistrationResult } from './graphManager/action/service/ServiceRegistrationResult.js';
 export {
-  BulkServiceRegistrationResult,
-  BulkRegistrationResultFail,
-  BulkRegistrationResultSuccess,
-} from './graphManager/action/service/BulkServiceRegistrationResult.js';
+  ServiceRegistrationResult,
+  ServiceRegistrationFail,
+  ServiceRegistrationSuccess,
+} from './graphManager/action/service/ServiceRegistrationResult.js';
 export { DEPRECATED__ServiceTestResult } from './graphManager/action/service/DEPRECATED__ServiceTestResult.js';
 export { SourceInformation } from './graphManager/action/SourceInformation.js';
 export * from './graphManager/protocol/pure/PureProtocolProcessorPlugin.js';