@acorex-platform/framework-server 0.0.18 → 0.0.20

package/jql/abstract/src/lib/entity-store/entity-seed-storage.adapter.js

@@ -1,15 +1,107 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.configureEntitySeedDataTenantId = configureEntitySeedDataTenantId;
+exports.getEntitySeedDataTenantId = getEntitySeedDataTenantId;
+exports.configureEntitySeedDataApplicationId = configureEntitySeedDataApplicationId;
+exports.getEntitySeedDataApplicationId = getEntitySeedDataApplicationId;
 exports.createEntitySeedStorageAdapter = createEntitySeedStorageAdapter;
+const entity_access_policy_cache_1 = require("./entity-access-policy.cache");
+const entity_access_expression_builtins_1 = require("./entity-access-expression.builtins");
 //#region ---- Entity storage → seed port adapter ----
 const DEFAULT_SEED_INITIAL_OPTIONS = {
     mergeType: 'replace',
     skipExistenceCheck: true,
     uniqueKeys: ['id'],
 };
+/**
+ * Optional demo/default data tenant for rows missing `scopeInfo.tenantId`.
+ * Configured by the app/seed layer — never a hardcoded UUID in framework.
+ */
+let seedDataTenantId;
+/**
+ * Optional demo/default application for rows missing `scopeInfo.applicationId`
+ * when the entity policy stamps app-bound scope.
+ */
+let seedDataApplicationId;
+function configureEntitySeedDataTenantId(tenantId) {
+    seedDataTenantId = typeof tenantId === 'string' && tenantId ? tenantId : undefined;
+}
+function getEntitySeedDataTenantId() {
+    return seedDataTenantId;
+}
+function configureEntitySeedDataApplicationId(applicationId) {
+    seedDataApplicationId =
+        typeof applicationId === 'string' && applicationId ? applicationId : undefined;
+}
+function getEntitySeedDataApplicationId() {
+    return seedDataApplicationId;
+}
+/**
+ * Attribute-aware seed stamping:
+ * - tenant stamp policies → fill missing scopeInfo.tenantId from configured seed tenant
+ * - app stamp policies → also fill missing scopeInfo.applicationId when configured
+ * - empty/global policies → ensure scopeInfo is `{}` when missing
+ */
+function stampDemoScopeIfNeeded(entityName, row) {
+    const policy = (0, entity_access_policy_cache_1.resolveEntityAccessPolicy)(entityName);
+    const stamp = (0, entity_access_expression_builtins_1.createScopeStampForPolicy)({
+        write: policy.write,
+        read: policy.read,
+    });
+    const record = row;
+    const existing = record['scopeInfo'] ?? undefined;
+    if (stamp === 'none') {
+        return row;
+    }
+    if (stamp === 'empty') {
+        // Platform-global rows must stay attribute-empty (never inherit demo seed tenant).
+        return {
+            ...record,
+            scopeInfo: {},
+        };
+    }
+    if (stamp === 'tenant' || stamp === 'app') {
+        // Explicit empty scopeInfo from mocks means platform-global — do not stamp demo tenant.
+        if (existing && typeof existing === 'object' && Object.keys(existing).length === 0) {
+            return row;
+        }
+        const { kind: _k, catalogScope: _c, ...cleanExisting } = (existing && typeof existing === 'object' ? existing : {});
+        const next = { ...cleanExisting };
+        let changed = existing != null && ('kind' in existing || 'catalogScope' in existing);
+        const mockProvidedTenantId = typeof cleanExisting['tenantId'] === 'string' && Boolean(cleanExisting['tenantId']);
+        const mockProvidedApplicationId = typeof cleanExisting['applicationId'] === 'string' &&
+            Boolean(cleanExisting['applicationId']);
+        // Mock `{ tenantId }` without applicationId is intentional tenant-wide catalog scope
+        // (e.g. Developer role) — do not inherit the demo app id.
+        const mockIsTenantWide = mockProvidedTenantId && !mockProvidedApplicationId;
+        const hasTenant = typeof next['tenantId'] === 'string' && Boolean(next['tenantId']);
+        if (!hasTenant && seedDataTenantId) {
+            next['tenantId'] = seedDataTenantId;
+            changed = true;
+        }
+        if (stamp === 'app') {
+            const hasApp = typeof next['applicationId'] === 'string' && Boolean(next['applicationId']);
+            if (!hasApp && seedDataApplicationId && !mockIsTenantWide) {
+                next['applicationId'] = seedDataApplicationId;
+                changed = true;
+            }
+        }
+        if (!changed) {
+            return row;
+        }
+        return {
+            ...record,
+            scopeInfo: next,
+        };
+    }
+    return row;
+}
+function stampCollection(entityName, collection) {
+    return collection.map((row) => stampDemoScopeIfNeeded(entityName, row));
+}
 function createEntitySeedStorageAdapter(backend) {
     return {
-        initial: (entityName, collection, options) => backend.initial(entityName, collection, {
+        initial: (entityName, collection, options) => backend.initial(entityName, stampCollection(entityName, collection), {
             ...DEFAULT_SEED_INITIAL_OPTIONS,
             ...options,
         }),
@@ -17,7 +109,7 @@ function createEntitySeedStorageAdapter(backend) {
             const result = await backend.query(entityName, { skip: 0, take: 0 });
             return (result.items ?? []);
         },
-        insertOne: (entityName, entity) => backend.insertOne(entityName, entity),
+        insertOne: (entityName, entity) => backend.insertOne(entityName, stampDemoScopeIfNeeded(entityName, entity)),
         updateOne: (entityName, id, keyValues) => backend.updateOne(entityName, id, keyValues),
     };
 }

package/jql/abstract/src/lib/entity-store/entity-seed-storage.adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"entity-seed-storage.adapter.js","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/jql/abstract/src/lib/entity-store/entity-seed-storage.adapter.ts"],"names":[],"mappings":";;AAWA,wEAuBC;AA/BD,sDAAsD;AAEtD,MAAM,4BAA4B,GAAG;IACnC,SAAS,EAAE,SAAkB;IAC7B,kBAAkB,EAAE,IAAI;IACxB,UAAU,EAAE,CAAC,IAAI,CAAC;CACnB,CAAC;AAEF,SAAgB,8BAA8B,CAAC,OAA6B;IAC1E,OAAO;QACL,OAAO,EAAE,CACP,UAAkB,EAClB,UAAe,EACf,OAAwD,EACxD,EAAE,CACF,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,UAAU,EAAE;YACtC,GAAG,4BAA4B;YAC/B,GAAG,OAAO;SACX,CAAiB;QAEpB,KAAK,CAAC,MAAM,CAAC,UAAkB;YAC7B,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;YACrE,OAAO,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAqD,CAAC;QAClF,CAAC;QAED,SAAS,EAAE,CAAC,UAAkB,EAAE,MAA+B,EAAE,EAAE,CACjE,OAAO,CAAC,SAAS,CAAC,UAAU,EAAE,MAAM,CAAoB;QAE1D,SAAS,EAAE,CAAC,UAAkB,EAAE,EAAU,EAAE,SAAkC,EAAE,EAAE,CAChF,OAAO,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,EAAE,SAAS,CAAC;KAC/C,CAAC;AACJ,CAAC;AAED,YAAY"}
+{"version":3,"file":"entity-seed-storage.adapter.js","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/jql/abstract/src/lib/entity-store/entity-seed-storage.adapter.ts"],"names":[],"mappings":"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"}

package/jql/abstract/src/lib/entity-store/entity-store-request.util.d.ts

@@ -23,4 +23,6 @@ export declare function buildEntityJqlQueryFromRequest(from: string, request: AX
     useExternalQuickSearch?: boolean;
     idFilter?: string[];
 }): JqlQuery;
