@finos/legend-graph 2.0.3 → 2.1.1

package/src/models/metamodels/pure/packageableElements/domain/Stereotype.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { observable, action, computed, makeObservable } from 'mobx';
+import { observable, computed, makeObservable } from 'mobx';
 import { uuid } from '@finos/legend-shared';
 import type { Profile } from './Profile';
 import type { Stubable } from '../../../../../helpers/Stubable';
@@ -27,7 +27,6 @@ export class Stereotype implements Stubable {
   constructor(owner: Profile, value: string) {
     makeObservable(this, {
       value: observable,
-      setValue: action,
       isStub: computed,
     });
 
@@ -35,10 +34,6 @@ export class Stereotype implements Stubable {
     this.value = value;
   }
 
-  setValue(value: string): void {
-    this.value = value;
-  }
-
   static createStub = (profile: Profile): Stereotype =>
     new Stereotype(profile, '');
   get isStub(): boolean {

package/src/models/metamodels/pure/packageableElements/domain/StereotypeReference.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { observable, action, computed, makeObservable } from 'mobx';
+import { observable, computed, makeObservable } from 'mobx';
 import { CORE_HASH_STRUCTURE } from '../../../../../MetaModelConst';
 import { hashString } from '@finos/legend-shared';
 import {
@@ -42,7 +42,6 @@ export abstract class StereotypeReference
 
     makeObservable(this, {
       value: observable,
-      setValue: action,
       isStub: computed,
       pointerHashCode: computed,
     });
@@ -51,11 +50,6 @@ export abstract class StereotypeReference
     this.value = value;
   }
 
-  setValue(value: Stereotype): void {
-    this.value = value;
-    this.ownerReference.setValue(value.owner);
-  }
-
   get isStub(): boolean {
     return !this.value.isStub;
   }

package/src/models/metamodels/pure/packageableElements/domain/Tag.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { observable, action, computed, makeObservable } from 'mobx';
+import { observable, computed, makeObservable } from 'mobx';
 import { uuid } from '@finos/legend-shared';
 import type { Profile } from './Profile';
 import type { Stubable } from '../../../../../helpers/Stubable';
@@ -27,7 +27,6 @@ export class Tag implements Stubable {
   constructor(owner: Profile, value: string) {
     makeObservable(this, {
       value: observable,
-      setValue: action,
       isStub: computed,
     });
 
@@ -35,10 +34,6 @@ export class Tag implements Stubable {
     this.value = value;
   }
 
-  setValue(value: string): void {
-    this.value = value;
-  }
-
   static createStub = (profile: Profile): Tag => new Tag(profile, '');
   get isStub(): boolean {
     return !this.value;

package/src/models/metamodels/pure/packageableElements/domain/TagReference.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { observable, action, computed, makeObservable } from 'mobx';
+import { observable, computed, makeObservable } from 'mobx';
 import { CORE_HASH_STRUCTURE } from '../../../../../MetaModelConst';
 import { hashString } from '@finos/legend-shared';
 import {
@@ -42,7 +42,6 @@ export abstract class TagReference
 
     makeObservable(this, {
       value: observable,
-      setValue: action,
       isStub: computed,
       pointerHashCode: computed,
     });
@@ -51,11 +50,6 @@ export abstract class TagReference
     this.value = value;
   }
 
-  setValue(value: Tag): void {
-    this.value = value;
-    this.ownerReference.setValue(value.owner);
-  }
-
   get isStub(): boolean {
     return !this.value.isStub;
   }

package/src/models/metamodels/pure/packageableElements/domain/TaggedValue.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { observable, action, computed, makeObservable } from 'mobx';
+import { observable, computed, makeObservable } from 'mobx';
 import { hashArray, uuid, type Hashable } from '@finos/legend-shared';
 import { CORE_HASH_STRUCTURE } from '../../../../../MetaModelConst';
 import type { Tag } from './Tag';
@@ -29,8 +29,6 @@ export class TaggedValue implements Hashable, Stubable {
   constructor(tag: TagReference, value: string) {
     makeObservable(this, {
       value: observable,
-      setTag: action,
-      setValue: action,
       isStub: computed,
       hashCode: computed,
     });
@@ -39,13 +37,6 @@ export class TaggedValue implements Hashable, Stubable {
     this.value = value;
   }
 
-  setTag(tag: Tag): void {
-    this.tag.setValue(tag);
-  }
-  setValue(value: string): void {
-    this.value = value;
-  }
-
   static createStub = (tag: Tag): TaggedValue =>
     new TaggedValue(TagExplicitReference.create(tag), '');
   get isStub(): boolean {

package/src/models/metamodels/pure/packageableElements/mapping/SetImplementationReference.ts

@@ -23,6 +23,7 @@ import {
 import type { Mapping } from './Mapping';
 import type { SetImplementation } from './SetImplementation';
 import { ReferenceWithOwner } from '../../Reference';
+import { setPackageableElementReferenceValue } from '../../../../DomainModifierHelper';
 
 export abstract class SetImplementationReference extends ReferenceWithOwner {
   override readonly ownerReference: PackageableElementReference<Mapping>;
@@ -45,7 +46,7 @@ export abstract class SetImplementationReference extends ReferenceWithOwner {
 
   setValue(value: SetImplementation): void {
     this.value = value;
-    this.ownerReference.setValue(value.parent);
+    setPackageableElementReferenceValue(this.ownerReference, value.parent);
   }
 }
 

package/src/models/metamodels/pure/packageableElements/runtime/Runtime.ts

@@ -37,6 +37,7 @@ import {
   getElementPointerHashCode,
   PACKAGEABLE_ELEMENT_POINTER_TYPE,
 } from '../PackageableElement';
+import { setPackageableElementReferenceValue } from '../../../../DomainModifierHelper';
 
 export class IdentifiedConnection implements Hashable {
   uuid = uuid();
@@ -213,7 +214,7 @@ export class RuntimePointer extends Runtime implements Hashable {
   }
 
   setPackageableRuntime(value: PackageableRuntime): void {
-    this.packageableRuntime.setValue(value);
+    setPackageableElementReferenceValue(this.packageableRuntime, value);
   }
 
   get hashCode(): string {

package/src/models/metamodels/pure/packageableElements/service/ServiceExecution.ts

@@ -31,6 +31,7 @@ import {
   createValidationError,
 } from '../../../../../helpers/ValidationHelper';
 import type { PackageableElementReference } from '../PackageableElementReference';
+import { setPackageableElementReferenceValue } from '../../../../DomainModifierHelper';
 
 export abstract class ServiceExecution implements Hashable {
   private readonly _$nominalTypeBrand!: 'ServiceExecution';
@@ -102,7 +103,7 @@ export class PureSingleExecution extends PureExecution implements Hashable {
   }
 
   setMapping(value: Mapping): void {
-    this.mapping.setValue(value);
+    setPackageableElementReferenceValue(this.mapping, value);
   }
   setRuntime(value: Runtime): void {
     this.runtime = value;
@@ -160,7 +161,7 @@ export class KeyedExecutionParameter implements Hashable {
     this.key = value;
   }
   setMapping(value: Mapping): void {
-    this.mapping.setValue(value);
+    setPackageableElementReferenceValue(this.mapping, value);
   }
   setRuntime(value: Runtime): void {
     this.runtime = value;

package/src/models/metamodels/pure/packageableElements/store/flatData/model/FlatDataSectionReference.ts

@@ -25,6 +25,7 @@ import {
 import { ReferenceWithOwner } from '../../../../Reference';
 import type { FlatData } from './FlatData';
 import type { FlatDataSection } from './FlatDataSection';
+import { setPackageableElementReferenceValue } from '../../../../../../DomainModifierHelper';
 
 export abstract class FlatDataSectionReference extends ReferenceWithOwner {
   override readonly ownerReference: PackageableElementReference<FlatData>;
@@ -48,7 +49,7 @@ export abstract class FlatDataSectionReference extends ReferenceWithOwner {
 
   setValue(value: FlatDataSection): void {
     this.value = value;
-    this.ownerReference.setValue(value.owner);
+    setPackageableElementReferenceValue(this.ownerReference, value.owner);
   }
 
   get pointerHashCode(): string {

package/src/models/metamodels/pure/packageableElements/store/flatData/model/RootFlatDataRecordTypeReference.ts

@@ -23,6 +23,7 @@ import {
 import { ReferenceWithOwner } from '../../../../Reference';
 import type { RootFlatDataRecordType } from './FlatDataDataType';
 import type { FlatData } from './FlatData';
+import { setPackageableElementReferenceValue } from '../../../../../../DomainModifierHelper';
 
 export abstract class RootFlatDataRecordTypeReference extends ReferenceWithOwner {
   override readonly ownerReference: PackageableElementReference<FlatData>;
@@ -45,7 +46,7 @@ export abstract class RootFlatDataRecordTypeReference extends ReferenceWithOwner
 
   setValue(value: RootFlatDataRecordType): void {
     this.value = value;
-    this.ownerReference.setValue(value.owner.owner);
+    setPackageableElementReferenceValue(this.ownerReference, value.owner.owner);
   }
 }
 

package/src/models/metamodels/pure/packageableElements/store/modelToModel/connection/JsonModelConnection.ts

@@ -27,6 +27,7 @@ import type { Class } from '../../../domain/Class';
 import type { ModelStore } from '../model/ModelStore';
 import { PureModelConnection } from './PureModelConnection';
 import type { PackageableElementReference } from '../../../PackageableElementReference';
+import { setPackageableElementReferenceValue } from '../../../../../../DomainModifierHelper';
 
 export class JsonModelConnection
   extends PureModelConnection
@@ -60,7 +61,7 @@ export class JsonModelConnection
   }
 
   setClass(value: Class): void {
-    this.class.setValue(value);
+    setPackageableElementReferenceValue(this.class, value);
   }
   setUrl(value: string): void {
     this.url = value;

package/src/models/metamodels/pure/packageableElements/store/modelToModel/connection/XmlModelConnection.ts

@@ -22,6 +22,7 @@ import type { Class } from '../../../domain/Class';
 import type { ModelStore } from '../model/ModelStore';
 import { PureModelConnection } from './PureModelConnection';
 import type { PackageableElementReference } from '../../../PackageableElementReference';
+import { setPackageableElementReferenceValue } from '../../../../../../DomainModifierHelper';
 
 export class XmlModelConnection
   extends PureModelConnection
@@ -51,7 +52,7 @@ export class XmlModelConnection
   }
 
   setClass(value: Class): void {
-    this.class.setValue(value);
+    setPackageableElementReferenceValue(this.class, value);
   }
   setUrl(value: string): void {
     this.url = value;

package/src/models/metamodels/pure/packageableElements/store/relational/model/ColumnReference.ts

@@ -24,6 +24,7 @@ import { ReferenceWithOwner } from '../../../../Reference';
 import type { Database } from './Database';
 import type { Column } from './Column';
 import { getSchemaFromRelation } from './RelationReference';
+import { setPackageableElementReferenceValue } from '../../../../../../DomainModifierHelper';
 
 export abstract class ColumnReference extends ReferenceWithOwner {
   override readonly ownerReference: PackageableElementReference<Database>;
@@ -46,7 +47,10 @@ export abstract class ColumnReference extends ReferenceWithOwner {
 
   setValue(value: Column): void {
     this.value = value;
-    this.ownerReference.setValue(getSchemaFromRelation(value.owner).owner);
+    setPackageableElementReferenceValue(
+      this.ownerReference,
+      getSchemaFromRelation(value.owner).owner,
+    );
   }
 }
 

package/src/models/metamodels/pure/packageableElements/store/relational/model/FilterReference.ts

@@ -23,6 +23,7 @@ import {
 import { ReferenceWithOwner } from '../../../../Reference';
 import type { Database } from './Database';
 import type { Filter } from './Filter';
+import { setPackageableElementReferenceValue } from '../../../../../../DomainModifierHelper';
 
 export abstract class FilterReference extends ReferenceWithOwner {
   override readonly ownerReference: PackageableElementReference<Database>;
@@ -45,7 +46,7 @@ export abstract class FilterReference extends ReferenceWithOwner {
 
   setValue(value: Filter): void {
     this.value = value;
-    this.ownerReference.setValue(value.owner);
+    setPackageableElementReferenceValue(this.ownerReference, value.owner);
   }
 }
 

package/src/models/metamodels/pure/packageableElements/store/relational/model/JoinReference.ts

@@ -23,6 +23,7 @@ import {
 import { ReferenceWithOwner } from '../../../../Reference';
 import type { Database } from './Database';
 import type { Join } from './Join';
+import { setPackageableElementReferenceValue } from '../../../../../../DomainModifierHelper';
 
 export abstract class JoinReference extends ReferenceWithOwner {
   override readonly ownerReference: PackageableElementReference<Database>;
@@ -45,7 +46,7 @@ export abstract class JoinReference extends ReferenceWithOwner {
 
   setValue(value: Join): void {
     this.value = value;
-    this.ownerReference.setValue(value.owner);
+    setPackageableElementReferenceValue(this.ownerReference, value.owner);
   }
 }
 

package/src/models/metamodels/pure/packageableElements/store/relational/model/TableReference.ts

@@ -26,6 +26,7 @@ import { ReferenceWithOwner } from '../../../../Reference';
 import type { Database } from './Database';
 import type { Table } from './Table';
 import { SELF_JOIN_SCHEMA_NAME, SELF_JOIN_TABLE_NAME } from './Join';
+import { setPackageableElementReferenceValue } from '../../../../../../DomainModifierHelper';
 
 export abstract class NamedRelationalReference extends ReferenceWithOwner {
   override readonly ownerReference: PackageableElementReference<Database>;
@@ -57,7 +58,10 @@ export abstract class TableReference extends NamedRelationalReference {
 
   setValue(value: Table): void {
     this.value = value;
-    this.ownerReference.setValue(value.schema.owner);
+    setPackageableElementReferenceValue(
+      this.ownerReference,
+      value.schema.owner,
+    );
   }
 
   get pointerHashCode(): string {

package/src/models/metamodels/pure/packageableElements/store/relational/model/ViewReference.ts

@@ -26,6 +26,7 @@ import type { Database } from './Database';
 import type { View } from './View';
 import { NamedRelationalReference } from './TableReference';
 import { SELF_JOIN_SCHEMA_NAME, SELF_JOIN_TABLE_NAME } from './Join';
+import { setPackageableElementReferenceValue } from '../../../../../../DomainModifierHelper';
 
 export abstract class ViewReference extends NamedRelationalReference {
   value: View;
@@ -48,7 +49,10 @@ export abstract class ViewReference extends NamedRelationalReference {
 
   setValue(value: View): void {
     this.value = value;
-    this.ownerReference.setValue(value.schema.owner);
+    setPackageableElementReferenceValue(
+      this.ownerReference,
+      value.schema.owner,
+    );
   }
 
   get pointerHashCode(): string {

package/src/models/metamodels/pure/rawValueSpecification/RawVariableExpression.ts

@@ -28,6 +28,7 @@ import {
   type RawValueSpecificationVisitor,
   RawValueSpecification,
 } from './RawValueSpecification';
+import { setPackageableElementReferenceValue } from '../../../DomainModifierHelper';
 
 export class RawVariableExpression
   extends RawValueSpecification
@@ -64,7 +65,7 @@ export class RawVariableExpression
     this.name = value;
   }
   setType(value: Type): void {
-    this.type.setValue(value);
+    setPackageableElementReferenceValue(this.type, value);
   }
   setMultiplicity(value: Multiplicity): void {
     this.multiplicity = value;

package/src/models/protocols/pure/DSLExternalFormat_PureProtocolProcessorPlugin.ts

@@ -86,6 +86,7 @@ import {
   V1_schemaSetModelSchema,
   V1_SCHEMA_SET_ELEMENT_PROTOCOL_TYPE,
 } from './v1/transformation/pureProtocol/serializationHelpers/V1_DSLExternalFormat_ProtocolHelper';
+import { addPackageElement } from '../../DomainModifierHelper';
 
 const BINDING_ELEMENT_CLASSIFIER_PATH =
   'meta::external::shared::format::binding::Binding';
@@ -118,9 +119,10 @@ export class DSLExternalFormat_PureProtocolProcessorPlugin
             elementProtocol.package,
             elementProtocol.name,
           );
-          context.currentSubGraph
-            .getOrCreatePackage(elementProtocol.package)
-            .addElement(element);
+          addPackageElement(
+            context.currentSubGraph.getOrCreatePackage(elementProtocol.package),
+            element,
+          );
           context.currentSubGraph.setOwnStore(path, element);
           return element;
         },

package/src/models/protocols/pure/MappingGeneration_PureProtocolProcessorPlugin_Extension.ts

@@ -0,0 +1,34 @@
+/**
+ * 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 { ModelGenerationConfiguration } from '../../ModelGenerationConfiguration';
+import type { V1_PureModelContextData } from './v1/model/context/V1_PureModelContextData';
+import type { V1_Engine } from './v1/engine/V1_Engine';
+import type { PureProtocolProcessorPlugin } from './PureProtocolProcessorPlugin';
+
+export type V1_ModelGeneratorFromConfiguration = (
+  config: ModelGenerationConfiguration,
+  model: V1_PureModelContextData,
+  engine: V1_Engine,
+) => Promise<V1_PureModelContextData | undefined>;
+
+export interface MappingGeneration_PureProtocolProcessorPlugin_Extension
+  extends PureProtocolProcessorPlugin {
+  /**
+   * Get generators for model generation from configuration.
+   */
+  V1_getExtraModelGeneratorsFromConfiguration?(): V1_ModelGeneratorFromConfiguration[];
+}

package/src/models/protocols/pure/v1/V1_PureGraphManager.ts

@@ -234,6 +234,8 @@ import {
 import { V1_MAPPING_ELEMENT_PROTOCOL_TYPE } from './transformation/pureProtocol/serializationHelpers/V1_MappingSerializationHelper';
 import { V1_SERVICE_ELEMENT_PROTOCOL_TYPE } from './transformation/pureProtocol/serializationHelpers/V1_ServiceSerializationHelper';
 import { MappingInclude } from '../../../metamodels/pure/packageableElements/mapping/MappingInclude';
+import type { ModelGenerationConfiguration } from '../../../ModelGenerationConfiguration';
+import type { MappingGeneration_PureProtocolProcessorPlugin_Extension } from '../MappingGeneration_PureProtocolProcessorPlugin_Extension';
 
 const V1_FUNCTION_SUFFIX_MULTIPLICITY_INFINITE = 'MANY';
 
@@ -411,7 +413,6 @@ const indexPureModelContextData = (
 interface V1_GraphBuilderInput {
   model: BasicModel;
   data: V1_PureModelContextDataIndex;
-  parentElementPath?: string | undefined;
 }
 
 export interface V1_EngineSetupConfig {
@@ -421,7 +422,7 @@ export interface V1_EngineSetupConfig {
 }
 
 export class V1_PureGraphManager extends AbstractPureGraphManager {
-  engine!: V1_Engine;
+  engine: V1_Engine;
   extensions: V1_GraphBuilderExtensions;
 
   constructor(pluginManager: GraphPluginManager, log: Log) {
@@ -461,6 +462,8 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
       buildGenerationSpecifications: flow,
     });
 
+    this.engine = new V1_Engine({}, log);
+
     // setup plugins
     this.extensions = new V1_GraphBuilderExtensions(
       this.pluginManager.getPureProtocolProcessorPlugins(),
@@ -958,28 +961,6 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
         ),
       );
     }
-    if (!options?.TEMPORARY_skipGeneratedElementsPostProcessing) {
-      // Assign generated elements to their parent generation element (config that drives generation)
-      yield Promise.all(
-        inputs
-          .filter((input) => Boolean(input.parentElementPath))
-          .flatMap((input) =>
-            input.data.elements.map((el) =>
-              promisify(() =>
-                runInAction(() => {
-                  // TODO: check performance once `getNullableElement` is optimized
-                  const element = graph.getElement(el.path);
-                  if (input.parentElementPath) {
-                    element.generationParentElement = graph.getElement(
-                      input.parentElementPath,
-                    );
-                  }
-                }),
-              ),
-            ),
-          ),
-      );
-    }
     /**
      * For now, we delete the section index. We are able to read both resolved and unresolved element paths
      * but when we write (serialize) we write only resolved paths. In the future once the issue with dependency is solved we will
@@ -1613,6 +1594,36 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     return this.pureModelContextDataToEntities(generatedModel);
   }
 
+  async generateModelFromConfiguration(
+    config: ModelGenerationConfiguration,
+    graph: PureModel,
+  ): Promise<Entity[]> {
+    const model = this.getFullGraphModelData(graph);
+    let generatedModel: V1_PureModelContextData | undefined = undefined;
+    const extraModelGenerators = this.pluginManager
+      .getPureProtocolProcessorPlugins()
+      .flatMap(
+        (plugin) =>
+          (
+            plugin as MappingGeneration_PureProtocolProcessorPlugin_Extension
+          ).V1_getExtraModelGeneratorsFromConfiguration?.() ?? [],
+      );
+    for (const generator of extraModelGenerators) {
+      const _model = await generator(config, model, this.engine);
+      if (_model) {
+        generatedModel = _model;
+        break;
+      }
+    }
+    if (!generatedModel) {
+      throw new UnsupportedOperationError(
+        `Can't generate model using the specified configuration: no compatible generator available from plugins`,
+        config,
+      );
+    }
+    return this.pureModelContextDataToEntities(generatedModel);
+  }
+
   // ------------------------------------------- ValueSpecification -------------------------------------------
 
   buildValueSpecification(
@@ -1861,6 +1872,22 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     );
   }
 
+  async debugExecutionPlanGeneration(
+    graph: PureModel,
+    mapping: Mapping,
+    lambda: RawLambda,
+    runtime: Runtime,
+    clientVersion: string,
+  ): Promise<{ plan: RawExecutionPlan; debug: string }> {
+    const result = await this.engine.debugExecutionPlanGeneration(
+      this.createExecutionInput(graph, mapping, lambda, runtime, clientVersion),
+    );
+    return {
+      plan: result.plan,
+      debug: result.debug.join('\n'),
+    };
+  }
+
   buildExecutionPlan(
     executionPlanJson: PlainObject<V1_ExecutionPlan>,
     graph: PureModel,
@@ -2047,6 +2074,9 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     );
   }
 
+  // TODO: we could potentially reshape this method to build light graph with just indexing
+  // and return a slightly more complicated object instead: separating the graph and the dependencies part instead of
+  // return a list of `V1_GraphBuilderInput`. This method would be useful for any other light graph builder algo.
   async indexEntitiesWithDependencyIntoGraph(
     graph: PureModel,
     _entities: Entity[],

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

@@ -448,6 +448,14 @@ export class V1_Engine {
     );
   }
 
+  debugExecutionPlanGeneration(
+    input: V1_ExecuteInput,
+  ): Promise<{ plan: PlainObject<V1_ExecutionPlan>; debug: string[] }> {
+    return this.engineServerClient.debugPlanGeneration(
+      V1_ExecuteInput.serialization.toJson(input),
+    );
+  }
+
   generateMappingTestData(input: V1_ExecuteInput): Promise<string> {
     return this.engineServerClient.generateTestDataWithDefaultSeed(
       V1_ExecuteInput.serialization.toJson(input),

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

@@ -290,6 +290,7 @@ export class V1_EngineServerClient extends AbstractServerClient {
   // ------------------------------------------- Execute -------------------------------------------
 
   _execution = (): string => `${this._pure()}/execution`;
+
   execute = (
     input: PlainObject<V1_ExecuteInput>,
     options?: {
@@ -322,6 +323,20 @@ export class V1_EngineServerClient extends AbstractServerClient {
       undefined,
       { enableCompression: true },
     );
+
+  debugPlanGeneration = (
+    input: PlainObject<V1_ExecuteInput>,
+  ): Promise<{ plan: PlainObject<V1_ExecutionPlan>; debug: string[] }> =>
+    this.postWithTracing(
+      this.getTraceData(CORE_ENGINE_TRACER_SPAN.GENERATE_EXECUTION_PLAN),
+      `${this._execution()}/generatePlan/debug`,
+      input,
+      {},
+      undefined,
+      undefined,
+      { enableCompression: true },
+    );
+
   generateTestDataWithDefaultSeed = (
     input: PlainObject<V1_ExecuteInput>,
   ): Promise<string> =>

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

@@ -19,6 +19,7 @@ import {
   assertNonEmptyString,
   assertTrue,
 } from '@finos/legend-shared';
+import { addPackageElement } from '../../../../../../DomainModifierHelper';
 import type { PackageableElement } from '../../../../../../metamodels/pure/packageableElements/PackageableElement';
 import type { V1_PackageableElement } from '../../../model/packageableElements/V1_PackageableElement';
 import type { V1_GraphBuilderContext } from './V1_GraphBuilderContext';
@@ -121,9 +122,10 @@ export class V1_ElementBuilder<T extends V1_PackageableElement> {
       `Element '${path}' already exists`,
     );
     const element = this.firstPass(elementProtocol, context);
-    context.currentSubGraph
-      .getOrCreatePackage(elementProtocol.package)
-      .addElement(element);
+    addPackageElement(
+      context.currentSubGraph.getOrCreatePackage(elementProtocol.package),
+      element,
+    );
     return element;
   }