@acorex-platform/framework-server 0.0.15 → 0.0.20

package/domain/providers/src/lib/middlewares/entity-query-fields-planning.middleware.d.ts

@@ -0,0 +1,20 @@
+import { AXPEntityOp, EntityStorageContext, EntityStorageMiddleware } from '@acorex-platform/framework-server/core';
+import { DomainDefinitionLoader } from '@acorex-platform/framework-server/domain/abstract';
+import { type EntityQueryFieldsPlan } from '../utils/entity-query-fields-path-planner.util';
+/**
+ * When `request.fields` is set, plans host / merge-detail / lookup selection and
+ * applies host projection via `params.$select` for the JQL engines.
+ */
+export declare class EntityQueryFieldsPlanningMiddleware implements EntityStorageMiddleware {
+    private readonly domainLoader;
+    private readonly logger;
+    readonly target: {
+        ops: AXPEntityOp[];
+        /** Before merge-detail persist / nested-filter reshape (8). */
+        order: number;
+    };
+    constructor(domainLoader: DomainDefinitionLoader);
+    execute(ctx: EntityStorageContext, next: () => Promise<void>): Promise<void>;
+}
+export declare function getEntityQueryFieldsPlan(ctx: EntityStorageContext): EntityQueryFieldsPlan | undefined;
+//# sourceMappingURL=entity-query-fields-planning.middleware.d.ts.map

package/domain/providers/src/lib/middlewares/entity-query-fields-planning.middleware.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"entity-query-fields-planning.middleware.d.ts","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/domain/providers/src/lib/middlewares/entity-query-fields-planning.middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AACpH,OAAO,EAAE,sBAAsB,EAAE,MAAM,mDAAmD,CAAC;AAE3F,OAAO,EAKL,KAAK,qBAAqB,EAC3B,MAAM,gDAAgD,CAAC;AAIxD;;;GAGG;AACH,qBACa,mCAAoC,YAAW,uBAAuB;IASrE,OAAO,CAAC,QAAQ,CAAC,YAAY;IARzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwD;IAE/E,QAAQ,CAAC,MAAM;aACe,WAAW,EAAE;QACzC,+DAA+D;;MAE/D;gBAE2B,YAAY,EAAE,sBAAsB;IAE3D,OAAO,CAAC,GAAG,EAAE,oBAAoB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;CA6BnF;AAED,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,oBAAoB,GAAG,qBAAqB,GAAG,SAAS,CAGrG"}

package/domain/providers/src/lib/middlewares/entity-query-fields-planning.middleware.js

