@rockster/core 0.0.4 → 0.1.1

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"./","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,qDAAmC;AACnC,qDAAmC;AACnC,wDAAsC;AACtC,oDAAkC;AAClC,6DAA2C;AAC3C,gEAA8C;AAC9C,sEAAoD;AACpD,kEAAgD;AAChD,0EAAuD;AACvD,wDAAsC;AACtC,wDAAsC;AACtC,qDAAmC;AACnC,qEAAmD;AACnD,oFAAkE;AAClE,mFAAiE;AACjE,oDAAkC;AAClC,wDAAsC;AACtC,4EAA0D;AAC1D,sDAAoC;AACpC,sDAAoC;AACpC,0DAAwC;AACxC,2DAAyC;AACzC,gFAA8D;AAC9D,2DAAyC;AACzC,sEAAoD;AACpD,2DAAyC;AACzC,iEAA+C;AAC/C,kEAAgD;AAChD,yEAAuD;AACvD,qDAAmC;AACnC,6EAA2D;AAC3D,mFAAiE;AAEjE,uDAAqC;AACrC,uDAAqC;AACrC,mEAAiD;AACjD,qEAAmD;AACnD,2EAAyD;AACzD,uDAAqC;AACrC,oDAAkC;AAClC,oDAAkC;AAClC,qFAAmE;AACnE,qFAAmE;AACnE,kFAAgE;AAChE,6EAA2D;AAC3D,gEAA8C"}
+{"version":3,"file":"index.js","sourceRoot":"./","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,qDAAmC;AACnC,qDAAmC;AACnC,wDAAsC;AACtC,oDAAkC;AAClC,6DAA2C;AAC3C,gEAA8C;AAC9C,sEAAoD;AACpD,kEAAgD;AAChD,0EAAuD;AACvD,wDAAsC;AACtC,wDAAsC;AACtC,qDAAmC;AACnC,oFAAkE;AAClE,mFAAiE;AACjE,oDAAkC;AAClC,wDAAsC;AACtC,4EAA0D;AAC1D,yFAAuE;AACvE,sDAAoC;AACpC,sDAAoC;AACpC,0DAAwC;AACxC,2DAAyC;AACzC,gFAA8D;AAC9D,2DAAyC;AACzC,sEAAoD;AACpD,2DAAyC;AACzC,iEAA+C;AAC/C,kEAAgD;AAChD,yEAAuD;AACvD,qDAAmC;AACnC,6EAA2D;AAC3D,mFAAiE;AAEjE,uDAAqC;AACrC,uDAAqC;AACrC,mEAAiD;AACjD,qEAAmD;AACnD,2EAAyD;AACzD,uDAAqC;AACrC,oDAAkC;AAClC,oDAAkC;AAClC,qFAAmE;AACnE,qFAAmE;AACnE,kFAAgE;AAChE,6EAA2D;AAC3D,gEAA8C;AAC9C,gDAA8B"}

package/jobs/jobs.controller.d.ts

@@ -12,6 +12,8 @@ export declare class JobsController extends ObjectLoader<IJobObject> {
     init(): Promise<void>;
     configJobs(): Promise<void>;
     checkContinue(): Promise<void>;
+    /** Fire-and-forget so one slow job does not block the scheduler tick or other jobs. */
+    protected dispatchJob(job: JobData): void;
     execute(jobName: string): Promise<Error>;
     protected logFinal(jobName: string, error?: Error): void;
     protected displayNextRun(job: JobData): void;

package/jobs/jobs.controller.js

@@ -66,27 +66,31 @@ let JobsController = class JobsController extends core_1.ObjectLoader {
             if (isTimeToRun && !job.isPending) {
                 job.nextRun = job.cron.getNextDate();
                 job.isPending = true;
-                if (core.workers) {
-                    await (0, dispatch_task_1.dispatchTask)({
-                        type: interfaces_1.WorkerMessageType.initRun,
-                        jobName: job.name
-                    }, async (message) => {
-                        job.isPending = false;
-                        this.logFinal(job.name, message.error);
-                        job.shown = false;
-                    });
-                }
-                else {
-                    const error = await this.execute(job.name);
-                    this.logFinal(job.name, error);
-                    job.shown = false;
-                    job.isPending = false;
-                }
+                void this.dispatchJob(job);
             }
             this.displayNextRun(job);
         }
         this.dispatching = false;
     }
