@finos/legend-application-query 5.2.6 → 5.2.7

package/lib/stores/fetch-structure/QueryBuilderFetchStructureImplementationState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderFetchStructureImplementationState.d.ts","sourceRoot":"","sources":["../../../src/stores/fetch-structure/QueryBuilderFetchStructureImplementationState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAC;AAE5F,8BAAsB,6CAA6C;IACjE,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,mBAAmB,EAAE,+BAA+B,CAAC;gBAGnD,iBAAiB,EAAE,iBAAiB,EACpC,mBAAmB,EAAE,+BAA+B;CAQvD"}
+{"version":3,"file":"QueryBuilderFetchStructureImplementationState.d.ts","sourceRoot":"","sources":["../../../src/stores/fetch-structure/QueryBuilderFetchStructureImplementationState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EACV,KAAK,EACL,gBAAgB,EAChB,cAAc,EACf,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,wCAAwC,EAAE,MAAM,0CAA0C,CAAC;AACzG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,mDAAmD,CAAC;AACrG,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAC;AAE5F,oBAAY,8BAA8B;IACxC,UAAU,eAAe;IACzB,WAAW,gBAAgB;CAC5B;AAED,8BAAsB,6CAA6C;IACjE,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,mBAAmB,EAAE,+BAA+B,CAAC;gBAGnD,iBAAiB,EAAE,iBAAiB,EACpC,mBAAmB,EAAE,+BAA+B;IAWtD,QAAQ,KAAK,IAAI,IAAI,MAAM,CAAC;IAC5B,QAAQ,KAAK,+BAA+B,IAAI,MAAM,EAAE,CAAC;IACzD,QAAQ,KAAK,gBAAgB,IAAI,MAAM,EAAE,GAAG,SAAS,CAAC;IACtD,QAAQ,CAAC,aAAa,CAAC,MAAM,EAAE,KAAK,GAAG,SAAS,GAAG,IAAI;IACvD,QAAQ,CAAC,sBAAsB,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO;IAC5E,QAAQ,CAAC,qBAAqB,IAAI,IAAI;IACtC,QAAQ,CAAC,aAAa,CAAC,IAAI,EAAE,wCAAwC,GAAG,IAAI;IAC5E,QAAQ,CAAC,eAAe,CACtB,KAAK,EAAE,wCAAwC,EAAE,GAChD,IAAI;IACP,QAAQ,CAAC,iCAAiC,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI;IACtE,QAAQ,CAAC,oBAAoB,CAC3B,cAAc,EAAE,cAAc,EAC9B,OAAO,CAAC,EAAE,2BAA2B,GACpC,IAAI;CACR"}

package/lib/stores/fetch-structure/QueryBuilderFetchStructureImplementationState.js

@@ -13,10 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { computed, makeObservable } from 'mobx';
+export var FETCH_STRUCTURE_IMPLEMENTATION;
+(function (FETCH_STRUCTURE_IMPLEMENTATION) {
+    FETCH_STRUCTURE_IMPLEMENTATION["PROJECTION"] = "PROJECTION";
+    FETCH_STRUCTURE_IMPLEMENTATION["GRAPH_FETCH"] = "GRAPH_FETCH";
+})(FETCH_STRUCTURE_IMPLEMENTATION = FETCH_STRUCTURE_IMPLEMENTATION || (FETCH_STRUCTURE_IMPLEMENTATION = {}));
 export class QueryBuilderFetchStructureImplementationState {
     queryBuilderState;
     fetchStructureState;
     constructor(queryBuilderState, fetchStructureState) {
+        makeObservable(this, {
+            usedExplorerTreePropertyNodeIDs: computed,
+            validationIssues: computed,
+        });
         this.queryBuilderState = queryBuilderState;
         this.fetchStructureState = fetchStructureState;
     }

package/lib/stores/fetch-structure/QueryBuilderFetchStructureImplementationState.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderFetchStructureImplementationState.js","sourceRoot":"","sources":["../../../src/stores/fetch-structure/QueryBuilderFetchStructureImplementationState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAKH,MAAM,OAAgB,6CAA6C;IACjE,iBAAiB,CAAoB;IACrC,mBAAmB,CAAkC;IAErD,YACE,iBAAoC,EACpC,mBAAoD;QAEpD,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;IACjD,CAAC;CAIF"}
+{"version":3,"file":"QueryBuilderFetchStructureImplementationState.js","sourceRoot":"","sources":["../../../src/stores/fetch-structure/QueryBuilderFetchStructureImplementationState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAOH,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AAMhD,MAAM,CAAN,IAAY,8BAGX;AAHD,WAAY,8BAA8B;IACxC,2DAAyB,CAAA;IACzB,6DAA2B,CAAA;AAC7B,CAAC,EAHW,8BAA8B,GAA9B,8BAA8B,KAA9B,8BAA8B,QAGzC;AAED,MAAM,OAAgB,6CAA6C;IACjE,iBAAiB,CAAoB;IACrC,mBAAmB,CAAkC;IAErD,YACE,iBAAoC,EACpC,mBAAoD;QAEpD,cAAc,CAAC,IAAI,EAAE;YACnB,+BAA+B,EAAE,QAAQ;YACzC,gBAAgB,EAAE,QAAQ;SAC3B,CAAC,CAAC;QAEH,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;IACjD,CAAC;CAiBF"}

package/lib/stores/fetch-structure/QueryBuilderFetchStructureState.d.ts

@@ -14,31 +14,14 @@
  * limitations under the License.
  */
 import type { QueryBuilderState } from '../QueryBuilderState.js';
-import { QueryBuilderGraphFetchTreeState } from './graph-fetch/QueryBuilderGraphFetchTreeState.js';
-import { QueryBuilderProjectionState } from './projection/QueryBuilderProjectionState.js';
 import { type QueryBuilderExplorerTreeNodeData } from '../explorer/QueryBuilderExplorerState.js';
-export declare enum FETCH_STRUCTURE_MODE {
-    PROJECTION = "PROJECTION",
-    GRAPH_FETCH = "GRAPH_FETCH"
-}
+import { type QueryBuilderFetchStructureImplementationState } from './QueryBuilderFetchStructureImplementationState.js';
 export declare class QueryBuilderFetchStructureState {
     queryBuilderState: QueryBuilderState;
-    /**
-     * TODO: refactor this so we could reduce this to
-     * `implementationState: QueryBuilderFetchStructureImplementationState`
-     * so we don't have graph fetch and projection at the same time
-     *
-     * TODO?: perhaps it would eventually make sense to default to
-     * graph-fetch since `getAll()` naturally works for graph-fetch case
-     * and graph-fetch allows somewhat an empty tree
-     */
-    fetchStructureMode: FETCH_STRUCTURE_MODE;
-    projectionState: QueryBuilderProjectionState;
-    graphFetchTreeState: QueryBuilderGraphFetchTreeState;
+    implementation: QueryBuilderFetchStructureImplementationState;
     constructor(queryBuilderState: QueryBuilderState);
-    setFetchStructureMode(val: FETCH_STRUCTURE_MODE): void;
+    changeImplementation(type: string): void;
     fetchProperty(node: QueryBuilderExplorerTreeNodeData): void;
     fetchNodeChildrenProperties(node: QueryBuilderExplorerTreeNodeData): void;
-    get validationIssues(): string[] | undefined;
 }
 //# sourceMappingURL=QueryBuilderFetchStructureState.d.ts.map

package/lib/stores/fetch-structure/QueryBuilderFetchStructureState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderFetchStructureState.d.ts","sourceRoot":"","sources":["../../../src/stores/fetch-structure/QueryBuilderFetchStructureState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,+BAA+B,EAAE,MAAM,kDAAkD,CAAC;AACnG,OAAO,EAAE,2BAA2B,EAAE,MAAM,6CAA6C,CAAC;AAC1F,OAAO,EAEL,KAAK,gCAAgC,EAEtC,MAAM,0CAA0C,CAAC;AAMlD,oBAAY,oBAAoB;IAC9B,UAAU,eAAe;IACzB,WAAW,gBAAgB;CAC5B;AAED,qBAAa,+BAA+B;IAC1C,iBAAiB,EAAE,iBAAiB,CAAC;IACrC;;;;;;;;OAQG;IACH,kBAAkB,uBAAmC;IACrD,eAAe,EAAE,2BAA2B,CAAC;IAC7C,mBAAmB,EAAE,+BAA+B,CAAC;gBAEzC,iBAAiB,EAAE,iBAAiB;IAmBhD,qBAAqB,CAAC,GAAG,EAAE,oBAAoB,GAAG,IAAI;IAItD,aAAa,CAAC,IAAI,EAAE,gCAAgC,GAAG,IAAI;IAgC3D,2BAA2B,CAAC,IAAI,EAAE,gCAAgC,GAAG,IAAI;IA0DzE,IAAI,gBAAgB,IAAI,MAAM,EAAE,GAAG,SAAS,CAQ3C;CACF"}
+{"version":3,"file":"QueryBuilderFetchStructureState.d.ts","sourceRoot":"","sources":["../../../src/stores/fetch-structure/QueryBuilderFetchStructureState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAGjE,OAAO,EACL,KAAK,gCAAgC,EAEtC,MAAM,0CAA0C,CAAC;AAGlD,OAAO,EAEL,KAAK,6CAA6C,EACnD,MAAM,oDAAoD,CAAC;AAE5D,qBAAa,+BAA+B;IAC1C,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,cAAc,EAAE,6CAA6C,CAAC;gBAElD,iBAAiB,EAAE,iBAAiB;IAoBhD,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAuBxC,aAAa,CAAC,IAAI,EAAE,gCAAgC,GAAG,IAAI;IAS3D,2BAA2B,CAAC,IAAI,EAAE,gCAAgC,GAAG,IAAI;CAoB1E"}

package/lib/stores/fetch-structure/QueryBuilderFetchStructureState.js

@@ -16,100 +16,58 @@
 import { action, makeAutoObservable } from 'mobx';
 import { QueryBuilderGraphFetchTreeState } from './graph-fetch/QueryBuilderGraphFetchTreeState.js';
 import { QueryBuilderProjectionState } from './projection/QueryBuilderProjectionState.js';
-import { buildPropertyExpressionFromExplorerTreeNodeData, QueryBuilderExplorerTreePropertyNodeData, } from '../explorer/QueryBuilderExplorerState.js';
+import { QueryBuilderExplorerTreePropertyNodeData, } from '../explorer/QueryBuilderExplorerState.js';
 import { Class } from '@finos/legend-graph';
-import { filterByType } from '@finos/legend-shared';
-import { addQueryBuilderPropertyNode } from './graph-fetch/QueryBuilderGraphFetchTreeUtil.js';
-import { QueryBuilderSimpleProjectionColumnState } from './projection/QueryBuilderProjectionColumnState.js';
-export var FETCH_STRUCTURE_MODE;
-(function (FETCH_STRUCTURE_MODE) {
-    FETCH_STRUCTURE_MODE["PROJECTION"] = "PROJECTION";
-    FETCH_STRUCTURE_MODE["GRAPH_FETCH"] = "GRAPH_FETCH";
-})(FETCH_STRUCTURE_MODE = FETCH_STRUCTURE_MODE || (FETCH_STRUCTURE_MODE = {}));
+import { filterByType, UnsupportedOperationError } from '@finos/legend-shared';
+import { FETCH_STRUCTURE_IMPLEMENTATION, } from './QueryBuilderFetchStructureImplementationState.js';
 export class QueryBuilderFetchStructureState {
     queryBuilderState;
-    /**
-     * TODO: refactor this so we could reduce this to
-     * `implementationState: QueryBuilderFetchStructureImplementationState`
-     * so we don't have graph fetch and projection at the same time
-     *
-     * TODO?: perhaps it would eventually make sense to default to
-     * graph-fetch since `getAll()` naturally works for graph-fetch case
-     * and graph-fetch allows somewhat an empty tree
-     */
-    fetchStructureMode = FETCH_STRUCTURE_MODE.PROJECTION;
-    projectionState;
-    graphFetchTreeState;
+    implementation;
     constructor(queryBuilderState) {
         makeAutoObservable(this, {
             queryBuilderState: false,
-            setFetchStructureMode: action,
+            changeImplementation: action,
         });
         this.queryBuilderState = queryBuilderState;
-        // TODO: we probably should modularize this a bit better
-        // See https://github.com/finos/legend-studio/issues/731
-        this.projectionState = new QueryBuilderProjectionState(queryBuilderState, this);
-        this.graphFetchTreeState = new QueryBuilderGraphFetchTreeState(queryBuilderState, this);
+        /**
+         * TODO?: perhaps it would eventually make sense to default to
+         * graph-fetch since `getAll()` naturally works for graph-fetch case
+         * and graph-fetch allows somewhat an empty tree
+         *
+         * TODO?: we could consider making this configurable
+         */
+        this.implementation = new QueryBuilderProjectionState(this.queryBuilderState, this);
     }
-    setFetchStructureMode(val) {
-        this.fetchStructureMode = val;
+    changeImplementation(type) {
+        switch (type) {
+            case FETCH_STRUCTURE_IMPLEMENTATION.PROJECTION: {
+                this.implementation = new QueryBuilderProjectionState(this.queryBuilderState, this);
+                return;
+            }
+            case FETCH_STRUCTURE_IMPLEMENTATION.GRAPH_FETCH: {
+                this.implementation = new QueryBuilderGraphFetchTreeState(this.queryBuilderState, this);
+                return;
+            }
+            default:
+                throw new UnsupportedOperationError(`Can't change fetch-structure implementation to unsupported type: '${type}'`);
+        }
     }
     fetchProperty(node) {
         if (node instanceof QueryBuilderExplorerTreePropertyNodeData &&
             !(node.type instanceof Class)) {
-            switch (this.fetchStructureMode) {
-                case FETCH_STRUCTURE_MODE.GRAPH_FETCH: {
-                    this.graphFetchTreeState.addProperty(node);
-                    return;
-                }
-                case FETCH_STRUCTURE_MODE.PROJECTION: {
-                    this.projectionState.addColumn(new QueryBuilderSimpleProjectionColumnState(this.projectionState, buildPropertyExpressionFromExplorerTreeNodeData(this.queryBuilderState.explorerState.nonNullableTreeData, node, this.queryBuilderState.graphManagerState.graph, this.queryBuilderState.explorerState.propertySearchPanelState
-                        .allMappedPropertyNodes), this.queryBuilderState.explorerState.humanizePropertyName));
-                    return;
-                }
-                default:
-                    return;
-            }
+            this.implementation.fetchProperty(node);
         }
     }
     fetchNodeChildrenProperties(node) {
         if (node.type instanceof Class) {
+            this.implementation.fetchProperties(
             // NOTE: here we require the node to already been expanded so the child nodes are generated
             // we don't allow adding unopened node. Maybe if it helps, we can show a warning.
-            const nodesToAdd = node.childrenIds
+            node.childrenIds
                 .map((childId) => this.queryBuilderState.explorerState.nonNullableTreeData.nodes.get(childId))
                 .filter(filterByType(QueryBuilderExplorerTreePropertyNodeData))
-                .filter((childNode) => !(childNode.type instanceof Class) && childNode.mappingData.mapped);
-            switch (this.fetchStructureMode) {
-                case FETCH_STRUCTURE_MODE.GRAPH_FETCH: {
-                    const graphFetchTreeData = this.graphFetchTreeState.treeData;
-                    if (graphFetchTreeData) {
-                        nodesToAdd.forEach((nodeToAdd) => addQueryBuilderPropertyNode(graphFetchTreeData, this.queryBuilderState.explorerState.nonNullableTreeData, nodeToAdd, this.queryBuilderState));
-                        this.graphFetchTreeState.setGraphFetchTree({
-                            ...graphFetchTreeData,
-                        });
-                    }
-                    return;
-                }
-                case FETCH_STRUCTURE_MODE.PROJECTION: {
-                    nodesToAdd.forEach((nodeToAdd) => {
-                        this.projectionState.addColumn(new QueryBuilderSimpleProjectionColumnState(this.projectionState, buildPropertyExpressionFromExplorerTreeNodeData(this.queryBuilderState.explorerState.nonNullableTreeData, nodeToAdd, this.queryBuilderState.graphManagerState.graph, this.queryBuilderState.explorerState.propertySearchPanelState
-                            .allMappedPropertyNodes), this.queryBuilderState.explorerState.humanizePropertyName));
-                    });
-                    return;
-                }
-                default:
-                    return;
-            }
-        }
-    }
-    get validationIssues() {
-        switch (this.fetchStructureMode) {
-            case FETCH_STRUCTURE_MODE.PROJECTION:
-                return this.projectionState.validationIssues;
-            case FETCH_STRUCTURE_MODE.GRAPH_FETCH:
-            default:
-                return undefined;
+                .filter((childNode) => !(childNode.type instanceof Class) &&
+                childNode.mappingData.mapped));
         }
     }
 }

package/lib/stores/fetch-structure/QueryBuilderFetchStructureState.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderFetchStructureState.js","sourceRoot":"","sources":["../../../src/stores/fetch-structure/QueryBuilderFetchStructureState.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"QueryBuilderFetchStructureState.js","sourceRoot":"","sources":["../../../src/stores/fetch-structure/QueryBuilderFetchStructureState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,MAAM,CAAC;AAElD,OAAO,EAAE,+BAA+B,EAAE,MAAM,kDAAkD,CAAC;AACnG,OAAO,EAAE,2BAA2B,EAAE,MAAM,6CAA6C,CAAC;AAC1F,OAAO,EAEL,wCAAwC,GACzC,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EACL,8BAA8B,GAE/B,MAAM,oDAAoD,CAAC;AAE5D,MAAM,OAAO,+BAA+B;IAC1C,iBAAiB,CAAoB;IACrC,cAAc,CAAgD;IAE9D,YAAY,iBAAoC;QAC9C,kBAAkB,CAAC,IAAI,EAAE;YACvB,iBAAiB,EAAE,KAAK;YACxB,oBAAoB,EAAE,MAAM;SAC7B,CAAC,CAAC;QAEH,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C;;;;;;WAMG;QACH,IAAI,CAAC,cAAc,GAAG,IAAI,2BAA2B,CACnD,IAAI,CAAC,iBAAiB,EACtB,IAAI,CACL,CAAC;IACJ,CAAC;IAED,oBAAoB,CAAC,IAAY;QAC/B,QAAQ,IAAI,EAAE;YACZ,KAAK,8BAA8B,CAAC,UAAU,CAAC,CAAC;gBAC9C,IAAI,CAAC,cAAc,GAAG,IAAI,2BAA2B,CACnD,IAAI,CAAC,iBAAiB,EACtB,IAAI,CACL,CAAC;gBACF,OAAO;aACR;YACD,KAAK,8BAA8B,CAAC,WAAW,CAAC,CAAC;gBAC/C,IAAI,CAAC,cAAc,GAAG,IAAI,+BAA+B,CACvD,IAAI,CAAC,iBAAiB,EACtB,IAAI,CACL,CAAC;gBACF,OAAO;aACR;YACD;gBACE,MAAM,IAAI,yBAAyB,CACjC,qEAAqE,IAAI,GAAG,CAC7E,CAAC;SACL;IACH,CAAC;IAED,aAAa,CAAC,IAAsC;QAClD,IACE,IAAI,YAAY,wCAAwC;YACxD,CAAC,CAAC,IAAI,CAAC,IAAI,YAAY,KAAK,CAAC,EAC7B;YACA,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;SACzC;IACH,CAAC;IAED,2BAA2B,CAAC,IAAsC;QAChE,IAAI,IAAI,CAAC,IAAI,YAAY,KAAK,EAAE;YAC9B,IAAI,CAAC,cAAc,CAAC,eAAe;YACjC,2FAA2F;YAC3F,iFAAiF;YACjF,IAAI,CAAC,WAAW;iBACb,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CACf,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,mBAAmB,CAAC,KAAK,CAAC,GAAG,CAChE,OAAO,CACR,CACF;iBACA,MAAM,CAAC,YAAY,CAAC,wCAAwC,CAAC,CAAC;iBAC9D,MAAM,CACL,CAAC,SAAS,EAAE,EAAE,CACZ,CAAC,CAAC,SAAS,CAAC,IAAI,YAAY,KAAK,CAAC;gBAClC,SAAS,CAAC,WAAW,CAAC,MAAM,CAC/B,CACJ,CAAC;SACH;IACH,CAAC;CACF"}

package/lib/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeState.d.ts

@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 import type { QueryBuilderState } from '../../QueryBuilderState.js';
-import { RootGraphFetchTree } from '@finos/legend-graph';
+import { type CompilationError, type Class, type LambdaFunction } from '@finos/legend-graph';
 import { type QueryBuilderGraphFetchTreeData } from './QueryBuilderGraphFetchTreeUtil.js';
-import type { QueryBuilderExplorerTreePropertyNodeData } from '../../explorer/QueryBuilderExplorerState.js';
+import { type QueryBuilderExplorerTreePropertyNodeData } from '../../explorer/QueryBuilderExplorerState.js';
 import { QueryBuilderFetchStructureImplementationState } from '../QueryBuilderFetchStructureImplementationState.js';
 import type { QueryBuilderFetchStructureState } from '../QueryBuilderFetchStructureState.js';
+import type { LambdaFunctionBuilderOption } from '../../QueryBuilderValueSpecificationBuilderHelper.js';
 export declare class QueryBuilderGraphFetchTreeState extends QueryBuilderFetchStructureImplementationState {
     treeData?: QueryBuilderGraphFetchTreeData | undefined;
     /**
@@ -28,9 +29,21 @@ export declare class QueryBuilderGraphFetchTreeState extends QueryBuilderFetchSt
      */
     isChecked: boolean;
     constructor(queryBuilderState: QueryBuilderState, fetchStructureState: QueryBuilderFetchStructureState);
+    get type(): string;
+    get usedExplorerTreePropertyNodeIDs(): string[];
+    get validationIssues(): string[] | undefined;
     setGraphFetchTree(val: QueryBuilderGraphFetchTreeData | undefined): void;
     setChecked(val: boolean): void;
-    initialize(tree?: RootGraphFetchTree): void;
-    addProperty(node: QueryBuilderExplorerTreePropertyNodeData): void;
+    private updateTreeData;
+    onClassChange(_class: Class | undefined): void;
+    appendFetchStructure(lambdaFunction: LambdaFunction, options?: LambdaFunctionBuilderOption): void;
+    addProperty(node: QueryBuilderExplorerTreePropertyNodeData, options?: {
+        refreshTreeData?: boolean;
+    }): void;
+    revealCompilationError(compilationError: CompilationError): boolean;
+    clearCompilationError(): void;
+    fetchProperty(node: QueryBuilderExplorerTreePropertyNodeData): void;
+    fetchProperties(nodes: QueryBuilderExplorerTreePropertyNodeData[]): void;
+    checkBeforeChangingImplementation(onChange: () => void): void;
 }
 //# sourceMappingURL=QueryBuilderGraphFetchTreeState.d.ts.map

package/lib/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderGraphFetchTreeState.d.ts","sourceRoot":"","sources":["../../../../src/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAEpE,OAAO,EAEL,kBAAkB,EACnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,8BAA8B,EAGpC,MAAM,qCAAqC,CAAC;AAC7C,OAAO,KAAK,EAAE,wCAAwC,EAAE,MAAM,6CAA6C,CAAC;AAE5G,OAAO,EAAE,6CAA6C,EAAE,MAAM,qDAAqD,CAAC;AACpH,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,uCAAuC,CAAC;AAE7F,qBAAa,+BAAgC,SAAQ,6CAA6C;IAChG,QAAQ,CAAC,EAAE,8BAA8B,GAAG,SAAS,CAAC;IACtD;;;;OAIG;IACH,SAAS,UAAS;gBAGhB,iBAAiB,EAAE,iBAAiB,EACpC,mBAAmB,EAAE,+BAA+B;IAYtD,iBAAiB,CAAC,GAAG,EAAE,8BAA8B,GAAG,SAAS,GAAG,IAAI;IAIxE,UAAU,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;IAK9B,UAAU,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,IAAI;IAmB3C,WAAW,CAAC,IAAI,EAAE,wCAAwC,GAAG,IAAI;CAgBlE"}
+{"version":3,"file":"QueryBuilderGraphFetchTreeState.d.ts","sourceRoot":"","sources":["../../../../src/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAEpE,OAAO,EACL,KAAK,gBAAgB,EAGrB,KAAK,KAAK,EACV,KAAK,cAAc,EAEpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,8BAA8B,EAGpC,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAGL,KAAK,wCAAwC,EAC9C,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAEL,6CAA6C,EAC9C,MAAM,qDAAqD,CAAC;AAC7D,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,uCAAuC,CAAC;AAK7F,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,sDAAsD,CAAC;AAIxG,qBAAa,+BAAgC,SAAQ,6CAA6C;IAChG,QAAQ,CAAC,EAAE,8BAA8B,GAAG,SAAS,CAAC;IACtD;;;;OAIG;IACH,SAAS,UAAS;gBAGhB,iBAAiB,EAAE,iBAAiB,EACpC,mBAAmB,EAAE,+BAA+B;IAetD,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,IAAI,+BAA+B,IAAI,MAAM,EAAE,CAiD9C;IAED,IAAI,gBAAgB,IAAI,MAAM,EAAE,GAAG,SAAS,CAE3C;IAED,iBAAiB,CAAC,GAAG,EAAE,8BAA8B,GAAG,SAAS,GAAG,IAAI;IAIxE,UAAU,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;IAI9B,OAAO,CAAC,cAAc;IAYtB,aAAa,CAAC,MAAM,EAAE,KAAK,GAAG,SAAS,GAAG,IAAI;IAI9C,oBAAoB,CAClB,cAAc,EAAE,cAAc,EAC9B,OAAO,CAAC,EAAE,2BAA2B,GACpC,IAAI;IAIP,WAAW,CACT,IAAI,EAAE,wCAAwC,EAC9C,OAAO,CAAC,EAAE;QACR,eAAe,CAAC,EAAE,OAAO,CAAC;KAC3B,GACA,IAAI;IAkBP,sBAAsB,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO;IAInE,qBAAqB,IAAI,IAAI;IAI7B,aAAa,CAAC,IAAI,EAAE,wCAAwC,GAAG,IAAI;IAInE,eAAe,CAAC,KAAK,EAAE,wCAAwC,EAAE,GAAG,IAAI;IAaxE,iCAAiC,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI;CA0B9D"}

package/lib/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeState.js

@@ -14,10 +14,13 @@
  * limitations under the License.
  */
 import { action, makeObservable, observable } from 'mobx';
-import { PackageableElementExplicitReference, RootGraphFetchTree, } from '@finos/legend-graph';
+import { PackageableElementExplicitReference, RootGraphFetchTree, getAllSuperclasses, } from '@finos/legend-graph';
 import { addQueryBuilderPropertyNode, buildGraphFetchTreeData, } from './QueryBuilderGraphFetchTreeUtil.js';
-import { assertNonNullable } from '@finos/legend-shared';
-import { QueryBuilderFetchStructureImplementationState } from '../QueryBuilderFetchStructureImplementationState.js';
+import { generateExplorerTreePropertyNodeID, generateExplorerTreeSubtypeNodeID, } from '../../explorer/QueryBuilderExplorerState.js';
+import { FETCH_STRUCTURE_IMPLEMENTATION, QueryBuilderFetchStructureImplementationState, } from '../QueryBuilderFetchStructureImplementationState.js';
+import { ActionAlertActionType, ActionAlertType, } from '@finos/legend-application';
+import { appendGraphFetch } from './QueryBuilderGraphFetchValueSpecificationBuilder.js';
+import { guaranteeNonNullable } from '@finos/legend-shared';
 export class QueryBuilderGraphFetchTreeState extends QueryBuilderFetchStructureImplementationState {
     treeData;
     /**
@@ -29,11 +32,57 @@ export class QueryBuilderGraphFetchTreeState extends QueryBuilderFetchStructureI
     constructor(queryBuilderState, fetchStructureState) {
         super(queryBuilderState, fetchStructureState);
         makeObservable(this, {
-            treeData: observable,
+            treeData: observable.ref,
             isChecked: observable,
             setGraphFetchTree: action,
             setChecked: action,
         });
+        // try to initialize the graph-fetch tree data using the setup class
+        this.updateTreeData(this.queryBuilderState.querySetupState._class);
+    }
+    get type() {
+        return FETCH_STRUCTURE_IMPLEMENTATION.GRAPH_FETCH;
+    }
+    get usedExplorerTreePropertyNodeIDs() {
+        if (!this.treeData) {
+            return [];
+        }
+        const explorerTreeNodeIDIndex = new Map();
+        const ids = [];
+        // traverse in breadth-first fashion
+        const nodesToProcess = this.treeData.rootIds.slice();
+        while (nodesToProcess.length) {
+            const currentNodeID = guaranteeNonNullable(nodesToProcess[0]);
+            const node = this.treeData.nodes.get(currentNodeID);
+            if (!node) {
+                continue;
+            }
+            let nodeID;
+            const parentNodeID = node.parentId
+                ? // since we traverse the nodes in order, parent node ID should already been computed
+                    guaranteeNonNullable(explorerTreeNodeIDIndex.get(node.parentId))
+                : '';
+            const propertyNodeID = generateExplorerTreePropertyNodeID(parentNodeID, node.tree.property.value.name);
+            ids.push(propertyNodeID);
+            if (node.tree.subType) {
+                nodeID = generateExplorerTreeSubtypeNodeID(propertyNodeID, node.tree.subType.value.path);
+                getAllSuperclasses(node.tree.subType.value)
+                    .concat(node.tree.subType.value)
+                    .forEach((_class) => ids.push(generateExplorerTreeSubtypeNodeID(propertyNodeID, _class.path)));
+            }
+            else {
+                nodeID = propertyNodeID;
+            }
+            explorerTreeNodeIDIndex.set(node.id, nodeID);
+            // update list of nodes to process
+            nodesToProcess.shift();
+            node.childrenIds.forEach((childId) => nodesToProcess.push(childId));
+        }
+        // de-duplicate
+        return Array.from(new Set(ids).values());
+    }
+    get validationIssues() {
+        return undefined;
     }
     setGraphFetchTree(val) {
         this.treeData = val;
@@ -41,28 +90,68 @@ export class QueryBuilderGraphFetchTreeState extends QueryBuilderFetchStructureI
     setChecked(val) {
         this.isChecked = val;
     }
-    // TODO-BEFORE-PR: consider removing this
-    initialize(tree) {
-        if (tree) {
-            this.setGraphFetchTree(buildGraphFetchTreeData(tree));
+    updateTreeData(_class) {
+        this.setGraphFetchTree(_class
+            ? buildGraphFetchTreeData(new RootGraphFetchTree(PackageableElementExplicitReference.create(_class)))
+            : undefined);
+    }
+    onClassChange(_class) {
+        this.updateTreeData(_class);
+    }
+    appendFetchStructure(lambdaFunction, options) {
+        appendGraphFetch(this, lambdaFunction, options);
+    }
+    addProperty(node, options) {
+        if (!this.treeData) {
+            this.queryBuilderState.applicationStore.notifyWarning(`Can't add property: graph-fetch tree has not been properly initialized`);
+            return;
         }
-        else {
-            const _class = this.queryBuilderState.querySetupState._class;
-            if (_class) {
-                this.setGraphFetchTree(buildGraphFetchTreeData(new RootGraphFetchTree(PackageableElementExplicitReference.create(_class))));
-            }
-            else {
-                this.setGraphFetchTree(undefined);
-            }
+        addQueryBuilderPropertyNode(this.treeData, this.queryBuilderState.explorerState.nonNullableTreeData, node, this.queryBuilderState);
+        if (options?.refreshTreeData) {
+            this.setGraphFetchTree({ ...this.treeData });
         }
     }
-    addProperty(node) {
+    revealCompilationError(compilationError) {
+        return false;
+    }
+    clearCompilationError() {
+        return;
+    }
+    fetchProperty(node) {
+        this.addProperty(node, { refreshTreeData: true });
+    }
+    fetchProperties(nodes) {
         if (!this.treeData) {
-            this.initialize();
+            this.queryBuilderState.applicationStore.notifyWarning(`Can't add property: graph-fetch tree has not been properly initialized`);
+            return;
+        }
+        nodes.forEach((nodeToAdd) => this.addProperty(nodeToAdd));
+        this.setGraphFetchTree({
+            ...this.treeData,
+        });
+    }
+    checkBeforeChangingImplementation(onChange) {
+        if (this.treeData?.rootIds.length) {
+            this.queryBuilderState.applicationStore.setActionAlertInfo({
+                message: 'Current graph-fetch will be lost when switching to projection mode. Do you still want to proceed?',
+                type: ActionAlertType.CAUTION,
+                actions: [
+                    {
+                        label: 'Proceed',
+                        type: ActionAlertActionType.PROCEED_WITH_CAUTION,
+                        handler: this.queryBuilderState.applicationStore.guardUnhandledError(async () => onChange()),
+                    },
+                    {
+                        label: 'Cancel',
+                        type: ActionAlertActionType.PROCEED,
+                        default: true,
+                    },
+                ],
+            });
+        }
+        else {
+            onChange();
         }
-        assertNonNullable(this.treeData, `Graph-fetch tree has not been properly initialized`);
-        addQueryBuilderPropertyNode(this.treeData, this.queryBuilderState.explorerState.nonNullableTreeData, node, this.queryBuilderState);
-        this.setGraphFetchTree({ ...this.treeData });
     }
 }
 //# sourceMappingURL=QueryBuilderGraphFetchTreeState.js.map

package/lib/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeState.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderGraphFetchTreeState.js","sourceRoot":"","sources":["../../../../src/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAC1D,OAAO,EACL,mCAAmC,EACnC,kBAAkB,GACnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,2BAA2B,EAC3B,uBAAuB,GACxB,MAAM,qCAAqC,CAAC;AAE7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,6CAA6C,EAAE,MAAM,qDAAqD,CAAC;AAGpH,MAAM,OAAO,+BAAgC,SAAQ,6CAA6C;IAChG,QAAQ,CAA8C;IACtD;;;;OAIG;IACH,SAAS,GAAG,KAAK,CAAC;IAElB,YACE,iBAAoC,EACpC,mBAAoD;QAEpD,KAAK,CAAC,iBAAiB,EAAE,mBAAmB,CAAC,CAAC;QAE9C,cAAc,CAAC,IAAI,EAAE;YACnB,QAAQ,EAAE,UAAU;YACpB,SAAS,EAAE,UAAU;YACrB,iBAAiB,EAAE,MAAM;YACzB,UAAU,EAAE,MAAM;SACnB,CAAC,CAAC;IACL,CAAC;IAED,iBAAiB,CAAC,GAA+C;QAC/D,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC;IACtB,CAAC;IAED,UAAU,CAAC,GAAY;QACrB,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC;IACvB,CAAC;IAED,yCAAyC;IACzC,UAAU,CAAC,IAAyB;QAClC,IAAI,IAAI,EAAE;YACR,IAAI,CAAC,iBAAiB,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC,CAAC;SACvD;aAAM;YACL,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,MAAM,CAAC;YAC7D,IAAI,MAAM,EAAE;gBACV,IAAI,CAAC,iBAAiB,CACpB,uBAAuB,CACrB,IAAI,kBAAkB,CACpB,mCAAmC,CAAC,MAAM,CAAC,MAAM,CAAC,CACnD,CACF,CACF,CAAC;aACH;iBAAM;gBACL,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;aACnC;SACF;IACH,CAAC;IAED,WAAW,CAAC,IAA8C;QACxD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,IAAI,CAAC,UAAU,EAAE,CAAC;SACnB;QACD,iBAAiB,CACf,IAAI,CAAC,QAAQ,EACb,oDAAoD,CACrD,CAAC;QACF,2BAA2B,CACzB,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,mBAAmB,EACxD,IAAI,EACJ,IAAI,CAAC,iBAAiB,CACvB,CAAC;QACF,IAAI,CAAC,iBAAiB,CAAC,EAAE,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC/C,CAAC;CACF"}
+{"version":3,"file":"QueryBuilderGraphFetchTreeState.js","sourceRoot":"","sources":["../../../../src/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeState.ts"],"names":[],"mappings":"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"}

package/lib/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeStateBuilder.d.ts

@@ -0,0 +1,20 @@
+/**
+ * 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 { SimpleFunctionExpression } from '@finos/legend-graph';
+import type { QueryBuilderState } from '../../QueryBuilderState.js';
+export declare const processGraphFetchExpression: (expression: SimpleFunctionExpression, queryBuilderState: QueryBuilderState) => void;
+export declare const processGraphFetchSerializeExpression: (expression: SimpleFunctionExpression, queryBuilderState: QueryBuilderState) => void;
+//# sourceMappingURL=QueryBuilderGraphFetchTreeStateBuilder.d.ts.map

package/lib/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeStateBuilder.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderGraphFetchTreeStateBuilder.d.ts","sourceRoot":"","sources":["../../../../src/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeStateBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAIL,wBAAwB,EACzB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAMpE,eAAO,MAAM,2BAA2B,eAC1B,wBAAwB,qBACjB,iBAAiB,KACnC,IAyCF,CAAC;AAEF,eAAO,MAAM,oCAAoC,eACnC,wBAAwB,qBACjB,iBAAiB,KACnC,IAmDF,CAAC"}

package/lib/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeStateBuilder.js

@@ -0,0 +1,62 @@
+/**
+ * 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 { GraphFetchTreeInstanceValue, matchFunctionName, RootGraphFetchTree, SimpleFunctionExpression, } from '@finos/legend-graph';
+import { assertTrue, guaranteeType } from '@finos/legend-shared';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../QueryBuilder_Const.js';
+import { QueryBuilderValueSpecificationProcessor } from '../../QueryBuilderStateBuilder.js';
+import { FETCH_STRUCTURE_IMPLEMENTATION } from '../QueryBuilderFetchStructureImplementationState.js';
+import { QueryBuilderGraphFetchTreeState } from './QueryBuilderGraphFetchTreeState.js';
+import { buildGraphFetchTreeData } from './QueryBuilderGraphFetchTreeUtil.js';
+export const processGraphFetchExpression = (expression, queryBuilderState) => {
+    const functionName = expression.functionName;
+    // check parameters
+    assertTrue(expression.parametersValues.length === 2, `Can't process ${functionName}() expression: ${functionName}() expects 1 argument`);
+    // check preceding expression
+    const precedingExpression = guaranteeType(expression.parametersValues[0], SimpleFunctionExpression, `Can't process ${functionName}() expression: only support ${functionName}() immediately following an expression`);
+    assertTrue(matchFunctionName(precedingExpression.functionName, [
+        QUERY_BUILDER_SUPPORTED_FUNCTIONS.FILTER,
+        QUERY_BUILDER_SUPPORTED_FUNCTIONS.GET_ALL,
+    ]), `Can't process ${functionName}(): only support ${functionName}() immediately following either getAll() or filter()`);
+    QueryBuilderValueSpecificationProcessor.process(precedingExpression, queryBuilderState);
+    // build state
+    if (queryBuilderState.fetchStructureState.implementation instanceof
+        QueryBuilderGraphFetchTreeState) {
+        const graphFetchTreeState = queryBuilderState.fetchStructureState.implementation;
+        graphFetchTreeState.setChecked(matchFunctionName(expression.functionName, QUERY_BUILDER_SUPPORTED_FUNCTIONS.GRAPH_FETCH_CHECKED));
+    }
+};
+export const processGraphFetchSerializeExpression = (expression, queryBuilderState) => {
+    // update fetch-structure
+    queryBuilderState.fetchStructureState.changeImplementation(FETCH_STRUCTURE_IMPLEMENTATION.GRAPH_FETCH);
+    // check parameters
+    assertTrue(expression.parametersValues.length === 2, `Can't process serialize() expression: serialize() expects 1 argument`);
+    // check preceding expression
+    const precedingExpression = guaranteeType(expression.parametersValues[0], SimpleFunctionExpression, `Can't process serialize() expression: only support serialize() immediately following an expression`);
+    assertTrue(matchFunctionName(precedingExpression.functionName, [
+        QUERY_BUILDER_SUPPORTED_FUNCTIONS.GRAPH_FETCH,
+        QUERY_BUILDER_SUPPORTED_FUNCTIONS.GRAPH_FETCH_CHECKED,
+    ]), `Can't process serialize() expression: only support serialize() in graph-fetch expression`);
+    QueryBuilderValueSpecificationProcessor.process(precedingExpression, queryBuilderState);
+    // build state
+    if (queryBuilderState.fetchStructureState.implementation instanceof
+        QueryBuilderGraphFetchTreeState) {
+        const graphFetchTreeState = queryBuilderState.fetchStructureState.implementation;
+        const graphFetchTree = guaranteeType(expression.parametersValues[1], GraphFetchTreeInstanceValue, `Can't process serialize() expression: serialize() graph-fetch is missing`);
+        const graphFetchTreeRoot = guaranteeType(graphFetchTree.values[0], RootGraphFetchTree, `Can't process serialize() expression: serialize() graph-fetch tree root is missing`);
+        graphFetchTreeState.setGraphFetchTree(buildGraphFetchTreeData(graphFetchTreeRoot));
+    }
+};
+//# sourceMappingURL=QueryBuilderGraphFetchTreeStateBuilder.js.map

package/lib/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeStateBuilder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderGraphFetchTreeStateBuilder.js","sourceRoot":"","sources":["../../../../src/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeStateBuilder.ts"],"names":[],"mappings":"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"}

package/lib/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeUtil.d.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import type { TreeNodeData, TreeData } from '@finos/legend-art';
-import { type Type, type RootGraphFetchTree, PropertyGraphFetchTree } from '@finos/legend-graph';
+import { type AbstractProperty, type Type, type RootGraphFetchTree, PropertyGraphFetchTree } from '@finos/legend-graph';
 import { type QueryBuilderExplorerTreeNodeData, QueryBuilderExplorerTreePropertyNodeData } from '../../explorer/QueryBuilderExplorerState.js';
 import type { QueryBuilderState } from '../../QueryBuilderState.js';
 export declare class QueryBuilderGraphFetchTreeNodeData implements TreeNodeData {
@@ -31,6 +31,7 @@ export declare class QueryBuilderGraphFetchTreeNodeData implements TreeNodeData
 export interface QueryBuilderGraphFetchTreeData extends TreeData<QueryBuilderGraphFetchTreeNodeData> {
     tree: RootGraphFetchTree;
 }
+export declare const generateGraphFetchTreeNodeID: (property: AbstractProperty, parentNodeId: string | undefined, subType: Type | undefined) => string;
 /**
  * Build graph fetch tree data from an existing graph fetch tree root
  */

package/lib/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeUtil.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderGraphFetchTreeUtil.d.ts","sourceRoot":"","sources":["../../../../src/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeUtil.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAGL,KAAK,IAAI,EACT,KAAK,kBAAkB,EAGvB,sBAAsB,EAGvB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,gCAAgC,EACrC,wCAAwC,EAEzC,MAAM,6CAA6C,CAAC;AACrD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAMpE,qBAAa,kCAAmC,YAAW,YAAY;IACrE,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,EAAE,CAAM;IAC3B,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,IAAI,EAAE,sBAAsB,CAAC;gBAG3B,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,kBAAkB,EAAE,sBAAsB;IAU5C,IAAI,IAAI,IAAI,IAAI,CAEf;CACF;AAED,MAAM,WAAW,8BACf,SAAQ,QAAQ,CAAC,kCAAkC,CAAC;IACpD,IAAI,EAAE,kBAAkB,CAAC;CAC1B;AA6CD;;GAEG;AACH,eAAO,MAAM,uBAAuB,SAC5B,kBAAkB,KACvB,8BASF,CAAC;AAEF,eAAO,MAAM,yBAAyB,aAC1B,8BAA8B,KACvC,OAA8C,CAAC;AA6ClD,eAAO,MAAM,qBAAqB,aACtB,8BAA8B,QAClC,kCAAkC,KACvC,IAGF,CAAC;AAEF,eAAO,MAAM,2BAA2B,aAC5B,8BAA8B,oBACtB,SAAS,gCAAgC,CAAC,QACtD,wCAAwC,qBAC3B,iBAAiB,KACnC,IAkGF,CAAC"}
+{"version":3,"file":"QueryBuilderGraphFetchTreeUtil.d.ts","sourceRoot":"","sources":["../../../../src/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeUtil.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,EACL,KAAK,gBAAgB,EAErB,KAAK,IAAI,EACT,KAAK,kBAAkB,EAGvB,sBAAsB,EAGvB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,gCAAgC,EACrC,wCAAwC,EAEzC,MAAM,6CAA6C,CAAC;AACrD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAMpE,qBAAa,kCAAmC,YAAW,YAAY;IACrE,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,EAAE,CAAM;IAC3B,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,IAAI,EAAE,sBAAsB,CAAC;gBAG3B,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,kBAAkB,EAAE,sBAAsB;IAU5C,IAAI,IAAI,IAAI,IAAI,CAEf;CACF;AAED,MAAM,WAAW,8BACf,SAAQ,QAAQ,CAAC,kCAAkC,CAAC;IACpD,IAAI,EAAE,kBAAkB,CAAC;CAC1B;AAED,eAAO,MAAM,4BAA4B,aAC7B,gBAAgB,gBACZ,MAAM,GAAG,SAAS,WACvB,IAAI,GAAG,SAAS,KACxB,MAGC,CAAC;AA6BL;;GAEG;AACH,eAAO,MAAM,uBAAuB,SAC5B,kBAAkB,KACvB,8BASF,CAAC;AAEF,eAAO,MAAM,yBAAyB,aAC1B,8BAA8B,KACvC,OAA8C,CAAC;AA6ClD,eAAO,MAAM,qBAAqB,aACtB,8BAA8B,QAClC,kCAAkC,KACvC,IAGF,CAAC;AAEF,eAAO,MAAM,2BAA2B,aAC5B,8BAA8B,oBACtB,SAAS,gCAAgC,CAAC,QACtD,wCAAwC,qBAC3B,iBAAiB,KACnC,IAgGF,CAAC"}

package/lib/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeUtil.js

@@ -37,16 +37,13 @@ export class QueryBuilderGraphFetchTreeNodeData {
         return this.tree.property.value.genericType.value.rawType;
     }
 }
-const generateNodeId = (property, parentNodeId) => `${parentNodeId ? `${parentNodeId}.` : ''}${property.name}`;
-const generateNodeIdForSubType = (property, subType, parentNodeId) => `${parentNodeId ? `${parentNodeId}.` : ''}${property.name}${TYPE_CAST_TOKEN}${subType.path}`;
+export const generateGraphFetchTreeNodeID = (property, parentNodeId, subType) => `${parentNodeId ? `${parentNodeId}.` : ''}${property.name}${subType ? `${TYPE_CAST_TOKEN}${subType.path}` : ''}`;
 const buildGraphFetchSubTree = (tree, parentNode, nodes) => {
     assertType(tree, PropertyGraphFetchTree, 'Graph fetch sub-tree must be a property graph fetch tree');
     const property = tree.property.value;
     const subType = tree.subType?.value;
     const parentNodeId = parentNode?.id;
-    const node = new QueryBuilderGraphFetchTreeNodeData(subType
-        ? generateNodeIdForSubType(property, subType, parentNodeId)
-        : generateNodeId(property, parentNodeId), property.name, parentNodeId, tree);
+    const node = new QueryBuilderGraphFetchTreeNodeData(generateGraphFetchTreeNodeID(property, parentNodeId, subType), property.name, parentNodeId, tree);
     tree.subTrees.forEach((subTree) => {
         const subTreeNode = buildGraphFetchSubTree(subTree, node, nodes);
         addUniqueEntry(node.childrenIds, subTreeNode.id);
@@ -149,9 +146,7 @@ export const addQueryBuilderPropertyNode = (treeData, explorerTreeData, node, qu
     let parentNode = undefined;
     let newSubTree;
     for (const propertyGraphFetchTree of propertyGraphFetchTrees) {
-        currentNodeId = propertyGraphFetchTree.subType?.value
-            ? generateNodeIdForSubType(propertyGraphFetchTree.property.value, propertyGraphFetchTree.subType.value, currentNodeId)
-            : generateNodeId(propertyGraphFetchTree.property.value, currentNodeId);
+        currentNodeId = generateGraphFetchTreeNodeID(propertyGraphFetchTree.property.value, currentNodeId, propertyGraphFetchTree.subType?.value);
         const existingGraphFetchNode = treeData.nodes.get(currentNodeId);
         if (existingGraphFetchNode) {
             parentNode = existingGraphFetchNode;