+/** Converts a CDK-style AXP filter tree into a {@link JqlFilter}. */
+export declare function axpFilterToJqlFilter(filter: unknown): JqlFilter | undefined;
 //# sourceMappingURL=entity-store-request.util.d.ts.map

package/jql/abstract/src/lib/entity-store/entity-store-request.util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"entity-store-request.util.d.ts","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/jql/abstract/src/lib/entity-store/entity-store-request.util.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAS5D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAevD,mFAAmF;AACnF,wBAAgB,2BAA2B,CACzC,OAAO,EAAE;IACP,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC,EACD,gBAAgB,CAAC,EAAE,MAAM,EAAE,EAC3B,OAAO,CAAC,EAAE;IAAE,sBAAsB,CAAC,EAAE,OAAO,CAAA;CAAE,GAC7C,SAAS,GAAG,SAAS,CA6BvB;AAED,yFAAyF;AACzF,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,EAC/D,gBAAgB,CAAC,EAAE,MAAM,EAAE,EAC3B,OAAO,CAAC,EAAE;IAAE,sBAAsB,CAAC,EAAE,OAAO,CAAA;CAAE,GAC7C,SAAS,CAGX;AAED,yFAAyF;AACzF,wBAAgB,eAAe,CAC7B,IAAI,CAAC,EAAE,eAAe,CAAC,MAAM,CAAC,EAC9B,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/B,OAAO,EAAE,GAAG,SAAS,CAUvB;AAED,mFAAmF;AACnF,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,eAAe,GACvB,QAAQ,CAEV;AAED,0FAA0F;AAC1F,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,eAAe,EACxB,UAAU,CAAC,EAAE,MAAM,EACnB,gBAAgB,CAAC,EAAE,MAAM,EAAE,EAC3B,OAAO,CAAC,EAAE;IAAE,sBAAsB,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,GAClE,QAAQ,CA6BV"}
+{"version":3,"file":"entity-store-request.util.d.ts","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/jql/abstract/src/lib/entity-store/entity-store-request.util.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAS5D,OAAO,EAAE,eAAe,EAAgB,MAAM,sBAAsB,CAAC;AAerE,mFAAmF;AACnF,wBAAgB,2BAA2B,CACzC,OAAO,EAAE;IACP,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC,EACD,gBAAgB,CAAC,EAAE,MAAM,EAAE,EAC3B,OAAO,CAAC,EAAE;IAAE,sBAAsB,CAAC,EAAE,OAAO,CAAA;CAAE,GAC7C,SAAS,GAAG,SAAS,CA6BvB;AAED,yFAAyF;AACzF,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,EAC/D,gBAAgB,CAAC,EAAE,MAAM,EAAE,EAC3B,OAAO,CAAC,EAAE;IAAE,sBAAsB,CAAC,EAAE,OAAO,CAAA;CAAE,GAC7C,SAAS,CAGX;AAED,yFAAyF;AACzF,wBAAgB,eAAe,CAC7B,IAAI,CAAC,EAAE,eAAe,CAAC,MAAM,CAAC,EAC9B,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/B,OAAO,EAAE,GAAG,SAAS,CAgBvB;AAcD,mFAAmF;AACnF,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,eAAe,GACvB,QAAQ,CAEV;AAED,0FAA0F;AAC1F,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,eAAe,EACxB,UAAU,CAAC,EAAE,MAAM,EACnB,gBAAgB,CAAC,EAAE,MAAM,EAAE,EAC3B,OAAO,CAAC,EAAE;IAAE,sBAAsB,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,GAClE,QAAQ,CA8BV;AAaD,qEAAqE;AACrE,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,OAAO,GAAG,SAAS,GAAG,SAAS,CA2B3E"}

package/jql/abstract/src/lib/entity-store/entity-store-request.util.js

@@ -5,6 +5,7 @@ exports.entityScopedFilter = entityScopedFilter;
 exports.mapAxpSortToJql = mapAxpSortToJql;
 exports.buildJqlQueryFromRequest = buildJqlQueryFromRequest;
 exports.buildEntityJqlQueryFromRequest = buildEntityJqlQueryFromRequest;
+exports.axpFilterToJqlFilter = axpFilterToJqlFilter;
 const jql_filter_util_1 = require("../jql-filter.util");
 const jql_operator_util_1 = require("../jql-operator.util");
 const odata_query_parser_1 = require("../odata/odata-query.parser");
@@ -50,7 +51,24 @@ function mapAxpSortToJql(sort, params) {
     if (!sort?.length) {
         return undefined;
     }
-    return sort.map((item) => ({ field: item.field, dir: item.dir }));
+    const mapped = sort
+        .map((item) => {
+        const field = resolveAxpSortField(item);
+        return field ? { field, dir: item.dir } : undefined;
+    })
+        .filter((item) => Boolean(item));
+    return mapped.length ? mapped : undefined;
+}
+/**
+ * Entity list views and some AXDataSource payloads send `{ name, dir }`;
+ * AXPQueryRequest / JQL sort use `{ field, dir }`. Accept either on the wire.
+ */
+function resolveAxpSortField(item) {
+    const field = typeof item.field === 'string' ? item.field.trim() : '';
+    if (field) {
+        return field;
+    }
+    return typeof item.name === 'string' ? item.name.trim() : '';
 }
 /** Builds a {@link JqlQuery} from an AXP/OData request for a given source name. */
 function buildJqlQueryFromRequest(from, entityName, request) {
@@ -79,7 +97,8 @@ function buildEntityJqlQueryFromRequest(from, request, entityName, searchableFie
         sort: mapAxpSortToJql(request.sort, request.params) ?? odata.sort,
         skip: odata.skip ?? request.skip ?? 0,
         take: odata.take ?? request.take ?? 0,
-        projection: odata.projection,
+        // Prefer OData `$select` (fields planner writes host projection here). Fall back to `fields` for simple callers.
+        projection: odata.projection?.length ? odata.projection : request.fields,
         aggregate: odata.aggregate,
     };
 }
@@ -93,6 +112,7 @@ function parseODataNumber(value) {
     }
     return undefined;
 }