@@ -0,0 +1,59 @@
+"use strict";
+var EntityQueryFieldsPlanningMiddleware_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EntityQueryFieldsPlanningMiddleware = void 0;
+exports.getEntityQueryFieldsPlan = getEntityQueryFieldsPlan;
+const tslib_1 = require("tslib");
+const abstract_1 = require("@acorex-platform/framework-server/domain/abstract");
+const common_1 = require("@nestjs/common");
+const entity_query_fields_path_planner_util_1 = require("../utils/entity-query-fields-path-planner.util");
+//#region ----- Entity query fields planning middleware -----
+/**
+ * When `request.fields` is set, plans host / merge-detail / lookup selection and
+ * applies host projection via `params.$select` for the JQL engines.
+ */
+let EntityQueryFieldsPlanningMiddleware = EntityQueryFieldsPlanningMiddleware_1 = class EntityQueryFieldsPlanningMiddleware {
+    constructor(domainLoader) {
+        this.domainLoader = domainLoader;
+        this.logger = new common_1.Logger(EntityQueryFieldsPlanningMiddleware_1.name);
+        this.target = {
+            ops: ['query', 'getOne'],
+            /** Before merge-detail persist / nested-filter reshape (8). */
+            order: 5,
+        };
+    }
+    async execute(ctx, next) {
+        const fields = (0, entity_query_fields_path_planner_util_1.normalizeEntityQueryFields)(ctx.request?.fields);
+        if (!fields?.length) {
+            await next();
+            return;
+        }
+        const def = await this.domainLoader.loadEntity(ctx.entityName).catch(() => null);
+        const plan = (0, entity_query_fields_path_planner_util_1.planEntityQueryFields)(def, fields);
+        ctx.locals.set(entity_query_fields_path_planner_util_1.ENTITY_QUERY_FIELDS_PLAN_KEY, plan);
+        const hostProjection = (0, entity_query_fields_path_planner_util_1.resolveHostProjectionFields)(plan);
+        if (ctx.request) {
+            ctx.request = {
+                ...ctx.request,
+                fields,
+                params: {
+                    ...(ctx.request.params ?? {}),
+                    $select: hostProjection.join(','),
+                },
+            };
+        }
+        this.logger.debug(`[${ctx.op}] ${ctx.entityName} fields plan: host=${hostProjection.length}, merge=${plan.mergeDetails.length}, lookup=${plan.lookups.length}`);
+        await next();
+    }
+};
+exports.EntityQueryFieldsPlanningMiddleware = EntityQueryFieldsPlanningMiddleware;
+exports.EntityQueryFieldsPlanningMiddleware = EntityQueryFieldsPlanningMiddleware = EntityQueryFieldsPlanningMiddleware_1 = tslib_1.__decorate([
+    (0, common_1.Injectable)(),
+    tslib_1.__metadata("design:paramtypes", [abstract_1.DomainDefinitionLoader])
+], EntityQueryFieldsPlanningMiddleware);
+function getEntityQueryFieldsPlan(ctx) {
+    const plan = ctx.locals.get(entity_query_fields_path_planner_util_1.ENTITY_QUERY_FIELDS_PLAN_KEY);
+    return plan;
+}
+//#endregion
+//# sourceMappingURL=entity-query-fields-planning.middleware.js.map

package/domain/providers/src/lib/middlewares/entity-query-fields-planning.middleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"entity-query-fields-planning.middleware.js","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/domain/providers/src/lib/middlewares/entity-query-fields-planning.middleware.ts"],"names":[],"mappings":";;;;AA4DA,4DAGC;;AA9DD,gFAA2F;AAC3F,2CAAoD;AACpD,0GAMwD;AAExD,6DAA6D;AAE7D;;;GAGG;AAEI,IAAM,mCAAmC,2CAAzC,MAAM,mCAAmC;IAS9C,YAA6B,YAAoC;QAApC,iBAAY,GAAZ,YAAY,CAAwB;QARhD,WAAM,GAAG,IAAI,eAAM,CAAC,qCAAmC,CAAC,IAAI,CAAC,CAAC;QAEtE,WAAM,GAAG;YAChB,GAAG,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAkB;YACzC,+DAA+D;YAC/D,KAAK,EAAE,CAAC;SACT,CAAC;IAEkE,CAAC;IAErE,KAAK,CAAC,OAAO,CAAC,GAAyB,EAAE,IAAyB;QAChE,MAAM,MAAM,GAAG,IAAA,kEAA0B,EAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC/D,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;YACpB,MAAM,IAAI,EAAE,CAAC;YACb,OAAO;QACT,CAAC;QAED,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QACjF,MAAM,IAAI,GAAG,IAAA,6DAAqB,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAChD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,oEAA4B,EAAE,IAAI,CAAC,CAAC;QAEnD,MAAM,cAAc,GAAG,IAAA,mEAA2B,EAAC,IAAI,CAAC,CAAC;QACzD,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;YAChB,GAAG,CAAC,OAAO,GAAG;gBACZ,GAAG,GAAG,CAAC,OAAO;gBACd,MAAM;gBACN,MAAM,EAAE;oBACN,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC;oBAC7B,OAAO,EAAE,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC;iBAClC;aACF,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,IAAI,GAAG,CAAC,EAAE,KAAK,GAAG,CAAC,UAAU,sBAAsB,cAAc,CAAC,MAAM,WAAW,IAAI,CAAC,YAAY,CAAC,MAAM,YAAY,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAC7I,CAAC;QAEF,MAAM,IAAI,EAAE,CAAC;IACf,CAAC;CACF,CAAA;AAxCY,kFAAmC;8CAAnC,mCAAmC;IAD/C,IAAA,mBAAU,GAAE;6CAUgC,iCAAsB;GATtD,mCAAmC,CAwC/C;AAED,SAAgB,wBAAwB,CAAC,GAAyB;IAChE,MAAM,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,oEAA4B,CAAC,CAAC;IAC1D,OAAO,IAAyC,CAAC;AACnD,CAAC;AAED,YAAY"}

