@rockster/core 0.0.2 → 0.1.0

package/query/functions/collect-external-column-owners.js

@@ -0,0 +1,100 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.collectExternalColumnOwners = collectExternalColumnOwners;
+/**
+ * Strips the query root alias prefix from a select path so it matches TypeORM entity property names.
+ * e.g. `infraServer.client.name` + rootAlias `infraServer` → `client.name`
+ */
+function selectPathToEntitySegments(fullSelectPath, rootAlias) {
+    const prefix = `${rootAlias}.`;
+    const stripped = rootAlias && fullSelectPath.startsWith(prefix)
+        ? fullSelectPath.slice(prefix.length)
+        : fullSelectPath;
+    return stripped.split(".").filter(Boolean);
+}
+function* walkToParents(root, pathSegments) {
+    if (pathSegments.length === 0) {
+        if (root !== null && root !== undefined && typeof root === "object") {
+            yield root;
+        }
+        return;
+    }
+    const [head, ...rest] = pathSegments;
+    const next = root?.[head];
+    if (next === null || next === undefined) {
+        return;
+    }
+    if (Array.isArray(next)) {
+        for (const el of next) {
+            yield* walkToParents(el, rest);
+        }
+    }
+    else {
+        yield* walkToParents(next, rest);
+    }
+}
+function splitParentAndProperty(entitySegments) {
+    if (entitySegments.length === 0) {
+        return { parentSegments: [], property: "" };
+    }
+    if (entitySegments.length === 1) {
+        return { parentSegments: [], property: entitySegments[0] };
+    }
+    return {
+        parentSegments: entitySegments.slice(0, -1),
+        property: entitySegments[entitySegments.length - 1],
+    };
+}
+/**
+ * For each root row from `getMany()`, finds every object that must receive an external column value.
+ * Same logical entity instance appears once in the result (Map by reference).
+ *
+ * Uses `QueryProperty.externalOwnerWalkSegments` / `externalColumnKey` from the query metadata
+ * so the anchor can be a middle segment (e.g. `person` for `user.person.id`), not only the leaf.
+ */
+function collectExternalColumnOwners(roots, externalSelectPaths, rootAlias, properties) {
+    const byObject = new Map();
+    const add = (obj, prop) => {
+        if (!prop || obj === null || typeof obj !== "object") {
+            return;
+        }
+        let set = byObject.get(obj);
+        if (!set) {
+            set = new Set();
+            byObject.set(obj, set);
+        }
+        set.add(prop);
+    };
+    for (const root of roots) {
+        for (const fullPath of externalSelectPaths) {
+            const qp = properties[fullPath];
+            if (!qp?.isExternal) {
+                continue;
+            }
+            let ownerWalk;
+            let columnKey;
+            if (qp.externalOwnerWalkSegments !== undefined &&
+                qp.externalColumnKey !== undefined) {
+                ownerWalk = qp.externalOwnerWalkSegments;
+                columnKey = qp.externalColumnKey;
+            }
+            else {
+                const segments = selectPathToEntitySegments(fullPath, rootAlias);
+                const split = splitParentAndProperty(segments);
+                ownerWalk = split.parentSegments;
+                columnKey = split.property;
+            }
+            if (!columnKey) {
+                continue;
+            }
+            for (const parent of walkToParents(root, ownerWalk)) {
+                add(parent, columnKey);
+            }
+        }
+    }
+    return [...byObject.entries()].map(([object, props]) => ({
+        object: object,
+        properties: [...props],
+    }));
+}
+//# sourceMappingURL=collect-external-column-owners.js.map

package/query/functions/collect-external-column-owners.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"collect-external-column-owners.js","sourceRoot":"./","sources":["query/functions/collect-external-column-owners.ts"],"names":[],"mappings":"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"}

package/query/functions/create-query-builder.js

@@ -2,17 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createQueryBuilder = void 0;
 const use_repository_1 = require("../../database/functions/use-repository");
-const use_protector_1 = require("../../database/functions/use-protector");
 const add_join_1 = require("./add-join");