+    /** Fire-and-forget so one slow job does not block the scheduler tick or other jobs. */
+    dispatchJob(job) {
+        if (core.workers) {
+            void (0, dispatch_task_1.dispatchTask)({
+                type: interfaces_1.WorkerMessageType.initRun,
+                jobName: job.name,
+            }, async (message) => {
+                job.isPending = false;
+                this.logFinal(job.name, message.error);
+                job.shown = false;
+            });
+            return;
+        }
+        void this.execute(job.name).then((error) => {
+            this.logFinal(job.name, error);
+            job.shown = false;
+            job.isPending = false;
+        });
+    }
     async execute(jobName) {
         try {
             const job = constants_1.jobs

package/jobs/jobs.controller.js.map

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

package/package.json

@@ -1,72 +1,72 @@
 {
-   "name": "@rockster/core",
-   "version": "0.0.4",
-   "main": "index",
-   "types": "index.d.ts",
-   "scripts": {
-      "pre:build": "rm -rf ./dist && mkdir ./dist && cp package.json ./dist",
-      "build:prod": "npm run pre:build && tsc -p tsconfig.prod.json",
-      "build:dev": "npm run pre:build && tsc -p tsconfig.prod.json -w",
-      "post:publish": "cd ./dist && npm publish"
-   },
-   "author": "Hubseat",
-   "license": "MIT",
-   "publishConfig": {
-      "access": "public"
-   },
-   "repository": {
-      "type": "git",
-      "url": "https://git.hubseat.io/rockster/rockster-core"
-   },
-   "dependencies": {
-      "@dr.pogodin/csurf": "^1.13.0",
-      "@formatjs/intl": "^2.9.0",
-      "@google-cloud/storage": "^7.5.0",
-      "@paralleldrive/cuid2": "^2.2.2",
-      "@rockster/class-injector": "0.0.2",
-      "@rockster/class-memory": "0.0.3",
-      "@rockster/class-pipe": "^0.0.3",
-      "@rockster/common": "0.0.3",
-      "@rockster/logger": "0.0.3",
-      "@types/body-parser": "^1.19.2",
-      "@types/busboy": "^1.5.2",
-      "@types/cors": "^2.8.13",
-      "@types/dot-object": "^2.1.2",
-      "@types/express": "^4.17.21",
-      "@types/lodash": "^4.14.195",
-      "@types/node": "^20.8.10",
-      "@types/uuid": "^10.0.0",
-      "@types/validator": "^13.11.1",
-      "@types/ws": "^8.5.5",
-      "axios": "^1.5.1",
-      "body-parser": "^1.20.2",
-      "busboy": "^1.6.0",
-      "cors": "^2.8.5",
-      "cron-schedule": "^3.0.6",
-      "dot-object": "^2.1.4",
-      "drizzle-orm": "^0.39.2",
-      "express": "^4.18.2",
-      "google-auth-library": "^10.5.0",
-      "helmet": "^7.0.0",
-      "inflection": "^3.0.2",
-      "lodash": "^4.17.21",
-      "moment": "^2.29.4",
-      "mongodb": "^5.5.0",
-      "msgpackr": "^1.11.5",
-      "nanoid": "^3.3.8",
-      "path-to-regexp": "^8.3.0",
-      "pg": "^8.11.0",
-      "radash": "^12.1.0",
-      "redis": "^4.6.7",
-      "typeorm": "^0.3.16",
-      "typeorm-naming-strategies": "^4.1.0",
-      "uuid": "^10.0.0",
-      "validator": "^13.11.0",
-      "ws": "^8.13.0",
-      "xxhash-wasm": "^1.1.0",
-      "zod": "^3.23.8"
-   },
-   "devDependencies": {
-      "typescript": "^5.2.2"
-   }
+  "name": "@rockster/core",
+  "version": "0.1.1",
+  "main": "index",
+  "types": "index.d.ts",
+  "scripts": {
+    "pre:build": "rm -rf ./dist && mkdir ./dist && cp package.json ./dist",
+    "build:prod": "npm run pre:build && tsc -p tsconfig.prod.json",
+    "build:dev": "npm run pre:build && tsc -p tsconfig.prod.json -w",
+    "post:publish": "cd ./dist && npm publish"
+  },
+  "author": "Hubseat",
+  "license": "MIT",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://git.hubseat.io/rockster/rockster-core"
+  },
+  "dependencies": {
+    "@dr.pogodin/csurf": "^1.13.0",
+    "@formatjs/intl": "^2.9.0",
+    "@google-cloud/storage": "^7.5.0",
+    "@paralleldrive/cuid2": "^2.2.2",
+    "@rockster/class-injector": "0.1.0",
+    "@rockster/class-memory": "0.1.0",
+    "@rockster/class-pipe": "^0.1.0",
+    "@rockster/common": "0.1.0",
+    "@rockster/logger": "0.1.0",
+    "@types/body-parser": "^1.19.2",
+    "@types/busboy": "^1.5.2",
+    "@types/cors": "^2.8.13",
+    "@types/dot-object": "^2.1.2",
+    "@types/express": "^4.17.21",
+    "@types/lodash": "^4.14.195",
+    "@types/node": "^20.8.10",
+    "@types/uuid": "^10.0.0",
+    "@types/validator": "^13.11.1",
+    "@types/ws": "^8.5.5",
+    "axios": "^1.5.1",
+    "body-parser": "^1.20.2",
+    "busboy": "^1.6.0",
+    "cors": "^2.8.5",
+    "cron-schedule": "^3.0.6",
+    "dot-object": "^2.1.4",
+    "drizzle-orm": "^0.39.2",
+    "express": "^4.18.2",
+    "google-auth-library": "^10.5.0",
+    "helmet": "^7.0.0",
+    "inflection": "^3.0.2",
+    "lodash": "^4.17.21",
+    "moment": "^2.29.4",
+    "mongodb": "^5.5.0",
+    "msgpackr": "^1.11.5",
+    "nanoid": "^3.3.8",
+    "path-to-regexp": "^8.3.0",
+    "pg": "8.21.0",
+    "radash": "^12.1.0",
+    "redis": "^4.6.7",
+    "typeorm": "^0.3.28",
+    "typeorm-naming-strategies": "^4.1.0",
+    "uuid": "^10.0.0",
+    "validator": "^13.11.0",
+    "ws": "^8.13.0",
+    "xxhash-wasm": "^1.1.0",
+    "zod": "^3.23.8"
+  },
+  "devDependencies": {
+    "typescript": "^5.2.2"
+  }
 }

package/query/functions/add-join.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addJoin = void 0;
-const use_protector_1 = require("../../database/functions/use-protector");
 const get_entity_object_class_1 = require("./get-entity-object-class");
 const addJoin = (RootEntity, queryContent, joins, queryBuilder, path, entityManager) => {
     if (path.type === "embedded") {
@@ -14,16 +13,6 @@ const addJoin = (RootEntity, queryContent, joins, queryBuilder, path, entityMana
         if (path.parent) {
             (0, exports.addJoin)(RootEntity, queryContent, joins, queryBuilder, path.parent, entityManager);
         }
-        const protector = (0, use_protector_1.useProtector)(path.target);
-        const secure = path.secure && protector
-            ? protector
-                .relationCondition({
-                userId: queryContent.userId,
-                contextParams: queryContent.context,
-                alias: path.entityAlias,
-                rootPath: RootEntity
-            })
-            : '';
         const result = typeof path.relation.condition === 'string'
             ? path
                 .relation
@@ -32,8 +21,8 @@ const addJoin = (RootEntity, queryContent, joins, queryBuilder, path, entityMana
                 .relation
                 .condition(queryBuilder, queryContent, entityManager);
         path.relation.type === "direct"
-            ? queryBuilder.leftJoinAndMapOne(path.relation.mapTo, result?.tableName ?? (0, get_entity_object_class_1.getEntityObjectClass)(path.target), path.entityAlias, result?.condition ?? result + ` ${secure}`)
-            : queryBuilder.leftJoinAndMapMany(path.relation.mapTo, result?.tableName ?? (0, get_entity_object_class_1.getEntityObjectClass)(path.target), path.entityAlias, result?.condition ?? result + ` ${secure}`);
+            ? queryBuilder.leftJoinAndMapOne(path.relation.mapTo, result?.tableName ?? (0, get_entity_object_class_1.getEntityObjectClass)(path.target), path.entityAlias, result?.condition ?? result)
+            : queryBuilder.leftJoinAndMapMany(path.relation.mapTo, result?.tableName ?? (0, get_entity_object_class_1.getEntityObjectClass)(path.target), path.entityAlias, result?.condition ?? result);
         joins[joinKey] = true;
     }
 };

package/query/functions/add-join.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-join.js","sourceRoot":"./","sources":["query/functions/add-join.ts"],"names":[],"mappings":";;;AAIA,0EAAsE;AACtE,uEAAiE;AAE1D,MAAM,OAAO,GAAG,CACpB,UAAwB,EACxB,YAAgC,EAChC,KAA0B,EAC1B,YAAqC,EACrC,IAAe,EACf,aAA4B,EAC7B,EAAE;IAED,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAC5B,IAAA,eAAO,EACJ,UAAU,EACV,YAAY,EACZ,KAAK,EACL,YAAY,EACZ,IAAI,CAAC,MAAM,EACX,aAAa,CACf,CAAC;IACL,CAAC;IAED,0GAA0G;IAC1G,MAAM,OAAO,GACV,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;IAC5D,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;IAEhC,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,IAAI,CAAC,QAAQ,EAAE,CAAC;QACzC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACf,IAAA,eAAO,EACJ,UAAU,EACV,YAAY,EACZ,KAAK,EACL,YAAY,EACZ,IAAI,CAAC,MAAM,EACX,aAAa,CACf,CAAC;QACL,CAAC;QAED,MAAM,SAAS,GAAG,IAAA,4BAAY,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC5C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,SAAS;YACpC,CAAC,CAAC,SAAS;iBACP,iBAAiB,CAAC;gBAChB,MAAM,EAAE,YAAY,CAAC,MAAM;gBAC3B,aAAa,EAAE,YAAY,CAAC,OAAO;gBACnC,KAAK,EAAE,IAAI,CAAC,WAAW;gBACvB,QAAQ,EAAE,UAAU;aACtB,CAAC;YACL,CAAC,CAAC,EAAE,CAAA;QAEP,MAAM,MAAM,GAAQ,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,KAAK,QAAQ;YAC5D,CAAC,CAAC,IAAI;iBACF,QAAQ;iBACR,SAAS;YACb,CAAC,CAAC,IAAI;iBACF,QAAQ;iBACR,SAAS,CACP,YAAY,EACZ,YAAY,EACZ,aAAa,CACf,CAAC;QAER,IAAI,CAAC,QAAQ,CAAC,IAAI,KAAK,QAAQ;YAC5B,CAAC,CAAC,YAAY,CAAC,iBAAiB,CAC7B,IAAI,CAAC,QAAQ,CAAC,KAAK,EACnB,MAAM,EAAE,SAAS,IAAI,IAAA,8CAAoB,EAAC,IAAI,CAAC,MAAM,CAAC,EACtD,IAAI,CAAC,WAAW,EAChB,MAAM,EAAE,SAAS,IAAI,MAAM,GAAG,IAAI,MAAM,EAAE,CAC5C;YACD,CAAC,CAAC,YAAY,CAAC,kBAAkB,CAC9B,IAAI,CAAC,QAAQ,CAAC,KAAK,EACnB,MAAM,EAAE,SAAS,IAAI,IAAA,8CAAoB,EAAC,IAAI,CAAC,MAAM,CAAC,EACtD,IAAI,CAAC,WAAW,EAChB,MAAM,EAAE,SAAS,IAAI,MAAM,GAAG,IAAI,MAAM,EAAE,CAC5C,CAAC;QAEL,KAAK,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;IACzB,CAAC;AACJ,CAAC,CAAC;AA5EW,QAAA,OAAO,WA4ElB"}
+{"version":3,"file":"add-join.js","sourceRoot":"./","sources":["query/functions/add-join.ts"],"names":[],"mappings":";;;AAIA,uEAAiE;AAE1D,MAAM,OAAO,GAAG,CACpB,UAAwB,EACxB,YAAgC,EAChC,KAA0B,EAC1B,YAAqC,EACrC,IAAe,EACf,aAA4B,EAC7B,EAAE;IAED,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAC5B,IAAA,eAAO,EACJ,UAAU,EACV,YAAY,EACZ,KAAK,EACL,YAAY,EACZ,IAAI,CAAC,MAAM,EACX,aAAa,CACf,CAAC;IACL,CAAC;IAED,0GAA0G;IAC1G,MAAM,OAAO,GACV,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;IAC5D,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;IAEhC,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,IAAI,CAAC,QAAQ,EAAE,CAAC;QACzC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACf,IAAA,eAAO,EACJ,UAAU,EACV,YAAY,EACZ,KAAK,EACL,YAAY,EACZ,IAAI,CAAC,MAAM,EACX,aAAa,CACf,CAAC;QACL,CAAC;QAED,MAAM,MAAM,GAAQ,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,KAAK,QAAQ;YAC5D,CAAC,CAAC,IAAI;iBACF,QAAQ;iBACR,SAAS;YACb,CAAC,CAAC,IAAI;iBACF,QAAQ;iBACR,SAAS,CACP,YAAY,EACZ,YAAY,EACZ,aAAa,CACf,CAAC;QAER,IAAI,CAAC,QAAQ,CAAC,IAAI,KAAK,QAAQ;YAC5B,CAAC,CAAC,YAAY,CAAC,iBAAiB,CAC7B,IAAI,CAAC,QAAQ,CAAC,KAAK,EACnB,MAAM,EAAE,SAAS,IAAI,IAAA,8CAAoB,EAAC,IAAI,CAAC,MAAM,CAAC,EACtD,IAAI,CAAC,WAAW,EAChB,MAAM,EAAE,SAAS,IAAI,MAAM,CAC7B;YACD,CAAC,CAAC,YAAY,CAAC,kBAAkB,CAC9B,IAAI,CAAC,QAAQ,CAAC,KAAK,EACnB,MAAM,EAAE,SAAS,IAAI,IAAA,8CAAoB,EAAC,IAAI,CAAC,MAAM,CAAC,EACtD,IAAI,CAAC,WAAW,EAChB,MAAM,EAAE,SAAS,IAAI,MAAM,CAC7B,CAAC;QAEL,KAAK,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;IACzB,CAAC;AACJ,CAAC,CAAC;AAjEW,QAAA,OAAO,WAiElB"}

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

@@ -2,7 +2,6 @@
 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_native_select_1 = require("./get-native-select");
 const create_query_cache_hash_1 = require("./create-query-cache-hash");
@@ -24,15 +23,6 @@ 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 joinHash = (0, create_query_cache_hash_1.getJoinStructureHash)(queryContent.target.name, queryContent.query.select);
     const cachedPaths = (0, query_structure_cache_1.getCachedJoinPlan)(joinHash);

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

package/query/functions/execute-query.js

@@ -48,6 +48,40 @@ const executeQuery = async ({ content: queryContent, intercept, preFilter }) =>
         });
     }
     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);
     });

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

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

