From 545f9b11c4e5ac98d5ab01a47ff945615c1a3236 Mon Sep 17 00:00:00 2001
From: rijkvanzanten <rijkvanzanten@me.com>
Date: Fri, 26 Jun 2020 14:21:22 -0400
Subject: [PATCH] Fix TS errors, remove last loader usage

---
 package.json                         | 2 +-
 src/middleware/validate-singleton.ts | 6 +++++-
 src/types/express.d.ts               | 3 +--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 059afbd65c..4e437833c2 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "main": "dist/server.js",
   "scripts": {
     "start": "NODE_ENV=production node dist/server.js",
-    "build": "rimraf dist && tsc && copyfiles \"src/**/*.*\" -e \"src/**/*.ts\" -u 1 dist",
+    "build": "rimraf dist && tsc -b && copyfiles \"src/**/*.*\" -e \"src/**/*.ts\" -u 1 dist",
     "dev": "LOG_LEVEL=trace ts-node-dev src/server.ts --clear --watch \"src/**/*.ts\" --rs --transpile-only | pino-colada"
   },
   "repository": {
diff --git a/src/middleware/validate-singleton.ts b/src/middleware/validate-singleton.ts
index d3b08f8bbd..480f59ba62 100644
--- a/src/middleware/validate-singleton.ts
+++ b/src/middleware/validate-singleton.ts
@@ -10,7 +10,11 @@ import APIError, { ErrorCode } from '../error';
 const validateCollection: RequestHandler = asyncHandler(async (req, res, next) => {
 	if (!req.collection) return next();
 
-	const collectionInfo = await req.loaders.collections.load(req.collection);
+	const collectionInfo = await database
+		.select('single')
+		.from('directus_collections')
+		.where({ collection: req.collection })
+		.first();
 
 	if (!collectionInfo) return next();
 
diff --git a/src/types/express.d.ts b/src/types/express.d.ts
index a11eebeadc..392b1aabd4 100644
--- a/src/types/express.d.ts
+++ b/src/types/express.d.ts
@@ -2,7 +2,7 @@
  * Custom properties on the req object in express
  */
 
-import createSystemLoaders from '../loaders';
+export {};
 
 declare global {
 	namespace Express {
@@ -11,7 +11,6 @@ declare global {
 			user?: string;
 			role?: string;
 			collection?: string;
-			loaders?: ReturnType<typeof createSystemLoaders>;
 		}
 	}
 }