@finos/legend-graph 21.0.0 → 22.0.1

package/src/graphManager/action/changeDetection/DSL_Service_ObserverHelper.ts

@@ -53,6 +53,8 @@ import {
   observe_AtomicTest,
   observe_TestAssertion,
 } from './Testable_ObserverHelper.js';
+import type { PostValidation } from '../../../graph/metamodel/pure/packageableElements/service/PostValidation.js';
+import type { PostValidationAssertion } from '../../../graph/metamodel/pure/packageableElements/service/PostValidationAssertion.js';
 
 export const observe_ConnectionTestData = skipObservedWithContext(
   (
@@ -83,6 +85,34 @@ export const observe_ParameterValue = skipObserved(
   },
 );
 
+const observe_PostValidationAssertion = skipObserved(
+  (metamodel: PostValidationAssertion): PostValidationAssertion => {
+    makeObservable(metamodel, {
+      assertion: observable,
+      hashCode: computed,
+      id: observable,
+    });
+
+    observe_RawLambda(metamodel.assertion);
+    return metamodel;
+  },
+);
+
+const observe_PostValidation = skipObserved(
+  (metamodel: PostValidation): PostValidation => {
+    makeObservable(metamodel, {
+      assertions: observable,
+      description: observable,
+      parameters: observable,
+      hashCode: computed,
+    });
+
+    metamodel.assertions.forEach(observe_PostValidationAssertion);
+    metamodel.parameters.forEach(observe_RawLambda);
+    return metamodel;
+  },
+);
+
 export const observe_TestData = skipObservedWithContext(
   (metamodel: TestData, context: ObserverContext): TestData => {
     makeObservable(metamodel, {
@@ -219,9 +249,12 @@ export const observe_PureSingleExecution = skipObservedWithContext(
       runtime: observable,
       hashCode: computed,
     });
-
-    observe_PackageableElementReference(metamodel.mapping);
-    observe_Runtime(metamodel.runtime, context);
+    if (metamodel.mapping) {
+      observe_PackageableElementReference(metamodel.mapping);
+    }
+    if (metamodel.runtime) {
+      observe_Runtime(metamodel.runtime, context);
+    }
 
     return metamodel;
   },
@@ -284,6 +317,7 @@ export const observe_Service = skipObservedWithContext(
       execution: observable,
       test: observable,
       tests: observable,
+      postValidations: observable,
       patternParameters: computed,
       _elementHashCode: override,
     });
@@ -295,6 +329,7 @@ export const observe_Service = skipObservedWithContext(
       observe_ServiceTest_Legacy(metamodel.test);
     }
     metamodel.tests.forEach((m) => observe_ServiceTestSuite(m, context));
+    metamodel.postValidations.forEach((m) => observe_PostValidation(m));
     return metamodel;
   },
 );

package/src/graphManager/protocol/pure/v1/V1_PureGraphManager.ts

@@ -1691,6 +1691,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
           this.pluginManager.getPureGraphManagerPlugins(),
         ),
       );
+      runTestableInput.unitTestIds = [unitAtomicTest];
       runTestsInput.testables = [runTestableInput];
       const parent = test.__parent;
       unitAtomicTest.testSuiteId =
