@finos/legend-graph 10.0.0 → 10.1.2

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

@@ -46,7 +46,6 @@ import {
   V1_serializePureModelContext,
   V1_serializePureModelContextData,
 } from '../transformation/pureProtocol/V1_PureProtocolSerialization.js';
-import { V1_DEPRECATED__ServiceTestResult } from './service/V1_DEPRECATED__ServiceTestResult.js';
 import { V1_serializeRawValueSpecification } from '../transformation/pureProtocol/serializationHelpers/V1_RawValueSpecificationSerializationHelper.js';
 import { V1_transformRawLambda } from '../transformation/pureGraph/from/V1_RawValueSpecificationTransformer.js';
 import { V1_GenerateFileInput } from '../engine/generation/V1_FileGenerationInput.js';
@@ -180,6 +179,10 @@ export class V1_Engine {
     return this.engineServerClient;
   }
 
+  getCurrentUserId(): string | undefined {
+    return this.engineServerClient.currentUserId;
+  }
+
   async setup(config: V1_EngineSetupConfig): Promise<void> {
     this.config.setEnv(config.env);
     this.config.setTabSize(config.tabSize);
@@ -634,16 +637,6 @@ export class V1_Engine {
     return (await this.engineServerClient.getServerServiceInfo()) as unknown as V1_ServiceConfigurationInfo;
   }
 
-  async runLegacyServiceTests(
-    model: V1_PureModelContextData,
-  ): Promise<V1_DEPRECATED__ServiceTestResult[]> {
-    return (
-      await this.engineServerClient.runServiceTests(
-        V1_serializePureModelContextData(model),
-      )
-    ).map((v) => V1_DEPRECATED__ServiceTestResult.serialization.fromJson(v));
-  }
-
   async registerService(
     input: V1_PureModelContext,
     server: string,

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

@@ -25,7 +25,6 @@ import {
 import type { ImportMode } from '../../../../../graphManager/action/generation/ImportConfigurationDescription.js';
 import type { V1_PureModelContextData } from '../model/context/V1_PureModelContextData.js';
 import type { V1_LambdaReturnTypeResult } from './compilation/V1_LambdaReturnTypeResult.js';
-import type { V1_DEPRECATED__ServiceTestResult } from './service/V1_DEPRECATED__ServiceTestResult.js';
 import type { V1_ServiceRegistrationResult } from './service/V1_ServiceRegistrationResult.js';
 import type { V1_ServiceConfigurationInfo } from './service/V1_ServiceConfiguration.js';
 import type { V1_CompileResult } from './compilation/V1_CompileResult.js';
@@ -580,18 +579,6 @@ export class V1_EngineServerClient extends AbstractServerClient {
       {},
       { skipProcessing: true },
     );
-  runServiceTests = (
-    model: PlainObject<V1_PureModelContextData>,
-  ): Promise<PlainObject<V1_DEPRECATED__ServiceTestResult>[]> =>
-    this.postWithTracing(
-      this.getTraceData(CORE_ENGINE_TRACER_SPAN.RUN_SERVICE_TESTS),
-      `${this._service()}/doTest`,
-      model,
-      {},
-      undefined,
-      undefined,
-      { enableCompression: true },
-    );
 
   // ------------------------------------------- Query -------------------------------------------
 

package/src/models/protocols/pure/v1/model/packageableElements/service/V1_MultiExecutionServiceTestResult.ts

@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { V1_TestResult } from '../../test/result/V1_TestResult.js';
+
+export class V1_MultiExecutionServiceTestResult extends V1_TestResult {
+  keyIndexedTestResults: Map<string, V1_TestResult> = new Map();
+}

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

@@ -20,22 +20,24 @@ import {
   guaranteeType,
   UnsupportedOperationError,
 } from '@finos/legend-shared';
+import { MultiExecutionServiceTestResult } from '../../../../../../../metamodels/pure/packageableElements/service/MultiExecutionServiceTestResult.js';
 import { AssertFail } from '../../../../../../../metamodels/pure/test/assertion/status/AssertFail.js';
 import type { AssertionStatus } from '../../../../../../../metamodels/pure/test/assertion/status/AssertionStatus.js';
 import { AssertPass } from '../../../../../../../metamodels/pure/test/assertion/status/AssertPass.js';
 import { EqualToJsonAssertFail } from '../../../../../../../metamodels/pure/test/assertion/status/EqualToJsonAssertFail.js';
 import { AtomicTestId } from '../../../../../../../metamodels/pure/test/result/AtomicTestId.js';
 import {
+  type TestResult,
   TestError,
   TestFailed,
   TestPassed,
-  type TestResult,
 } from '../../../../../../../metamodels/pure/test/result/TestResult.js';
 import {
   AtomicTest,
   TestSuite,
 } from '../../../../../../../metamodels/pure/test/Test.js';
 import type { Testable } from '../../../../../../../metamodels/pure/test/Testable.js';
+import { V1_MultiExecutionServiceTestResult } from '../../../../model/packageableElements/service/V1_MultiExecutionServiceTestResult.js';
 import { V1_AssertFail } from '../../../../model/test/assertion/status/V1_AssertFail.js';
 import type { V1_AssertionStatus } from '../../../../model/test/assertion/status/V1_AssertionStatus.js';
 import { V1_AssertPass } from '../../../../model/test/assertion/status/V1_AssertPass.js';
@@ -150,16 +152,35 @@ export const V1_buildTestPassed = (
   return testPassed;
 };
 
-export const V1_buildTestResult = (
+export const V1_buildMultiExecutionServiceTestResult = (
+  element: V1_MultiExecutionServiceTestResult,
+  testable: Testable,
+): MultiExecutionServiceTestResult => {
+  const multi = new MultiExecutionServiceTestResult();
+  multi.testable = testable;
+  multi.atomicTestId = buildAtomicTestId(element.atomicTestId, testable);
+  multi.keyIndexedTestResults = new Map<string, TestResult>();
+  Array.from(element.keyIndexedTestResults.entries()).forEach((result) => {
+    multi.keyIndexedTestResults.set(
+      result[0],
+      V1_buildTestResult(result[1], testable),
+    );
+  });
+  return multi;
+};
+
+export function V1_buildTestResult(
   element: V1_TestResult,
   testable: Testable,
-): TestResult | undefined => {
+): TestResult {
   if (element instanceof V1_TestPassed) {
     return V1_buildTestPassed(element, testable);
   } else if (element instanceof V1_TestFailed) {
     return V1_buildTestFailed(element, testable);
   } else if (element instanceof V1_TestError) {
     return V1_buildTestError(element, testable);
+  } else if (element instanceof V1_MultiExecutionServiceTestResult) {
+    return V1_buildMultiExecutionServiceTestResult(element, testable);
   }
   throw new UnsupportedOperationError(`Can't build test result`, element);
-};
+}

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

@@ -19,6 +19,7 @@ import {
   UnsupportedOperationError,
   usingConstantValueSchema,
   usingModelSchema,
+  deserializeMap,
 } from '@finos/legend-shared';
 import {
   createModelSchema,
@@ -27,8 +28,10 @@ import {
   list,
   primitive,
   serialize,
+  SKIP,
 } from 'serializr';
 import type { PureProtocolProcessorPlugin } from '../../../../PureProtocolProcessorPlugin.js';
+import { V1_MultiExecutionServiceTestResult } from '../../../model/packageableElements/service/V1_MultiExecutionServiceTestResult.js';
 import { V1_ServiceTest } from '../../../model/packageableElements/service/V1_ServiceTest.js';
 import { V1_ServiceTestSuite } from '../../../model/packageableElements/service/V1_ServiceTestSuite.js';
 import { V1_AssertFail } from '../../../model/test/assertion/status/V1_AssertFail.js';
@@ -74,6 +77,9 @@ enum V1_TestResultType {
   TEST_ERROR = 'testError',
   TEST_PASSED = 'testPassed',
   TEST_FAILED = 'testFailed',
+  MULTI_EXECUTION_TEST_RESULT = 'multiExecutionTestResult',
+  // Remove once https://github.com/finos/legend-engine/pull/808 is released
+  TEMPROARY_MULTI_EXECUTION_TEST_RESULT = 'MultiExecutionServiceTestResult',
 }
 
 export enum V1_TestSuiteType {
@@ -177,13 +183,29 @@ export const V1_testFailedModelSchema = createModelSchema(V1_TestFailed, {
   testable: primitive(),
 });
 
+export const V1_MultiExecutionServiceTestResultModelSchema = createModelSchema(
+  V1_MultiExecutionServiceTestResult,
+  {
+    atomicTestId: usingModelSchema(V1_atomicTestIdModelSchema),
+    keyIndexedTestResults: custom(
+      () => SKIP,
+      (val) =>
+        deserializeMap(val, (v) =>
+          V1_deserializeTestResult(v as PlainObject<V1_TestResult>),
+        ),
+    ),
+    testable: primitive(),
+  },
+);
+
 export const V1_testPassedModelSchema = createModelSchema(V1_TestPassed, {
   atomicTestId: usingModelSchema(V1_atomicTestIdModelSchema),
   testable: primitive(),
 });
-export const V1_deserializeTestResult = (
+
+export function V1_deserializeTestResult(
   json: PlainObject<V1_TestResult>,
-): V1_TestResult => {
+): V1_TestResult {
   switch (json._type) {
     case V1_TestResultType.TEST_ERROR:
       return deserialize(V1_testErrorModelSchema, json);
@@ -191,12 +213,16 @@ export const V1_deserializeTestResult = (
       return deserialize(V1_testFailedModelSchema, json);
     case V1_TestResultType.TEST_PASSED:
       return deserialize(V1_testPassedModelSchema, json);
+    case V1_TestResultType.MULTI_EXECUTION_TEST_RESULT:
+    case V1_TestResultType.TEMPROARY_MULTI_EXECUTION_TEST_RESULT:
+      return deserialize(V1_MultiExecutionServiceTestResultModelSchema, json);
     default:
       throw new UnsupportedOperationError(
         `Can't deserialize atomic test of type '${json._type}'`,
       );
   }
-};
+}
+
 export const V1_serializeAtomicTest = (
   protocol: V1_AtomicTest,
 ): PlainObject<V1_AtomicTest> => {

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

@@ -234,55 +234,55 @@ const appliedPropertyModelSchema = createModelSchema(V1_AppliedProperty, {
 
 const collectionModelSchema = createModelSchema(V1_Collection, {
   _type: usingConstantValueSchema(V1_ValueSpecificationType.COLLECTION),
+  multiplicity: usingModelSchema(V1_multiplicitySchema),
   values: list(
     custom(
       (val) => V1_serializeValueSpecification(val),
       (val) => V1_deserializeValueSpecification(val),
     ),
   ),
-  multiplicity: usingModelSchema(V1_multiplicitySchema),
 });
 
 const cDecimalModelSchema = createModelSchema(V1_CDecimal, {
   _type: usingConstantValueSchema(V1_ValueSpecificationType.CDECIMAL),
-  values: list(primitive()),
   multiplicity: usingModelSchema(V1_multiplicitySchema),
+  values: list(primitive()),
 });
 
 const cIntegerModelSchema = createModelSchema(V1_CInteger, {
   _type: usingConstantValueSchema(V1_ValueSpecificationType.CINTEGER),
-  values: list(primitive()),
   multiplicity: usingModelSchema(V1_multiplicitySchema),
+  values: list(primitive()),
 });
 
 const cStringModelSchema = createModelSchema(V1_CString, {
   _type: usingConstantValueSchema(V1_ValueSpecificationType.CSTRING),
-  values: list(primitive()),
   multiplicity: usingModelSchema(V1_multiplicitySchema),
+  values: list(primitive()),
 });
 
 const cfloatModelSchema = createModelSchema(V1_CFloat, {
   _type: usingConstantValueSchema(V1_ValueSpecificationType.CFLOAT),
-  values: list(primitive()),
   multiplicity: usingModelSchema(V1_multiplicitySchema),
+  values: list(primitive()),
 });
 
 const cDateTimeModelSchema = createModelSchema(V1_CDateTime, {
   _type: usingConstantValueSchema(V1_ValueSpecificationType.CDATETIME),
-  values: list(primitive()),
   multiplicity: usingModelSchema(V1_multiplicitySchema),
+  values: list(primitive()),
 });
 
 const cStrictTimeModelSchema = createModelSchema(V1_CStrictTime, {
   _type: usingConstantValueSchema(V1_ValueSpecificationType.CSTRICTTIME),
-  values: list(primitive()),
   multiplicity: usingModelSchema(V1_multiplicitySchema),
+  values: list(primitive()),
 });
 
 const cStrictDateModelSchema = createModelSchema(V1_CStrictDate, {
   _type: usingConstantValueSchema(V1_ValueSpecificationType.CSTRICTDATE),
-  values: list(primitive()),
   multiplicity: usingModelSchema(V1_multiplicitySchema),
+  values: list(primitive()),
 });
 
 const cLatestDateModelSchema = createModelSchema(V1_CLatestDate, {
@@ -292,8 +292,8 @@ const cLatestDateModelSchema = createModelSchema(V1_CLatestDate, {
 
 const cBooleanModelSchema = createModelSchema(V1_CBoolean, {
   _type: usingConstantValueSchema(V1_ValueSpecificationType.CBOOLEAN),
-  values: list(primitive()),
   multiplicity: usingModelSchema(V1_multiplicitySchema),
+  values: list(primitive()),
 });
 
 const aggregationValueModelSchema = createModelSchema(V1_AggregateValue, {

package/tsconfig.json

@@ -215,6 +215,7 @@
     "./src/models/metamodels/pure/packageableElements/section/SectionIndex.ts",
     "./src/models/metamodels/pure/packageableElements/service/ConnectionTestData.ts",
     "./src/models/metamodels/pure/packageableElements/service/DEPRECATED__ServiceTest.ts",
+    "./src/models/metamodels/pure/packageableElements/service/MultiExecutionServiceTestResult.ts",
     "./src/models/metamodels/pure/packageableElements/service/ParameterValue.ts",
     "./src/models/metamodels/pure/packageableElements/service/Service.ts",
     "./src/models/metamodels/pure/packageableElements/service/ServiceExecution.ts",
@@ -422,6 +423,7 @@
     "./src/models/protocols/pure/v1/model/packageableElements/section/V1_SectionIndex.ts",
     "./src/models/protocols/pure/v1/model/packageableElements/service/V1_ConnectionTestData.ts",
     "./src/models/protocols/pure/v1/model/packageableElements/service/V1_DEPRECATED__ServiceTest.ts",
+    "./src/models/protocols/pure/v1/model/packageableElements/service/V1_MultiExecutionServiceTestResult.ts",
     "./src/models/protocols/pure/v1/model/packageableElements/service/V1_ParameterValue.ts",
     "./src/models/protocols/pure/v1/model/packageableElements/service/V1_Service.ts",
     "./src/models/protocols/pure/v1/model/packageableElements/service/V1_ServiceExecution.ts",