directus 9.12.0 → 9.12.1

package/dist/extensions.js

@@ -255,7 +255,7 @@ class ExtensionManager {
                 const endpointPath = path_1.default.resolve(endpoint.path, endpoint.entrypoint);
                 const endpointInstance = require(endpointPath);
                 const config = (0, get_module_default_1.default)(endpointInstance);
-                this.registerEndpoint(config, endpointPath, this.endpointRouter);
+                this.registerEndpoint(config, endpointPath, endpoint.name, this.endpointRouter);
             }
             catch (error) {
                 logger_1.default.warn(`Couldn't register endpoint "${endpoint.name}"`);
@@ -350,9 +350,9 @@ class ExtensionManager {
         });
         this.apiExtensions.hooks.push(hookHandler);
     }
-    registerEndpoint(config, path, router) {
+    registerEndpoint(config, path, name, router) {
         const register = typeof config === 'function' ? config : config.handler;
-        const routeName = typeof config === 'function' ? config.name : config.id;
+        const routeName = typeof config === 'function' ? name : config.id;
         const scopedRouter = express_1.default.Router();
         router.use(`/${routeName}`, scopedRouter);
         register(scopedRouter, {

package/dist/services/graphql.js

@@ -1167,7 +1167,12 @@ class GraphQLService {
                         values.push(this.parseArgs(valueNode.fields, variableValues));
                     }
                     else {
-                        values.push(valueNode.value);
+                        if (valueNode.kind === 'Variable') {
+                            values.push(variableValues[valueNode.name.value]);
+                        }
+                        else {
+                            values.push(valueNode.value);
+                        }
                     }
                 }
                 argsObject[argument.name.value] = values;

package/dist/services/import-export.js

@@ -169,7 +169,7 @@ class ExportService {
                 const requestedLimit = (_a = query.limit) !== null && _a !== void 0 ? _a : -1;
                 const batchesRequired = Math.ceil(count / env_1.default.EXPORT_BATCH_SIZE);
                 let readCount = 0;
-                for (let batch = 0; batch <= batchesRequired; batch++) {
+                for (let batch = 0; batch < batchesRequired; batch++) {
                     let limit = env_1.default.EXPORT_BATCH_SIZE;
                     if (requestedLimit > 0 && env_1.default.EXPORT_BATCH_SIZE > requestedLimit - readCount) {
                         limit = requestedLimit - readCount;
@@ -177,7 +177,7 @@ class ExportService {
                     const result = await service.readByQuery({
                         ...query,
                         limit,
-                        page: batch,
+                        offset: batch * env_1.default.EXPORT_BATCH_SIZE,
                     });
                     readCount += result.length;
                     if (result.length) {
@@ -265,7 +265,11 @@ class ExportService {
                 transforms: [json2csv_1.transforms.flatten({ separator: '.' })],
                 header: (options === null || options === void 0 ? void 0 : options.includeHeader) !== false,
             });
-            return parser.parse(input);
+            let string = parser.parse(input);
+            if ((options === null || options === void 0 ? void 0 : options.includeHeader) === false) {
+                string = '\n' + string;
+            }
+            return string;
         }
         throw new exceptions_1.ServiceUnavailableException(`Illegal export type used: "${format}"`, { service: 'export' });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "directus",
-	"version": "9.12.0",
+	"version": "9.12.1",
 	"license": "GPL-3.0-only",
 	"homepage": "https://github.com/directus/directus#readme",
 	"description": "Directus is a real-time API and App dashboard for managing SQL database content.",
@@ -77,16 +77,16 @@
 	],
 	"dependencies": {
 		"@aws-sdk/client-ses": "^3.40.0",
-		"@directus/app": "9.12.0",
-		"@directus/drive": "9.12.0",
-		"@directus/drive-azure": "9.12.0",
-		"@directus/drive-gcs": "9.12.0",
-		"@directus/drive-s3": "9.12.0",
-		"@directus/extensions-sdk": "9.12.0",
-		"@directus/format-title": "9.12.0",
-		"@directus/schema": "9.12.0",
-		"@directus/shared": "9.12.0",
-		"@directus/specs": "9.12.0",
+		"@directus/app": "9.12.1",
+		"@directus/drive": "9.12.1",
+		"@directus/drive-azure": "9.12.1",
+		"@directus/drive-gcs": "9.12.1",
+		"@directus/drive-s3": "9.12.1",
+		"@directus/extensions-sdk": "9.12.1",
+		"@directus/format-title": "9.12.1",
+		"@directus/schema": "9.12.1",
+		"@directus/shared": "9.12.1",
+		"@directus/specs": "9.12.1",
 		"@godaddy/terminus": "^4.9.0",
 		"@rollup/plugin-alias": "^3.1.9",
 		"@rollup/plugin-virtual": "^2.0.3",
@@ -119,6 +119,7 @@
 		"graphql-compose": "^9.0.1",
 		"helmet": "^4.6.0",
 		"inquirer": "^8.1.1",
+		"ioredis": "^4.27.6",
 		"joi": "^17.3.0",
 		"js-yaml": "^4.1.0",
 		"js2xmlparser": "^4.0.1",
@@ -164,7 +165,6 @@
 	},
 	"optionalDependencies": {
 		"@keyv/redis": "^2.1.2",
-		"ioredis": "^4.27.6",
 		"keyv-memcache": "^1.2.5",
 		"memcached": "^2.2.2",
 		"mysql": "^2.18.1",
@@ -173,7 +173,7 @@
 		"sqlite3": "^5.0.6",
 		"tedious": "^13.0.0"
 	},
-	"gitHead": "4d63fba50a7cf199e89423365a515e99cecf4ebf",
+	"gitHead": "cd58611aa7114dd7ef13f0819f77f9858f34ad1e",
 	"devDependencies": {
 		"@types/async": "3.2.10",
 		"@types/body-parser": "1.19.2",