@@ -2183,12 +2184,14 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
         // and not embedded.
         const execution = service.execution;
         if (execution instanceof PureSingleExecution) {
-          sdlcInfo.packageableElementPointers = [
-            new V1_PackageableElementPointer(
-              PackageableElementPointerType.MAPPING,
-              execution.mapping.value.path,
-            ),
-          ];
+          if (execution.mapping) {
+            sdlcInfo.packageableElementPointers = [
+              new V1_PackageableElementPointer(
+                PackageableElementPointerType.MAPPING,
+                execution.mapping.value.path,
+              ),
+            ];
+          }
         } else if (execution instanceof PureMultiExecution) {
           sdlcInfo.packageableElementPointers =
             execution.executionParameters.map(

package/src/graphManager/protocol/pure/v1/model/packageableElements/service/V1_PostValidation.ts

@@ -0,0 +1,35 @@
+/**
+ * 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 Hashable, hashArray } from '@finos/legend-shared';
+import { CORE_HASH_STRUCTURE } from '../../../../../../../graph/Core_HashUtils.js';
+import type { V1_RawLambda } from '../../rawValueSpecification/V1_RawLambda.js';
+import type { V1_PostValidationAssertion } from './V1_PostValidationAssertion.js';
+
+export class V1_PostValidation implements Hashable {
+  description!: string;
+  parameters: V1_RawLambda[] = [];
+  assertions: V1_PostValidationAssertion[] = [];
+
+  get hashCode(): string {
+    return hashArray([
+      CORE_HASH_STRUCTURE.SERVICE_POST_VALIDATION,
+      this.description,
+      hashArray(this.parameters),
+      hashArray(this.assertions),
+    ]);
+  }
+}

package/src/graphManager/protocol/pure/v1/model/packageableElements/service/V1_PostValidationAssertion.ts

@@ -0,0 +1,32 @@
+/**
+ * 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 Hashable, hashArray } from '@finos/legend-shared';
+import { CORE_HASH_STRUCTURE } from '../../../../../../../graph/Core_HashUtils.js';
+import type { V1_RawLambda } from '../../rawValueSpecification/V1_RawLambda.js';
+
+export class V1_PostValidationAssertion implements Hashable {
+  id!: string;
+  assertion!: V1_RawLambda;
+
+  get hashCode(): string {
+    return hashArray([
+      CORE_HASH_STRUCTURE.SERVICE_POST_VALIDATION_ASSERTION,
+      this.id,
+      this.assertion,
+    ]);
+  }
+}

package/src/graphManager/protocol/pure/v1/model/packageableElements/service/V1_Service.ts

@@ -25,6 +25,7 @@ import type { V1_StereotypePtr } from '../../../model/packageableElements/domain
 import type { V1_TaggedValue } from '../../../model/packageableElements/domain/V1_TaggedValue.js';
 import type { V1_DEPRECATED__ServiceTest } from './V1_DEPRECATED__ServiceTest.js';
 import type { V1_TestSuite } from '../../test/V1_TestSuite.js';
+import type { V1_PostValidation } from './V1_PostValidation.js';
 
 export class V1_Service extends V1_PackageableElement implements Hashable {
   stereotypes: V1_StereotypePtr[] = [];
@@ -36,6 +37,7 @@ export class V1_Service extends V1_PackageableElement implements Hashable {
   execution!: V1_ServiceExecution;
   test?: V1_DEPRECATED__ServiceTest | undefined;
   testSuites: V1_TestSuite[] = [];
+  postValidations: V1_PostValidation[] = [];
 
   override get hashCode(): string {
     return hashArray([
@@ -50,6 +52,7 @@ export class V1_Service extends V1_PackageableElement implements Hashable {
       this.execution,
       this.test ?? '',
       hashArray(this.testSuites),
+      hashArray(this.postValidations),
     ]);
   }
 

package/src/graphManager/protocol/pure/v1/model/packageableElements/service/V1_ServiceExecution.ts

@@ -43,15 +43,15 @@ export class V1_PureSingleExecution
   extends V1_PureExecution
   implements Hashable
 {
-  mapping!: string;
-  runtime!: V1_Runtime;
+  mapping: string | undefined;
+  runtime: V1_Runtime | undefined;
 
   override get hashCode(): string {
     return hashArray([
       CORE_HASH_STRUCTURE.SERVICE_PURE_SINGLE_EXECUTION,
       super.hashCode,
-      this.mapping,
-      this.runtime,
+      this.mapping ?? '',
+      this.runtime ?? '',
     ]);
   }
 }

package/src/graphManager/protocol/pure/v1/transformation/pureGraph/from/V1_ServiceTransformer.ts

@@ -32,7 +32,10 @@ import {
   V1_KeyedExecutionParameter,
 } from '../../../model/packageableElements/service/V1_ServiceExecution.js';
 import { V1_ServiceTest } from '../../../model/packageableElements/service/V1_ServiceTest.js';
-import { V1_RawValueSpecificationTransformer } from './V1_RawValueSpecificationTransformer.js';
+import {
+  V1_RawValueSpecificationTransformer,
+  V1_transformRawLambda,
+} from './V1_RawValueSpecificationTransformer.js';
 import type { V1_RawLambda } from '../../../model/rawValueSpecification/V1_RawLambda.js';
 import { V1_transformRuntime } from './V1_RuntimeTransformer.js';
 import type { V1_GraphTransformerContext } from './V1_GraphTransformerContext.js';
@@ -68,6 +71,10 @@ import {
   V1_transformTestAssertion,
   V1_transformTestSuite,
 } from './V1_TestTransformer.js';
+import type { PostValidation } from '../../../../../../../graph/metamodel/pure/packageableElements/service/PostValidation.js';
+import { V1_PostValidation } from '../../../model/packageableElements/service/V1_PostValidation.js';
+import type { PostValidationAssertion } from '../../../../../../../graph/metamodel/pure/packageableElements/service/PostValidationAssertion.js';
+import { V1_PostValidationAssertion } from '../../../model/packageableElements/service/V1_PostValidationAssertion.js';
 
 const transformConnectionTestData = (
   element: ConnectionTestData,
@@ -88,6 +95,34 @@ export const V1_transformParameterValue = (
   return parameterValue;
 };
 
+const V1_transformPostValidationAssertion = (
+  element: PostValidationAssertion,
+  context: V1_GraphTransformerContext,
+): V1_PostValidationAssertion => {
+  const postValidationAssertion = new V1_PostValidationAssertion();
+  postValidationAssertion.id = element.id;
+  postValidationAssertion.assertion = V1_transformRawLambda(
+    element.assertion,
+    context,
+  );
+  return postValidationAssertion;
+};
+
+const V1_transformPostValidation = (
+  element: PostValidation,
+  context: V1_GraphTransformerContext,
+): V1_PostValidation => {
+  const postValidation = new V1_PostValidation();
+  postValidation.description = element.description;
+  postValidation.parameters = element.parameters.map((p) =>
+    V1_transformRawLambda(p, context),
+  );
+  postValidation.assertions = element.assertions.map((a) =>
+    V1_transformPostValidationAssertion(a, context),
+  );
+  return postValidation;
+};
+
 const transformTestData = (
   element: TestData,
   context: V1_GraphTransformerContext,
@@ -137,8 +172,12 @@ const transformSingleExecution = (
   execution.func = element.func.accept_RawValueSpecificationVisitor(
     new V1_RawValueSpecificationTransformer(context),
   ) as V1_RawLambda;
-  execution.mapping = element.mapping.valueForSerialization ?? '';
-  execution.runtime = V1_transformRuntime(element.runtime, context);
+  if (element.mapping) {
+    execution.mapping = element.mapping.valueForSerialization ?? '';
+  }
+  if (element.runtime) {
+    execution.runtime = V1_transformRuntime(element.runtime, context);
+  }
   return execution;
 };
 
@@ -262,5 +301,8 @@ export const V1_transformService = (
   service.testSuites = element.tests.map((testSuite) =>
     V1_transformTestSuite(testSuite, context),
   );
+  service.postValidations = element.postValidations.map((postValidation) =>
+    V1_transformPostValidation(postValidation, context),
+  );
   return service;
 };

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

@@ -53,6 +53,7 @@ import {
 import {
   V1_buildServiceExecution,
   V1_buildLegacyServiceTest,
+  V1_buildPostValidation,
 } from './helpers/V1_ServiceBuilderHelper.js';
 import {
   V1_buildEnumerationMapping,
@@ -85,6 +86,7 @@ import { V1_DataElementReference } from '../../../model/data/V1_EmbeddedData.js'
 import { V1_buildFunctionSignature } from '../../../helpers/V1_DomainHelper.js';
 import { getFunctionName } from '../../../../../../../graph/helpers/DomainHelper.js';
 import { GraphBuilderError } from '../../../../../../GraphManagerUtils.js';
+import { PostValidation } from '../../../../../../../graph/metamodel/pure/packageableElements/service/PostValidation.js';
 
 export class V1_ElementSecondPassBuilder
   implements V1_PackageableElementVisitor<void>
@@ -332,6 +334,12 @@ export class V1_ElementSecondPassBuilder
     service.tests = element.testSuites
       .map((testSuite) => V1_buildTestSuite(service, testSuite, this.context))
       .map((e) => guaranteeType(e, ServiceTestSuite));
+
+    service.postValidations = element.postValidations
+      .map((postValidation) =>
+        V1_buildPostValidation(postValidation, this.context),
+      )
+      .map((e) => guaranteeType(e, PostValidation));
   }
 
   visit_SectionIndex(element: V1_SectionIndex): void {

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

@@ -78,6 +78,10 @@ import {
   DEPRECATED__MultiExecutionTest,
 } from '../../../../../../../../graph/metamodel/pure/packageableElements/service/DEPRECATED__ServiceTest.js';
 import { V1_buildEmbeddedData } from './V1_DataElementBuilderHelper.js';
+import type { V1_PostValidation } from '../../../../model/packageableElements/service/V1_PostValidation.js';
+import { PostValidation } from '../../../../../../../../graph/metamodel/pure/packageableElements/service/PostValidation.js';
+import type { V1_PostValidationAssertion } from '../../../../model/packageableElements/service/V1_PostValidationAssertion.js';
+import { PostValidationAssertion } from '../../../../../../../../graph/metamodel/pure/packageableElements/service/PostValidationAssertion.js';
 
 const buildConnectionTestData = (
   element: V1_ConnectionTestData,
@@ -96,6 +100,35 @@ const buildParameterValue = (element: V1_ParameterValue): ParameterValue => {
   return parameterValue;
 };
 
+const buildPostValidationAssertion = (
+  element: V1_PostValidationAssertion,
+  context: V1_GraphBuilderContext,
+): PostValidationAssertion => {
+  const postValidationAssertion = new PostValidationAssertion();
+  postValidationAssertion.id = element.id;
+  postValidationAssertion.assertion = V1_buildRawLambdaWithResolvedPaths(
+    element.assertion.parameters,
+    element.assertion.body,
+    context,
+  );
+  return postValidationAssertion;
+};
+
+export const V1_buildPostValidation = (
+  element: V1_PostValidation,
+  context: V1_GraphBuilderContext,
+): PostValidation => {
+  const postValidation = new PostValidation();
+  postValidation.description = element.description;
+  postValidation.assertions = element.assertions.map((a) =>
+    buildPostValidationAssertion(a, context),
+  );
+  postValidation.parameters = element.parameters.map((rq) =>
+    V1_buildRawLambdaWithResolvedPaths(rq.parameters, rq.body, context),
+  );
+  return postValidation;
+};
+
 const buildTestData = (
   element: V1_TestData,
   context: V1_GraphBuilderContext,
@@ -331,6 +364,22 @@ export const V1_buildServiceExecution = (
       serviceExecution.func,
       `Service Pure execution 'func' field is missing`,
     );
+    if (serviceExecution.mapping && serviceExecution.runtime) {
+      return new PureSingleExecution(
+        V1_buildRawLambdaWithResolvedPaths(
+          serviceExecution.func.parameters,
+          serviceExecution.func.body,
+          context,
+        ),
+        parentService,
+        context.resolveMapping(serviceExecution.mapping),
+        buildServiceExecutionRuntime(
+          serviceExecution.runtime,
+          serviceExecution.mapping,
+          context,
+        ),
+      );
+    }
     return new PureSingleExecution(
       V1_buildRawLambdaWithResolvedPaths(
         serviceExecution.func.parameters,
@@ -338,12 +387,8 @@ export const V1_buildServiceExecution = (
         context,
       ),
       parentService,
-      context.resolveMapping(serviceExecution.mapping),
-      buildServiceExecutionRuntime(
-        serviceExecution.runtime,
-        serviceExecution.mapping,
-        context,
-      ),
+      undefined,
+      undefined,
     );
   } else if (serviceExecution instanceof V1_PureMultiExecution) {
     if (!serviceExecution.executionParameters.length) {

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

@@ -84,6 +84,8 @@ import {
 import type { PureProtocolProcessorPlugin } from '../../../../PureProtocolProcessorPlugin.js';
 import type { V1_TestSuite } from '../../../model/test/V1_TestSuite.js';
 import { ATOMIC_TEST_TYPE } from '../../../../../../../graph/MetaModelConst.js';
+import { V1_PostValidation } from '../../../model/packageableElements/service/V1_PostValidation.js';
+import { V1_PostValidationAssertion } from '../../../model/packageableElements/service/V1_PostValidationAssertion.js';
 
 export const V1_SERVICE_ELEMENT_PROTOCOL_TYPE = 'service';
 
@@ -116,6 +118,28 @@ export const V1_parameterValueModelSchema = createModelSchema(
   },
 );
 
+const V1_servicePostValidationAssertionModelSchema = createModelSchema(
+  V1_PostValidationAssertion,
+  {
+    assertion: usingModelSchema(V1_rawLambdaModelSchema),
+    id: primitive(),
+  },
+);
+
+const V1_servicePostValidationModelSchema = createModelSchema(
+  V1_PostValidation,
+  {
+    assertions: list(
+      custom(
+        (val) => serialize(V1_servicePostValidationAssertionModelSchema, val),
+        (val) => deserialize(V1_servicePostValidationAssertionModelSchema, val),
+      ),
+    ),
+    description: primitive(),
+    parameters: list(usingModelSchema(V1_rawLambdaModelSchema)),
+  },
+);
+
 export const V1_testDataModelSchema = (
   plugins: PureProtocolProcessorPlugin[],
 ): ModelSchema<V1_TestData> =>
@@ -212,8 +236,8 @@ const pureSingleExecutionModelSchema = createModelSchema(
       V1_ServiceExecutionType.PURE_SINGLE_EXECUTION,
     ),
     func: usingModelSchema(V1_rawLambdaModelSchema),
-    mapping: primitive(),
-    runtime: custom(
+    mapping: optional(primitive()),
+    runtime: optionalCustom(
       (val) => V1_serializeRuntimeValue(val),
       (val) => V1_deserializeRuntimeValue(val),
     ),
@@ -408,4 +432,24 @@ export const V1_serviceModelSchema = (
           skipIfEmpty: false,
         }),
     ),
+    postValidations: custom(
+      (values) =>
+        serializeArray(
+          values,
+          (value: V1_PostValidation) =>
+            serialize(V1_servicePostValidationModelSchema, value),
+          {
+            skipIfEmpty: true,
+            INTERNAL__forceReturnEmptyInTest: true,
+          },
+        ),
+      (values) =>
+        deserializeArray(
+          values,
+          (v) => deserialize(V1_servicePostValidationModelSchema, v),
+          {
+            skipIfEmpty: false,
+          },
+        ),
+    ),
   });

package/tsconfig.json

@@ -169,6 +169,8 @@
     "./src/graph/metamodel/pure/packageableElements/service/DEPRECATED__ServiceTest.ts",
     "./src/graph/metamodel/pure/packageableElements/service/MultiExecutionServiceTestResult.ts",
     "./src/graph/metamodel/pure/packageableElements/service/ParameterValue.ts",
+    "./src/graph/metamodel/pure/packageableElements/service/PostValidation.ts",
+    "./src/graph/metamodel/pure/packageableElements/service/PostValidationAssertion.ts",
     "./src/graph/metamodel/pure/packageableElements/service/Service.ts",
     "./src/graph/metamodel/pure/packageableElements/service/ServiceExecution.ts",
     "./src/graph/metamodel/pure/packageableElements/service/ServiceTest.ts",
@@ -441,6 +443,8 @@
     "./src/graphManager/protocol/pure/v1/model/packageableElements/service/V1_DEPRECATED__ServiceTest.ts",
     "./src/graphManager/protocol/pure/v1/model/packageableElements/service/V1_MultiExecutionServiceTestResult.ts",
     "./src/graphManager/protocol/pure/v1/model/packageableElements/service/V1_ParameterValue.ts",
+    "./src/graphManager/protocol/pure/v1/model/packageableElements/service/V1_PostValidation.ts",
+    "./src/graphManager/protocol/pure/v1/model/packageableElements/service/V1_PostValidationAssertion.ts",
     "./src/graphManager/protocol/pure/v1/model/packageableElements/service/V1_Service.ts",
     "./src/graphManager/protocol/pure/v1/model/packageableElements/service/V1_ServiceExecution.ts",
     "./src/graphManager/protocol/pure/v1/model/packageableElements/service/V1_ServiceTest.ts",