-const get_column_path_1 = require("./get-column-path");
 const get_native_select_1 = require("./get-native-select");
+const create_query_cache_hash_1 = require("./create-query-cache-hash");
+const query_structure_cache_1 = require("./query-structure-cache");
 const select_query_builder_1 = require("../../database/extensions/select-query-builder");
 const transaction_context_1 = require("../../database/contexts/transaction-context");
+const get_entity_object_class_1 = require("./get-entity-object-class");
 const createQueryBuilder = async (queryContent, intercept) => {
     const object = core
         .storage
         .findObject(queryContent.target);
-    const RootEntity = object.rootPath.target();
+    const RootEntity = (0, get_entity_object_class_1.getEntityObjectClass)(object.rootPath.target());
     const requestContext = transaction_context_1.transactionContextStore.getStore();
     const entityManager = requestContext?.entityManager;
     const repository = entityManager
@@ -22,35 +23,53 @@ const createQueryBuilder = async (queryContent, intercept) => {
     if (intercept) {
         await intercept(queryBuilder);
     }
-    const rootProtector = (0, use_protector_1.useProtector)(RootEntity);
-    if (object.rootPath.secure && rootProtector) {
-        rootProtector.rootCondition({
-            rootAlias: object.rootPath.alias,
-            queryBuilder: queryBuilder,
-            userId: queryContent.userId,
-            contextParams: queryContent.context
-        });
-    }
     const joins = {};
-    const select = [...queryContent.query.select];
-    for (const name of queryContent.query.select) {
-        const property = object.properties[name];
-        (0, add_join_1.addJoin)(RootEntity, queryContent, joins, queryBuilder, property.path, entityManager);
-        switch (property.path.type) {
-            case "relation":
-            case "root":
-                (0, add_join_1.addJoin)(RootEntity, queryContent, joins, queryBuilder, property.path, entityManager);
-                break;
-            case "embedded":
-                const columnPath = (0, get_column_path_1.getColumnPath)(property.path);
-                select.pushIfNotExists(columnPath);
-                break;
+    const joinHash = (0, create_query_cache_hash_1.getJoinStructureHash)(queryContent.target.name, queryContent.query.select);
+    const cachedPaths = (0, query_structure_cache_1.getCachedJoinPlan)(joinHash);
+    if (cachedPaths) {
+        for (const path of cachedPaths) {
+            (0, add_join_1.addJoin)(RootEntity, queryContent, joins, queryBuilder, path, entityManager);
+            if (path.type === "relation" || path.type === "root") {
+                (0, add_join_1.addJoin)(RootEntity, queryContent, joins, queryBuilder, path, entityManager);
+            }
+        }
+    }
+    else {
+        const paths = [];
+        for (const name of queryContent.query.select) {
+            const property = object.properties[name];
+            paths.push(property.path);
+            (0, add_join_1.addJoin)(RootEntity, queryContent, joins, queryBuilder, property.path, entityManager);
+            switch (property.path.type) {
+                case "relation":
+                case "root":
+                    (0, add_join_1.addJoin)(RootEntity, queryContent, joins, queryBuilder, property.path, entityManager);
+                    break;
+                case "embedded":
+                    break;
+            }
         }
+        (0, query_structure_cache_1.setCachedJoinPlan)(joinHash, paths);
+    }
+    const fields = [
+        ...queryContent.query.select,
+        ...queryContent.query.orderBy
+            ? queryContent.query.orderBy.map(order => order.property)
+            : []
+    ];
+    const structureHash = (0, create_query_cache_hash_1.getQueryStructureHash)(queryContent.target.name, queryContent.query.select, queryContent.query.orderBy);
+    const cached = (0, query_structure_cache_1.getCachedNativeSelect)(structureHash);
+    if (cached) {
+        queryContent.nativeSelectAsArry = cached.asArry;
+        queryContent.nativeSelectAsMap = cached.asMap;
+    }
+    else {
+        const { asArry, asMap } = (0, get_native_select_1.getNativeSelect)(queryContent.target, fields);
+        (0, query_structure_cache_1.setCachedNativeSelect)(structureHash, asArry, asMap);
+        queryContent.nativeSelectAsArry = asArry;
+        queryContent.nativeSelectAsMap = asMap;
     }
-    const { asArry, asMap } = (0, get_native_select_1.getNativeSelect)(queryContent.target, queryContent.query.select);
     queryContent.rootAlias = object.rootPath.alias;
-    queryContent.nativeSelectAsArry = asArry;
-    queryContent.nativeSelectAsMap = asMap;
     return queryBuilder;
 };
 exports.createQueryBuilder = createQueryBuilder;

package/query/functions/create-query-builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-query-builder.js","sourceRoot":"./","sources":["query/functions/create-query-builder.ts"],"names":[],"mappings":";;;AACA,4EAAwE;AACxE,0EAAsE;AAEtE,yCAAqC;AACrC,uDAAkD;AAClD,2DAAsD;AAEtD,yFAAoF;AACpF,qFAAsF;AAI/E,MAAM,kBAAkB,GAAG,KAAK,EACpC,YAAmC,EACnC,SAAuC,EACH,EAAE;IAEtC,MAAM,MAAM,GAAG,IAAI;SACf,OAAO;SACP,UAAU,CAAC,YAAY,CAAC,MAAM,CACP,CAAC;IAE5B,MAAM,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;IAE5C,MAAM,cAAc,GAAG,6CAAuB,CAAC,QAAQ,EAAE,CAAC;IAC1D,MAAM,aAAa,GAAG,cAAc,EAAE,aAAa,CAAC;IACpD,MAAM,UAAU,GAAG,aAAa;QAC7B,CAAC,CAAC,aAAa,CAAC,aAAa,CAAC,UAAU,CAAC;QACzC,CAAC,CAAC,IAAA,8BAAa,EAAC,UAAU,CAAC,CAAC;IAE/B,MAAM,YAAY,GAAG,IAAI,yCAAkB,CAAC,UAAU,CAAC,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;IAElG,IAAI,SAAS,EAAE,CAAC;QACb,MAAM,SAAS,CAAC,YAA0C,CAAC,CAAC;IAC/D,CAAC;IAED,MAAM,aAAa,GAAG,IAAA,4BAAY,EAAC,UAAU,CAAC,CAAC;IAE/C,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,IAAI,aAAa,EAAE,CAAC;QAC3C,aAAa,CAAC,aAAa,CAAC;YACzB,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,KAAK;YAChC,YAAY,EAAE,YAAY;YAC1B,MAAM,EAAE,YAAY,CAAC,MAAM;YAC3B,aAAa,EAAE,YAAY,CAAC,OAAO;SACrC,CAAC,CAAC;IACN,CAAC;IACD,MAAM,KAAK,GAAG,EAAyB,CAAC;IACxC,MAAM,MAAM,GAAG,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAE9C,KAAK,MAAM,IAAI,IAAI,YAAY,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QAC5C,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACzC,IAAA,kBAAO,EACJ,UAAU,EACV,YAAY,EACZ,KAAK,EACL,YAAY,EACZ,QAAQ,CAAC,IAAI,EACb,aAAa,CACf,CAAC;QACF,QAAQ,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YAC1B,KAAK,UAAU,CAAC;YAChB,KAAK,MAAM;gBACR,IAAA,kBAAO,EACJ,UAAU,EACV,YAAY,EACZ,KAAK,EACL,YAAY,EACZ,QAAQ,CAAC,IAAI,EACb,aAAa,CACf,CAAC;gBACF,MAAM;YACT,KAAK,UAAU;gBACZ,MAAM,UAAU,GAAG,IAAA,+BAAa,EAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBAChD,MAAM,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;gBACnC,MAAM;QACZ,CAAC;IACJ,CAAC;IAED,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,IAAA,mCAAe,EACtC,YAAY,CAAC,MAAM,EACnB,YAAY,CAAC,KAAK,CAAC,MAAM,CAC3B,CAAC;IAEF,YAAY,CAAC,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;IAC/C,YAAY,CAAC,kBAAkB,GAAG,MAAM,CAAC;IACzC,YAAY,CAAC,iBAAiB,GAAG,KAAK,CAAC;IAEvC,OAAO,YAA0C,CAAC;AACrD,CAAC,CAAA;AA5EY,QAAA,kBAAkB,sBA4E9B"}
+{"version":3,"file":"create-query-builder.js","sourceRoot":"./","sources":["query/functions/create-query-builder.ts"],"names":[],"mappings":"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"}

package/query/functions/create-query-cache-hash.d.ts

@@ -0,0 +1,16 @@
+import { Query, OrderBy } from '../interfaces/query';
+/**
+ * Hash only the query structure (select + orderBy), not parameters (filter, take, skip).
+ * Used to cache native select resolution so the same shape reuses asArry/asMap without reprocessing.
+ * Sync, uses Node crypto – no async hasher in the hot path.
+ */
+export declare function getQueryStructureHash(targetName: string, select: string[], orderBy?: OrderBy[]): string;
+/**
+ * Hash only the select list (order matters for joins). Used to cache the join plan
+ * so we reuse the list of QueryPath to apply on a fresh QB each request (no QB instance cached).
+ */
+export declare function getJoinStructureHash(targetName: string, select: string[]): string;
+export declare function createQueryCacheHash<Entity>(input: {
+    target: string;
+    query: Query<Entity>;
+}): Promise<string>;

package/query/functions/create-query-cache-hash.js

@@ -0,0 +1,70 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getQueryStructureHash = getQueryStructureHash;
+exports.getJoinStructureHash = getJoinStructureHash;
+exports.createQueryCacheHash = createQueryCacheHash;
+const crypto_1 = require("crypto");
+const xxhash_wasm_1 = __importDefault(require("xxhash-wasm"));
+let xxh = null;
+async function getHasher() {
+    if (!xxh) {
+        xxh = await (0, xxhash_wasm_1.default)();
+    }
+    return xxh;
+}
+function stableSortObject(value) {
+    if (Array.isArray(value)) {
+        return value.map(stableSortObject);
+    }
+    if (value && typeof value === 'object') {
+        return Object.keys(value)
+            .sort()
+            .reduce((acc, key) => {
+            acc[key] = stableSortObject(value[key]);
+            return acc;
+        }, {});
+    }
+    return value;
+}
+/**
+ * Hash only the query structure (select + orderBy), not parameters (filter, take, skip).
+ * Used to cache native select resolution so the same shape reuses asArry/asMap without reprocessing.
+ * Sync, uses Node crypto – no async hasher in the hot path.
+ */
+function getQueryStructureHash(targetName, select, orderBy) {
+    const structure = {
+        t: targetName,
+        s: [...select].sort(),
+        o: (orderBy ?? []).map((o) => ({ p: o.property, d: o.direction })),
+    };
+    const serialized = JSON.stringify(structure);
+    return (0, crypto_1.createHash)('sha256').update(serialized).digest('hex');
+}
+/**
+ * Hash only the select list (order matters for joins). Used to cache the join plan
+ * so we reuse the list of QueryPath to apply on a fresh QB each request (no QB instance cached).
+ */
+function getJoinStructureHash(targetName, select) {
+    const structure = { t: targetName, s: select };
+    return (0, crypto_1.createHash)('sha256').update(JSON.stringify(structure)).digest('hex');
+}
+async function createQueryCacheHash(input) {
+    const { query } = input;
+    const fingerprint = {
+        target: input.target,
+        select: [...query.select].sort(),
+        filter: query.filter ?? null,
+        orderBy: query.orderBy?.map(o => ({
+            property: o.property,
+            direction: o.direction.toLowerCase(),
+        })) ?? []
+    };
+    const normalized = stableSortObject(fingerprint);
+    const serialized = JSON.stringify(normalized);
+    const hasher = await getHasher();
+    return hasher.h64(serialized).toString(16);
+}
+//# sourceMappingURL=create-query-cache-hash.js.map

package/query/functions/create-query-cache-hash.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-query-cache-hash.js","sourceRoot":"./","sources":["query/functions/create-query-cache-hash.ts"],"names":[],"mappings":"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"}

package/query/functions/create-query.d.ts

@@ -1,5 +1,10 @@
 import { DirectPath, IndirectPath, RootPath } from "../../database";
+import { Instantiable } from "@rockster/common";
 import { QueryActionOptions } from "../interfaces/query-action-options";
-export declare const createQuery: <Entity>(rootPath: RootPath<Entity>) => (options?: QueryActionOptions) => (target: any, propertyKey: string) => void;
-export declare const directPath: <Entity>(path: Omit<DirectPath<Entity>, "type">) => DirectPath<Entity>;
-export declare const indirectPath: <Entity>(path: Omit<IndirectPath<Entity>, "type">) => IndirectPath<Entity>;
+/** Controller decorator factory from createQuery; `.queryRequest` is the generated request class. */
+export type QueryDecoratorFactory = ((options?: QueryActionOptions) => (target: object, propertyKey: string) => void) & {
+    queryRequest: Instantiable;
+};
+export declare const createQuery: <Entity>(rootPath: RootPath<Entity>) => QueryDecoratorFactory;
+export declare const joinOne: <Entity>(path: Omit<DirectPath<Entity>, "type">) => DirectPath<Entity>;
+export declare const joinMany: <Entity>(path: Omit<IndirectPath<Entity>, "type">) => IndirectPath<Entity>;

package/query/functions/create-query.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.indirectPath = exports.directPath = exports.createQuery = void 0;
+exports.joinMany = exports.joinOne = exports.createQuery = void 0;
 const class_pipe_1 = require("@rockster/class-pipe");
 const database_1 = require("../../database");
 const interfaces_1 = require("../../common/interfaces");
@@ -31,7 +31,8 @@ const createQuery = (rootPath) => {
         entityAlias: rootPath.alias,
         paths: rootPath.paths,
         secure: rootPath.secure,
-        rootEntity: Target
+        rootEntity: Target,
+        rootAlias: rootPath.alias,
     });
     // Data of response
     (0, class_pipe_1.IsType)(() => Target)(QueryResponse.prototype, 'data');
@@ -48,8 +49,9 @@ const createQuery = (rootPath) => {
     // OrderBy.direction
     (0, class_pipe_1.IsIn)(Object.getOwnPropertyNames(database_1.OrderByDirection))(QueryOrderBy.prototype, 'direction');
     (0, class_pipe_1.IsRequired)()(QueryOrderBy.prototype, 'direction');
-    // OrderBy.property
-    (0, class_pipe_1.IsIn)(Object.getOwnPropertyNames(properties))(QueryOrderBy.prototype, 'property');
+    // OrderBy.property (exclude external columns – not in DB, cannot order by them in SQL)
+    const orderByPropertyNames = Object.keys(properties).filter((path) => !properties[path].isExternal);
+    (0, class_pipe_1.IsIn)(orderByPropertyNames)(QueryOrderBy.prototype, 'property');
     (0, class_pipe_1.IsRequired)()(QueryOrderBy.prototype, 'property');
     // OrderBy
     (0, class_pipe_1.IsType)(() => QueryOrderBy)(QueryRequest.prototype, 'orderBy');
@@ -66,7 +68,7 @@ const createQuery = (rootPath) => {
         .createObject(QueryRequest);
     object.properties = properties;
     object.rootPath = rootPath;
-    return (options) => {
+    const decorator = (options) => {
         return (target, propertyKey) => {
             const property = core
                 .storage
@@ -81,20 +83,21 @@ const createQuery = (rootPath) => {
             (0, class_injector_1.markExecutable)(target, propertyKey, property.name);
         };
     };
+    return Object.assign(decorator, { queryRequest: QueryRequest });
 };
 exports.createQuery = createQuery;
-const directPath = (path) => {
+const joinOne = (path) => {
     return {
         type: 'direct',
         ...path
     };
 };
-exports.directPath = directPath;
-const indirectPath = (path) => {
+exports.joinOne = joinOne;
+const joinMany = (path) => {
     return {
         type: 'indirect',
         ...path
     };
 };
-exports.indirectPath = indirectPath;
+exports.joinMany = joinMany;
 //# sourceMappingURL=create-query.js.map

package/query/functions/create-query.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-query.js","sourceRoot":"./","sources":["query/functions/create-query.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"create-query.js","sourceRoot":"./","sources":["query/functions/create-query.ts"],"names":[],"mappings":"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"}

package/query/functions/describe-query-filter.js

@@ -26,7 +26,8 @@ const negatableOperators = {
     ilike: true,
     contains: true,
     in: true,
-    between: true
+    between: true,
+    is: true
 };
 const validIsValues = {
     'null': true,
@@ -77,7 +78,7 @@ const describeQueryFilter = (pendingAction, target, query, select) => {
                     throw new common_1.BadRequestError({ message: `${requestRef} [filter] invalidField [${current}]` });
                 }
                 const fieldName = isValidProperty.path.type === 'embedded'
-                    ? isValidProperty.path.rootOrRelationFullPath
+                    ? isValidProperty.path.rootOrRelationPath
                     : `${isValidProperty.path.entityAlias}.${isValidProperty.columnName}`;
                 select.pushIfNotExists(current);
                 lastField = {

package/query/functions/describe-query-filter.js.map

@@ -1 +1 @@
-{"version":3,"file":"describe-query-filter.js","sourceRoot":"./","sources":["query/functions/describe-query-filter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"describe-query-filter.js","sourceRoot":"./","sources":["query/functions/describe-query-filter.ts"],"names":[],"mappings":"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"}

package/query/functions/execute-query.js

@@ -1,23 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeQuery = void 0;
+const class_injector_1 = require("@rockster/class-injector");
 const create_query_builder_1 = require("./create-query-builder");
 const class_pipe_1 = require("@rockster/class-pipe");
 const logger_1 = require("@rockster/logger");
 const global_1 = require("../../global");
+const collect_external_column_owners_1 = require("./collect-external-column-owners");
+const expand_select_with_external_dependencies_1 = require("./expand-select-with-external-dependencies");
 const executeQuery = async ({ content: queryContent, intercept, preFilter }) => {
     const logger = new logger_1.Logger('ExecuteQuery');
     const query = queryContent.query;
-    const queryBuilder = await (0, create_query_builder_1.createQueryBuilder)(queryContent, intercept);
+    const object = core
+        .storage
+        .findObject(queryContent.target);
+    const effectiveSelect = (0, expand_select_with_external_dependencies_1.expandSelectWithExternalDependencies)(object.properties, query.select, logger);
+    const queryForBuilder = {
+        ...queryContent,
+        query: { ...queryContent.query, select: effectiveSelect },
+    };
+    const queryBuilder = await (0, create_query_builder_1.createQueryBuilder)(queryForBuilder, intercept);
     let page = queryContent.query.page;
     let getWhere = 'where';
     let filtered = 0;
     let total;
-    const object = core
-        .storage
-        .findObject(queryContent.target);
+    if (queryBuilder.expressionMap.wheres.length > 0) {
+        getWhere = 'andWhere';
+    }
     if (preFilter) {
-        queryBuilder.where(preFilter);
+        queryBuilder[getWhere](preFilter);
         getWhere = 'andWhere';
     }
     if (page) {
@@ -32,21 +43,90 @@ const executeQuery = async ({ content: queryContent, intercept, preFilter }) =>
     if (query.orderBy) {
         query.orderBy.forEach((orderBy, i) => {
             const direction = orderBy.direction.toUpperCase();
-            queryBuilder.addOrderBy(queryContent.nativeSelectAsMap.get(orderBy.property), direction);
+            const nativeField = queryForBuilder.nativeSelectAsMap.get(orderBy.property);
+            queryBuilder.addOrderBy(nativeField, direction);
         });
     }
-    queryBuilder.select(queryContent.nativeSelectAsArry);
+    queryBuilder.select(queryForBuilder.nativeSelectAsArry);
+    /**
+     * When selecting only a subset of columns, TypeORM will NOT hydrate mapped joins unless it can
+     * identify joined rows. In practice, that requires selecting the joined entity's primary column(s).
+     *
+     * We DO NOT addSelect(join.alias.name) because that selects *all* columns for the join alias and can
+     * duplicate columns already in nativeSelect, causing ambiguous column references in DISTINCT wrappers.
+     *
+     * Instead, ensure each mapped join has its primary key(s) selected (if not already).
+     */
+    const currentSelections = new Set((queryBuilder.expressionMap.selects ?? [])
+        .map((s) => s.selection)
+        .filter((s) => typeof s === "string" && s.length > 0));
+    const mainAlias = queryBuilder.expressionMap.mainAlias;
+    if (mainAlias?.name && mainAlias.metadata) {
+        for (const pk of mainAlias.metadata.primaryColumns ?? []) {
+            const sel = `${mainAlias.name}.${pk.propertyPath}`;
+            if (!currentSelections.has(sel)) {
+                queryBuilder.addSelect(sel);
+                currentSelections.add(sel);
+            }
+        }
+    }
+    for (const join of queryBuilder.expressionMap.joinAttributes) {
+        if (!join.mapToProperty || !join.alias?.name || !join.metadata)
+            continue;
+        const alias = join.alias.name;
+        for (const pk of join.metadata.primaryColumns ?? []) {
+            const sel = `${alias}.${pk.propertyPath}`;
+            if (!currentSelections.has(sel)) {
+                queryBuilder.addSelect(sel);
+                currentSelections.add(sel);
+            }
+        }
+    }
     queryBuilder.getVirtualSelect().forEach((virtualSelect) => {
         queryBuilder.addSelect(virtualSelect.selection, virtualSelect.alias);
     });
     logger.debug(queryBuilder.getSql());
-    const items = await queryBuilder.getMany();
+    let items = await queryBuilder.getMany();
+    const externalSelectPaths = query.select.filter((path) => object.properties[path]?.isExternal);
+    if (externalSelectPaths.length > 0) {
+        const pathsByResolver = new Map();
+        for (const path of externalSelectPaths) {
+            const ResolverClass = object.properties[path]
+                ?.externalResolver;
+            if (!ResolverClass) {
+                logger.warn(`External column "${path}" has no resolver; set @ExternalColumn(() => YourResolverClass) on the entity property.`);
+                continue;
+            }
+            const list = pathsByResolver.get(ResolverClass) ?? [];
+            list.push(path);
+            pathsByResolver.set(ResolverClass, list);
+        }
+        for (const [ResolverClass, pathsForResolver] of pathsByResolver) {
+            const owners = (0, collect_external_column_owners_1.collectExternalColumnOwners)(items, pathsForResolver, queryForBuilder.rootAlias ?? "", object.properties);
+            if (owners.length === 0) {
+                continue;
+            }
+            const instance = await (0, class_injector_1.createInstance)(ResolverClass);
+            if (typeof instance?.resolve !== "function") {
+                logger.warn(`${ResolverClass.name} must implement resolve(payload, context) for external columns.`);
+                continue;
+            }
+            const resolvedRoots = await instance.resolve({
+                roots: items,
+                externalSelectPaths: pathsForResolver,
+                owners,
+            }, queryContent);
+            if (Array.isArray(resolvedRoots)) {
+                items = resolvedRoots;
+            }
+        }
+    }
     const data = await Promise.all(items.map((item) => {
         return (0, class_pipe_1.transform)({
             target: object.rootPath.target(),
             values: item,
             select: query.select,
-            fullPath: `${queryContent.rootAlias}.`,
+            fullPath: `${queryForBuilder.rootAlias}.`,
             groups: [global_1.actionGroups.query]
         });
     }));