package/domain/providers/src/lib/middlewares/lookup-resolver.middleware.d.ts

@@ -1,8 +1,11 @@
 import { AXPEntityOp, EntityStorageContext, EntityStorageMiddleware } from '@acorex-platform/framework-server/core';
 import { DomainDefinitionLoader } from '@acorex-platform/framework-server/domain/abstract';
 /**
- * Resolves lookup field IDs to full objects on create/update.
- * Ported from mock connectivity `lookup-resolver.middleware.ts`.
+ * Write-side lookup persistence: keep scalar `*Id` / `*Ids` and strip nested
+ * snapshot objects the client may send via LookupBox `expose`.
+ * Polymorphic stored refs (`subjectRef`, `ownerRef`) are not snapshots — leave them.
+ *
+ * Read joins are planned from the entity definition and executed by entity storage / JQL.
  */
 export declare class LookupResolverMiddleware implements EntityStorageMiddleware {
     private readonly domainLoader;

package/domain/providers/src/lib/middlewares/lookup-resolver.middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lookup-resolver.middleware.d.ts","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/domain/providers/src/lib/middlewares/lookup-resolver.middleware.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,WAAW,EACX,oBAAoB,EACpB,uBAAuB,EACxB,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,sBAAsB,EAAE,MAAM,mDAAmD,CAAC;AAI3F;;;GAGG;AACH,qBACa,wBAAyB,YAAW,uBAAuB;IAM1D,OAAO,CAAC,QAAQ,CAAC,YAAY;IALzC,QAAQ,CAAC,MAAM;aACgB,WAAW,EAAE;;MAE1C;gBAE2B,YAAY,EAAE,sBAAsB;IAE3D,OAAO,CAAC,GAAG,EAAE,oBAAoB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;CAsFnF"}
+{"version":3,"file":"lookup-resolver.middleware.d.ts","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/domain/providers/src/lib/middlewares/lookup-resolver.middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,oBAAoB,EACpB,uBAAuB,EACxB,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,sBAAsB,EAAE,MAAM,mDAAmD,CAAC;AAkI3F;;;;;;GAMG;AACH,qBACa,wBAAyB,YAAW,uBAAuB;IAM1D,OAAO,CAAC,QAAQ,CAAC,YAAY;IALzC,QAAQ,CAAC,MAAM;aACgB,WAAW,EAAE;;MAE1C;gBAE2B,YAAY,EAAE,sBAAsB;IAE3D,OAAO,CAAC,GAAG,EAAE,oBAAoB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;CAmBnF"}

package/domain/providers/src/lib/middlewares/lookup-resolver.middleware.js

@@ -2,13 +2,97 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LookupResolverMiddleware = void 0;
 const tslib_1 = require("tslib");
+const abstract_1 = require("@acorex-platform/framework-server/domain/abstract");
 const common_1 = require("@nestjs/common");
 const lodash_es_1 = require("lodash-es");
-const abstract_1 = require("@acorex-platform/framework-server/domain/abstract");
-//#region ---- Lookup resolver middleware ----
+//#endregion
+//#region ----- Helpers -----
+function parseLookupExposeEntries(options) {
+    const expose = options?.['expose'];
+    if (!Array.isArray(expose)) {
+        return [];
+    }
+    return expose.filter((row) => row != null &&
+        typeof row === 'object' &&
+        typeof row.source === 'string' &&
+        typeof row.target === 'string' &&
+        Boolean(row.source.trim()) &&
+        Boolean(row.target.trim()));
+}
+function resolveSnapshotRoot(fieldName, expose) {
+    for (const entry of expose) {
+        const target = entry.target.trim();
+        const dotIndex = target.indexOf('.');
+        if (dotIndex > 0) {
+            return target.slice(0, dotIndex);
+        }
+    }
+    return fieldName.replace(/(Ids|IDs|Id|ID)$/i, '');
+}
+function collectLookupFieldConfigs(fields) {
+    if (!fields?.length) {
+        return [];
+    }
+    const configs = [];
+    for (const field of fields) {
+        const fieldName = field.name?.trim();
+        if (!fieldName || fieldName.toLowerCase() === 'id') {
+            continue;
+        }
+        // Nested stored refs (`subjectRef.id`, `ownerRef.id`) are not scalar FKs.
+        // Treating them as `*Id` would strip the persisted object (snapshotRoot = `subjectRef`).
+        if (fieldName.includes('.')) {
+            continue;
+        }
+        if (!/(Ids|IDs|Id|ID)$/i.test(fieldName)) {
+            continue;
+        }
+        const opts = field.interface?.options;
+        if (!opts || typeof opts !== 'object') {
+            continue;
+        }
+        const lookupEntityName = opts['entity'] != null ? String(opts['entity']).trim() : '';
+        if (!lookupEntityName) {
+            continue;
+        }
+        const expose = parseLookupExposeEntries(opts);
+        configs.push({
+            fieldName,
+            isMultiple: /(Ids|IDs)$/i.test(fieldName),
+            snapshotRoot: resolveSnapshotRoot(fieldName, expose),
+        });
+    }
+    return configs;
+}
+function stripLookupSnapshots(data, configs) {
+    for (const config of configs) {
+        if (config.fieldName === config.snapshotRoot ||
+            config.fieldName.startsWith(`${config.snapshotRoot}.`)) {
+            continue;
+        }
+        (0, lodash_es_1.unset)(data, config.snapshotRoot);
+        if (config.isMultiple) {
+            (0, lodash_es_1.unset)(data, `${config.snapshotRoot}List`);
+        }
+        const prefix = `${config.snapshotRoot}.`;
+        for (const key of Object.keys(data)) {
+            if (key === config.snapshotRoot || key.startsWith(prefix)) {
+                delete data[key];
+            }
+            if (config.isMultiple && key === `${config.snapshotRoot}List`) {
+                delete data[key];
+            }
+        }
+    }
+}
+//#endregion
+//#region ----- Lookup resolver middleware -----
 /**
- * Resolves lookup field IDs to full objects on create/update.
- * Ported from mock connectivity `lookup-resolver.middleware.ts`.
+ * Write-side lookup persistence: keep scalar `*Id` / `*Ids` and strip nested
+ * snapshot objects the client may send via LookupBox `expose`.
+ * Polymorphic stored refs (`subjectRef`, `ownerRef`) are not snapshots — leave them.
+ *
+ * Read joins are planned from the entity definition and executed by entity storage / JQL.
  */
 let LookupResolverMiddleware = class LookupResolverMiddleware {
     constructor(domainLoader) {
@@ -20,73 +104,19 @@ let LookupResolverMiddleware = class LookupResolverMiddleware {
     }
     async execute(ctx, next) {
         const [moduleName, entityName] = ctx.entityName.split('.');
-        if (!moduleName || !entityName || !ctx.data || typeof ctx.data !== 'object') {
+        if (!moduleName || !entityName) {
             await next();
             return;
         }
-        const data = ctx.data;
-        const currentEntityDef = await this.domainLoader.loadEntity(ctx.entityName).catch(() => null);
-        const idFields = Object.keys(data).filter((fieldName) => fieldName.toLowerCase() !== 'id' && /(Ids|IDs|Id|ID)$/i.test(fieldName));
-        if (!idFields.length) {
-            await next();
-            return;
-        }
-        await Promise.all(idFields.map(async (fieldName) => {
-            const fieldValue = (0, lodash_es_1.get)(data, fieldName);
-            if (fieldValue === null || fieldValue === undefined) {
-                return;
-            }
-            const targetEntityName = fieldName.replace(/(Ids|IDs|Id|ID)$/i, '');
-            const isMultiple = /(Ids|IDs)$/i.test(fieldName);
-            const resolvedFieldName = isMultiple ? `${targetEntityName}List` : targetEntityName;
-            const resolvedValue = (0, lodash_es_1.get)(data, resolvedFieldName);
-            if (resolvedValue && (typeof resolvedValue === 'object' || Array.isArray(resolvedValue))) {
-                return;
+        if (ctx.data && typeof ctx.data === 'object') {
+            const currentEntityDef = await this.domainLoader.loadEntity(ctx.entityName).catch(() => null);
+            const configs = collectLookupFieldConfigs(currentEntityDef?.fields);
+            if (configs.length) {
+                const data = ctx.data;
+                stripLookupSnapshots(data, configs);
+                ctx.data = data;
             }
-            try {
-                const ids = Array.isArray(fieldValue)
-                    ? fieldValue
-                    : isMultiple && typeof fieldValue === 'string'
-                        ? fieldValue.split(',').map((x) => x.trim()).filter(Boolean)
-                        : [fieldValue];
-                let lookupEntityName = '';
-                let idField = 'id';
-                const property = currentEntityDef?.fields?.find((p) => p.name === fieldName);
-                const opts = property?.interface?.options;
-                if (opts?.['entity']) {
-                    lookupEntityName = String(opts['entity']);
-                    idField = String(opts['valueField'] ?? 'id');
-                }
-                else if (targetEntityName.includes('.')) {
-                    lookupEntityName = targetEntityName;
-                }
-                else {
-                    lookupEntityName = `${moduleName}.${targetEntityName}`;
-                }
-                const lookupResults = await ctx.backend.query(lookupEntityName, {
-                    skip: 0,
-                    take: ids.length,
-                    filter: {
-                        field: idField,
-                        operator: { type: 'in' },
-                        value: ids,
-                    },
-                });
-                if (!lookupResults?.items?.length) {
-                    return;
-                }
-                const lookupMap = new Map();
-                for (const item of lookupResults.items) {
-                    lookupMap.set(String((0, lodash_es_1.get)(item, idField)), item);
-                }
-                const resolvedObjects = ids.map((id) => lookupMap.get(String(id))).filter(Boolean);
-                (0, lodash_es_1.set)(data, resolvedFieldName, isMultiple ? resolvedObjects : resolvedObjects[0] ?? null);
-            }
-            catch (error) {
-                console.error(`[lookup-resolver] Failed to resolve field ${fieldName}:`, error);
-            }
-        }));
-        ctx.data = data;
+        }
         await next();
     }
 };

package/domain/providers/src/lib/middlewares/lookup-resolver.middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"lookup-resolver.middleware.js","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/domain/providers/src/lib/middlewares/lookup-resolver.middleware.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"lookup-resolver.middleware.js","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/domain/providers/src/lib/middlewares/lookup-resolver.middleware.ts"],"names":[],"mappings":"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"}

package/domain/providers/src/lib/middlewares/merge-detail-relation.middleware.d.ts

@@ -1,8 +1,12 @@
 import { AXPEntityOp, EntityStorageContext, EntityStorageMiddleware, EntityStorageMiddlewareService } from '@acorex-platform/framework-server/core';
 import { DomainDefinitionLoader } from '@acorex-platform/framework-server/domain/abstract';
 /**
- * Persists and hydrates merge-detail related entities (referenced strategy).
- * Ported from mock connectivity `merge-detail-relation.middleware.ts`.
+ * Write-side merge-detail persistence: insert/update the referenced child and
+ * keep only `idField` on the parent.
+ *
+ * Read joins (`party`, `person`, …) are planned from the definition and executed
+ * by entity storage / JQL. Nested filter/sort on those paths is still reshaped
+ * here because the engine pages the host before `$lookup`.
  */
 export declare class MergeDetailRelationMiddleware implements EntityStorageMiddleware {
     private readonly domainLoader;
@@ -15,7 +19,6 @@ export declare class MergeDetailRelationMiddleware implements EntityStorageMiddl
     constructor(domainLoader: DomainDefinitionLoader, entityStorage: EntityStorageMiddlewareService);
     execute(ctx: EntityStorageContext, next: () => Promise<void>): Promise<void>;
     private persistReferencedChildren;
-    private hydrateGetOne;
-    private hydrateQueryRows;
+    private reshapeAfterJoin;
 }
 //# sourceMappingURL=merge-detail-relation.middleware.d.ts.map

package/domain/providers/src/lib/middlewares/merge-detail-relation.middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge-detail-relation.middleware.d.ts","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/domain/providers/src/lib/middlewares/merge-detail-relation.middleware.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,WAAW,EACX,oBAAoB,EACpB,uBAAuB,EACvB,8BAA8B,EAC/B,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAEL,sBAAsB,EACvB,MAAM,mDAAmD,CAAC;AA2E3D;;;GAGG;AACH,qBACa,6BAA8B,YAAW,uBAAuB;IASzE,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAThC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkD;IAEzE,QAAQ,CAAC,MAAM;aACmC,WAAW,EAAE;;MAE7D;gBAGiB,YAAY,EAAE,sBAAsB,EACpC,aAAa,EAAE,8BAA8B;IAG1D,OAAO,CAAC,GAAG,EAAE,oBAAoB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;YAuEpE,yBAAyB;YAsDzB,aAAa;YAyBb,gBAAgB;CAqF/B"}
+{"version":3,"file":"merge-detail-relation.middleware.d.ts","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/domain/providers/src/lib/middlewares/merge-detail-relation.middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,8BAA8B,EAAE,MAAM,wCAAwC,CAAC;AACpJ,OAAO,EAAE,sBAAsB,EAAyC,MAAM,mDAAmD,CAAC;AAwGlI;;;;;;;GAOG;AACH,qBACa,6BAA8B,YAAW,uBAAuB;IASzE,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAThC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkD;IAEzE,QAAQ,CAAC,MAAM;aACyB,WAAW,EAAE;;MAEnD;gBAGiB,YAAY,EAAE,sBAAsB,EACpC,aAAa,EAAE,8BAA8B;IAG1D,OAAO,CAAC,GAAG,EAAE,oBAAoB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;YAoEpE,yBAAyB;IAuDvC,OAAO,CAAC,gBAAgB;CAqCzB"}

package/domain/providers/src/lib/middlewares/merge-detail-relation.middleware.js

@@ -3,12 +3,12 @@ var MergeDetailRelationMiddleware_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MergeDetailRelationMiddleware = void 0;
 const tslib_1 = require("tslib");
-const common_1 = require("@nestjs/common");
-const lodash_es_1 = require("lodash-es");
 const core_1 = require("@acorex-platform/framework-server/core");
 const abstract_1 = require("@acorex-platform/framework-server/domain/abstract");
+const common_1 = require("@nestjs/common");
+const lodash_es_1 = require("lodash-es");
 const merge_detail_query_util_1 = require("../utils/merge-detail-query.util");
-//#region ---- Merge-detail relation middleware ----
+//#region ----- Helpers -----
 function defaultIdField(dataPath) {
     const leaf = (dataPath || '').split('.').filter(Boolean).pop() || 'related';
     return `${leaf}Id`;
@@ -59,15 +59,41 @@ function coerceRecordId(value) {
     }
     return undefined;
 }
+/**
+ * After a referenced child is persisted, keep only `idField` on the parent.
+ * Form payloads nest under `dataPath` (and sometimes flat `dataPath.*` keys);
+ * leave those out of the parent document so source-of-truth stays on the child entity.
+ */
+function stripReferencedMergeDetailSubtree(parentData, dataPath) {
+    if (!dataPath) {
+        return;
+    }
+    (0, lodash_es_1.unset)(parentData, dataPath);
+    const prefix = `${dataPath}.`;
+    for (const key of Object.keys(parentData)) {
+        if (key === dataPath || key.startsWith(prefix)) {
+            delete parentData[key];
+        }
+    }
+}
 function collectMergeDetailDataPaths(related) {
     return related
         .filter((re) => re?.layout?.type === 'merge-detail')
         .map((re) => re.persistence?.dataPath?.trim())
         .filter((dp) => !!dp);
 }
+function isMergeDetailRelated(related) {
+    return related?.layout?.type === 'merge-detail';
+}
+//#endregion
+//#region ----- Merge-detail relation middleware -----
 /**
- * Persists and hydrates merge-detail related entities (referenced strategy).
- * Ported from mock connectivity `merge-detail-relation.middleware.ts`.
+ * Write-side merge-detail persistence: insert/update the referenced child and
+ * keep only `idField` on the parent.
+ *
+ * Read joins (`party`, `person`, …) are planned from the definition and executed
+ * by entity storage / JQL. Nested filter/sort on those paths is still reshaped
+ * here because the engine pages the host before `$lookup`.
  */
 let MergeDetailRelationMiddleware = MergeDetailRelationMiddleware_1 = class MergeDetailRelationMiddleware {
     constructor(domainLoader, entityStorage) {
@@ -75,20 +101,22 @@ let MergeDetailRelationMiddleware = MergeDetailRelationMiddleware_1 = class Merg
         this.entityStorage = entityStorage;
         this.logger = new common_1.Logger(MergeDetailRelationMiddleware_1.name);
         this.target = {
-            ops: ['create', 'update', 'getOne', 'query'],
+            ops: ['create', 'update', 'query'],
             order: 8,
         };
     }
     async execute(ctx, next) {
         this.logger.debug(`[${ctx.op}] ${ctx.entityName}`);
         const def = await this.domainLoader.loadEntity(ctx.entityName).catch(() => null);
-        const related = (def?.relatedEntities ?? []).filter((re) => re?.layout?.type === 'merge-detail' || re?.layout?.type === 'page-detail');
-        const mergeDetailDataPaths = collectMergeDetailDataPaths(related);
-        const isQueryLikeOp = ctx.op === 'query';
+        const related = (def?.relatedEntities ?? []).filter(isMergeDetailRelated);
+        if ((ctx.op === 'create' || ctx.op === 'update') && ctx.data && related.length) {
+            await this.persistReferencedChildren(ctx, related);
+        }
         let postHydrateFilter;
         let postHydrateSort;
         let originalPagination;
-        if (isQueryLikeOp && mergeDetailDataPaths.length && ctx.request) {
+        if (ctx.op === 'query' && related.length && ctx.request) {
+            const mergeDetailDataPaths = collectMergeDetailDataPaths(related);
             if (ctx.request.filter) {
                 const split = (0, merge_detail_query_util_1.partitionFilterByMergeDetailDataPaths)(ctx.request.filter, mergeDetailDataPaths);
                 postHydrateFilter = split.postHydrate;
@@ -122,15 +150,9 @@ let MergeDetailRelationMiddleware = MergeDetailRelationMiddleware_1 = class Merg
                 }
             }
         }
-        if ((ctx.op === 'create' || ctx.op === 'update') && ctx.data && related.length) {
-            await this.persistReferencedChildren(ctx, related);
-        }
         await next();
-        if (ctx.op === 'getOne' && ctx.result && related.length) {
-            await this.hydrateGetOne(ctx, related);
-        }
-        if ((ctx.op === 'query') && ctx.result && related.length) {
-            await this.hydrateQueryRows(ctx, related, postHydrateFilter, postHydrateSort, originalPagination);
+        if (ctx.op === 'query' && ctx.result && (postHydrateFilter || postHydrateSort?.length)) {
+            this.reshapeAfterJoin(ctx, postHydrateFilter, postHydrateSort, originalPagination);
         }
     }
     async persistReferencedChildren(ctx, related) {
@@ -169,88 +191,32 @@ let MergeDetailRelationMiddleware = MergeDetailRelationMiddleware_1 = class Merg
                     candidateId)
                 : String(await this.entityStorage.insertOne(re.entity, payload));
             (0, lodash_es_1.set)(data, idField, childId);
+            stripReferencedMergeDetailSubtree(data, dp);
         }
         ctx.data = data;
     }
-    async hydrateGetOne(ctx, related) {
-        const result = ctx.result;
-        for (const re of related) {
-            const p = re.persistence ?? {};
-            if ((p.strategy ?? 'embedded') !== 'referenced' || p.hydrate === 'lazy') {
-                continue;
-            }
-            const idField = p.idField || defaultIdField(re.persistence?.dataPath);
-            const id = (0, lodash_es_1.get)(result, idField);
-            if (!id) {
-                continue;
-            }
-            const child = await ctx.backend.getOne(re.entity, String(id));
-            if (p.dataPath) {
-                (0, lodash_es_1.set)(result, p.dataPath, child);
-            }
-        }
-    }
-    async hydrateQueryRows(ctx, related, postHydrateFilter, postHydrateSort, originalPagination) {
+    reshapeAfterJoin(ctx, postHydrateFilter, postHydrateSort, originalPagination) {
         const resultObj = ctx.result;
-        const rows = Array.isArray(resultObj?.items) ? resultObj.items : [];
-        if (!rows.length) {
-            return;
-        }
-        for (const re of related) {
-            const p = re.persistence ?? {};
-            if ((p.strategy ?? 'embedded') !== 'referenced' || p.hydrate === 'lazy') {
-                continue;
-            }
-            const idField = p.idField || defaultIdField(p.dataPath);
-            const ids = Array.from(new Set(rows.map((r) => (0, lodash_es_1.get)(r, idField)).filter((v) => v != null && v !== undefined)));
-            if (!ids.length) {
-                continue;
-            }
-            const resp = await ctx.backend.query(re.entity, {
-                skip: 0,
-                take: ids.length || merge_detail_query_util_1.MERGE_DETAIL_QUERY_SCAN_CAP,
-                filter: {
-                    field: 'id',
-                    operator: { type: 'in' },
-                    value: ids,
-                },
-            });
-            const childMap = new Map();
-            for (const c of resp.items) {
-                childMap.set(c['id'], c);
-            }
-            for (const row of rows) {
-                const cid = (0, lodash_es_1.get)(row, idField);
-                if (!cid) {
-                    continue;
-                }
-                const child = childMap.get(cid);
-                if (child && p.dataPath) {
-                    (0, lodash_es_1.set)(row, p.dataPath, child);
-                }
-            }
-        }
-        const deferredFilter = ctx.locals.get('mergeDetailPostHydrateFilter') ??
-            postHydrateFilter;
-        const deferredSort = ctx.locals.get('mergeDetailPostHydrateSort') ??
-            postHydrateSort;
+        const deferredFilter = ctx.locals.get('mergeDetailPostHydrateFilter') ?? postHydrateFilter;
+        const deferredSort = ctx.locals.get('mergeDetailPostHydrateSort') ?? postHydrateSort;
         const pagination = ctx.locals.get('mergeDetailOriginalPagination') ??
             originalPagination;
-        if ((deferredFilter || deferredSort?.length) && ctx.op === 'query') {
-            const skip = pagination?.skip ?? 0;
-            const take = pagination?.take ?? 10;
-            const reshaped = (0, merge_detail_query_util_1.applyPostHydrateQueryReshape)(ctx.result, {
-                postHydrateFilter: deferredFilter,
-                postHydrateSort: deferredSort,
-                skip,
-                take,
-            });
-            ctx.result = {
-                ...resultObj,
-                items: reshaped.items,
-                totalCount: reshaped.total,
-            };
+        if (!(deferredFilter || deferredSort?.length)) {
+            return;
         }
+        const skip = pagination?.skip ?? 0;
+        const take = pagination?.take ?? 10;
+        const reshaped = (0, merge_detail_query_util_1.applyPostHydrateQueryReshape)(ctx.result, {
+            postHydrateFilter: deferredFilter,
+            postHydrateSort: deferredSort,
+            skip,
+            take,
+        });
+        ctx.result = {
+            ...resultObj,
+            items: reshaped.items,
+            totalCount: reshaped.total,
+        };
     }
 };
 exports.MergeDetailRelationMiddleware = MergeDetailRelationMiddleware;

package/domain/providers/src/lib/middlewares/merge-detail-relation.middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"merge-detail-relation.middleware.js","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/domain/providers/src/lib/middlewares/merge-detail-relation.middleware.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"merge-detail-relation.middleware.js","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/domain/providers/src/lib/middlewares/merge-detail-relation.middleware.ts"],"names":[],"mappings":"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"}