@finos/legend-graph 4.0.3 → 5.0.0

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

@@ -25,7 +25,10 @@ import {
 } from '@finos/legend-shared';
 import { CORE_PURE_PATH } from '../../../../../../../MetaModelConst';
 import { Class } from '../../../../../../metamodels/pure/packageableElements/domain/Class';
-import type { V1_GraphBuilderContext } from '../../../transformation/pureGraph/to/V1_GraphBuilderContext';
+import {
+  V1_buildFullPath,
+  type V1_GraphBuilderContext,
+} from '../../../transformation/pureGraph/to/V1_GraphBuilderContext';
 import type {
   V1_PackageableElement,
   V1_PackageableElementVisitor,
@@ -83,8 +86,8 @@ export class V1_ProtocolToMetaModelGraphThirdPassBuilder
   }
 
   visit_Class(element: V1_Class): void {
-    const _class = this.context.graph.getClass(
-      this.context.graph.buildPath(element.package, element.name),
+    const _class = this.context.currentSubGraph.getOwnClass(
+      V1_buildFullPath(element.package, element.name),
     );
     element.superTypes.forEach((type) => {
       // supertype `Any` will not be processed
@@ -102,7 +105,7 @@ export class V1_ProtocolToMetaModelGraphThirdPassBuilder
           assertErrorThrown(error);
           // NOTE: reconsider this as we might need to get elements from `system` and `platform` as well
           throw new GraphBuilderError(
-            `Can't find supertype '${type}' of class '${this.context.graph.buildPath(
+            `Can't find supertype '${type}' of class '${V1_buildFullPath(
               element.package,
               element.name,
             )}': ${error.message}`,
@@ -126,13 +129,13 @@ export class V1_ProtocolToMetaModelGraphThirdPassBuilder
   }
 
   visit_Association(element: V1_Association): void {
+    const association = this.context.currentSubGraph.getOwnAssociation(
+      V1_buildFullPath(element.package, element.name),
+    );
     assertTrue(
       element.properties.length === 2,
       'Association must have exactly 2 properties',
     );
-    const association = this.context.graph.getAssociation(
-      this.context.graph.buildPath(element.package, element.name),
-    );
     const first = guaranteeNonNullable(element.properties[0]);
     const second = guaranteeNonNullable(element.properties[1]);
     if (first.name === second.name) {
@@ -166,14 +169,12 @@ export class V1_ProtocolToMetaModelGraphThirdPassBuilder
   }
 
   visit_FlatData(element: V1_FlatData): void {
-    this.context.graph.getFlatDataStore(
-      this.context.graph.buildPath(element.package, element.name),
-    );
+    return;
   }
 
   visit_Database(element: V1_Database): void {
-    const database = this.context.graph.getDatabase(
-      this.context.graph.buildPath(element.package, element.name),
+    const database = this.context.currentSubGraph.getOwnDatabase(
+      V1_buildFullPath(element.package, element.name),
     );
     element.schemas.forEach((schema) =>
       V1_buildDatabaseSchemaViewsFirstPass(schema, database, this.context),
@@ -181,8 +182,9 @@ export class V1_ProtocolToMetaModelGraphThirdPassBuilder
   }
 
   visit_Mapping(element: V1_Mapping): void {
-    const path = this.context.graph.buildPath(element.package, element.name);
-    const mapping = this.context.graph.getMapping(path);
+    const mapping = this.context.currentSubGraph.getOwnMapping(
+      V1_buildFullPath(element.package, element.name),
+    );
     mapping.classMappings = element.classMappings.map((classMapping) =>
       classMapping.accept_ClassMappingVisitor(
         new V1_ProtocolToMetaModelClassMappingFirstPassBuilder(

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

@@ -31,10 +31,7 @@ import type { PropertyMappingsImplementation } from '../../../../../../metamodel
 import { EmbeddedFlatDataPropertyMapping } from '../../../../../../metamodels/pure/packageableElements/store/flatData/mapping/EmbeddedFlatDataPropertyMapping';
 import { FlatDataPropertyMapping } from '../../../../../../metamodels/pure/packageableElements/store/flatData/mapping/FlatDataPropertyMapping';
 import type { EnumerationMapping } from '../../../../../../metamodels/pure/packageableElements/mapping/EnumerationMapping';
-import {
-  TEMPORARY__UnresolvedSetImplementation,
-  type SetImplementation,
-} from '../../../../../../metamodels/pure/packageableElements/mapping/SetImplementation';
+import type { SetImplementation } from '../../../../../../metamodels/pure/packageableElements/mapping/SetImplementation';
 import { Class } from '../../../../../../metamodels/pure/packageableElements/domain/Class';
 import type { Association } from '../../../../../../metamodels/pure/packageableElements/domain/Association';
 import type { TableAlias } from '../../../../../../metamodels/pure/packageableElements/store/relational/model/RelationalOperationElement';
@@ -75,7 +72,7 @@ import { MappingClass } from '../../../../../../metamodels/pure/packageableEleme
 import { LocalMappingPropertyInfo } from '../../../../../../metamodels/pure/packageableElements/mapping/LocalMappingPropertyInfo';
 import type { AggregationAwareSetImplementation } from '../../../../../../metamodels/pure/packageableElements/mapping/aggregationAware/AggregationAwareSetImplementation';
 import { AggregationAwarePropertyMapping } from '../../../../../../metamodels/pure/packageableElements/mapping/aggregationAware/AggregationAwarePropertyMapping';
-import { V1_resolvePathsInRawLambda } from './helpers/V1_ValueSpecificationPathResolver';
+import { V1_buildRawLambdaWithResolvedPaths } from './helpers/V1_ValueSpecificationPathResolver';
 import {
   V1_deserializeRelationalOperationElement,
   V1_serializeRelationalOperationElement,
@@ -92,6 +89,7 @@ import type { AbstractProperty } from '../../../../../../metamodels/pure/package
 import { BindingTransformer } from '../../../../../../metamodels/pure/packageableElements/externalFormat/store/DSLExternalFormat_BindingTransformer';
 import type { Mapping } from '../../../../../../metamodels/pure/packageableElements/mapping/Mapping';
 import { V1_resolveBinding } from './V1_DSLExternalFormat_GraphBuilderHelper';
+import { TEMPORARY__UnresolvedSetImplementation } from '../../../../../../metamodels/pure/packageableElements/mapping/TEMPORARY__UnresolvedSetImplementation';
 
 /* @MARKER: RELAXED GRAPH CHECK - See https://github.com/finos/legend-studio/issues/880 */
 const TEMPORARY__getClassMappingByIdOrReturnUnresolved = (
@@ -241,7 +239,11 @@ export class V1_ProtocolToMetaModelPropertyMappingBuilder
     const purePropertyMapping = new PurePropertyMapping(
       topParent,
       property,
-      V1_resolvePathsInRawLambda(this.context, [], protocol.transform.body),
+      V1_buildRawLambdaWithResolvedPaths(
+        [],
+        protocol.transform.body,
+        this.context,
+      ),
       sourceSetImplementation ?? topParent,
       targetSetImplementation,
       protocol.explodeProperty,
@@ -322,7 +324,11 @@ export class V1_ProtocolToMetaModelPropertyMappingBuilder
         ),
         property,
       ),
-      V1_resolvePathsInRawLambda(this.context, [], protocol.transform.body),
+      V1_buildRawLambdaWithResolvedPaths(
+        [],
+        protocol.transform.body,
+        this.context,
+      ),
       sourceSetImplementation,
       targetSetImplementation,
     );
@@ -834,10 +840,10 @@ export class V1_ProtocolToMetaModelPropertyMappingBuilder
       guaranteeNonNullable(sourceSetImplementation),
       targetSetImplementation,
     );
-    xStorePropertyMapping.crossExpression = V1_resolvePathsInRawLambda(
-      this.context,
+    xStorePropertyMapping.crossExpression = V1_buildRawLambdaWithResolvedPaths(
       protocol.crossExpression.parameters,
       protocol.crossExpression.body,
+      this.context,
     );
     return xStorePropertyMapping;
   }

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

@@ -21,8 +21,8 @@ import type { V1_GraphBuilderContext } from '../../../transformation/pureGraph/t
 import type { V1_RawValueSpecificationVisitor } from '../../../model/rawValueSpecification/V1_RawValueSpecification';
 import type { V1_RawLambda } from '../../../model/rawValueSpecification/V1_RawLambda';
 import type { V1_RawVariable } from '../../../model/rawValueSpecification/V1_RawVariable';
-import type { V1_RawInstanceValue } from '../../../model/rawValueSpecification/V1_RawInstanceValue';
-import { RawInstanceValue } from '../../../../../../metamodels/pure/rawValueSpecification/RawInstanceValue';
+import type { V1_RawPrimitiveInstanceValue } from '../../../model/rawValueSpecification/V1_RawPrimitiveInstanceValue';
+import { RawPrimitiveInstanceValue } from '../../../../../../metamodels/pure/rawValueSpecification/RawPrimitiveInstanceValue';
 
 export class V1_ProtocolToMetaModelRawValueSpecificationBuilder
   implements V1_RawValueSpecificationVisitor<RawValueSpecification>
@@ -53,14 +53,18 @@ export class V1_ProtocolToMetaModelRawValueSpecificationBuilder
     );
   }
 
-  visit_InstanceValue(
-    valueSpecification: V1_RawInstanceValue,
+  visit_PrimitiveInstanceValue(
+    valueSpecification: V1_RawPrimitiveInstanceValue,
   ): RawValueSpecification {
     const multiplicity = this.context.graph.getMultiplicity(
       valueSpecification.multiplicity.lowerBound,
       valueSpecification.multiplicity.upperBound,
     );
     const type = this.context.resolveType(valueSpecification.type);
-    return new RawInstanceValue(type, multiplicity, valueSpecification.values);
+    return new RawPrimitiveInstanceValue(
+      type,
+      multiplicity,
+      valueSpecification.values,
+    );
   }
 }

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

@@ -26,17 +26,17 @@ import { GroupByFunctionSpecification } from '../../../../../../../metamodels/pu
 import { AggregationFunctionSpecification } from '../../../../../../../metamodels/pure/packageableElements/mapping/aggregationAware/AggregationFunctionSpecification';
 import type { V1_AggregateFunction } from '../../../../model/packageableElements/store/relational/mapping/aggregationAware/V1_AggregateFunction';
 import { V1_ProtocolToMetaModelClassMappingFirstPassBuilder } from '../V1_ProtocolToMetaModelClassMappingFirstPassBuilder';
-import { V1_resolvePathsInRawLambda } from './V1_ValueSpecificationPathResolver';
+import { V1_buildRawLambdaWithResolvedPaths } from './V1_ValueSpecificationPathResolver';
 
 const buildGroupByFunction = (
   groupByFunction: V1_GroupByFunction,
   context: V1_GraphBuilderContext,
 ): GroupByFunctionSpecification => {
   const groupByFunctionSpecification = new GroupByFunctionSpecification(
-    V1_resolvePathsInRawLambda(
-      context,
+    V1_buildRawLambdaWithResolvedPaths(
       groupByFunction.groupByFn.parameters,
       groupByFunction.groupByFn.body,
+      context,
     ),
   );
 
@@ -47,15 +47,15 @@ const buildAggregateFunction = (
   aggregationFunction: V1_AggregateFunction,
   context: V1_GraphBuilderContext,
 ): AggregationFunctionSpecification => {
-  const mapFn = V1_resolvePathsInRawLambda(
-    context,
+  const mapFn = V1_buildRawLambdaWithResolvedPaths(
     aggregationFunction.mapFn.parameters,
     aggregationFunction.mapFn.body,
-  );
-  const aggregateFn = V1_resolvePathsInRawLambda(
     context,
+  );
+  const aggregateFn = V1_buildRawLambdaWithResolvedPaths(
     aggregationFunction.aggregateFn.parameters,
     aggregationFunction.aggregateFn.body,
+    context,
   );
   return new AggregationFunctionSpecification(mapFn, aggregateFn);
 };

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

@@ -38,15 +38,21 @@ import type {
   PropertyOwner,
 } from '../../../../../../../metamodels/pure/packageableElements/domain/AbstractProperty';
 import type { V1_ValueSpecification } from '../../../../model/valueSpecification/V1_ValueSpecification';
-import type { V1_GraphBuilderContext } from '../../../../transformation/pureGraph/to/V1_GraphBuilderContext';
+import {
+  V1_buildFullPath,
+  type V1_GraphBuilderContext,
+} from '../../../../transformation/pureGraph/to/V1_GraphBuilderContext';
 import type { V1_Constraint } from '../../../../model/packageableElements/domain/V1_Constraint';
 import type { V1_RawVariable } from '../../../../model/rawValueSpecification/V1_RawVariable';
 import type { V1_Property } from '../../../../model/packageableElements/domain/V1_Property';
 import type { V1_DerivedProperty } from '../../../../model/packageableElements/domain/V1_DerivedProperty';
 import type { V1_Unit } from '../../../../model/packageableElements/domain/V1_Measure';
 import type { V1_TaggedValue } from '../../../../model/packageableElements/domain/V1_TaggedValue';
-import { V1_resolvePathsInRawLambda } from './V1_ValueSpecificationPathResolver';
-import { _package_addElement } from '../../../../../../../../helpers/DomainHelper';
+import { V1_buildRawLambdaWithResolvedPaths } from './V1_ValueSpecificationPathResolver';
+import {
+  addElementToPackage,
+  getOrCreateGraphPackage,
+} from '../../../../../../../../helpers/DomainHelper';
 
 export const V1_buildTaggedValue = (
   taggedValue: V1_TaggedValue,
@@ -75,19 +81,19 @@ export const V1_buildConstraint = (
   const pureConstraint = new Constraint(
     constraint.name,
     _class,
-    V1_resolvePathsInRawLambda(
-      context,
+    V1_buildRawLambdaWithResolvedPaths(
       constraint.functionDefinition.parameters,
       constraint.functionDefinition.body,
+      context,
     ),
   );
   pureConstraint.enforcementLevel = constraint.enforcementLevel;
   pureConstraint.externalId = constraint.externalId;
   pureConstraint.messageFunction = constraint.messageFunction
-    ? V1_resolvePathsInRawLambda(
-        context,
+    ? V1_buildRawLambdaWithResolvedPaths(
         constraint.messageFunction.parameters,
         constraint.messageFunction.body,
+        context,
       )
     : constraint.messageFunction;
   return pureConstraint;
@@ -133,19 +139,22 @@ export const V1_buildUnit = (
     unit.name,
     parentMeasure,
     unit.conversionFunction
-      ? V1_resolvePathsInRawLambda(
-          context,
+      ? V1_buildRawLambdaWithResolvedPaths(
           unit.conversionFunction.parameters,
           unit.conversionFunction.body,
+          context,
         )
       : undefined,
   );
-  const path = currentGraph.buildPath(unit.package, unit.name);
+  const path = V1_buildFullPath(unit.package, unit.name);
   assertTrue(
     !currentGraph.getOwnNullableElement(path),
     `Element '${path}' already exists`,
   );
-  _package_addElement(currentGraph.getOrCreatePackage(unit.package), pureUnit);
+  addElementToPackage(
+    getOrCreateGraphPackage(currentGraph, unit.package, undefined),
+    pureUnit,
+  );
   currentGraph.setOwnType(path, pureUnit);
   return pureUnit;
 };
@@ -218,10 +227,10 @@ export const V1_buildDerivedProperty = (
   derivedProperty.taggedValues = property.taggedValues
     .map((taggedValue) => V1_buildTaggedValue(taggedValue, context))
     .filter(isNonNullable);
-  const rawLambda = V1_resolvePathsInRawLambda(
-    context,
+  const rawLambda = V1_buildRawLambdaWithResolvedPaths(
     property.parameters,
     property.body,
+    context,
   );
   derivedProperty.body = rawLambda.body;
   derivedProperty.parameters = rawLambda.parameters;

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

@@ -64,7 +64,7 @@ import { V1_ObjectInputData } from '../../../../model/packageableElements/store/
 import { V1_FlatDataInputData } from '../../../../model/packageableElements/store/flatData/mapping/V1_FlatDataInputData';
 import type { V1_ClassMapping } from '../../../../model/packageableElements/mapping/V1_ClassMapping';
 import type { V1_MappingInclude } from '../../../../model/packageableElements/mapping/V1_MappingInclude';
-import { V1_resolvePathsInRawLambda } from './V1_ValueSpecificationPathResolver';
+import { V1_buildRawLambdaWithResolvedPaths } from './V1_ValueSpecificationPathResolver';
 import { V1_RelationalInputData } from '../../../../model/packageableElements/store/relational/mapping/V1_RelationalInputData';
 import {
   getRelationalInputType,
@@ -269,10 +269,10 @@ export const V1_buildMappingTest = (
     `Mapping test 'name' field is missing or empty`,
   );
   assertNonNullable(mappingTest.query, `Mapping test 'query' field is missing`);
-  const query = V1_resolvePathsInRawLambda(
-    context,
+  const query = V1_buildRawLambdaWithResolvedPaths(
     mappingTest.query.parameters,
     mappingTest.query.body,
+    context,
   );
   // TODO: fix this when we support another mapping test type
   assertType(

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

@@ -29,7 +29,7 @@ import { V1_ProcessingMilestoning } from '../../../../model/packageableElements/
 import { ProcessingMilestoning } from '../../../../../../../metamodels/pure/packageableElements/store/relational/model/milestoning/ProcessingMilestoning';
 import type { V1_GraphBuilderContext } from '../V1_GraphBuilderContext';
 import type { StoreRelational_PureProtocolProcessorPlugin_Extension } from '../../../../../StoreRelational_PureProtocolProcessorPlugin_Extension';
-import { RawInstanceValue } from '../../../../../../../metamodels/pure/rawValueSpecification/RawInstanceValue';
+import { RawPrimitiveInstanceValue } from '../../../../../../../metamodels/pure/rawValueSpecification/RawPrimitiveInstanceValue';
 import { V1_ProtocolToMetaModelRawValueSpecificationBuilder } from '../V1_ProtocolToMetaModelRawValueSpecificationBuilder';
 
 const buildBusinessMilesoning = (
@@ -54,7 +54,7 @@ const buildBusinessMilesoning = (
       protocol.infinityDate.accept_RawValueSpecificationVisitor(
         new V1_ProtocolToMetaModelRawValueSpecificationBuilder(context),
       ),
-      RawInstanceValue,
+      RawPrimitiveInstanceValue,
     );
   }
   return metamodel;
@@ -74,7 +74,7 @@ const buildBusinessSnapshotMilestoning = (
       protocol.infinityDate.accept_RawValueSpecificationVisitor(
         new V1_ProtocolToMetaModelRawValueSpecificationBuilder(context),
       ),
-      RawInstanceValue,
+      RawPrimitiveInstanceValue,
     );
   }
   return metamodel;
@@ -102,7 +102,7 @@ const buildProcessingMilestoning = (
       protocol.infinityDate.accept_RawValueSpecificationVisitor(
         new V1_ProtocolToMetaModelRawValueSpecificationBuilder(context),
       ),
-      RawInstanceValue,
+      RawPrimitiveInstanceValue,
     );
   }
   return metamodel;

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

@@ -27,7 +27,6 @@ import {
   DefaultCodeSection,
 } from '../../../../../../../metamodels/pure/packageableElements/section/Section';
 import type { SectionIndex } from '../../../../../../../metamodels/pure/packageableElements/section/SectionIndex';
-import { Package } from '../../../../../../../metamodels/pure/packageableElements/domain/Package';
 import { PackageableElementExplicitReference } from '../../../../../../../metamodels/pure/packageableElements/PackageableElementReference';
 import type { V1_GraphBuilderContext } from '../../../../transformation/pureGraph/to/V1_GraphBuilderContext';
 import {
@@ -37,42 +36,43 @@ import {
 } from '../../../../model/packageableElements/section/V1_Section';
 
 export const V1_buildSection = (
-  section: V1_Section,
+  protocol: V1_Section,
   context: V1_GraphBuilderContext,
   parentSectionIndex: SectionIndex,
 ): Section => {
-  let sec: Section;
-  if (section instanceof V1_ImportAwareCodeSection) {
+  let section: Section;
+
+  if (protocol instanceof V1_ImportAwareCodeSection) {
     const importAwareSection = new ImportAwareCodeSection(
-      section.parserName,
+      protocol.parserName,
       parentSectionIndex,
     );
-    importAwareSection.imports = uniq(section.imports)
+    importAwareSection.imports = uniq(protocol.imports)
       .map((_package) => {
-        const element = context.graph.getNullableElement(_package, true);
-        if (!(element instanceof Package)) {
+        const pkg = context.graph.getNullablePackage(_package);
+        if (!pkg) {
           context.log.warn(
             LogEvent.create(GRAPH_MANAGER_EVENT.GRAPH_BUILDER_FAILURE),
             `Can't find section import package '${_package}'`,
           );
+          return undefined;
         }
-        return element instanceof Package
-          ? // NOTE: here we use explicit because this information from section
-            // must always be the package full path
-            PackageableElementExplicitReference.create(element)
-          : undefined;
+        // NOTE: here we use explicit because this information from section
+        // must always be the package full path
+        return PackageableElementExplicitReference.create(pkg);
       })
       .filter(isNonNullable);
-    sec = importAwareSection;
-  } else if (section instanceof V1_DefaultCodeSection) {
-    sec = new DefaultCodeSection(section.parserName, parentSectionIndex);
+    section = importAwareSection;
+  } else if (protocol instanceof V1_DefaultCodeSection) {
+    section = new DefaultCodeSection(protocol.parserName, parentSectionIndex);
   } else {
-    throw new UnsupportedOperationError(`Can't build section`, section);
+    throw new UnsupportedOperationError(`Can't build section`, protocol);
   }
+
   // NOTE: we ignore not-found element path and duplicated import packages, but we will prune them as well
-  sec.elements = uniq(section.elements)
+  section.elements = uniq(protocol.elements)
     .map((elementPath) => {
-      const element = context.graph.getNullableElement(elementPath);
+      const element = context.graph.getOwnNullableElement(elementPath);
       if (!element) {
         context.log.warn(
           LogEvent.create(GRAPH_MANAGER_EVENT.GRAPH_BUILDER_FAILURE),
@@ -80,18 +80,18 @@ export const V1_buildSection = (
         );
         return element;
       }
-      if (context.graph.getOwnSection(element.path)) {
+      if (context.graph.getOwnNullableSection(element.path)) {
         context.log.warn(
           LogEvent.create(GRAPH_MANAGER_EVENT.GRAPH_BUILDER_FAILURE),
           `Found duplicated section element '${elementPath}'`,
         );
       } else {
-        context.graph.setOwnSection(element.path, sec);
+        context.graph.setOwnSection(element.path, section);
       }
       // NOTE: here we use explicit because this information from section
       // must always be the full element path
       return PackageableElementExplicitReference.create(element);
     })
     .filter(isNonNullable);
-  return sec;
+  return section;
 };

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

@@ -64,7 +64,7 @@ import {
   V1_PackageableElementPointer,
   V1_PackageableElementPointerType,
 } from '../../../../model/packageableElements/V1_PackageableElement';
-import { V1_resolvePathsInRawLambda } from './V1_ValueSpecificationPathResolver';
+import { V1_buildRawLambdaWithResolvedPaths } from './V1_ValueSpecificationPathResolver';
 import { GraphBuilderError } from '../../../../../../../../graphManager/GraphManagerUtils';
 
 export const V1_buildServiceTest = (
@@ -81,10 +81,10 @@ export const V1_buildServiceTest = (
     const singleTest = new SingleExecutionTest(parentService, serviceTest.data);
     singleTest.asserts = serviceTest.asserts.map((assert) => {
       const testContainer = new TestContainer(
-        V1_resolvePathsInRawLambda(
-          context,
+        V1_buildRawLambdaWithResolvedPaths(
           assert.assert.parameters,
           assert.assert.body,
+          context,
         ),
         singleTest,
       );
@@ -129,10 +129,10 @@ export const V1_buildServiceTest = (
       );
       keyedTest.asserts = test.asserts.map((assert) => {
         const testContaier = new TestContainer(
-          V1_resolvePathsInRawLambda(
-            context,
+          V1_buildRawLambdaWithResolvedPaths(
             assert.assert.parameters,
             assert.assert.body,
+            context,
           ),
           keyedTest,
         );
@@ -248,10 +248,10 @@ export const V1_buildServiceExecution = (
       `Service Pure execution 'func' field is missing`,
     );
     return new PureSingleExecution(
-      V1_resolvePathsInRawLambda(
-        context,
+      V1_buildRawLambdaWithResolvedPaths(
         serviceExecution.func.parameters,
         serviceExecution.func.body,
+        context,
       ),
       parentService,
       context.resolveMapping(serviceExecution.mapping),
@@ -275,10 +275,10 @@ export const V1_buildServiceExecution = (
     );
     const execution = new PureMultiExecution(
       serviceExecution.executionKey,
-      V1_resolvePathsInRawLambda(
-        context,
+      V1_buildRawLambdaWithResolvedPaths(
         serviceExecution.func.parameters,
         serviceExecution.func.body,
+        context,
       ),
       parentService,
     );

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

@@ -80,7 +80,12 @@ class V1_ValueSpecificationPathResolver
   implements V1_ValueSpecificationVisitor<V1_ValueSpecification>
 {
   context: V1_GraphBuilderContext;
-  hasModifiedLambda = false;
+  /**
+   * This flag is an optimization we do so the consumer can tell if any modification to the protocol
+   * models happened as part of path resolution.
+   */
+  hasModified = false;
+
   constructor(context: V1_GraphBuilderContext) {
     this.context = context;
   }
@@ -323,47 +328,50 @@ function V1_resolveElementPath(
   resolver: V1_ValueSpecificationPathResolver,
 ): string {
   const resolvedPath = resolverFunc(path).value.path;
-  // Note: this handles any system elements + primitive types already resolved. i.e String, ModelStore
   if (resolvedPath !== path) {
-    resolver.hasModifiedLambda = true;
+    resolver.hasModified = true;
   }
   return resolvedPath;
 }
 
 /**
- * Method resolves element paths inside RawLambda
+ * Method resolves element paths inside raw lambda.
+ *
  * To do this we take RawLamba (body: object, parameters: obect) convert it to Lambda and
- * resolve where possible (where an element path is defined as part of the value specification flow.
- * When completed we convert it back to RawLambda.
- * This method ignores any function matching therefore if any time we encounter an error resolving an element path
- * inside the value specification, we continue on the graph unchanging the value spec.
- * We use this new resolved lamba if we have changed any element path (noted by the hasModifiedLambda flag)
- * The whole flow is wrapper around a try/catch and we use the orginal lambda if any errors arise from this flow.
+ * resolve paths using section index where possible (wherever an element path is defined as
+ * part of the value specification flow. When completed we convert it back to raw lambda.
+ *
+ * This method ignores any function matching therefore if any time we encounter an error resolving an
+ * element path inside the value specification, we continue on the graph unchanging the value spec.
+ * We use this new resolved lambda if we have changed any element path.
+ *
+ * NOTE: Here we fail silently, and we would use the orginal lambda if any errors arise from this procedure.
  */
 const V1_resolveLambdaElementPaths = (
-  _context: V1_GraphBuilderContext,
   rawLambdaProtocol: V1_RawLambda,
+  context: V1_GraphBuilderContext,
 ): V1_RawLambda => {
   try {
-    // Convert raw lambda to lambda
+    // Convert raw lambda to V1 lambda
     const lambdaProtocol = V1_deserializeValueSpecification(
       V1_serializeRawValueSpecification(rawLambdaProtocol),
     );
-    // Resolve paths in lambda
-    const resolver = new V1_ValueSpecificationPathResolver(_context);
+    // Resolve paths in V1 lambda
+    const resolver = new V1_ValueSpecificationPathResolver(context);
     lambdaProtocol.accept_ValueSpecificationVisitor(resolver);
-    // if the resolver has modified lambda then convert lambda back to raw lambda and return
-    // else return orginal lambda
-    return resolver.hasModifiedLambda
+    // if the resolver has modified the lambda then convert lambda back to raw lambda and return
+    // else return orginal lambda (this check saves us the work to convert between
+    // raw protocol and protocol forms)
+    return resolver.hasModified
       ? (V1_deserializeRawValueSpecification(
           V1_serializeValueSpecification(lambdaProtocol),
         ) as V1_RawLambda)
       : rawLambdaProtocol;
   } catch (error) {
     assertErrorThrown(error);
-    // return orginal lambda if anything goes wrong
+    // silently return orginal lambda if anything goes wrong
     error.message = `Can't resolve element paths for lambda:\n${error.message}`;
-    _context.log.warn(
+    context.log.warn(
       LogEvent.create(GRAPH_MANAGER_EVENT.GRAPH_BUILDER_FAILURE),
       error,
     );
@@ -371,20 +379,27 @@ const V1_resolveLambdaElementPaths = (
   }
 };
 
-export const V1_resolvePathsInRawLambda = (
-  _context: V1_GraphBuilderContext,
-  parameters?: object,
-  body?: object,
+/**
+ * This method will traverse through the lambda protocol model tree
+ * and **with best effort** try to rewrite the lambda so all shortened
+ * paths inside the lambda are fully resolved.
+ *
+ * This is needed since apps like `Studio` leave value specifications raw/unprocessed
+ * when building the graph, hence any modification to section index or imports
+ * will not apply to the raw value specification (for the contrast, see the
+ * behavior of references)
+ */
+export const V1_buildRawLambdaWithResolvedPaths = (
+  parameters: object | undefined,
+  body: object | undefined,
+  context: V1_GraphBuilderContext,
 ): RawLambda => {
   const rawLambda = new V1_RawLambda();
   rawLambda.parameters = parameters ?? [];
   rawLambda.body = body ?? [];
-  const resolverEnabled =
-    !_context.options?.TEMPORARY__disableRawLambdaResolver &&
-    !_context.options?.TEMPORARY__keepSectionIndex;
   let resolved = rawLambda;
-  if (resolverEnabled) {
-    resolved = V1_resolveLambdaElementPaths(_context, rawLambda);
+  if (context.enableRawLambdaAutoPathResolution) {
+    resolved = V1_resolveLambdaElementPaths(rawLambda, context);
   }
   return new RawLambda(resolved.parameters, resolved.body);
 };