@finos/legend-graph 23.0.0 → 23.0.1

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

@@ -200,7 +200,9 @@ import {
 import { V1_buildExecutionResult } from './engine/execution/V1_ExecutionHelper.js';
 import {
   type Entity,
-  type LegendSDLC,
+  type GraphDataOrigin,
+  type EntitiesWithOrigin,
+  LegendSDLC,
   ENTITY_PATH_DELIMITER,
 } from '@finos/legend-storage';
 import {
@@ -272,6 +274,7 @@ import { CompilationWarning } from '../../../action/compilation/CompilationWarni
 import { V1_transformParameterValue } from './transformation/pureGraph/from/V1_ServiceTransformer.js';
 import { V1_transformModelUnit } from './transformation/pureGraph/from/V1_DSL_ExternalFormat_Transformer.js';
 import type { ModelUnit } from '../../../../graph/metamodel/pure/packageableElements/externalFormat/store/DSL_ExternalFormat_ModelUnit.js';
+import { V1_LambdaReturnTypeInput } from './engine/compilation/V1_LambdaReturnType.js';
 
 class V1_PureModelContextDataIndex {
   elements: V1_PackageableElement[] = [];
@@ -428,6 +431,7 @@ export const V1_indexPureModelContextData = (
 interface V1_PureGraphBuilderInput {
   model: BasicModel;
   data: V1_PureModelContextDataIndex;
+  origin?: GraphDataOrigin | undefined;
 }
 
 export interface V1_EngineSetupConfig {
@@ -583,7 +587,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     coreModel: CoreModel,
     systemModel: SystemModel,
     dependencyManager: DependencyManager,
-    dependencyEntitiesIndex: Map<string, Entity[]>,
+    dependencyEntitiesIndex: Map<string, EntitiesWithOrigin>,
     buildState: ActionState,
     options?: GraphBuilderOptions,
     _report?: GraphManagerOperationReport,
@@ -611,11 +615,11 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
       >();
       await Promise.all(
         Array.from(dependencyEntitiesIndex.entries()).map(
-          ([dependencyKey, entities]) => {
+          ([dependencyKey, entitiesWithOrigin]) => {
             const projectModelData = new V1_PureModelContextData();
             dependencyGraphDataIndex.set(dependencyKey, projectModelData);
             return V1_entitiesToPureModelContextData(
-              entities,
+              entitiesWithOrigin.entities,
               projectModelData,
               this.pluginManager.getPureProtocolProcessorPlugins(),
             );
@@ -726,8 +730,8 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
        * This sets the SDLC of the graph if there exists a versioned `SDLC` of the graph. This means the graph is immutable and we can easily `refetch`
        * the graph with the provided sdlc pointer
        */
-      if (options?.sdlc) {
-        graph.setSDLC(options.sdlc);
+      if (options?.origin) {
+        graph.setOrigin(options.origin);
       }
 
       buildState.pass();
@@ -1739,6 +1743,17 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     options?: { keepSourceInformation?: boolean },
   ): Promise<string> {
     return this.engine.getLambdaReturnType(
+      this.buildLambdaReturnTypeInput(lambda, graph, options),
+    );
+  }
+
+  private buildLambdaReturnTypeInput(
+    lambda: RawLambda,
+    graph: PureModel,
+    options?: { keepSourceInformation?: boolean },
+  ): V1_LambdaReturnTypeInput {
+    return new V1_LambdaReturnTypeInput(
+      this.getFullGraphModelContext(graph),
       lambda.accept_RawValueSpecificationVisitor(
         new V1_RawValueSpecificationTransformer(
           new V1_GraphTransformerContextBuilder(
@@ -1750,7 +1765,6 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
             .build(),
         ),
       ) as V1_RawLambda,
-      this.getFullGraphModelData(graph),
     );
   }
 
@@ -1823,7 +1837,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     graph: PureModel,
   ): Promise<TestResult[]> {
     const runTestsInput = new V1_RunTestsInput();
-    runTestsInput.model = this.getFullGraphModelData(graph);
+    runTestsInput.model = this.getFullGraphModelContext(graph);
     runTestsInput.testables = inputs
       .map((input) => {
         const testable = guaranteeNonNullable(
@@ -1922,6 +1936,8 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
                   aStatus.assertion === baseAssertion &&
                   aStatus instanceof AssertFail,
               );
+            } else if (testResult instanceof TestError) {
+              throw new IllegalStateError(testResult.error);
             }
             return undefined;
           })
@@ -2173,16 +2189,15 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     );
 
   private buildPureModelSDLCPointer(
-    legendSdlc: LegendSDLC,
+    origin: GraphDataOrigin,
   ): V1_PureModelContextPointer {
-    return new V1_PureModelContextPointer(
-      undefined,
-      new V1_LegendSDLC(
-        legendSdlc.groupId,
-        legendSdlc.artifactId,
-        legendSdlc.versionId,
-      ),
-    );
+    if (origin instanceof LegendSDLC) {
+      return new V1_PureModelContextPointer(
+        undefined,
+        new V1_LegendSDLC(origin.groupId, origin.artifactId, origin.versionId),
+      );
+    }
+    throw new UnsupportedOperationError('Unsupported graph origin');
   }
 
   private buildExecutionInput = (
@@ -2194,8 +2209,8 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     executeInput: V1_ExecuteInput,
     parameterValues?: ParameterValue[],
   ): V1_ExecuteInput => {
-    const pureModelContext = graph.sdlc
-      ? this.buildPureModelSDLCPointer(graph.sdlc)
+    const pureModelContext = graph.origin
+      ? this.buildPureModelSDLCPointer(graph.origin)
       : this.buildExecutionInputGraphData(graph, mapping, runtime);
     // NOTE: for execution, we usually will just assume that we send the connections embedded in the runtime value, since we don't want the user to have to create
     // packageable runtime and connection just to play with execution.
@@ -2746,8 +2761,8 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     const input = new V1_MappingModelCoverageAnalysisInput();
     input.clientVersion = V1_PureGraphManager.DEV_PROTOCOL_VERSION;
     input.mapping = mapping.path;
-    input.model = graph.sdlc
-      ? this.buildPureModelSDLCPointer(graph.sdlc)
+    input.model = graph.origin
+      ? this.buildPureModelSDLCPointer(graph.origin)
       : this.buildMappingModelCoverageAnalysisInputContextData(graph);
     return V1_buildModelCoverageAnalysisResult(
       await this.engine.analyzeMappingModelCoverage(input),
@@ -2836,7 +2851,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
   async indexLightGraph(
     graph: PureModel,
     entities: Entity[],
-    dependencyEntities: Map<string, Entity[]>,
+    dependencyEntitiesIndex: Map<string, EntitiesWithOrigin>,
     entityFilterFn?: ((entity: Entity) => boolean) | undefined,
     entityProcessorFn?: ((entity: Entity) => Entity) | undefined,
   ): Promise<V1_PureGraphBuilderInput[]> {
@@ -2874,31 +2889,33 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     ];
 
     // build dependencies graph builder input
-    graph.dependencyManager.initialize(dependencyEntities);
+    graph.dependencyManager.initialize(dependencyEntitiesIndex);
     const dependencyGraphDataIndex = new Map<string, V1_PureModelContextData>();
     await Promise.all(
-      Array.from(dependencyEntities.entries()).map(([dependencyKey, value]) => {
-        const projectModelData = new V1_PureModelContextData();
-        dependencyGraphDataIndex.set(dependencyKey, projectModelData);
-        return V1_entitiesToPureModelContextData(
-          value
-            .filter((entity) => {
-              // never exclude section index as it could be used for path resolution when building the graph later
-              if (entity.classifierPath === CORE_PURE_PATH.SECTION_INDEX) {
+      Array.from(dependencyEntitiesIndex.entries()).map(
+        ([dependencyKey, value]) => {
+          const projectModelData = new V1_PureModelContextData();
+          dependencyGraphDataIndex.set(dependencyKey, projectModelData);
+          return V1_entitiesToPureModelContextData(
+            value.entities
+              .filter((entity) => {
+                // never exclude section index as it could be used for path resolution when building the graph later
+                if (entity.classifierPath === CORE_PURE_PATH.SECTION_INDEX) {
+                  return true;
+                }
+                if (entityFilterFn) {
+                  return entityFilterFn(entity);
+                }
                 return true;
-              }
-              if (entityFilterFn) {
-                return entityFilterFn(entity);
-              }
-              return true;
-            })
-            .map((entity) =>
-              entityProcessorFn ? entityProcessorFn(entity) : entity,
-            ),
-          projectModelData,
-          this.pluginManager.getPureProtocolProcessorPlugins(),
-        );
-      }),
+              })
+              .map((entity) =>
+                entityProcessorFn ? entityProcessorFn(entity) : entity,
+              ),
+            projectModelData,
+            this.pluginManager.getPureProtocolProcessorPlugins(),
+          );
+        },
+      ),
     );
     const dependencyGraphBuilderInput: V1_PureGraphBuilderInput[] = Array.from(
       dependencyGraphDataIndex.entries(),
@@ -2921,6 +2938,17 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     return graphBuilderInput;
   }
 
+  private getFullGraphModelContext(
+    graph: PureModel,
+    options?: { keepSourceInformation?: boolean | undefined } | undefined,
+  ): V1_PureModelContext {
+    // if options is given we will not use the origin if we want to keep source information
+    if (graph.origin && !options?.keepSourceInformation) {
+      return this.buildPureModelSDLCPointer(graph.origin);
+    }
+    return this.getFullGraphModelData(graph, options);
+  }
+
   getFullGraphModelData(
     graph: PureModel,
     options?: { keepSourceInformation?: boolean | undefined } | undefined,

package/src/graphManager/protocol/pure/v1/engine/V1_Engine.ts

@@ -35,13 +35,15 @@ import {
 } from '../../../../../graphManager/action/generation/GenerationConfigurationDescription.js';
 import { TEMPORARY__AbstractEngineConfig } from '../../../../../graphManager/action/TEMPORARY__AbstractEngineConfig.js';
 import { V1_EngineServerClient } from './V1_EngineServerClient.js';
-import type { V1_PureModelContextData } from '../model/context/V1_PureModelContextData.js';
-import type { V1_LambdaReturnTypeResult } from '../engine/compilation/V1_LambdaReturnTypeResult.js';
+import { V1_PureModelContextData } from '../model/context/V1_PureModelContextData.js';
+import {
+  type V1_LambdaReturnTypeResult,
+  V1_LambdaReturnTypeInput,
+} from './compilation/V1_LambdaReturnType.js';
 import type { V1_RawLambda } from '../model/rawValueSpecification/V1_RawLambda.js';
 import {
   V1_deserializePureModelContextData,
   V1_serializePureModelContext,
-  V1_serializePureModelContextData,
 } from '../transformation/pureProtocol/V1_PureProtocolSerialization.js';
 import { V1_serializeRawValueSpecification } from '../transformation/pureProtocol/serializationHelpers/V1_RawValueSpecificationSerializationHelper.js';
 import { V1_transformRawLambda } from '../transformation/pureGraph/from/V1_RawValueSpecificationTransformer.js';
@@ -158,16 +160,16 @@ export class V1_Engine {
     this.log = log;
   }
 
-  private serializePureModelContextData = (
-    graph: V1_PureModelContextData,
-  ): PlainObject<V1_PureModelContextData> => {
+  private serializePureModelContext = (
+    graph: V1_PureModelContext,
+  ): PlainObject<V1_PureModelContext> => {
     const startTime = Date.now();
-    const serializedGraph = V1_serializePureModelContextData(graph);
-    this.log.info(
-      LogEvent.create(GRAPH_MANAGER_EVENT.SERIALIZE_GRAPH_PROTOCOL__SUCCESS),
-      Date.now() - startTime,
-      'ms',
-    );
+    const serializedGraph = V1_serializePureModelContext(graph);
+    const logEvent =
+      graph instanceof V1_PureModelContextData
+        ? GRAPH_MANAGER_EVENT.SERIALIZE_GRAPH_PROTOCOL__SUCCESS
+        : GRAPH_MANAGER_EVENT.SERIALIZE_GRAPH_CONTEXT_PROTOCOL__SUCCESS;
+    this.log.info(LogEvent.create(logEvent), Date.now() - startTime, 'ms');
     return serializedGraph;
   };
 
@@ -203,7 +205,7 @@ export class V1_Engine {
     graph: V1_PureModelContextData,
   ): Promise<string> {
     return this.engineServerClient.JSONToGrammar_model(
-      this.serializePureModelContextData(graph),
+      this.serializePureModelContext(graph),
       V1_RenderStyle.STANDARD,
     );
   }
@@ -378,12 +380,12 @@ export class V1_Engine {
   // ------------------------------------------- Compile -------------------------------------------
 
   async compilePureModelContextData(
-    model: V1_PureModelContextData,
+    model: V1_PureModelContext,
     options?: { onError?: (() => void) | undefined } | undefined,
   ): Promise<V1_CompilationResult> {
     try {
       const compilationResult = await this.engineServerClient.compile(
-        this.serializePureModelContextData(model),
+        this.serializePureModelContext(model),
       );
       return {
         warnings: (
@@ -425,7 +427,7 @@ export class V1_Engine {
     });
     const pureModelContextDataJson = compileContext
       ? mergeObjects(
-          this.serializePureModelContextData(compileContext),
+          this.serializePureModelContext(compileContext),
           mainGraph,
           false,
         )
@@ -469,14 +471,12 @@ export class V1_Engine {
   }
 
   async getLambdaReturnType(
-    lambda: V1_RawLambda,
-    model: V1_PureModelContextData,
+    lambdaReturnInput: V1_LambdaReturnTypeInput,
   ): Promise<string> {
     try {
       return (
         (await this.engineServerClient.lambdaReturnType(
-          V1_serializeRawValueSpecification(lambda),
-          this.serializePureModelContextData(model),
+          V1_LambdaReturnTypeInput.serialization.toJson(lambdaReturnInput),
         )) as unknown as V1_LambdaReturnTypeResult
       ).returnType;
     } catch (error) {

package/src/graphManager/protocol/pure/v1/engine/V1_EngineServerClient.ts

@@ -23,7 +23,10 @@ import {
   HttpHeader,
 } from '@finos/legend-shared';
 import type { V1_PureModelContextData } from '../model/context/V1_PureModelContextData.js';
-import type { V1_LambdaReturnTypeResult } from './compilation/V1_LambdaReturnTypeResult.js';
+import type {
+  V1_LambdaReturnTypeInput,
+  V1_LambdaReturnTypeResult,
+} from './compilation/V1_LambdaReturnType.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';
@@ -411,7 +414,7 @@ export class V1_EngineServerClient extends AbstractServerClient {
   // ------------------------------------------- Compile -------------------------------------------
 
   compile = (
-    model: PlainObject<V1_PureModelContextData>,
+    model: PlainObject<V1_PureModelContext>,
   ): Promise<PlainObject<V1_CompileResult>> =>
     this.postWithTracing(
       this.getTraceData(CORE_ENGINE_ACTIVITY_TRACE.COMPILE),
@@ -423,13 +426,12 @@ export class V1_EngineServerClient extends AbstractServerClient {
       { enableCompression: true },
     );
   lambdaReturnType = (
-    lambda: PlainObject<V1_RawLambda>,
-    model: PlainObject<V1_PureModelContextData>,
+    input: PlainObject<V1_LambdaReturnTypeInput>,
   ): Promise<PlainObject<V1_LambdaReturnTypeResult>> =>
     this.postWithTracing(
       this.getTraceData(CORE_ENGINE_ACTIVITY_TRACE.GET_LAMBDA_RETURN_TYPE),
       `${this._pure()}/compilation/lambdaReturnType`,
-      { lambda, model },
+      input,
       {},
       undefined,
       undefined,

package/src/graphManager/protocol/pure/v1/engine/compilation/V1_LambdaReturnType.ts

@@ -0,0 +1,43 @@
+/**
+ * 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 { SerializationFactory, usingModelSchema } from '@finos/legend-shared';
+import { createModelSchema } from 'serializr';
+import type { V1_PureModelContext } from '../../model/context/V1_PureModelContext.js';
+import type { V1_RawLambda } from '../../model/rawValueSpecification/V1_RawLambda.js';
+import { V1_rawLambdaModelSchema } from '../../transformation/pureProtocol/serializationHelpers/V1_RawValueSpecificationSerializationHelper.js';
+import { V1_pureModelContextPropSchema } from '../../transformation/pureProtocol/V1_PureProtocolSerialization.js';
+
+export class V1_LambdaReturnTypeInput {
+  model: V1_PureModelContext;
+  lambda: V1_RawLambda;
+
+  constructor(model: V1_PureModelContext, lambda: V1_RawLambda) {
+    this.model = model;
+    this.lambda = lambda;
+  }
+
+  static readonly serialization = new SerializationFactory(
+    createModelSchema(V1_LambdaReturnTypeInput, {
+      lambda: usingModelSchema(V1_rawLambdaModelSchema),
+      model: V1_pureModelContextPropSchema,
+    }),
+  );
+}
+
+export interface V1_LambdaReturnTypeResult {
+  returnType: string;
+}

package/src/graphManager/protocol/pure/v1/engine/test/V1_RunTestsInput.ts

@@ -15,10 +15,11 @@
  */
 
 import { SerializationFactory, usingModelSchema } from '@finos/legend-shared';
-import { createModelSchema, object, primitive, list } from 'serializr';
-import { V1_PureModelContextData } from '../../model/context/V1_PureModelContextData.js';
+import { createModelSchema, primitive, list } from 'serializr';
+import type { V1_PureModelContext } from '../../model/context/V1_PureModelContext.js';
 import type { V1_UniqueTestId } from '../../model/test/V1_UniqueTestId.js';
 import { V1_uniqueTestIdModelSchema } from '../../transformation/pureProtocol/serializationHelpers/V1_TestSerializationHelper.js';
+import { V1_pureModelContextPropSchema } from '../../transformation/pureProtocol/V1_PureProtocolSerialization.js';
 
 export class V1_RunTestsTestableInput {
   testable!: string;
@@ -33,12 +34,12 @@ export class V1_RunTestsTestableInput {
 }
 
 export class V1_RunTestsInput {
-  model!: V1_PureModelContextData;
+  model!: V1_PureModelContext;
   testables: V1_RunTestsTestableInput[] = [];
 
   static readonly serialization = new SerializationFactory(
     createModelSchema(V1_RunTestsInput, {
-      model: object(V1_PureModelContextData),
+      model: V1_pureModelContextPropSchema,
       testables: usingModelSchema(
         V1_RunTestsTestableInput.serialization.schema,
       ),

package/tsconfig.json

@@ -335,7 +335,7 @@
     "./src/graphManager/protocol/pure/v1/engine/compilation/V1_CompilationResult.ts",
     "./src/graphManager/protocol/pure/v1/engine/compilation/V1_CompilationWarning.ts",
     "./src/graphManager/protocol/pure/v1/engine/compilation/V1_CompileResult.ts",
-    "./src/graphManager/protocol/pure/v1/engine/compilation/V1_LambdaReturnTypeResult.ts",
+    "./src/graphManager/protocol/pure/v1/engine/compilation/V1_LambdaReturnType.ts",
     "./src/graphManager/protocol/pure/v1/engine/execution/V1_ExecuteInput.ts",
     "./src/graphManager/protocol/pure/v1/engine/execution/V1_ExecutionError.ts",
     "./src/graphManager/protocol/pure/v1/engine/execution/V1_ExecutionHelper.ts",

package/lib/graphManager/protocol/pure/v1/engine/compilation/V1_LambdaReturnTypeResult.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"V1_LambdaReturnTypeResult.d.ts","sourceRoot":"","sources":["../../../../../../../src/graphManager/protocol/pure/v1/engine/compilation/V1_LambdaReturnTypeResult.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,MAAM,WAAW,yBAAyB;IACxC,UAAU,EAAE,MAAM,CAAC;CACpB"}

package/lib/graphManager/protocol/pure/v1/engine/compilation/V1_LambdaReturnTypeResult.js

@@ -1,17 +0,0 @@
-/**
- * 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.
- */
-export {};
-//# sourceMappingURL=V1_LambdaReturnTypeResult.js.map

package/lib/graphManager/protocol/pure/v1/engine/compilation/V1_LambdaReturnTypeResult.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"V1_LambdaReturnTypeResult.js","sourceRoot":"","sources":["../../../../../../../src/graphManager/protocol/pure/v1/engine/compilation/V1_LambdaReturnTypeResult.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG"}

package/src/graphManager/protocol/pure/v1/engine/compilation/V1_LambdaReturnTypeResult.ts

@@ -1,19 +0,0 @@
-/**
- * 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.
- */
-
-export interface V1_LambdaReturnTypeResult {
-  returnType: string;
-}