@finos/legend-graph 0.1.3 → 0.2.2

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

@@ -105,7 +105,7 @@ export class Association
       idx !== -1,
       `Can't find property '${property.name}' in association '${this.path}'`,
     );
-    return this.properties[(idx + 1) % 2];
+    return guaranteeNonNullable(this.properties[(idx + 1) % 2]);
   };
   getPropertyAssociatedClass = (property: AbstractProperty): Class => {
     if (property instanceof Property) {

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

@@ -15,7 +15,12 @@
  */
 
 import { observable, action, computed, makeObservable } from 'mobx';
-import { uuid, isNumber, hashArray } from '@finos/legend-shared';
+import {
+  uuid,
+  isNumber,
+  hashArray,
+  guaranteeNonNullable,
+} from '@finos/legend-shared';
 import {
   CORE_HASH_STRUCTURE,
   PRIMITIVE_TYPE,
@@ -82,7 +87,7 @@ export class EnumValueMapping implements Hashable, Stubable {
     val: Enum | string | undefined,
     sourceType: Type | undefined,
   ): void {
-    const sourceValue = this.sourceValues[idx];
+    const sourceValue = guaranteeNonNullable(this.sourceValues[idx]);
     // If the source type is an enumeration but the value does NOT match an enum value (most likely user is mid typing an enum value)
     // we move on to update the source value with the string value
     if (

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

@@ -33,8 +33,10 @@ import type { RootRelationalInstanceSetImplementation } from '../store/relationa
 import type { InferableMappingElementIdValue } from './InferableMappingElementId';
 import type { InferableMappingElementRoot } from './InferableMappingElementRoot';
 import type { AggregationAwareSetImplementation } from './aggregationAware/AggregationAwareSetImplementation';
+import type { InstanceSetImplementation } from './InstanceSetImplementation';
 
 export interface SetImplementationVisitor<T> {
+  visit_SetImplementation(setImplementation: InstanceSetImplementation): T;
   visit_OperationSetImplementation(
     setImplementation: OperationSetImplementation,
   ): T;
@@ -133,7 +135,6 @@ export enum BASIC_SET_IMPLEMENTATION_TYPE {
   INSTANCE = 'instance',
 }
 
-/* @MARKER: NEW CLASS MAPPING TYPE SUPPORT --- consider adding class mapping type handler here whenever support for a new one is added to the app */
 export enum SET_IMPLEMENTATION_TYPE {
   OPERATION = 'operation',
   PUREINSTANCE = 'pureInstance',

package/src/models/metamodels/pure/packageableElements/store/relational/mapping/RelationalInputData.ts

@@ -58,6 +58,7 @@ export class RelationalInputData extends InputData implements Hashable {
       data: observable,
       inputType: observable,
       setData: action,
+      setInputType: action,
       validationResult: computed,
       hashCode: computed,
     });
@@ -71,6 +72,10 @@ export class RelationalInputData extends InputData implements Hashable {
     this.data = value;
   }
 
+  setInputType(value: string): void {
+    this.inputType = getRelationalInputType(value);
+  }
+
   get validationResult(): ValidationIssue | undefined {
     if (this.database.value.isStub) {
       return createValidationError([

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

@@ -167,7 +167,9 @@ export class JoinTreeNode {
  */
 export const extractLine = (joinTreeNode: JoinTreeNode): JoinTreeNode[] =>
   [joinTreeNode].concat(
-    joinTreeNode.children.length ? extractLine(joinTreeNode.children[0]) : [],
+    joinTreeNode.children.length
+      ? extractLine(joinTreeNode.children[0] as JoinTreeNode)
+      : [],
   );
 
 export class RelationalOperationElementWithJoin extends RelationalOperationElement {

package/src/models/metamodels/pure/valueSpecification/SimpleFunctionExpression.ts

@@ -62,6 +62,7 @@ export class FunctionExpression extends Expression {
 }
 
 export class SimpleFunctionExpression extends FunctionExpression {
+  // eslint-disable-next-line @typescript-eslint/ban-types
   func?: PackageableElementReference<Function> | undefined;
 
   override accept_ValueSpecificationVisitor<T>(

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

@@ -16,13 +16,41 @@
 
 import type { PlainObject } from '@finos/legend-shared';
 import type { Connection } from '../../metamodels/pure/packageableElements/connection/Connection';
-import { PureProtocolProcessorPlugin } from './PureProtocolProcessorPlugin';
+import type { Mapping } from '../../metamodels/pure/packageableElements/mapping/Mapping';
+import type { InstanceSetImplementation } from '../../metamodels/pure/packageableElements/mapping/InstanceSetImplementation';
+import type { PureProtocolProcessorPlugin } from './PureProtocolProcessorPlugin';
 import type { V1_Connection } from '../pure/v1/model/packageableElements/connection/V1_Connection';
 import type { V1_GraphTransformerContext } from './v1/transformation/pureGraph/from/V1_GraphTransformerContext';
+import type { V1_ClassMapping } from '../pure/v1/model/packageableElements/mapping/V1_ClassMapping';
 import type { V1_GraphBuilderContext } from './v1/transformation/pureGraph/to/V1_GraphBuilderContext';
 import type { Store } from '../../metamodels/pure/packageableElements/store/Store';
 import type { PackageableElementReference } from '../../metamodels/pure/packageableElements/PackageableElementReference';
 
+export type V1_ClassMappingFirstPassBuilder = (
+  classMapping: V1_ClassMapping,
+  context: V1_GraphBuilderContext,
+  parent: Mapping,
+) => InstanceSetImplementation | undefined;
+
+export type V1_ClassMappingSecondPassBuilder = (
+  classMapping: V1_ClassMapping,
+  context: V1_GraphBuilderContext,
+  parent: Mapping,
+) => void;
+
+export type V1_ClassMappingTransformer = (
+  setImplementation: InstanceSetImplementation,
+  context: V1_GraphTransformerContext,
+) => V1_ClassMapping | undefined;
+
+export type V1_ClassMappingSerializer = (
+  value: V1_ClassMapping,
+) => V1_ClassMapping | undefined;
+
+export type V1_ClassMappingDeserializer = (
+  json: PlainObject<V1_ClassMapping>,
+) => V1_ClassMapping | undefined;
+
 export type V1_ConnectionBuilder = (
   connection: V1_Connection,
   context: V1_GraphBuilderContext,
@@ -42,7 +70,18 @@ export type V1_ConnectionProtocolDeserializer = (
   json: PlainObject<V1_Connection>,
 ) => V1_Connection | undefined;
 
-export abstract class DSLMapping_PureProtocolProcessorPlugin_Extension extends PureProtocolProcessorPlugin {
+export interface DSLMapping_PureProtocolProcessorPlugin_Extension
+  extends PureProtocolProcessorPlugin {
+  V1_getExtraClassMappingFirstPassBuilders?(): V1_ClassMappingFirstPassBuilder[];
+
+  V1_getExtraClassMappingSecondPassBuilders?(): V1_ClassMappingSecondPassBuilder[];
+
+  V1_getExtraClassMappingTransformers?(): V1_ClassMappingTransformer[];
+
+  V1_getExtraClassMappingSerializers?(): V1_ClassMappingSerializer[];
+
+  V1_getExtraClassMappingDeserializers?(): V1_ClassMappingDeserializer[];
+
   V1_getExtraConnectionBuilders?(): V1_ConnectionBuilder[];
 
   V1_getExtraConnectionTransformers?(): V1_ConnectionTransformer[];

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

@@ -41,10 +41,12 @@ export type V1_ElementTransformer = (
 
 export type V1_ElementProtocolSerializer = (
   protocol: V1_PackageableElement,
+  plugins: PureProtocolProcessorPlugin[],
 ) => PlainObject<V1_PackageableElement> | undefined;
 
 export type V1_ElementProtocolDeserializer = (
   protocol: PlainObject<V1_PackageableElement>,
+  plugins: PureProtocolProcessorPlugin[],
 ) => V1_PackageableElement | undefined;
 
 export type V1_FunctionExpressionBuilder = (

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

@@ -135,7 +135,7 @@ import { V1_GenerationSpecification } from './model/packageableElements/generati
 import { V1_Mapping } from './model/packageableElements/mapping/V1_Mapping';
 import { V1_ConcreteFunctionDefinition } from './model/packageableElements/function/V1_ConcreteFunctionDefinition';
 import { V1_PureModelContextComposite } from './model/context/V1_PureModelContextComposite';
-import { V1_AlloySdlc } from './model/context/V1_AlloySdlc';
+import { V1_AlloySDLC } from './model/context/V1_SDLC';
 import { V1_Protocol } from './model/V1_Protocol';
 import type { V1_PureModelContext } from './model/context/V1_PureModelContext';
 import type { V1_ElementBuilder } from './transformation/pureGraph/to/V1_ElementBuilder';
@@ -154,7 +154,6 @@ import {
 import { V1_transformRelationalDatabaseConnection } from './transformation/pureGraph/from/V1_ConnectionTransformer';
 import { V1_FlatData } from './model/packageableElements/store/flatData/model/V1_FlatData';
 import { V1_Database } from './model/packageableElements/store/relational/model/V1_Database';
-import { V1_ServiceStore } from './model/packageableElements/store/relational/V1_ServiceStore';
 import type { V1_Multiplicity } from './model/packageableElements/domain/V1_Multiplicity';
 import type { V1_RawVariable } from './model/rawValueSpecification/V1_RawVariable';
 import { V1_setupDatabaseSerialization } from './transformation/pureProtocol/serializationHelpers/V1_DatabaseSerializationHelper';
@@ -421,7 +420,6 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
 
   // --------------------------------------------- Graph Builder ---------------------------------------------
 
-  /* @MARKER: NEW ELEMENT TYPE SUPPORT --- consider adding new element type handler here whenever support for a new element type is added to the app */
   *buildSystem(
     coreModel: CoreModel,
     systemModel: SystemModel,
@@ -495,7 +493,6 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     }
   }
 
-  /* @MARKER: NEW ELEMENT TYPE SUPPORT --- consider adding new element type handler here whenever support for a new element type is added to the app */
   *buildDependencies(
     coreModel: CoreModel,
     systemModel: SystemModel,
@@ -605,7 +602,6 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     }
   }
 
-  /* @MARKER: NEW ELEMENT TYPE SUPPORT --- consider adding new element type handler here whenever support for a new element type is added to the app */
   *buildGraph(
     graph: PureModel,
     entities: Entity[],
@@ -1794,7 +1790,6 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
      *
      */
     const graphData = this.getFullGraphModelData(graph);
-    /* @MARKER: NEW ELEMENT TYPE SUPPORT --- consider adding new element type handler here whenever support for a new element type is added to the app */
     const prunedGraphData = new V1_PureModelContextData();
     const extraExecutionElements = this.pluginManager
       .getPureProtocolProcessorPlugins()
@@ -1970,7 +1965,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
         break;
       }
       case ServiceExecutionMode.SEMI_INTERACTIVE: {
-        const sdlcInfo = new V1_AlloySdlc(groupdId, artifactId, version);
+        const sdlcInfo = new V1_AlloySDLC(groupdId, artifactId, version);
         const pointer = new V1_PureModelContextPointer(protocol, sdlcInfo);
         // data
         const data = new V1_PureModelContextData();
@@ -1996,7 +1991,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
         break;
       }
       case ServiceExecutionMode.PROD: {
-        const sdlcInfo = new V1_AlloySdlc(groupdId, artifactId, version);
+        const sdlcInfo = new V1_AlloySDLC(groupdId, artifactId, version);
         const pointer = new V1_PureModelContextPointer(protocol, sdlcInfo);
         sdlcInfo.packageableElementPointers = [
           new V1_PackageableElementPointer(
@@ -2034,7 +2029,6 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     service: Service,
   ): V1_PureModelContextData => {
     const graphData = this.getFullGraphModelData(graph);
-    /* @MARKER: NEW ELEMENT TYPE SUPPORT --- consider adding new element type handler here whenever support for a new element type is added to the app */
     const prunedGraphData = new V1_PureModelContextData();
     prunedGraphData.elements = graphData.elements.filter(
       (element) => !(element instanceof V1_Service),
@@ -2258,7 +2252,6 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     return `${elementProtocol.package}${ENTITY_PATH_DELIMITER}${name}`;
   };
 
-  /* @MARKER: NEW ELEMENT TYPE SUPPORT --- consider adding new element type handler here whenever support for a new element type is added to the app */
   private getElementClassiferPath = (
     protocol: V1_PackageableElement,
   ): string => {
@@ -2286,8 +2279,6 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
       return CORE_ELEMENT_PATH.FLAT_DATA;
     } else if (protocol instanceof V1_Database) {
       return CORE_ELEMENT_PATH.DATABASE;
-    } else if (protocol instanceof V1_ServiceStore) {
-      return CORE_ELEMENT_PATH.SERVICE_STORE;
     } else if (protocol instanceof V1_Service) {
       return CORE_ELEMENT_PATH.SERVICE;
     } else if (protocol instanceof V1_FileGenerationSpecification) {
@@ -2311,7 +2302,6 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     );
   };
 
-  /* @MARKER: NEW ELEMENT TYPE SUPPORT --- consider adding new element type handler here whenever support for a new element type is added to the app */
   private graphToPureModelContextData = (
     graph: PureModel,
     options?: { keepSourceInformation?: boolean | undefined } | undefined,
@@ -2333,7 +2323,6 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     return graphData;
   };
 
-  /* @MARKER: NEW ELEMENT TYPE SUPPORT --- consider adding new element type handler here whenever support for a new element type is added to the app */
   private getGraphCompileContext = (
     graph: PureModel,
   ): V1_PureModelContextData => {

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

@@ -66,6 +66,7 @@ import { V1_GraphTransformerContextBuilder } from '../transformation/pureGraph/f
 import type { PureProtocolProcessorPlugin } from '../../PureProtocolProcessorPlugin';
 import {
   V1_buildCompilationError,
+  V1_buildExecutionError,
   V1_buildGenerationConfigurationDescription,
   V1_buildImportConfigurationDescription,
   V1_buildParserError,
@@ -82,6 +83,7 @@ import { V1_ServiceRegistrationResult } from './service/V1_ServiceRegistrationRe
 import type { V1_PureModelContext } from '../model/context/V1_PureModelContext';
 import { ServiceExecutionMode } from '../../../../../graphManager/action/service/ServiceExecutionMode';
 import { serialize } from 'serializr';
+import { V1_ExecutionError } from './execution/V1_ExecutionError';
 
 class V1_EngineConfig extends TEMP__AbstractEngineConfig {
   private engine: V1_Engine;
@@ -397,17 +399,29 @@ export class V1_Engine {
     input: V1_ExecuteInput,
     useLosslessParse: boolean,
   ): Promise<V1_ExecutionResult> {
-    const executionResultInText = await (
-      (await this.engineServerClient.execute(
-        V1_ExecuteInput.serialization.toJson(input),
-        true,
-      )) as Response
-    ).text();
-    return V1_serializeExecutionResult(
-      useLosslessParse
-        ? losslessParse(executionResultInText)
-        : JSON.parse(executionResultInText),
-    );
+    try {
+      const executionResultInText = await (
+        (await this.engineServerClient.execute(
+          V1_ExecuteInput.serialization.toJson(input),
+          true,
+        )) as Response
+      ).text();
+      return V1_serializeExecutionResult(
+        useLosslessParse
+          ? losslessParse(executionResultInText)
+          : JSON.parse(executionResultInText),
+      );
+    } catch (error) {
+      assertErrorThrown(error);
+      if (error instanceof NetworkClientError) {
+        throw V1_buildExecutionError(
+          V1_ExecutionError.serialization.fromJson(
+            error.payload as PlainObject<V1_ExecutionError>,
+          ),
+        );
+      }
+      throw error;
+    }
   }
 
   generateExecutionPlan(

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

@@ -50,6 +50,8 @@ import {
 } from '../../../../../graphManager/action/EngineError';
 import type { V1_SourceInformation } from '../model/V1_SourceInformation';
 import { SourceInformation } from '../../../../../graphManager/action/SourceInformation';
+import { ExecutionError } from '../../../../../graphManager/action/ExecutionError';
+import type { V1_ExecutionError } from './execution/V1_ExecutionError';
 
 export const V1_buildLightQuery = (
   protocol: V1_LightQuery,
@@ -317,3 +319,12 @@ export const V1_buildParserError = (protocol: V1_ParserError): ParserError => {
     : undefined;
   return metamodel;
 };
+
+export const V1_buildExecutionError = (
+  protocol: V1_ExecutionError,
+): ExecutionError => {
+  const executionError = new ExecutionError();
+  executionError.message = protocol.message;
+  executionError.stack = protocol.trace;
+  return executionError;
+};

package/src/models/protocols/pure/v1/engine/execution/V1_ExecutionError.ts

@@ -0,0 +1,30 @@
+/**
+ * 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 { createModelSchema, primitive } from 'serializr';
+import { SerializationFactory } from '@finos/legend-shared';
+
+export class V1_ExecutionError {
+  message!: string;
+  trace!: string;
+
+  static readonly serialization = new SerializationFactory(
+    createModelSchema(V1_ExecutionError, {
+      message: primitive(),
+      trace: primitive(),
+    }),
+  );
+}

package/src/models/protocols/pure/v1/model/context/V1_PureModelContextPointer.ts

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-import type { V1_Sdlc } from '../../model/context/V1_AlloySdlc';
+import type { V1_SDLC } from './V1_SDLC';
 import type { V1_Protocol } from '../../model/V1_Protocol';
 import { V1_PureModelContext } from './V1_PureModelContext';
 
 export class V1_PureModelContextPointer extends V1_PureModelContext {
   serializer: V1_Protocol;
-  sdlcInfo?: V1_Sdlc | undefined;
+  sdlcInfo?: V1_SDLC | undefined;
 
-  constructor(protocol: V1_Protocol, sdlc?: V1_Sdlc) {
+  constructor(protocol: V1_Protocol, sdlc?: V1_SDLC) {
     super();
     this.serializer = protocol;
     this.sdlcInfo = sdlc;

package/src/models/protocols/pure/v1/model/context/{V1_AlloySdlc.ts → V1_SDLC.ts}

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import type { V1_PackageableElementPointer } from '../../model/packageableElements/V1_PackageableElement';
+import type { V1_PackageableElementPointer } from '../packageableElements/V1_PackageableElement';
 
-export abstract class V1_Sdlc {
+export abstract class V1_SDLC {
   baseVersion = 'latest';
   version: string;
   packageableElementPointers: V1_PackageableElementPointer[] = [];
@@ -26,7 +26,7 @@ export abstract class V1_Sdlc {
   }
 }
 
-export class V1_AlloySdlc extends V1_Sdlc {
+export class V1_AlloySDLC extends V1_SDLC {
   groupId: string;
   artifactId: string;
 

package/src/models/protocols/pure/v1/model/packageableElements/V1_PackageableElement.ts

@@ -35,9 +35,7 @@ import type { V1_FileGenerationSpecification } from './fileGeneration/V1_FileGen
 import type { V1_GenerationSpecification } from './generationSpecification/V1_GenerationSpecification';
 import type { V1_Measure } from './domain/V1_Measure';
 import type { V1_SectionIndex } from './section/V1_SectionIndex';
-import type { V1_ServiceStore } from './store/relational/V1_ServiceStore';
 
-/* @MARKER: NEW ELEMENT TYPE SUPPORT --- consider adding new element type handler here whenever support for a new element type is added to the app */
 export interface V1_PackageableElementVisitor<T> {
   visit_PackageableElement(element: V1_PackageableElement): T;
   visit_SectionIndex(element: V1_SectionIndex): T;
@@ -53,7 +51,6 @@ export interface V1_PackageableElementVisitor<T> {
 
   visit_FlatData(element: V1_FlatData): T;
   visit_Database(element: V1_Database): T;
-  visit_ServiceStore(element: V1_ServiceStore): T;
   visit_Service(element: V1_Service): T;
   visit_GenerationSpecification(element: V1_GenerationSpecification): T;
   visit_FileGeneration(element: V1_FileGenerationSpecification): T;

package/src/models/protocols/pure/v1/model/packageableElements/connection/V1_Connection.ts

@@ -32,7 +32,6 @@ export enum V1_ConnectionType {
   RELATIONAL_DATABASE_CONNECTION = 'RelationalDatabaseConnection',
 }
 
-/* @MARKER: NEW CONNECTION TYPE SUPPORT --- consider adding connection type handler here whenever support for a new one is added to the app */
 export interface V1_ConnectionVisitor<T> {
   visit_Connection(connection: V1_Connection): T;
   visit_ConnectionPointer(connection: V1_ConnectionPointer): T;

package/src/models/protocols/pure/v1/model/packageableElements/mapping/V1_ClassMapping.ts

@@ -25,8 +25,8 @@ import type { V1_OperationClassMapping } from './V1_OperationClassMapping';
 import type { V1_PureInstanceClassMapping } from '../../../model/packageableElements/store/modelToModel/mapping/V1_PureInstanceClassMapping';
 import type { V1_RootFlatDataClassMapping } from '../../../model/packageableElements/store/flatData/mapping/V1_RootFlatDataClassMapping';
 
-/* @MARKER: NEW CLASS MAPPING TYPE SUPPORT --- consider adding class mapping type handler here whenever support for a new one is added to the app */
 export interface V1_ClassMappingVisitor<T> {
+  visit_ClassMapping(classMapping: V1_ClassMapping): T;
   visit_OperationClassMapping(classMapping: V1_OperationClassMapping): T;
   visit_PureInstanceClassMapping(classMapping: V1_PureInstanceClassMapping): T;
   visit_RootFlatDataClassMapping(classMapping: V1_RootFlatDataClassMapping): T;

package/src/models/protocols/pure/v1/transformation/pureGraph/from/V1_DatabaseTransformer.ts

@@ -174,7 +174,8 @@ export const V1_transformTableAliasToTablePointer = (
   tablePtr.database = options?.TEMPORARY__resolveToFullPath
     ? tableAlias.relation.ownerReference.value.path
     : tableAlias.relation.ownerReference.valueForSerialization ?? '';
-  /* @MARKER: GRAMMAR ROUNDTRIP --- omit this information during protocol transformation as it can be interpreted while building the graph */
+  // FIXME: Sometimes, we interpret this, so to maintain roundtrip stability, we need to handle this differrently
+  // See https://github.com/finos/legend-studio/issues/295
   tablePtr.mainTableDb = tablePtr.database;
   tablePtr.schema = tableAlias.isSelfJoinTarget
     ? SELF_JOIN_SCHEMA_NAME
@@ -188,7 +189,8 @@ export const V1_transformTableAliasToTablePointer = (
 export const V1_transformTableToTablePointer = (table: Table): V1_TablePtr => {
   const tablePtr = new V1_TablePtr();
   tablePtr.database = table.schema.owner.path;
-  /* @MARKER: GRAMMAR ROUNDTRIP --- omit this information during protocol transformation as it can be interpreted while building the graph */
+  // FIXME: Sometimes, we interpret this, so to maintain roundtrip stability, we need to handle this differrently
+  // See https://github.com/finos/legend-studio/issues/295
   tablePtr.mainTableDb = tablePtr.database;
   tablePtr.schema = table.schema.name;
   tablePtr.table = table.name;

package/src/models/protocols/pure/v1/transformation/pureGraph/from/V1_MappingTransformer.ts

@@ -139,6 +139,9 @@ import { V1_RelationalInputData } from '../../../model/packageableElements/store
 import { SOURCE_INFORMATION_KEY } from '../../../../../../../MetaModelConst';
 import type { V1_GraphTransformerContext } from './V1_GraphTransformerContext';
 import { toJS } from 'mobx';
+import type { DSLMapping_PureProtocolProcessorPlugin_Extension } from '../../../../DSLMapping_PureProtocolProcessorPlugin_Extension';
+import type { InstanceSetImplementation } from '../../../../../../metamodels/pure/packageableElements/mapping/InstanceSetImplementation';
+import type { SubstituteStore } from '../../../../../../metamodels/pure/packageableElements/mapping/SubstituteStore';
 
 export const V1_transformPropertyReference = (
   element: PropertyReference,
@@ -306,7 +309,7 @@ const transformMappingTest = (
   return test;
 };
 
-// Include V1_Mapping
+// Include Mapping
 
 const transformMappingInclude = (
   element: MappingInclude,
@@ -314,15 +317,17 @@ const transformMappingInclude = (
   const mappingInclude = new V1_MappingInclude();
   mappingInclude.includedMapping = element.included.valueForSerialization ?? '';
   mappingInclude.sourceDatabasePath = element.storeSubstitutions.length
-    ? element.storeSubstitutions[0].original.valueForSerialization ?? ''
+    ? (element.storeSubstitutions[0] as SubstituteStore).original
+        .valueForSerialization ?? ''
     : undefined;
   mappingInclude.targetDatabasePath = element.storeSubstitutions.length
-    ? element.storeSubstitutions[0].substitute.valueForSerialization ?? ''
+    ? (element.storeSubstitutions[0] as SubstituteStore).substitute
+        .valueForSerialization ?? ''
     : undefined;
   return mappingInclude;
 };
 
-// Class V1_Mapping
+// Class Mapping
 
 const transformOptionalPropertyMappingTransformer = (
   value: EnumerationMapping | undefined,
@@ -1008,6 +1013,27 @@ export class V1_SetImplementationTransformer
     this.context = context;
   }
 
+  visit_SetImplementation(
+    setImplementation: InstanceSetImplementation,
+  ): V1_ClassMapping | undefined {
+    const extraClassMappingTransformers = this.context.plugins.flatMap(
+      (plugin) =>
+        (
+          plugin as DSLMapping_PureProtocolProcessorPlugin_Extension
+        ).V1_getExtraClassMappingTransformers?.() ?? [],
+    );
+    for (const transformer of extraClassMappingTransformers) {
+      const classMapping = transformer(setImplementation, this.context);
+      if (classMapping) {
+        return classMapping;
+      }
+    }
+    throw new UnsupportedOperationError(
+      `Can't transform class mapping: no compatible transformer available from plugins`,
+      setImplementation,
+    );
+  }
+
   visit_OperationSetImplementation(
     setImplementation: OperationSetImplementation,
   ): V1_ClassMapping | undefined {

package/src/models/protocols/pure/v1/transformation/pureGraph/from/V1_PackageableElementTransformer.ts

@@ -27,7 +27,6 @@ import type { Association } from '../../../../../../metamodels/pure/packageableE
 import type { ConcreteFunctionDefinition } from '../../../../../../metamodels/pure/packageableElements/domain/ConcreteFunctionDefinition';
 import type { FlatData } from '../../../../../../metamodels/pure/packageableElements/store/flatData/model/FlatData';
 import type { Database } from '../../../../../../metamodels/pure/packageableElements/store/relational/model/Database';
-import type { ServiceStore } from '../../../../../../metamodels/pure/packageableElements/store/relational/model/ServiceStore';
 import type { Mapping } from '../../../../../../metamodels/pure/packageableElements/mapping/Mapping';
 import type { Service } from '../../../../../../metamodels/pure/packageableElements/service/Service';
 import type { PackageableRuntime } from '../../../../../../metamodels/pure/packageableElements/runtime/PackageableRuntime';
@@ -52,7 +51,6 @@ import {
   V1_transformGenerationSpecification,
 } from './V1_GenerationSpecificationTransformer';
 import { V1_transformFlatData } from './V1_FlatDataTransformer';
-import { V1_transformServiceStore } from './V1_ServiceStoreTransformer';
 import { V1_transformDatabase } from './V1_DatabaseTransformer';
 import { V1_transformMapping } from './V1_MappingTransformer';
 import { V1_transformService } from './V1_ServiceTransformer';
@@ -143,10 +141,6 @@ export class V1_PackageableElementTransformer
     return V1_transformDatabase(element, this.context);
   }
 
-  visit_ServiceStore(element: ServiceStore): V1_PackageableElement {
-    return V1_transformServiceStore(element);
-  }
-
   visit_Mapping(element: Mapping): V1_PackageableElement {
     return V1_transformMapping(element, this.context);
   }

package/src/models/protocols/pure/v1/transformation/pureGraph/from/V1_ValueSpecificationTransformer.ts

@@ -112,7 +112,7 @@ class V1_ValueSpecificationTransformer
     valueSpecification: RootGraphFetchTreeInstanceValue,
   ): V1_ValueSpecification {
     return V1_transformGraphFetchTree(
-      valueSpecification.values[0],
+      guaranteeNonNullable(valueSpecification.values[0]),
       this.inScope,
       this.open,
       this.isParameter,
@@ -124,7 +124,7 @@ class V1_ValueSpecificationTransformer
     valueSpecification: PropertyGraphFetchTreeInstanceValue,
   ): V1_ValueSpecification {
     return V1_transformGraphFetchTree(
-      valueSpecification.values[0],
+      guaranteeNonNullable(valueSpecification.values[0]),
       this.inScope,
       this.open,
       this.isParameter,
@@ -252,7 +252,7 @@ class V1_ValueSpecificationTransformer
     valueSpecification: EnumValueInstanceValue,
   ): V1_ValueSpecification {
     const _enumValue = new V1_EnumValue();
-    const _enum = valueSpecification.values[0].value;
+    const _enum = guaranteeNonNullable(valueSpecification.values[0]).value;
     _enumValue.value = _enum.name;
     _enumValue.fullPath = _enum.owner.path;
     return _enumValue;