package/query/functions/load-properties.js

@@ -6,6 +6,70 @@ const object_type_1 = require("../../common/interfaces/enum/object-type");
 const get_id_property_1 = require("../../database/functions/get-id-property");
 const get_entity_object_class_1 = require("./get-entity-object-class");
 const external_column_owner_path_1 = require("./external-column-owner-path");
+/**
+ * Multiple FK columns can reference the same entity (e.g. {@code routerAId} and {@code routerBId} → InfraClientRouter).
+ * Picking the first matching {@code @Relation} makes every join use the same column (wrong hydration / duplicate data).
+ * Prefer the path key from {@link joinOne} paths ({@code routerA}, {@code routerB}) via Rockster {@link IEntityProperty.directAlias}
+ * or common {@code pathProperty + "Id"} naming.
+ */
+function resolveJoinLinkProperty(path, pathProperty, targetObjectClass, pathObjectClass) {
+    const explicitKey = path.linkProperty;
+    if (explicitKey) {
+        if (path.type === "indirect") {
+            const match = core.storage
+                .getProperties(pathObjectClass)
+                .find((p) => p.isRelation &&
+                p.getRelationType() === targetObjectClass &&
+                (p.propertyKey === explicitKey || p.columnName === explicitKey));
+            if (match) {
+                return match;
+            }
+        }
+        else {
+            const match = core.storage
+                .getProperties(targetObjectClass)
+                .find((p) => p.isRelation &&
+                p.getRelationType() === pathObjectClass &&
+                (p.propertyKey === explicitKey || p.columnName === explicitKey));
+            if (match) {
+                return match;
+            }
+        }
+    }
+    if (path.type === "indirect") {
+        const candidates = core.storage
+            .getProperties(pathObjectClass)
+            .filter((p) => p.isRelation && p.getRelationType() === targetObjectClass);
+        return disambiguateRelationCandidates(candidates, pathProperty);
+    }
+    const candidates = core.storage
+        .getProperties(targetObjectClass)
+        .filter((p) => p.isRelation && p.getRelationType() === pathObjectClass);
+    return disambiguateRelationCandidates(candidates, pathProperty);
+}
+function disambiguateRelationCandidates(candidates, pathProperty) {
+    if (candidates.length === 0) {
+        return undefined;
+    }
+    if (candidates.length === 1) {
+        return candidates[0];
+    }
+    const byDirectAlias = candidates.find((p) => p.directAlias === pathProperty);
+    if (byDirectAlias) {
+        return byDirectAlias;
+    }
+    const byFk = candidates.find((p) => p.propertyKey === `${pathProperty}Id`);
+    if (byFk) {
+        return byFk;
+    }
+    const byName = candidates.find((p) => p.propertyKey === pathProperty);
+    if (byName) {
+        return byName;
+    }
+    throw new Error(`Ambiguous relation for path key "${pathProperty}" among: ${candidates
+        .map((c) => c.propertyKey)
+        .join(", ")}. ` + `Set linkProperty on joinOne or align path keys with @Relation FK names / directAlias.`);
+}
 function resolveExternalColumnClass(ep, entityLabel, propertyKey) {
     const Resolver = ep.getExternalResolver?.();
     if (!Resolver) {
@@ -165,9 +229,7 @@ const loadProperties = ({ type, target, alias, entityAlias, properties, parent,
         for (const pathProperty of pathKeys) {
             const path = paths[pathProperty];
             const pathObjectClass = (0, get_entity_object_class_1.getEntityObjectClass)(path.target());
-            const linkProperty = (path.type === 'indirect'
-                ? core.storage.getProperties(pathObjectClass).find((p) => p.isRelation && p.getRelationType() === targetObjectClass)
-                : core.storage.getProperties(targetObjectClass).find((p) => p.isRelation && p.getRelationType() === pathObjectClass));
+            const linkProperty = resolveJoinLinkProperty(path, pathProperty, targetObjectClass, pathObjectClass);
             if (!linkProperty && !path.condition) {
                 const line1 = `Unable to find linkProperty to ${path.alias}:${pathObjectClass?.name} into query:${target.name}`;
                 const line2 = `Use @Relation(() => <target>) to define`;
@@ -182,7 +244,7 @@ const loadProperties = ({ type, target, alias, entityAlias, properties, parent,
             const targetIdProperty = (0, get_id_property_1.getIdProperty)(pathObjectClass);
             const joinEntityAlias = joinSqlAlias;
             const condition = path.condition ?? (() => {
-                const linkName = path.linkProperty || linkProperty.columnName;
+                const linkName = linkProperty.columnName;
                 return path.type === "direct"
                     ? `"${entityAlias}"."${linkName}" = "${joinEntityAlias}"."${targetIdProperty.columnName}"`
                     : `"${entityAlias}"."${idProperty.columnName}" = "${joinEntityAlias}"."${linkName}"`;
@@ -203,7 +265,13 @@ const loadProperties = ({ type, target, alias, entityAlias, properties, parent,
                 externalSubtree,
                 relation: {
                     type: path.type,
-                    mapTo: `${alias}.${pathProperty}`,
+                    /**
+                     * TypeORM maps onto `parentJoinAlias.entityProperty`. The parent side must be this node's
+                     * SQL join alias (`entityAlias`), not the path key (`alias`). Keys match for most joins, but
+                     * `joinOne({ alias: "dcRouterA", ... })` under path `routerA` must map as `dcRouterA.server`,
+                     * not `routerA.server` (there is no query alias `routerA`).
+                     */
+                    mapTo: `${entityAlias}.${pathProperty}`,
                     condition,
                 },
                 parent: {

package/query/functions/load-properties.js.map

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

package/query/services/query-action-builder.js

@@ -10,7 +10,6 @@ exports.QueryActionBuilder = void 0;
 const class_injector_1 = require("@rockster/class-injector");
 const interfaces_1 = require("../../controllers/interfaces");
 const class_pipe_1 = require("@rockster/class-pipe");
-const common_1 = require("@rockster/common");
 const constants_1 = require("../constants");
 const interceptor_1 = require("../../core/interfaces/interceptor");
 const constants_2 = require("../../controllers/constants");
@@ -20,8 +19,9 @@ const docs_1 = require("@rockster/common/docs");
 const get_action_path_1 = require("../../core/functions/get-action-path");
 const create_interceptor_1 = require("../../core/functions/create-interceptor");
 const create_action_1 = require("../../core/functions/create-action");
-const get_user_keys_1 = require("../../access/functions/get-user-keys");
-const get_is_owner_1 = require("../../access/functions/get-is-owner");
+const assert_scope_action_access_1 = require("../../access/functions/assert-scope-action-access");
+const warn_if_public_1 = require("../../access/functions/warn-if-public");
+const describe_action_scope_1 = require("../../access/functions/describe-action-scope");
 const resolve_action_transactional_1 = require("../../core/functions/resolve-action-transactional");
 let QueryActionBuilder = class QueryActionBuilder {
     constructor() {
@@ -41,6 +41,7 @@ let QueryActionBuilder = class QueryActionBuilder {
             const isSecure = !property.public;
             const name = property.name || property.propertyKey;
             const path = (0, get_action_path_1.getActionPath)(object.alias, name);
+            (0, warn_if_public_1.warnIfPublic)(path, property);
             this.beforeInterceptors[path] =
                 (0, create_interceptor_1.createExecuteInterceptors)([interceptor_1.commonInterceptor.onBeforeExecute], object, property);
             this.afterInterceptors[path] =
@@ -77,6 +78,8 @@ let QueryActionBuilder = class QueryActionBuilder {
             path: path,
             description: property.description,
             isSecure: isSecure,
+            authenticated: property.authenticated,
+            keys: (0, describe_action_scope_1.describeActionScopeKeys)(property),
             payload: Payload,
             response: Response,
             exposeGroups: property.exposeGroups,
@@ -86,21 +89,12 @@ let QueryActionBuilder = class QueryActionBuilder {
         };
     }
     async onBefore(pending, context, property) {
-        if (property.keys?.has('query')) {
-            const userId = context.session.userId;
-            const key = property.keys.get('query');
-            const contextId = key.withId ? null : null;
-            const isOwner = await (0, get_is_owner_1.getIsOwner)(key.contextName, userId, contextId);
-            if (!isOwner) {
-                const userKeys = await (0, get_user_keys_1.getUserKeys)(userId, contextId);
-                if (!userKeys.includes(key.name)) {
-                    throw new common_1.ForbiddenError({
-                        message: `Query require permissions to execute`,
-                        requirements: [key.name]
-                    });
-                }
-            }
-        }
+        await (0, assert_scope_action_access_1.assertScopeActionAccess)({
+            property,
+            slot: "query",
+            pending,
+            context,
+        });
         if (property.data) {
             const payload = context.request[pending.requestRef];
             await this.beforeValidationInterceptors[pending.path]({