+/** Converts a CDK-style AXP filter tree into a {@link JqlFilter}. */
 function axpFilterToJqlFilter(filter) {
     if (!filter || typeof filter !== 'object') {
         return undefined;

package/jql/abstract/src/lib/entity-store/entity-store-request.util.js.map

@@ -1 +1 @@
-{"version":3,"file":"entity-store-request.util.js","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/jql/abstract/src/lib/entity-store/entity-store-request.util.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"entity-store-request.util.js","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/jql/abstract/src/lib/entity-store/entity-store-request.util.ts"],"names":[],"mappings":"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"}

package/jql/abstract/src/lib/entity-store/entity-store.service.d.ts

@@ -51,6 +51,13 @@ export declare class EntityStoreService implements EntityStorageBackend, OnModul
     initial(entityName: string, collection: unknown[], options?: EntityStorageInitialOptions): Promise<unknown[]>;
     /** Resolves binding for callers that need the target DataSource (schema/seed). */
     resolveBinding(entityName: string): import("../..").ResolvedStorageBinding;
+    private readOne;
+    private resolveRelationJoins;
+    /**
+     * Same-DataSource joins only; rewrite `source` to the registered JQL name
+     * (`physicalName` when set) so the engine registry can resolve `$lookup`.
+     */
+    private prepareJoinsForEngine;
     private resolveEngineAndSource;
     private ensurePhysicalSource;
 }

package/jql/abstract/src/lib/entity-store/entity-store.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"entity-store.service.d.ts","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/jql/abstract/src/lib/entity-store/entity-store.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"entity-store.service.d.ts","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/jql/abstract/src/lib/entity-store/entity-store.service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAC;AACpH,OAAO,EAA6B,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACzE,OAAO,EAAE,yBAAyB,EAAE,MAAM,2CAA2C,CAAC;AACtF,OAAO,EACL,sBAAsB,EACtB,KAAK,8BAA8B,EACpC,MAAM,wCAAwC,CAAC;AAIhD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAEhF,OAAO,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAWxE,OAAO,EAAE,eAAe,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AAInF,MAAM,WAAW,iBAAiB;IAChC,2DAA2D;IAC3D,iBAAiB,EAAE,MAAM,CAAC;IAC1B,0FAA0F;IAC1F,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,MAAM,WAAW,mBAAmB;IAClC,WAAW,CAAC,KAAK,EAAE;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,GAAG,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,KAAK,CAAC;YAAE,KAAK,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;KAAE,CAAC,CAAC;CAChE;AAED,MAAM,WAAW,oBAAoB;IACnC,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;CACjE;AAMD;;;GAGG;AACH,qBAAa,kBAAmB,YAAW,oBAAoB,EAAE,YAAY;IAIzE,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC;IAPtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuC;gBAG3C,MAAM,EAAE,iBAAiB,EACzB,WAAW,EAAE,yBAAyB,EACtC,eAAe,EAAE,sBAAsB,EACvC,cAAc,EAAE,oBAAoB,EACpC,kBAAkB,CAAC,EAAE,mBAAmB,YAAA;IAG3D,IAAI,MAAM,IAAI,MAAM,CAEnB;IAEK,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAK7B,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAIxD,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,0BAA0B,CAAC;IAuExF,SAAS,CACb,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,wBAAwB,CAAC;IAgB9B,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAkB/D,SAAS,CACb,UAAU,EAAE,MAAM,EAClB,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC7B,OAAO,CAAC,OAAO,CAAC;IAoBb,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYxD,OAAO,CACX,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,OAAO,EAAE,EACrB,OAAO,GAAE,2BAA0E,GAClF,OAAO,CAAC,OAAO,EAAE,CAAC;IAkErB,kFAAkF;IAClF,cAAc,CAAC,UAAU,EAAE,MAAM;YAInB,OAAO;YAqBP,oBAAoB;IAelC;;;OAGG;YACW,qBAAqB;YA0BrB,sBAAsB;YAatB,oBAAoB;CAsBnC;AAID,YAAY,EAAE,8BAA8B,EAAE,CAAC"}

package/jql/abstract/src/lib/entity-store/entity-store.service.js

@@ -6,6 +6,7 @@ const jql_filter_util_1 = require("../jql-filter.util");
 const entity_schema_naming_util_1 = require("../entity-schema/entity-schema-naming.util");
 const entity_store_aggregate_util_1 = require("./entity-store-aggregate.util");
 const entity_store_request_util_1 = require("./entity-store-request.util");
+const entity_relation_join_planner_1 = require("./entity-relation-join.planner");
 const entity_fulltext_search_util_1 = require("./entity-fulltext-search.util");
 const entity_quick_search_pagination_util_1 = require("./entity-quick-search-pagination.util");
 //#endregion
@@ -31,19 +32,11 @@ class EntityStoreService {
         this.logger.log(`Entity store multi-DataSource router ready [${listed}]`);
     }
     async getOne(entityName, id) {
-        const { engine, sourceName } = await this.resolveEngineAndSource(entityName);
-        const doc = await engine.findOne({
-            from: sourceName,
-            where: (0, jql_filter_util_1.eqCondition)('id', id),
-        });
-        if (!doc) {
-            throw new common_1.NotFoundException(`Entity not found: ${entityName}/${id}`);
-        }
-        return doc;
+        return this.readOne(entityName, id, { includeRelations: true });
     }
     async query(entityName, request) {
         const schema = await this.schemaResolver.ensureEntityReady(entityName);
-        const { engine, sourceName } = await this.resolveEngineAndSource(entityName);
+        const { engine, sourceName, dataSource } = await this.resolveEngineAndSource(entityName);
         const searchableFields = (0, entity_fulltext_search_util_1.resolveFullTextSearchFields)(schema);
         const quickSearchTerm = (0, entity_fulltext_search_util_1.extractQuickSearchTerm)(request.params);
         const useElasticsearchQuickSearch = !!quickSearchTerm &&
@@ -62,6 +55,7 @@ class EntityStoreService {
             }
             const idFilter = searchResult.hits.map((hit) => hit.refId);
             const jqlQuery = (0, entity_store_request_util_1.buildEntityJqlQueryFromRequest)(sourceName, request, undefined, searchableFields, { useExternalQuickSearch: true, idFilter });
+            jqlQuery.joins = await this.resolveRelationJoins(entityName, engine.dialect, dataSource, request.fields);
             if (jqlQuery.aggregate) {
                 const result = await engine.aggregate({
                     ...jqlQuery,
@@ -73,6 +67,7 @@ class EntityStoreService {
             return { totalCount: searchResult.total, items: result.items };
         }
         const jqlQuery = (0, entity_store_request_util_1.buildEntityJqlQueryFromRequest)(sourceName, request, undefined, searchableFields);
+        jqlQuery.joins = await this.resolveRelationJoins(entityName, engine.dialect, dataSource, request.fields);
         if (jqlQuery.aggregate) {
             const result = await engine.aggregate({
                 ...jqlQuery,
@@ -111,7 +106,7 @@ class EntityStoreService {
     }
     async updateOne(entityName, id, patch) {
         const { engine, sourceName } = await this.resolveEngineAndSource(entityName);
-        const existing = await this.getOne(entityName, id);
+        const existing = await this.readOne(entityName, id, { includeRelations: false });
         const base = (existing ?? {});
         const { id: _omitId, ...safePatch } = patch;
         const updated = {
@@ -195,6 +190,59 @@ class EntityStoreService {
     resolveBinding(entityName) {
         return this.bindingResolver.resolve(entityName);
     }
+    async readOne(entityName, id, options) {
+        const { engine, sourceName, dataSource } = await this.resolveEngineAndSource(entityName);
+        const joins = options.includeRelations
+            ? await this.resolveRelationJoins(entityName, engine.dialect, dataSource)
+            : undefined;
+        const doc = await engine.findOne({
+            from: sourceName,
+            where: (0, jql_filter_util_1.eqCondition)('id', id),
+            joins,
+        });
+        if (!doc) {
+            throw new common_1.NotFoundException(`Entity not found: ${entityName}/${id}`);
+        }
+        return doc;
+    }
+    async resolveRelationJoins(entityName, dialect, hostDataSource, fields) {
+        if (!(0, entity_relation_join_planner_1.getEntityRelationJoinPlanner)() || dialect !== 'mongodb') {
+            return undefined;
+        }
+        const planned = await (0, entity_relation_join_planner_1.getEntityRelationJoinPlanner)().plan(entityName, fields);
+        const prepared = await this.prepareJoinsForEngine(planned, hostDataSource);
+        return prepared.length ? prepared : undefined;
+    }
+    /**
+     * Same-DataSource joins only; rewrite `source` to the registered JQL name
+     * (`physicalName` when set) so the engine registry can resolve `$lookup`.
+     */
+    async prepareJoinsForEngine(joins, hostDataSource) {
+        const kept = [];
+        for (const join of joins) {
+            let sourceName;
+            try {
+                const binding = this.bindingResolver.resolve(join.source);
+                if (binding.dataSource !== hostDataSource) {
+                    continue;
+                }
+                await this.schemaResolver.ensureEntityReady(join.source);
+                sourceName = binding.physicalName ?? (0, entity_schema_naming_util_1.resolveEntityJqlSourceName)(join.source);
+            }
+            catch {
+                continue;
+            }
+            const nested = join.joins?.length
+                ? await this.prepareJoinsForEngine(join.joins, hostDataSource)
+                : undefined;
+            kept.push({
+                ...join,
+                source: sourceName,
+                joins: nested?.length ? nested : undefined,
+            });
+        }
+        return kept;
+    }
     async resolveEngineAndSource(entityName) {
         await this.schemaResolver.ensureEntityReady(entityName);
         const binding = this.bindingResolver.resolve(entityName);

package/jql/abstract/src/lib/entity-store/entity-store.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"entity-store.service.js","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/jql/abstract/src/lib/entity-store/entity-store.service.ts"],"names":[],"mappings":";;;AACA,2CAAyE;AAMzE,wDAAiD;AAEjD,0FAAwF;AAKxF,+EAA6E;AAC7E,2EAA6E;AAC7E,+EAGuC;AACvC,+FAAqF;AAyBrF,YAAY;AAEZ,iDAAiD;AAEjD;;;GAGG;AACH,MAAa,kBAAkB;IAG7B,YACmB,MAAyB,EACzB,WAAsC,EACtC,eAAuC,EACvC,cAAoC,EACpC,kBAAwC;QAJxC,WAAM,GAAN,MAAM,CAAmB;QACzB,gBAAW,GAAX,WAAW,CAA2B;QACtC,oBAAe,GAAf,eAAe,CAAwB;QACvC,mBAAc,GAAd,cAAc,CAAsB;QACpC,uBAAkB,GAAlB,kBAAkB,CAAsB;QAP1C,WAAM,GAAG,IAAI,eAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAQ3D,CAAC;IAEJ,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpF,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,+CAA+C,MAAM,GAAG,CAAC,CAAC;IAC5E,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,UAAkB,EAAE,EAAU;QACzC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;QAC7E,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;YAC/B,IAAI,EAAE,UAAU;YAChB,KAAK,EAAE,IAAA,6BAAW,EAAC,IAAI,EAAE,EAAE,CAAC;SAC7B,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,MAAM,IAAI,0BAAiB,CAAC,qBAAqB,UAAU,IAAI,EAAE,EAAE,CAAC,CAAC;QACvE,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,UAAkB,EAAE,OAAwB;QACtD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;QACvE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;QAC7E,MAAM,gBAAgB,GAAG,IAAA,yDAA2B,EAAC,MAAM,CAAC,CAAC;QAE7D,MAAM,eAAe,GAAG,IAAA,oDAAsB,EAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC/D,MAAM,2BAA2B,GAC/B,CAAC,CAAC,eAAe;YACjB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB;YACjC,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC;QAE5B,IAAI,2BAA2B,EAAE,CAAC;YAChC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,IAAA,kEAA4B,EAAC,OAAO,CAAC,CAAC;YAC7D,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,kBAAmB,CAAC,WAAW,CAAC;gBAC9D,IAAI,EAAE,eAAe;gBACrB,OAAO,EAAE,UAAU;gBACnB,IAAI;gBACJ,IAAI;aACL,CAAC,CAAC;YAEH,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBAC9B,OAAO,EAAE,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;YACtC,CAAC;YAED,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAC3D,MAAM,QAAQ,GAAG,IAAA,0DAA8B,EAC7C,UAAU,EACV,OAAO,EACP,SAAS,EACT,gBAAgB,EAChB,EAAE,sBAAsB,EAAE,IAAI,EAAE,QAAQ,EAAE,CAC3C,CAAC;YAEF,IAAI,QAAQ,CAAC,SAAS,EAAE,CAAC;gBACvB,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC;oBACpC,GAAG,QAAQ;oBACX,SAAS,EAAE,QAAQ,CAAC,SAAS;iBAC9B,CAAC,CAAC;gBACH,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;YAClF,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC3C,OAAO,EAAE,UAAU,EAAE,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;QACjE,CAAC;QAED,MAAM,QAAQ,GAAG,IAAA,0DAA8B,EAAC,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,gBAAgB,CAAC,CAAC;QAElG,IAAI,QAAQ,CAAC,SAAS,EAAE,CAAC;YACvB,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC;gBACpC,GAAG,QAAQ;gBACX,SAAS,EAAE,QAAQ,CAAC,SAAS;aAC9B,CAAC,CAAC;YACH,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;QAClF,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,SAAS,CACb,UAAkB,EAClB,OAAkC;QAElC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;QAC7E,MAAM,QAAQ,GAAG,IAAA,0DAA4B,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAEnE,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,YAAY,CAAC,MAAM,EAAE,CAAC;YAC7C,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;QACtB,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC;YACpC,GAAG,QAAQ;YACX,SAAS,EAAE,QAAQ,CAAC,SAAS;SAC9B,CAAC,CAAC;QAEH,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,KAAkC,EAAE,CAAC;IAC7D,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,UAAkB,EAAE,MAAe;QACjD,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;QAC7E,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,EAAE,CAA4B,CAAC;QACzD,MAAM,EAAE,GACN,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QACxF,MAAM,GAAG,GAAG;YACV,GAAG,MAAM;YACT,EAAE;SACH,CAAC;QAEF,MAAM,MAAM,CAAC,MAAM,CAAC;YAClB,IAAI,EAAE,UAAU;YAChB,SAAS,EAAE,CAAC,GAAG,CAAC;SACjB,CAAC,CAAC;QAEH,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,KAAK,CAAC,SAAS,CACb,UAAkB,EAClB,EAAU,EACV,KAA8B;QAE9B,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;QAC7E,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QACnD,MAAM,IAAI,GAAG,CAAC,QAAQ,IAAI,EAAE,CAA4B,CAAC;QACzD,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,SAAS,EAAE,GAAG,KAAK,CAAC;QAC5C,MAAM,OAAO,GAAG;YACd,GAAG,IAAI;YACP,GAAG,SAAS;YACZ,EAAE;SACH,CAAC;QAEF,MAAM,MAAM,CAAC,MAAM,CAAC;YAClB,MAAM,EAAE,UAAU;YAClB,KAAK,EAAE,IAAA,6BAAW,EAAC,IAAI,EAAE,EAAE,CAAC;YAC5B,GAAG,EAAE,OAAO;SACb,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,UAAkB,EAAE,EAAU;QAC5C,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;QAC7E,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC;YAClC,IAAI,EAAE,UAAU;YAChB,KAAK,EAAE,IAAA,6BAAW,EAAC,IAAI,EAAE,EAAE,CAAC;SAC7B,CAAC,CAAC;QAEH,IAAI,OAAO,KAAK,CAAC,EAAE,CAAC;YAClB,MAAM,IAAI,0BAAiB,CAAC,qBAAqB,UAAU,IAAI,EAAE,EAAE,CAAC,CAAC;QACvE,CAAC;IACH,CAAC;IAED,KAAK,CAAC,OAAO,CACX,UAAkB,EAClB,UAAqB,EACrB,UAAuC,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,MAAM,CAAC,EAAE;QAEnF,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,CAAC;YACxB,OAAO,UAAU,CAAC;QACpB,CAAC;QAED,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;QAC7E,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,CAAC,MAAM,CAAC,CAAC;QAClD,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC;QAC/C,MAAM,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,IAAI,KAAK,CAAC;QAC/D,IAAI,YAAY,GAAG,IAAI,CAAC;QAExB,MAAM,aAAa,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC;YACvC,IAAI,EAAE,UAAU;SACjB,CAAC,CAAC;QAEH,IAAI,CAAC,kBAAkB,IAAI,aAAa,GAAG,CAAC,EAAE,CAAC;YAC7C,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC;gBACjC,IAAI,EAAE,UAAU;aACjB,CAAC,CAAC;YACH,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;gBAC9B,MAAM,MAAM,GAAG,IAA+B,CAAC;gBAC/C,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CACxC,UAAU,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAE,GAA+B,CAAC,GAAG,CAAC,KAAK,MAAM,CAAC,GAAG,CAAC,CAAC,CACjF,CAAC;gBACF,IAAI,KAAK,EAAE,CAAC;oBACV,YAAY,GAAG,KAAK,CAAC;oBACrB,MAAM;gBACR,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAO,UAAU,CAAC;QACpB,CAAC;QAED,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC5B,MAAM,MAAM,CAAC,MAAM,CAAC;gBAClB,IAAI,EAAE,UAAU;aACjB,CAAC,CAAC;QACL,CAAC;QAED,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACnC,MAAM,MAAM,GAAG,IAA+B,CAAC;YAC/C,MAAM,EAAE,GACN,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;YACxF,OAAO;gBACL,GAAG,MAAM;gBACT,EAAE;aACH,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC;YACH,MAAM,MAAM,CAAC,MAAM,CAAC;gBAClB,IAAI,EAAE,UAAU;gBAChB,SAAS,EAAE,IAAI;aAChB,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,GAAI,KAAoC,EAAE,IAAI,CAAC;YACzD,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;gBACnB,MAAM,KAAK,CAAC;YACd,CAAC;QACH,CAAC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,kFAAkF;IAClF,cAAc,CAAC,UAAkB;QAC/B,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAClD,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAClC,UAAkB;QAElB,MAAM,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;QACxD,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACzD,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC9D,MAAM,WAAW,GAAG,IAAA,sDAA0B,EAAC,UAAU,CAAC,CAAC;QAC3D,MAAM,UAAU,GAAG,OAAO,CAAC,YAAY,IAAI,WAAW,CAAC;QAEvD,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;QACtF,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC;IAChE,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAChC,MAAqB,EACrB,UAAkB,EAClB,UAAkB,EAClB,YAAqB;QAErB,IAAI,MAAM,CAAC,mBAAmB,CAAC,UAAU,CAAC,EAAE,CAAC;YAC3C,OAAO;QACT,CAAC;QAED,kFAAkF;QAClF,IAAI,YAAY,IAAI,YAAY,KAAK,UAAU,EAAE,CAAC;YAChD,MAAM,MAAM,GAAc;gBACxB,IAAI,EAAE,UAAU;gBAChB,OAAO,EAAE,UAAU;gBACnB,UAAU,EAAE,YAAY;gBACxB,KAAK,EAAE,YAAY;gBACnB,OAAO,EAAE,IAAI;aACd,CAAC;YACF,MAAM,MAAM,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;CACF;AAnRD,gDAmRC"}
+{"version":3,"file":"entity-store.service.js","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/jql/abstract/src/lib/entity-store/entity-store.service.ts"],"names":[],"mappings":";;;AACA,2CAAyE;AAMzE,wDAAiD;AAEjD,0FAAwF;AAKxF,+EAA6E;AAC7E,2EAA6E;AAC7E,iFAA8E;AAG9E,+EAGuC;AACvC,+FAAqF;AAyBrF,YAAY;AAEZ,iDAAiD;AAEjD;;;GAGG;AACH,MAAa,kBAAkB;IAG7B,YACmB,MAAyB,EACzB,WAAsC,EACtC,eAAuC,EACvC,cAAoC,EACpC,kBAAwC;QAJxC,WAAM,GAAN,MAAM,CAAmB;QACzB,gBAAW,GAAX,WAAW,CAA2B;QACtC,oBAAe,GAAf,eAAe,CAAwB;QACvC,mBAAc,GAAd,cAAc,CAAsB;QACpC,uBAAkB,GAAlB,kBAAkB,CAAsB;QAP1C,WAAM,GAAG,IAAI,eAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAQ3D,CAAC;IAEJ,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpF,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,+CAA+C,MAAM,GAAG,CAAC,CAAC;IAC5E,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,UAAkB,EAAE,EAAU;QACzC,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC;IAClE,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,UAAkB,EAAE,OAAwB;QACtD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;QACvE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;QACzF,MAAM,gBAAgB,GAAG,IAAA,yDAA2B,EAAC,MAAM,CAAC,CAAC;QAE7D,MAAM,eAAe,GAAG,IAAA,oDAAsB,EAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC/D,MAAM,2BAA2B,GAC/B,CAAC,CAAC,eAAe;YACjB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB;YACjC,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC;QAE5B,IAAI,2BAA2B,EAAE,CAAC;YAChC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,IAAA,kEAA4B,EAAC,OAAO,CAAC,CAAC;YAC7D,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,kBAAmB,CAAC,WAAW,CAAC;gBAC9D,IAAI,EAAE,eAAe;gBACrB,OAAO,EAAE,UAAU;gBACnB,IAAI;gBACJ,IAAI;aACL,CAAC,CAAC;YAEH,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBAC9B,OAAO,EAAE,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;YACtC,CAAC;YAED,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAC3D,MAAM,QAAQ,GAAG,IAAA,0DAA8B,EAC7C,UAAU,EACV,OAAO,EACP,SAAS,EACT,gBAAgB,EAChB,EAAE,sBAAsB,EAAE,IAAI,EAAE,QAAQ,EAAE,CAC3C,CAAC;YACF,QAAQ,CAAC,KAAK,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAC9C,UAAU,EACV,MAAM,CAAC,OAAO,EACd,UAAU,EACV,OAAO,CAAC,MAAM,CACf,CAAC;YAEF,IAAI,QAAQ,CAAC,SAAS,EAAE,CAAC;gBACvB,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC;oBACpC,GAAG,QAAQ;oBACX,SAAS,EAAE,QAAQ,CAAC,SAAS;iBAC9B,CAAC,CAAC;gBACH,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;YAClF,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC3C,OAAO,EAAE,UAAU,EAAE,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;QACjE,CAAC;QAED,MAAM,QAAQ,GAAG,IAAA,0DAA8B,EAAC,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,gBAAgB,CAAC,CAAC;QAClG,QAAQ,CAAC,KAAK,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAC9C,UAAU,EACV,MAAM,CAAC,OAAO,EACd,UAAU,EACV,OAAO,CAAC,MAAM,CACf,CAAC;QAEF,IAAI,QAAQ,CAAC,SAAS,EAAE,CAAC;YACvB,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC;gBACpC,GAAG,QAAQ;gBACX,SAAS,EAAE,QAAQ,CAAC,SAAS;aAC9B,CAAC,CAAC;YACH,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;QAClF,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,SAAS,CACb,UAAkB,EAClB,OAAkC;QAElC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;QAC7E,MAAM,QAAQ,GAAG,IAAA,0DAA4B,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAEnE,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,YAAY,CAAC,MAAM,EAAE,CAAC;YAC7C,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;QACtB,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC;YACpC,GAAG,QAAQ;YACX,SAAS,EAAE,QAAQ,CAAC,SAAS;SAC9B,CAAC,CAAC;QAEH,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,KAAkC,EAAE,CAAC;IAC7D,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,UAAkB,EAAE,MAAe;QACjD,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;QAC7E,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,EAAE,CAA4B,CAAC;QACzD,MAAM,EAAE,GACN,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QACxF,MAAM,GAAG,GAAG;YACV,GAAG,MAAM;YACT,EAAE;SACH,CAAC;QAEF,MAAM,MAAM,CAAC,MAAM,CAAC;YAClB,IAAI,EAAE,UAAU;YAChB,SAAS,EAAE,CAAC,GAAG,CAAC;SACjB,CAAC,CAAC;QAEH,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,KAAK,CAAC,SAAS,CACb,UAAkB,EAClB,EAAU,EACV,KAA8B;QAE9B,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;QAC7E,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,EAAE,EAAE,gBAAgB,EAAE,KAAK,EAAE,CAAC,CAAC;QACjF,MAAM,IAAI,GAAG,CAAC,QAAQ,IAAI,EAAE,CAA4B,CAAC;QACzD,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,SAAS,EAAE,GAAG,KAAK,CAAC;QAC5C,MAAM,OAAO,GAAG;YACd,GAAG,IAAI;YACP,GAAG,SAAS;YACZ,EAAE;SACH,CAAC;QAEF,MAAM,MAAM,CAAC,MAAM,CAAC;YAClB,MAAM,EAAE,UAAU;YAClB,KAAK,EAAE,IAAA,6BAAW,EAAC,IAAI,EAAE,EAAE,CAAC;YAC5B,GAAG,EAAE,OAAO;SACb,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,UAAkB,EAAE,EAAU;QAC5C,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;QAC7E,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC;YAClC,IAAI,EAAE,UAAU;YAChB,KAAK,EAAE,IAAA,6BAAW,EAAC,IAAI,EAAE,EAAE,CAAC;SAC7B,CAAC,CAAC;QAEH,IAAI,OAAO,KAAK,CAAC,EAAE,CAAC;YAClB,MAAM,IAAI,0BAAiB,CAAC,qBAAqB,UAAU,IAAI,EAAE,EAAE,CAAC,CAAC;QACvE,CAAC;IACH,CAAC;IAED,KAAK,CAAC,OAAO,CACX,UAAkB,EAClB,UAAqB,EACrB,UAAuC,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,MAAM,CAAC,EAAE;QAEnF,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,CAAC;YACxB,OAAO,UAAU,CAAC;QACpB,CAAC;QAED,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;QAC7E,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,CAAC,MAAM,CAAC,CAAC;QAClD,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC;QAC/C,MAAM,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,IAAI,KAAK,CAAC;QAC/D,IAAI,YAAY,GAAG,IAAI,CAAC;QAExB,MAAM,aAAa,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC;YACvC,IAAI,EAAE,UAAU;SACjB,CAAC,CAAC;QAEH,IAAI,CAAC,kBAAkB,IAAI,aAAa,GAAG,CAAC,EAAE,CAAC;YAC7C,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC;gBACjC,IAAI,EAAE,UAAU;aACjB,CAAC,CAAC;YACH,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;gBAC9B,MAAM,MAAM,GAAG,IAA+B,CAAC;gBAC/C,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CACxC,UAAU,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAE,GAA+B,CAAC,GAAG,CAAC,KAAK,MAAM,CAAC,GAAG,CAAC,CAAC,CACjF,CAAC;gBACF,IAAI,KAAK,EAAE,CAAC;oBACV,YAAY,GAAG,KAAK,CAAC;oBACrB,MAAM;gBACR,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAO,UAAU,CAAC;QACpB,CAAC;QAED,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC5B,MAAM,MAAM,CAAC,MAAM,CAAC;gBAClB,IAAI,EAAE,UAAU;aACjB,CAAC,CAAC;QACL,CAAC;QAED,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACnC,MAAM,MAAM,GAAG,IAA+B,CAAC;YAC/C,MAAM,EAAE,GACN,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;YACxF,OAAO;gBACL,GAAG,MAAM;gBACT,EAAE;aACH,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC;YACH,MAAM,MAAM,CAAC,MAAM,CAAC;gBAClB,IAAI,EAAE,UAAU;gBAChB,SAAS,EAAE,IAAI;aAChB,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,GAAI,KAAoC,EAAE,IAAI,CAAC;YACzD,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;gBACnB,MAAM,KAAK,CAAC;YACd,CAAC;QACH,CAAC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,kFAAkF;IAClF,cAAc,CAAC,UAAkB;QAC/B,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAClD,CAAC;IAEO,KAAK,CAAC,OAAO,CACnB,UAAkB,EAClB,EAAU,EACV,OAAsC;QAEtC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;QACzF,MAAM,KAAK,GAAG,OAAO,CAAC,gBAAgB;YACpC,CAAC,CAAC,MAAM,IAAI,CAAC,oBAAoB,CAAC,UAAU,EAAE,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC;YACzE,CAAC,CAAC,SAAS,CAAC;QACd,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;YAC/B,IAAI,EAAE,UAAU;YAChB,KAAK,EAAE,IAAA,6BAAW,EAAC,IAAI,EAAE,EAAE,CAAC;YAC5B,KAAK;SACN,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,MAAM,IAAI,0BAAiB,CAAC,qBAAqB,UAAU,IAAI,EAAE,EAAE,CAAC,CAAC;QACvE,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAChC,UAAkB,EAClB,OAAmB,EACnB,cAAsB,EACtB,MAAiB;QAEjB,IAAI,CAAC,IAAA,2DAA4B,GAAE,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC7D,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,IAAA,2DAA4B,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAC/E,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;QAC3E,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IAChD,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,qBAAqB,CAAC,KAAgB,EAAE,cAAsB;QAC1E,MAAM,IAAI,GAAc,EAAE,CAAC;QAC3B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IAAI,UAAkB,CAAC;YACvB,IAAI,CAAC;gBACH,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC1D,IAAI,OAAO,CAAC,UAAU,KAAK,cAAc,EAAE,CAAC;oBAC1C,SAAS;gBACX,CAAC;gBACD,MAAM,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACzD,UAAU,GAAG,OAAO,CAAC,YAAY,IAAI,IAAA,sDAA0B,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC/E,CAAC;YAAC,MAAM,CAAC;gBACP,SAAS;YACX,CAAC;YACD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,EAAE,MAAM;gBAC/B,CAAC,CAAC,MAAM,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,KAAK,EAAE,cAAc,CAAC;gBAC9D,CAAC,CAAC,SAAS,CAAC;YACd,IAAI,CAAC,IAAI,CAAC;gBACR,GAAG,IAAI;gBACP,MAAM,EAAE,UAAU;gBAClB,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;aAC3C,CAAC,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAClC,UAAkB;QAElB,MAAM,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;QACxD,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACzD,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC9D,MAAM,WAAW,GAAG,IAAA,sDAA0B,EAAC,UAAU,CAAC,CAAC;QAC3D,MAAM,UAAU,GAAG,OAAO,CAAC,YAAY,IAAI,WAAW,CAAC;QAEvD,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;QACtF,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC;IAChE,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAChC,MAAqB,EACrB,UAAkB,EAClB,UAAkB,EAClB,YAAqB;QAErB,IAAI,MAAM,CAAC,mBAAmB,CAAC,UAAU,CAAC,EAAE,CAAC;YAC3C,OAAO;QACT,CAAC;QAED,kFAAkF;QAClF,IAAI,YAAY,IAAI,YAAY,KAAK,UAAU,EAAE,CAAC;YAChD,MAAM,MAAM,GAAc;gBACxB,IAAI,EAAE,UAAU;gBAChB,OAAO,EAAE,UAAU;gBACnB,UAAU,EAAE,YAAY;gBACxB,KAAK,EAAE,YAAY;gBACnB,OAAO,EAAE,IAAI;aACd,CAAC;YACF,MAAM,MAAM,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;CACF;AAxVD,gDAwVC"}

package/jql/abstract/src/lib/entity-store/entity-store.tokens.d.ts

@@ -12,4 +12,9 @@ export declare const ENTITY_STORAGE_JQL_INSTANCE: unique symbol;
 export declare const ENTITY_STORAGE_JQL_ENGINE: unique symbol;
 /** Storage binding resolver DI token. */
 export declare const STORAGE_BINDING_RESOLVER: unique symbol;
+/**
+ * Optional definition→join planner. Registered by domain middleware bootstrap.
+ * Entity storage executes the planned {@link JqlJoin} list; it does not load definitions.
+ */
+export declare const ENTITY_RELATION_JOIN_PLANNER: unique symbol;
 //# sourceMappingURL=entity-store.tokens.d.ts.map

package/jql/abstract/src/lib/entity-store/entity-store.tokens.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"entity-store.tokens.d.ts","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/jql/abstract/src/lib/entity-store/entity-store.tokens.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,sBAAsB,eAAmC,CAAC;AAEvE,eAAO,MAAM,mBAAmB,eAAgC,CAAC;AAEjE;;;GAGG;AACH,eAAO,MAAM,2BAA2B,eAAwC,CAAC;AAEjF;;;GAGG;AACH,eAAO,MAAM,yBAAyB,eAAsC,CAAC;AAE7E,yCAAyC;AACzC,eAAO,MAAM,wBAAwB,eAAqC,CAAC"}
+{"version":3,"file":"entity-store.tokens.d.ts","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/jql/abstract/src/lib/entity-store/entity-store.tokens.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,sBAAsB,eAAmC,CAAC;AAEvE,eAAO,MAAM,mBAAmB,eAAgC,CAAC;AAEjE;;;GAGG;AACH,eAAO,MAAM,2BAA2B,eAAwC,CAAC;AAEjF;;;GAGG;AACH,eAAO,MAAM,yBAAyB,eAAsC,CAAC;AAE7E,yCAAyC;AACzC,eAAO,MAAM,wBAAwB,eAAqC,CAAC;AAE3E;;;GAGG;AACH,eAAO,MAAM,4BAA4B,eAAyC,CAAC"}

package/jql/abstract/src/lib/entity-store/entity-store.tokens.js

@@ -1,7 +1,7 @@
 "use strict";
 //#region ---- Entity store DI tokens ----
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.STORAGE_BINDING_RESOLVER = exports.ENTITY_STORAGE_JQL_ENGINE = exports.ENTITY_STORAGE_JQL_INSTANCE = exports.ENTITY_STORE_CONFIG = exports.ENTITY_STORAGE_BACKEND = void 0;
+exports.ENTITY_RELATION_JOIN_PLANNER = exports.STORAGE_BINDING_RESOLVER = exports.ENTITY_STORAGE_JQL_ENGINE = exports.ENTITY_STORAGE_JQL_INSTANCE = exports.ENTITY_STORE_CONFIG = exports.ENTITY_STORAGE_BACKEND = void 0;
 exports.ENTITY_STORAGE_BACKEND = Symbol('ENTITY_STORAGE_BACKEND');
 exports.ENTITY_STORE_CONFIG = Symbol('ENTITY_STORE_CONFIG');
 /**
@@ -16,5 +16,10 @@ exports.ENTITY_STORAGE_JQL_INSTANCE = Symbol('ENTITY_STORAGE_JQL_INSTANCE');
 exports.ENTITY_STORAGE_JQL_ENGINE = Symbol('ENTITY_STORAGE_JQL_ENGINE');
 /** Storage binding resolver DI token. */
 exports.STORAGE_BINDING_RESOLVER = Symbol('STORAGE_BINDING_RESOLVER');
+/**
+ * Optional definition→join planner. Registered by domain middleware bootstrap.
+ * Entity storage executes the planned {@link JqlJoin} list; it does not load definitions.
+ */
+exports.ENTITY_RELATION_JOIN_PLANNER = Symbol('ENTITY_RELATION_JOIN_PLANNER');
 //#endregion
 //# sourceMappingURL=entity-store.tokens.js.map

package/jql/abstract/src/lib/entity-store/entity-store.tokens.js.map

@@ -1 +1 @@
-{"version":3,"file":"entity-store.tokens.js","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/jql/abstract/src/lib/entity-store/entity-store.tokens.ts"],"names":[],"mappings":";AAAA,0CAA0C;;;AAE7B,QAAA,sBAAsB,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC;AAE1D,QAAA,mBAAmB,GAAG,MAAM,CAAC,qBAAqB,CAAC,CAAC;AAEjE;;;GAGG;AACU,QAAA,2BAA2B,GAAG,MAAM,CAAC,6BAA6B,CAAC,CAAC;AAEjF;;;GAGG;AACU,QAAA,yBAAyB,GAAG,MAAM,CAAC,2BAA2B,CAAC,CAAC;AAE7E,yCAAyC;AAC5B,QAAA,wBAAwB,GAAG,MAAM,CAAC,0BAA0B,CAAC,CAAC;AAE3E,YAAY"}
+{"version":3,"file":"entity-store.tokens.js","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/jql/abstract/src/lib/entity-store/entity-store.tokens.ts"],"names":[],"mappings":";AAAA,0CAA0C;;;AAE7B,QAAA,sBAAsB,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC;AAE1D,QAAA,mBAAmB,GAAG,MAAM,CAAC,qBAAqB,CAAC,CAAC;AAEjE;;;GAGG;AACU,QAAA,2BAA2B,GAAG,MAAM,CAAC,6BAA6B,CAAC,CAAC;AAEjF;;;GAGG;AACU,QAAA,yBAAyB,GAAG,MAAM,CAAC,2BAA2B,CAAC,CAAC;AAE7E,yCAAyC;AAC5B,QAAA,wBAAwB,GAAG,MAAM,CAAC,0BAA0B,CAAC,CAAC;AAE3E;;;GAGG;AACU,QAAA,4BAA4B,GAAG,MAAM,CAAC,8BAA8B,CAAC,CAAC;AAEnF,YAAY"}

package/jql/abstract/src/lib/entity-store/entity-store.types.d.ts

@@ -7,6 +7,11 @@ export interface AXPQueryRequest {
     take?: number;
     sort?: AXPQuerySort[];
     filter?: unknown;
+    /**
+     * Optional dotted field paths to return (path-based selection).
+     * Host projection is derived by the fields path planner; nested paths drive lookup/merge-detail hydrate.
+     */
+    fields?: string[];
     params?: Record<string, unknown>;
 }
 export interface AXPPagedListResult<T = unknown> {

package/jql/abstract/src/lib/entity-store/entity-store.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"entity-store.types.d.ts","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/jql/abstract/src/lib/entity-store/entity-store.types.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,KAAK,GAAG,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,YAAY,EAAE,CAAC;IACtB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAED,MAAM,WAAW,kBAAkB,CAAC,CAAC,GAAG,OAAO;IAC7C,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,CAAC,EAAE,CAAC;CACZ;AAED,MAAM,WAAW,0BAA0B;IACzC,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,OAAO,EAAE,CAAC;CAClB;AAMD,MAAM,MAAM,WAAW,GACnB,SAAS,GACT,QAAQ,GACR,QAAQ,GACR,QAAQ,GACR,QAAQ,GACR,QAAQ,GACR,OAAO,GACP,OAAO,GACP,UAAU,GACV,SAAS,GACT,QAAQ,GACR,WAAW,GACX,WAAW,CAAC"}
+{"version":3,"file":"entity-store.types.d.ts","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/jql/abstract/src/lib/entity-store/entity-store.types.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,KAAK,GAAG,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,YAAY,EAAE,CAAC;IACtB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAED,MAAM,WAAW,kBAAkB,CAAC,CAAC,GAAG,OAAO;IAC7C,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,CAAC,EAAE,CAAC;CACZ;AAED,MAAM,WAAW,0BAA0B;IACzC,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,OAAO,EAAE,CAAC;CAClB;AAMD,MAAM,MAAM,WAAW,GACnB,SAAS,GACT,QAAQ,GACR,QAAQ,GACR,QAAQ,GACR,QAAQ,GACR,QAAQ,GACR,OAAO,GACP,OAAO,GACP,UAAU,GACV,SAAS,GACT,QAAQ,GACR,WAAW,GACX,WAAW,CAAC"}

package/jql/abstract/src/lib/entity-store/entity-store.types.js.map

@@ -1 +1 @@
-{"version":3,"file":"entity-store.types.js","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/jql/abstract/src/lib/entity-store/entity-store.types.ts"],"names":[],"mappings":";AAAA,+BAA+B;;AA4C/B,YAAY"}
+{"version":3,"file":"entity-store.types.js","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/jql/abstract/src/lib/entity-store/entity-store.types.ts"],"names":[],"mappings":";AAAA,+BAA+B;;AAiD/B,YAAY"}

package/jql/abstract/src/lib/entity-store/entity-visibility-filter.util.d.ts

@@ -1,6 +1,17 @@
 import { AXPQueryRequest } from './entity-store.types';
+import type { AXPAccessMode, AXPAccessSession, AXPEntityAccessPolicyRecord } from './entity-access-policy.types';
 export declare const VISIBILITY_FILTER_BYPASS = "__bypassVisibilityFilter";
-export declare const OWNERSHIP_FILTER_BYPASS = "__bypassOwnershipFilter";
+/** Server-only scope bypass (login, password reset, membership lookups). */
+export declare const SCOPE_FILTER_BYPASS = "__bypassScopeFilter";
+/** @deprecated Legacy alias — ignored on HTTP; prefer {@link SCOPE_FILTER_BYPASS}. */
+export declare const OWNERSHIP_FILTER_BYPASS = "__bypassScopeFilter";
+interface AxpFilterLeaf {
+    field: string;
+    operator: {
+        type: string;
+    };
+    value?: unknown;
+}
 interface AxpFilterGroup {
     logic: 'and' | 'or';
     filters: unknown[];
@@ -8,16 +19,69 @@ interface AxpFilterGroup {
 export interface EntityVisibilityFilterContext {
     tenantId?: string;
     applicationId?: string;
+    userId?: string;
     bypassVisibility?: boolean;
-    bypassOwnership?: boolean;
+    bypassScope?: boolean;
+    /** Pre-resolved membership user ids (for identity / User lists). */
+    membershipUserIds?: string[];
+    /** Pre-resolved ResourceShare resource ids for share-enabled data entities. */
+    sharedResourceIds?: string[];
+    /** Resolved access policy for the target entity. */
+    policy?: AXPEntityAccessPolicyRecord;
 }
 export declare function isFilterBypassed(params: Record<string, unknown> | undefined, key: string): boolean;
 export declare function bypassVisibilityFilter<T extends AXPQueryRequest>(request: T): T;
-export declare function bypassOwnershipFilter<T extends AXPQueryRequest>(request: T): T;
+export declare function bypassScopeFilter<T extends AXPQueryRequest>(request: T): T;
+/** @deprecated Use {@link bypassScopeFilter}. */
+export declare const bypassOwnershipFilter: typeof bypassScopeFilter;
 export declare function bypassAllEntityVisibilityFilters<T extends AXPQueryRequest>(request: T): T;
-/** Builds AXP filter group for list/query visibility (tenant, application, hidden). */
+/**
+ * Translate a read builtin (or known alias) into an AXP list filter.
+ * Unknown inline expressions → fail-closed empty match (no soft-null leak).
+ */
+export declare function buildReadScopeFilter(options: {
+    read: string;
+    session: AXPAccessSession;
+    membershipUserIds?: string[];
+    sharedResourceIds?: string[];
+}): AxpFilterGroup | AxpFilterLeaf | undefined;
+/** Builds AXP filter group for list/query/aggregate visibility + scope. */
 export declare function buildEntityVisibilityAxpFilter(context: EntityVisibilityFilterContext): AxpFilterGroup | undefined;
 /** AND-combines an existing AXP filter with an injected system filter. */
 export declare function mergeAxpQueryFilters(existing: unknown, injected: AxpFilterGroup | undefined): unknown;
+export interface ScopeSessionContext {
+    tenantId?: string;
+    applicationId?: string;
+    userId?: string;
+}
+export declare function evaluateRecordAccess(options: {
+    record: Record<string, unknown> | null | undefined;
+    policy: AXPEntityAccessPolicyRecord;
+    mode: AXPAccessMode;
+    session: ScopeSessionContext;
+    membershipUserIds?: string[];
+    sharedResourceIds?: string[];
+}): boolean;
+/** @deprecated Prefer {@link evaluateRecordAccess}. */
+export declare function recordMatchesScope(options: {
+    entityName: string;
+    record: Record<string, unknown> | null | undefined;
+    policy?: AXPEntityAccessPolicyRecord;
+    session: ScopeSessionContext;
+    membershipUserIds?: string[];
+    sharedResourceIds?: string[];
+}): boolean;
+/**
+ * Attribute-only create stamp from policy convention.
+ * Never trusts client-supplied scopeInfo.
+ */
+export declare function buildCreateScopeInfo(options: {
+    policy: AXPEntityAccessPolicyRecord;
+    session: ScopeSessionContext;
+    /** Create payload — used when `subscriberId` should become tenantId (Subscription). */
+    createData?: Record<string, unknown>;
+}): Record<string, unknown> | undefined;
+/** True when write expression is platform-only (non-platform sessions are readonly). */
+export declare function isPlatformOnlyWrite(policy: AXPEntityAccessPolicyRecord): boolean;
 export {};
 //# sourceMappingURL=entity-visibility-filter.util.d.ts.map

package/jql/abstract/src/lib/entity-store/entity-visibility-filter.util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"entity-visibility-filter.util.d.ts","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/jql/abstract/src/lib/entity-store/entity-visibility-filter.util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAIvD,eAAO,MAAM,wBAAwB,6BAA6B,CAAC;AACnE,eAAO,MAAM,uBAAuB,4BAA4B,CAAC;AAYjE,UAAU,cAAc;IACtB,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IACpB,OAAO,EAAE,OAAO,EAAE,CAAC;CACpB;AAED,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAMD,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EAC3C,GAAG,EAAE,MAAM,GACV,OAAO,CAET;AAED,wBAAgB,sBAAsB,CAAC,CAAC,SAAS,eAAe,EAAE,OAAO,EAAE,CAAC,GAAG,CAAC,CAK/E;AAED,wBAAgB,qBAAqB,CAAC,CAAC,SAAS,eAAe,EAAE,OAAO,EAAE,CAAC,GAAG,CAAC,CAK9E;AAED,wBAAgB,gCAAgC,CAAC,CAAC,SAAS,eAAe,EAAE,OAAO,EAAE,CAAC,GAAG,CAAC,CASzF;AAmDD,uFAAuF;AACvF,wBAAgB,8BAA8B,CAC5C,OAAO,EAAE,6BAA6B,GACrC,cAAc,GAAG,SAAS,CAqB5B;AAED,0EAA0E;AAC1E,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,OAAO,EACjB,QAAQ,EAAE,cAAc,GAAG,SAAS,GACnC,OAAO,CAQT"}
+{"version":3,"file":"entity-visibility-filter.util.d.ts","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/jql/abstract/src/lib/entity-store/entity-visibility-filter.util.ts"],"names":[],"mappings":"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"}