@medusajs/orchestration 3.0.0-preview-20250410180148 → 3.0.0-preview-20251201152819

package/dist/joiner/remote-joiner.d.ts

@@ -13,6 +13,8 @@ export declare class RemoteJoiner {
     private static filterFields;
     private static getNestedItems;
     private static createRelatedDataMap;
+    private computeIdsForRelationship;
+    private assignRelatedToItems;
     static parseQuery(graphqlQuery: string, variables?: Record<string, unknown>): RemoteJoinerQuery;
     constructor(serviceConfigs: ModuleJoinerConfig[], remoteFetchData: RemoteFetchDataCallback, options?: {
         autoCreateServiceNameAlias?: boolean;
@@ -28,9 +30,8 @@ export declare class RemoteJoiner {
     private handleFieldAliases;
     private handleExpands;
     private getEntityRelationship;
-    private expandProperty;
-    private expandRelationshipProperty;
     private parseExpands;
+    private buildQueryPlan;
     private parseProperties;
     private getEntity;
     private parseAlias;

package/dist/joiner/remote-joiner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remote-joiner.d.ts","sourceRoot":"","sources":["../../src/joiner/remote-joiner.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,kBAAkB,EAClB,oBAAoB,EACpB,mBAAmB,EACnB,iBAAiB,EAElB,MAAM,iBAAiB,CAAA;AAaxB,MAAM,MAAM,uBAAuB,GAAG,CACpC,MAAM,EAAE,oBAAoB,EAC5B,QAAQ,EAAE,MAAM,EAChB,GAAG,CAAC,EAAE,CAAC,OAAO,GAAG,OAAO,EAAE,CAAC,EAAE,EAC7B,YAAY,CAAC,EAAE,GAAG,KACf,OAAO,CAAC;IACX,IAAI,EAAE,OAAO,EAAE,GAAG;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAA;IAC7C,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,CAAC,CAAA;AAmBF,qBAAa,YAAY;IA8GrB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,OAAO;IA9GjB,OAAO,CAAC,kBAAkB,CACf;IAEX,OAAO,CAAC,SAAS,CAA8C;IAE/D,OAAO,CAAC,MAAM,CAAC,YAAY;IAwD3B,OAAO,CAAC,MAAM,CAAC,cAAc;IAe7B,OAAO,CAAC,MAAM,CAAC,oBAAoB;IAuBnC,MAAM,CAAC,UAAU,CACf,YAAY,EAAE,MAAM,EACpB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAClC,iBAAiB;gBAMlB,cAAc,EAAE,kBAAkB,EAAE,EAC5B,eAAe,EAAE,uBAAuB,EACxC,OAAO,GAAE;QACf,0BAA0B,CAAC,EAAE,OAAO,CAAA;QACpC,WAAW,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;KAC1B;IAmBD,oBAAoB,CAAC,eAAe,EAAE,uBAAuB,GAAG,IAAI;IAI3E,OAAO,CAAC,eAAe;IAqLvB,OAAO,CAAC,eAAe;IAgCvB,OAAO,CAAC,gBAAgB;IAyBxB,OAAO,CAAC,kBAAkB;YAmDZ,SAAS;IAkFvB,OAAO,CAAC,gBAAgB;IAgDxB,OAAO,CAAC,kBAAkB;YAkFZ,aAAa;IAwC3B,OAAO,CAAC,qBAAqB;YA+Bf,cAAc;YA8Bd,0BAA0B;IA6HxC,OAAO,CAAC,YAAY;IAkCpB,OAAO,CAAC,eAAe;IAuJvB,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,UAAU;IA8IlB,OAAO,CAAC,YAAY;IA4CpB,OAAO,CAAC,2BAA2B;IAuHnC,OAAO,CAAC,gBAAgB;IAiFlB,KAAK,CACT,QAAQ,EAAE,iBAAiB,EAC3B,OAAO,CAAC,EAAE,mBAAmB,GAC5B,OAAO,CAAC,GAAG,CAAC;CAkHhB"}
+{"version":3,"file":"remote-joiner.d.ts","sourceRoot":"","sources":["../../src/joiner/remote-joiner.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,kBAAkB,EAClB,oBAAoB,EACpB,mBAAmB,EACnB,iBAAiB,EAElB,MAAM,iBAAiB,CAAA;AAaxB,MAAM,MAAM,uBAAuB,GAAG,CACpC,MAAM,EAAE,oBAAoB,EAC5B,QAAQ,EAAE,MAAM,EAChB,GAAG,CAAC,EAAE,CAAC,OAAO,GAAG,OAAO,EAAE,CAAC,EAAE,EAC7B,YAAY,CAAC,EAAE,GAAG,KACf,OAAO,CAAC;IACX,IAAI,EAAE,OAAO,EAAE,GAAG;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAA;IAC7C,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,CAAC,CAAA;AAoBF,qBAAa,YAAY;IAiNrB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,OAAO;IAjNjB,OAAO,CAAC,kBAAkB,CACf;IAEX,OAAO,CAAC,SAAS,CAA8C;IAE/D,OAAO,CAAC,MAAM,CAAC,YAAY;IAwD3B,OAAO,CAAC,MAAM,CAAC,cAAc;IAe7B,OAAO,CAAC,MAAM,CAAC,oBAAoB;IAwBnC,OAAO,CAAC,yBAAyB;IAyCjC,OAAO,CAAC,oBAAoB;IAyD5B,MAAM,CAAC,UAAU,CACf,YAAY,EAAE,MAAM,EACpB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAClC,iBAAiB;gBAMlB,cAAc,EAAE,kBAAkB,EAAE,EAC5B,eAAe,EAAE,uBAAuB,EACxC,OAAO,GAAE;QACf,0BAA0B,CAAC,EAAE,OAAO,CAAA;QACpC,WAAW,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;KAC1B;IAmBD,oBAAoB,CAAC,eAAe,EAAE,uBAAuB,GAAG,IAAI;IAI3E,OAAO,CAAC,eAAe;IAgNvB,OAAO,CAAC,eAAe;IAgCvB,OAAO,CAAC,gBAAgB;IAyBxB,OAAO,CAAC,kBAAkB;YAmDZ,SAAS;IAmFvB,OAAO,CAAC,gBAAgB;IAgDxB,OAAO,CAAC,kBAAkB;YA0FZ,aAAa;IA4K3B,OAAO,CAAC,qBAAqB;IAiC7B,OAAO,CAAC,YAAY;IAqCpB,OAAO,CAAC,cAAc;IAuFtB,OAAO,CAAC,eAAe;IAuJvB,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,UAAU;IAoJlB,OAAO,CAAC,YAAY;IAuDpB,OAAO,CAAC,2BAA2B;IAuHnC,OAAO,CAAC,gBAAgB;IAoFlB,KAAK,CACT,QAAQ,EAAE,iBAAiB,EAC3B,OAAO,CAAC,EAAE,mBAAmB,GAC5B,OAAO,CAAC,GAAG,CAAC;CAmHhB"}

package/dist/joiner/remote-joiner.js

@@ -71,6 +71,80 @@ class RemoteJoiner {
             return acc;
         }, {});
     }
+    // compute ids to fetch for a relationship
+    computeIdsForRelationship(items, relationship) {
+        const field = relationship.inverse
+            ? relationship.primaryKey
+            : relationship.foreignKey.split(".").pop();
+        const fieldsArray = relationship.inverse
+            ? relationship.primaryKeyArr
+            : relationship.foreignKeyArr;
+        const idsToFetch = new Set();
+        for (let i = 0; i < items.length; i++) {
+            const item = items[i];
+            if (!item) {
+                continue;
+            }
+            const values = fieldsArray.map((f) => item?.[f]);
+            if (values.length !== fieldsArray.length) {
+                continue;
+            }
+            if (fieldsArray.length === 1) {
+                const val = values[0];
+                if (Array.isArray(val)) {
+                    for (let x = 0; x < val.length; x++) {
+                        idsToFetch.add(val[x]);
+                    }
+                }
+                else {
+                    idsToFetch.add(val);
+                }
+            }
+            else {
+                idsToFetch.add(values);
+            }
+        }
+        return { field, fieldsArray, idsToFetch };
+    }
+    // assign fetched related data to items
+    assignRelatedToItems(params) {
+        const { items, relationship, relatedDataMap, field, fieldsArray } = params;
+        items.forEach((item) => {
+            if (!item) {
+                return;
+            }
+            const itemKey = fieldsArray.map((f) => item[f]).join(",");
+            if (item[relationship.alias]) {
+                if (Array.isArray(item[field])) {
+                    for (let i = 0; i < item[relationship.alias].length; i++) {
+                        const it = item[relationship.alias][i];
+                        item[relationship.alias][i] = Object.assign(it, relatedDataMap[it[relationship.primaryKey]]);
+                    }
+                    return;
+                }
+                item[relationship.alias] = Object.assign(item[relationship.alias], relatedDataMap[itemKey]);
+                return;
+            }
+            if (Array.isArray(item[field])) {
+                item[relationship.alias] = item[field].map((id) => {
+                    if (relationship.isList && !Array.isArray(relatedDataMap[id])) {
+                        relatedDataMap[id] = (0, utils_1.isDefined)(relatedDataMap[id])
+                            ? [relatedDataMap[id]]
+                            : [];
+                    }
+                    return relatedDataMap[id];
+                });
+            }
+            else {
+                if (relationship.isList && !Array.isArray(relatedDataMap[itemKey])) {
+                    relatedDataMap[itemKey] = (0, utils_1.isDefined)(relatedDataMap[itemKey])
+                        ? [relatedDataMap[itemKey]]
+                        : [];
+                }
+                item[relationship.alias] = relatedDataMap[itemKey];
+            }
+        });
+    }
     static parseQuery(graphqlQuery, variables) {
         const parser = new utils_1.GraphQLUtils.GraphQLParser(graphqlQuery, variables);
         return parser.parseQuery();
@@ -111,6 +185,27 @@ class RemoteJoiner {
                 }
                 service_.relationships = relationships;
             }
+            // Precompute key arrays for all existing relationships on the service
+            if (service_.relationships?.size) {
+                for (const [, relVal] of service_.relationships.entries()) {
+                    if (Array.isArray(relVal)) {
+                        for (let i = 0; i < relVal.length; i++) {
+                            const rel = relVal[i];
+                            rel.primaryKeyArr = rel.primaryKey.split(",");
+                            rel.foreignKeyArr = rel.foreignKey
+                                .split(",")
+                                .map((fk) => fk.split(".").pop());
+                        }
+                    }
+                    else if (relVal) {
+                        const rel = relVal;
+                        rel.primaryKeyArr = rel.primaryKey.split(",");
+                        rel.foreignKeyArr = rel.foreignKey
+                            .split(",")
+                            .map((fk) => fk.split(".").pop());
+                    }
+                }
+            }
             // add aliases
             const isReadOnlyDefinition = !(0, utils_1.isDefined)(service_.serviceName) || service_.isReadOnlyLink;
             if (!isReadOnlyDefinition) {
@@ -184,6 +279,10 @@ class RemoteJoiner {
                 const service_ = expandedRelationships.get(extend.serviceName);
                 const aliasName = extend.relationship.alias;
                 const rel = extend.relationship;
+                rel.primaryKeyArr = rel.primaryKey.split(",");
+                rel.foreignKeyArr = rel.foreignKey
+                    .split(",")
+                    .map((fk) => fk.split(".").pop());
                 if (service_.relationships?.has(aliasName)) {
                     const existing = service_.relationships.get(aliasName);
                     const newRelation = Array.isArray(existing)
@@ -302,6 +401,9 @@ class RemoteJoiner {
             const isIdsUsingOperatorMap = (0, utils_1.isObject)(ids) &&
                 Object.keys(ids).some((key) => !!utils_1.FilterOperatorMap[key]);
             uniqueIds = isIdsUsingOperatorMap ? ids : Array.isArray(ids) ? ids : [ids];
+            uniqueIds = Array.isArray(uniqueIds)
+                ? uniqueIds.filter((id) => id != null)
+                : uniqueIds;
         }
         if (uniqueIds && Array.isArray(uniqueIds)) {
             const isCompositeKey = Array.isArray(uniqueIds[0]);
@@ -317,7 +419,6 @@ class RemoteJoiner {
             else {
                 uniqueIds = Array.from(new Set(uniqueIds.flat()));
             }
-            uniqueIds = uniqueIds.filter((id) => (0, utils_1.isDefined)(id));
         }
         let pkFieldAdjusted = pkField;
         if (relationship) {
@@ -386,10 +487,18 @@ class RemoteJoiner {
         };
         const removeChildren = (item, prop) => {
             if (Array.isArray(item)) {
-                item.forEach((currentItem) => delete currentItem[prop]);
+                for (let i = 0; i < item.length; i++) {
+                    Object.defineProperty(item[i], prop, {
+                        value: undefined,
+                        enumerable: false,
+                    });
+                }
             }
             else {
-                delete item[prop];
+                Object.defineProperty(item, prop, {
+                    value: undefined,
+                    enumerable: false,
+                });
             }
         };
         const cleanup = [];
@@ -445,28 +554,116 @@ class RemoteJoiner {
     }
     async handleExpands(params) {
         const { items, parsedExpands, implodeMapping = [], options } = params;
-        if (!parsedExpands) {
+        if (parsedExpands.size === 0) {
             return;
         }
-        for (const [expandedPath, expand] of parsedExpands.entries()) {
-            if (expandedPath === BASE_PATH) {
-                continue;
-            }
-            let nestedItems = items;
-            const expandedPathLevels = expandedPath.split(".");
+        const getItemsForPath = (rootItems, fullPath) => {
+            let nestedItems = rootItems;
+            const expandedPathLevels = fullPath.split(".");
             for (let idx = 1; idx < expandedPathLevels.length - 1; idx++) {
                 nestedItems = RemoteJoiner.getNestedItems(nestedItems, expandedPathLevels[idx]);
             }
-            if (nestedItems.length > 0) {
-                await this.expandProperty({
-                    items: nestedItems,
-                    parentServiceConfig: expand.parentConfig,
-                    expand,
-                    options,
-                });
+            return nestedItems;
+        };
+        const root = parsedExpands.get(BASE_PATH);
+        const executionStages = root?.executionStages;
+        // remove root
+        root?.executionStages.shift();
+        for (const stage of executionStages) {
+            const stageFetchGroups = [];
+            for (const { paths } of stage) {
+                const pathCtx = [];
+                for (const path of paths) {
+                    const expand = parsedExpands.get(path);
+                    const nestedItems = getItemsForPath(items, path);
+                    if (!nestedItems?.length || !expand) {
+                        continue;
+                    }
+                    const relationship = this.getEntityRelationship({
+                        parentServiceConfig: expand.parentConfig,
+                        property: expand.property,
+                        entity: expand.entity,
+                    });
+                    if (!relationship) {
+                        continue;
+                    }
+                    const { field, fieldsArray, idsToFetch } = this.computeIdsForRelationship(nestedItems, relationship);
+                    pathCtx.push({
+                        path,
+                        expand,
+                        relationship,
+                        nestedItems,
+                        field,
+                        fieldsArray,
+                        args: expand.args,
+                        ids: idsToFetch,
+                    });
+                }
+                if (!pathCtx.length) {
+                    continue;
+                }
+                // Group by pkField
+                const byPkField = new Map();
+                for (const ctx of pathCtx) {
+                    const key = ctx.field;
+                    if (!byPkField.has(key)) {
+                        byPkField.set(key, []);
+                    }
+                    byPkField.get(key).push(ctx);
+                }
+                for (const [pkField, ctxs] of byPkField.entries()) {
+                    const unionIds = Array.from(new Set(ctxs.flatMap((c) => Array.from(c.ids))));
+                    const unionFields = Array.from(new Set(ctxs.flatMap((c) => c.expand.fields ?? [])));
+                    const unionArgs = ctxs.flatMap((c) => c.expand.args ?? []);
+                    const base = ctxs[0].expand;
+                    const aggExpand = {
+                        ...base,
+                        fields: unionFields,
+                    };
+                    if (unionArgs.length) {
+                        aggExpand.args = unionArgs;
+                    }
+                    const relationship = ctxs[0].relationship;
+                    const promise = this.fetchData({
+                        expand: aggExpand,
+                        pkField,
+                        ids: unionIds,
+                        relationship,
+                        options,
+                    });
+                    stageFetchGroups.push({ ctxs, relationship, promise });
+                }
+            }
+            const stageResults = await Promise.all(stageFetchGroups.map((g) => g.promise));
+            for (let i = 0; i < stageFetchGroups.length; i++) {
+                const { ctxs, relationship } = stageFetchGroups[i];
+                const relatedDataArray = stageResults[i];
+                const joinFields = relationship.inverse
+                    ? relationship.foreignKeyArr
+                    : relationship.primaryKeyArr;
+                const relData = relatedDataArray.path
+                    ? relatedDataArray.data[relatedDataArray.path]
+                    : relatedDataArray.data;
+                const relatedDataMap = RemoteJoiner.createRelatedDataMap(relData, joinFields);
+                for (let ci = 0; ci < ctxs.length; ci++) {
+                    const ctx = ctxs[ci];
+                    this.assignRelatedToItems({
+                        items: ctx.nestedItems,
+                        relationship: ctx.relationship,
+                        relatedDataMap,
+                        field: ctx.field,
+                        fieldsArray: ctx.fieldsArray,
+                    });
+                }
             }
         }
-        this.handleFieldAliases({ items, parsedExpands, implodeMapping });
+        if (implodeMapping.length > 0) {
+            this.handleFieldAliases({
+                items,
+                parsedExpands,
+                implodeMapping,
+            });
+        }
     }
     getEntityRelationship(params) {
         const { parentServiceConfig, property, entity } = params;
@@ -488,124 +685,8 @@ class RemoteJoiner {
         }
         return rel;
     }
-    async expandProperty(params) {
-        const { items, parentServiceConfig, expand, options } = params;
-        if (!expand) {
-            return;
-        }
-        const relationship = this.getEntityRelationship({
-            parentServiceConfig,
-            property: expand.property,
-            entity: expand.entity,
-        });
-        if (!relationship) {
-            return;
-        }
-        await this.expandRelationshipProperty({
-            items,
-            expand,
-            relationship,
-            options,
-        });
-    }
-    async expandRelationshipProperty(params) {
-        const { items, expand, relationship, options } = params;
-        const field = relationship.inverse
-            ? relationship.primaryKey
-            : relationship.foreignKey.split(".").pop();
-        const fieldsArray = field.split(",");
-        const idsToFetch = new Set();
-        const requestedFields = new Set(expand.fields ?? []);
-        const fieldsById = new Map();
-        items.forEach((item) => {
-            const values = fieldsArray.map((field) => item?.[field]);
-            if (values.length === fieldsArray.length) {
-                if (item?.[relationship.alias]) {
-                    for (const field of requestedFields.values()) {
-                        if (field in item[relationship.alias]) {
-                            requestedFields.delete(field);
-                            fieldsById.delete(field);
-                        }
-                        else {
-                            if (!fieldsById.has(field)) {
-                                fieldsById.set(field, []);
-                            }
-                            fieldsById
-                                .get(field)
-                                .push(fieldsArray.length === 1 ? values[0] : values);
-                        }
-                    }
-                }
-                else {
-                    if (fieldsArray.length === 1) {
-                        idsToFetch.add(values[0]);
-                    }
-                    else {
-                        idsToFetch.add(values);
-                    }
-                }
-            }
-        });
-        for (const values of fieldsById.values()) {
-            values.forEach((val) => {
-                idsToFetch.add(val);
-            });
-        }
-        if (idsToFetch.size === 0) {
-            return;
-        }
-        const relatedDataArray = await this.fetchData({
-            expand,
-            pkField: field,
-            ids: Array.from(idsToFetch),
-            relationship,
-            options,
-        });
-        const joinFields = relationship.inverse
-            ? relationship.foreignKey.split(",")
-            : relationship.primaryKey.split(",");
-        const relData = relatedDataArray.path
-            ? relatedDataArray.data[relatedDataArray.path]
-            : relatedDataArray.data;
-        const relatedDataMap = RemoteJoiner.createRelatedDataMap(relData, joinFields);
-        items.forEach((item) => {
-            if (!item) {
-                return;
-            }
-            const itemKey = fieldsArray.map((field) => item[field]).join(",");
-            if (item[relationship.alias]) {
-                if (Array.isArray(item[field])) {
-                    for (let i = 0; i < item[relationship.alias].length; i++) {
-                        const it = item[relationship.alias][i];
-                        item[relationship.alias][i] = Object.assign(it, relatedDataMap[it[relationship.primaryKey]]);
-                    }
-                    return;
-                }
-                item[relationship.alias] = Object.assign(item[relationship.alias], relatedDataMap[itemKey]);
-                return;
-            }
-            if (Array.isArray(item[field])) {
-                item[relationship.alias] = item[field].map((id) => {
-                    if (relationship.isList && !Array.isArray(relatedDataMap[id])) {
-                        relatedDataMap[id] = (0, utils_1.isDefined)(relatedDataMap[id])
-                            ? [relatedDataMap[id]]
-                            : [];
-                    }
-                    return relatedDataMap[id];
-                });
-            }
-            else {
-                if (relationship.isList && !Array.isArray(relatedDataMap[itemKey])) {
-                    relatedDataMap[itemKey] = (0, utils_1.isDefined)(relatedDataMap[itemKey])
-                        ? [relatedDataMap[itemKey]]
-                        : [];
-                }
-                item[relationship.alias] = relatedDataMap[itemKey];
-            }
-        });
-    }
     parseExpands(params) {
-        const { initialService, query, serviceConfig, expands, implodeMapping, options, initialData, } = params;
+        const { initialService, query, serviceConfig, expands, implodeMapping, options, initialData, initialDataOnly, } = params;
         const { parsedExpands, aliasRealPathMap } = this.parseProperties({
             initialService,
             query,
@@ -613,7 +694,7 @@ class RemoteJoiner {
             expands,
             implodeMapping,
         });
-        if (initialData?.length) {
+        if (initialData?.length && initialDataOnly) {
             this.createFilterFromInitialData({
                 initialData: options?.initialData,
                 parsedExpands,
@@ -621,8 +702,75 @@ class RemoteJoiner {
             });
         }
         const groupedExpands = this.groupExpands(parsedExpands);
+        this.buildQueryPlan(parsedExpands, groupedExpands);
         return groupedExpands;
     }
+    buildQueryPlan(fullParsedExpands, groupedExpands) {
+        const stages = [];
+        // Root stage
+        const rootExp = groupedExpands.get(BASE_PATH);
+        const rootService = rootExp.serviceConfig.serviceName;
+        stages.push([
+            {
+                service: rootService,
+                entity: rootExp.entity,
+                paths: [],
+                depth: 0,
+            },
+        ]);
+        // Build service sequence for each path
+        const getServiceSequence = (path) => {
+            const sequence = [];
+            let currentPath = path;
+            while (currentPath && currentPath !== BASE_PATH) {
+                const expand = fullParsedExpands.get(currentPath);
+                if (!expand) {
+                    break;
+                }
+                sequence.unshift(expand.serviceConfig.serviceName);
+                currentPath = expand.parent;
+            }
+            return sequence;
+        };
+        // Group paths by their service sequence length and last service in sequence
+        const pathsBySequenceDepth = new Map();
+        for (const [path, expand] of groupedExpands.entries()) {
+            if (path === BASE_PATH) {
+                continue;
+            }
+            const serviceSequence = getServiceSequence(path);
+            const sequenceDepth = serviceSequence.length;
+            const lastService = expand.serviceConfig.serviceName;
+            if (!pathsBySequenceDepth.has(sequenceDepth)) {
+                pathsBySequenceDepth.set(sequenceDepth, new Map());
+            }
+            const depthMap = pathsBySequenceDepth.get(sequenceDepth);
+            if (!depthMap.has(lastService)) {
+                depthMap.set(lastService, []);
+            }
+            depthMap.get(lastService).push(path);
+        }
+        const maxDepth = Math.max(...Array.from(pathsBySequenceDepth.keys()));
+        for (let depth = 1; depth <= maxDepth; depth++) {
+            const serviceMap = pathsBySequenceDepth.get(depth);
+            if (!serviceMap) {
+                continue;
+            }
+            const stageGroups = [];
+            for (const [service, paths] of serviceMap.entries()) {
+                stageGroups.push({
+                    service,
+                    paths,
+                    depth: depth,
+                });
+            }
+            if (stageGroups.length > 0) {
+                stages.push(stageGroups);
+            }
+        }
+        const root = groupedExpands.get(BASE_PATH);
+        root.executionStages = stages;
+    }
     parseProperties(params) {
         const { initialService, query, serviceConfig, expands, implodeMapping } = params;
         const aliasRealPathMap = new Map();
@@ -780,12 +928,17 @@ class RemoteJoiner {
             const midProp = curMiddlePath.join(".");
             const existingExpand = expands.find((exp) => exp.property === midProp);
             const extraExtends = {
+                fields: existingExpand?.fields,
+                args: existingExpand?.args,
                 ...(midProp === fullAliasProp ? expand : {}),
                 property: midProp,
                 isAliasMapping: !existingExpand,
             };
             if (forwardArgumentsOnPath.includes(BASE_PATH + "." + midProp)) {
-                extraExtends.args = (existingExpand?.args ?? []).concat(expand?.args ?? []);
+                const forwarded = (existingExpand?.args ?? []).concat(expand?.args ?? []);
+                if (forwarded.length) {
+                    extraExtends.args = forwarded;
+                }
             }
             extMapping.push(extraExtends);
         }
@@ -848,8 +1001,19 @@ class RemoteJoiner {
                     targetExpand.expands ??= {};
                     targetExpand = targetExpand.expands[key] ??= {};
                 }
-                targetExpand.fields = [...new Set(expand.fields)];
-                targetExpand.args = expand.args;
+                const nextFields = [
+                    ...new Set([
+                        ...(targetExpand.fields ?? []),
+                        ...(expand.fields ?? []),
+                    ]),
+                ];
+                targetExpand.fields = nextFields;
+                if (expand.args?.length) {
+                    const existingArgs = targetExpand.args;
+                    targetExpand.args = existingArgs
+                        ? existingArgs.concat(expand.args)
+                        : expand.args;
+                }
                 mergedExpands.delete(path);
                 mergedPaths.set(path, expand);
                 parentPath = parentExpand.parent;
@@ -963,7 +1127,10 @@ class RemoteJoiner {
                     property: key,
                 });
                 if (isRel) {
-                    delete shallowProperty[key];
+                    Object.defineProperty(shallowProperty, key, {
+                        value: undefined,
+                        enumerable: false,
+                    });
                 }
             }
             Object.assign(item, shallowProperty);
@@ -1019,6 +1186,7 @@ class RemoteJoiner {
             implodeMapping,
             options,
             initialData: iniDataArray,
+            initialDataOnly: options?.initialDataOnly,
         };
         const parsedExpands = this.parseExpands(parseExpandsConfig);
         const root = parsedExpands.get(BASE_PATH);
@@ -1095,7 +1263,10 @@ function gerPrimaryKeysAndOtherFilters({ serviceConfig, queryObj }) {
                 name: primaryKeyFilter,
                 value: filters[primaryKeyFilter],
             };
-            delete filters[primaryKeyFilter];
+            Object.defineProperty(filters, primaryKeyFilter, {
+                value: undefined,
+                enumerable: false,
+            });
         }
     }
     otherArgs = otherArgs?.length ? otherArgs : undefined;