directus 9.18.1 → 9.19.0

package/dist/utils/get-ast-from-query.js

@@ -73,7 +73,7 @@ async function getASTFromQuery(collection, query, schema, options) {
         if (!fields || !Array.isArray(fields))
             return [];
         const children = [];
-        const relationalStructure = {};
+        const relationalStructure = Object.create(null);
         for (const fieldKey of fields) {
             let name = fieldKey;
             if (query.alias) {

package/dist/utils/get-auth-providers.d.ts

@@ -1,4 +1,5 @@
 interface AuthProvider {
+    label: string;
     name: string;
     driver: string;
     icon?: string;

package/dist/utils/get-auth-providers.js

@@ -11,6 +11,7 @@ function getAuthProviders() {
         .filter((provider) => provider && env_1.default[`AUTH_${provider.toUpperCase()}_DRIVER`])
         .map((provider) => ({
         name: provider,
+        label: env_1.default[`AUTH_${provider.toUpperCase()}_LABEL`],
         driver: env_1.default[`AUTH_${provider.toUpperCase()}_DRIVER`],
         icon: env_1.default[`AUTH_${provider.toUpperCase()}_ICON`],
     }));

package/dist/utils/get-auth-providers.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/utils/get-auth-providers.test.js

@@ -0,0 +1,72 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+let factoryEnv = {};
+jest.mock('../../src/env', () => new Proxy({}, {
+    get(target, prop) {
+        return factoryEnv[prop];
+    },
+}));
+const get_auth_providers_1 = require("../../src/utils/get-auth-providers");
+const scenarios = [
+    {
+        name: 'when no providers configured',
+        input: {},
+        output: [],
+    },
+    {
+        name: 'when no driver configured',
+        input: {
+            AUTH_PROVIDERS: 'directus',
+        },
+        output: [],
+    },
+    {
+        name: 'when single provider and driver are properly configured',
+        input: {
+            AUTH_PROVIDERS: 'directus',
+            AUTH_DIRECTUS_DRIVER: 'openid',
+            AUTH_DIRECTUS_LABEL: 'Directus',
+            AUTH_DIRECTUS_ICON: 'hare',
+        },
+        output: [
+            {
+                name: 'directus',
+                driver: 'openid',
+                label: 'Directus',
+                icon: 'hare',
+            },
+        ],
+    },
+    {
+        name: 'when multiple provider and driver are properly configured',
+        input: {
+            AUTH_PROVIDERS: 'directus,custom',
+            AUTH_DIRECTUS_DRIVER: 'openid',
+            AUTH_DIRECTUS_LABEL: 'Directus',
+            AUTH_DIRECTUS_ICON: 'hare',
+            AUTH_CUSTOM_DRIVER: 'openid',
+            AUTH_CUSTOM_ICON: 'lock',
+        },
+        output: [
+            {
+                name: 'directus',
+                driver: 'openid',
+                label: 'Directus',
+                icon: 'hare',
+            },
+            {
+                name: 'custom',
+                driver: 'openid',
+                icon: 'lock',
+            },
+        ],
+    },
+];
+describe('get auth providers', () => {
+    for (const scenario of scenarios) {
+        test(scenario.name, () => {
+            factoryEnv = scenario.input;
+            expect((0, get_auth_providers_1.getAuthProviders)()).toEqual(scenario.output);
+        });
+    }
+});

package/dist/utils/get-relation-info.js

@@ -2,12 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRelationInfo = void 0;
 const get_relation_type_1 = require("./get-relation-type");
+function checkImplicitRelation(field) {
+    if (field.startsWith('$FOLLOW(') && field.endsWith(')')) {
+        return field.slice(8, -1).split(',');
+    }
+    return null;
+}
 function getRelationInfo(relations, collection, field) {
-    var _a, _b;
+    var _a;
     if (field.startsWith('$FOLLOW') && field.length > 500) {
         throw new Error(`Implicit $FOLLOW statement is too big to parse. Got: "${field.substring(500)}..."`);
     }
-    const implicitRelation = (_a = field.match(/^\$FOLLOW\((.*?),(.*?)(?:,(.*?))?\)$/)) === null || _a === void 0 ? void 0 : _a.slice(1);
+    const implicitRelation = checkImplicitRelation(field);
     if (implicitRelation) {
         if (implicitRelation[2] === undefined) {
             const [m2oCollection, m2oField] = implicitRelation;
@@ -34,11 +40,11 @@ function getRelationInfo(relations, collection, field) {
             return { relation, relationType: 'o2a' };
         }
     }
-    const relation = (_b = relations.find((relation) => {
+    const relation = (_a = relations.find((relation) => {
         var _a;
         return ((relation.collection === collection && relation.field === field) ||
             (relation.related_collection === collection && ((_a = relation.meta) === null || _a === void 0 ? void 0 : _a.one_field) === field));
-    })) !== null && _b !== void 0 ? _b : null;
+    })) !== null && _a !== void 0 ? _a : null;
     const relationType = relation ? (0, get_relation_type_1.getRelationType)({ relation, collection, field }) : null;
     return { relation, relationType };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "directus",
-  "version": "9.18.1",
+  "version": "9.19.0",
   "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.",
@@ -65,110 +65,110 @@
     "README.md"
   ],
   "dependencies": {
-    "@aws-sdk/client-ses": "^3.107.0",
-    "@directus/app": "9.18.1",
-    "@directus/drive": "9.18.1",
-    "@directus/drive-azure": "9.18.1",
-    "@directus/drive-gcs": "9.18.1",
-    "@directus/drive-s3": "9.18.1",
-    "@directus/extensions-sdk": "^9.14.1",
-    "@directus/format-title": "^9.15.0",
-    "@directus/schema": "9.18.1",
-    "@directus/shared": "9.18.1",
-    "@directus/specs": "9.18.1",
-    "@godaddy/terminus": "^4.10.2",
-    "@rollup/plugin-alias": "^3.1.9",
-    "@rollup/plugin-virtual": "^2.1.0",
-    "argon2": "^0.28.5",
-    "async": "^3.2.4",
-    "async-mutex": "^0.3.2",
-    "axios": "^0.27.2",
-    "busboy": "^1.6.0",
-    "bytes": "^3.1.2",
-    "camelcase": "^6.2.0",
-    "chalk": "^4.1.1",
-    "chokidar": "^3.5.3",
-    "commander": "^8.0.0",
-    "cookie-parser": "^1.4.6",
-    "cors": "^2.8.5",
-    "csv-parser": "^3.0.0",
-    "date-fns": "^2.28.0",
-    "deep-diff": "^1.0.2",
-    "deep-map": "^2.0.0",
-    "destroy": "^1.2.0",
-    "dotenv": "^10.0.0",
-    "encodeurl": "^1.0.2",
-    "eventemitter2": "^6.4.5",
-    "execa": "^5.1.1",
-    "exifr": "^7.1.3",
-    "express": "^4.18.1",
-    "fast-redact": "^3.1.1",
-    "flat": "^5.0.2",
-    "fs-extra": "^10.1.0",
-    "globby": "^11.0.4",
-    "graphql": "^15.5.0",
-    "graphql-compose": "^9.0.8",
-    "helmet": "^4.6.0",
-    "inquirer": "^8.2.4",
-    "ioredis": "^4.27.6",
-    "joi": "^17.6.0",
-    "js-yaml": "^4.1.0",
-    "js2xmlparser": "^4.0.2",
-    "json2csv": "^5.0.7",
-    "jsonwebtoken": "^8.5.1",
-    "keyv": "^4.3.0",
-    "knex": "2.2.0",
-    "knex-schema-inspector": "2.0.4",
-    "ldapjs": "^2.3.3",
-    "liquidjs": "^9.37.0",
-    "lodash": "^4.17.21",
-    "marked": "^4.0.16",
-    "micromustache": "^8.0.3",
-    "mime-types": "^2.1.35",
-    "ms": "^2.1.3",
-    "nanoid": "^3.1.23",
-    "node-cron": "^3.0.2",
-    "node-machine-id": "^1.1.12",
-    "nodemailer": "^6.7.5",
-    "object-hash": "^2.2.0",
-    "openapi3-ts": "^2.0.2",
-    "openid-client": "^5.1.6",
-    "ora": "^5.4.0",
-    "otplib": "^12.0.1",
-    "pino": "6.13.3",
-    "pino-colada": "^2.2.2",
-    "pino-http": "5.8.0",
-    "qs": "^6.10.5",
-    "rate-limiter-flexible": "^2.3.7",
-    "resolve-cwd": "^3.0.0",
-    "rollup": "^2.75.6",
-    "sanitize-html": "^2.7.0",
-    "sharp": "^0.30.6",
-    "snappy": "^7.1.1",
-    "stream-json": "^1.7.4",
-    "strip-bom-stream": "^4.0.0",
-    "tmp-promise": "^3.0.3",
-    "update-check": "^1.5.4",
-    "uuid": "^8.3.2",
+    "@aws-sdk/client-ses": "3.190.0",
+    "@directus/app": "9.19.0",
+    "@directus/drive": "9.19.0",
+    "@directus/drive-azure": "9.19.0",
+    "@directus/drive-gcs": "9.19.0",
+    "@directus/drive-s3": "9.19.0",
+    "@directus/extensions-sdk": "9.19.0",
+    "@directus/format-title": "9.15.0",
+    "@directus/schema": "9.19.0",
+    "@directus/shared": "9.19.0",
+    "@directus/specs": "9.19.0",
+    "@godaddy/terminus": "4.11.2",
+    "@rollup/plugin-alias": "4.0.0",
+    "@rollup/plugin-virtual": "3.0.0",
+    "argon2": "0.30.1",
+    "async": "3.2.4",
+    "async-mutex": "0.4.0",
+    "axios": "1.1.3",
+    "busboy": "1.6.0",
+    "bytes": "3.1.2",
+    "camelcase": "6.3.0",
+    "chalk": "4.1.1",
+    "chokidar": "3.5.3",
+    "commander": "9.4.1",
+    "cookie-parser": "1.4.6",
+    "cors": "2.8.5",
+    "csv-parser": "3.0.0",
+    "date-fns": "2.29.3",
+    "deep-diff": "1.0.2",
+    "deep-map": "2.0.0",
+    "destroy": "1.2.0",
+    "dotenv": "16.0.3",
+    "encodeurl": "1.0.2",
+    "eventemitter2": "6.4.9",
+    "execa": "5.1.1",
+    "exifr": "7.1.3",
+    "express": "4.18.2",
+    "fast-redact": "3.1.2",
+    "flat": "5.0.2",
+    "fs-extra": "10.1.0",
+    "globby": "11.0.4",
+    "graphql": "16.6.0",
+    "graphql-compose": "9.0.9",
+    "helmet": "6.0.0",
+    "inquirer": "8.2.4",
+    "ioredis": "5.2.3",
+    "joi": "17.6.3",
+    "js-yaml": "4.1.0",
+    "js2xmlparser": "5.0.0",
+    "json2csv": "5.0.7",
+    "jsonwebtoken": "8.5.1",
+    "keyv": "4.5.0",
+    "knex": "2.3.0",
+    "knex-schema-inspector": "3.0.0",
+    "ldapjs": "2.3.3",
+    "liquidjs": "9.42.0",
+    "lodash": "4.17.21",
+    "marked": "4.1.1",
+    "micromustache": "8.0.3",
+    "mime-types": "2.1.35",
+    "ms": "2.1.3",
+    "nanoid": "3.1.23",
+    "node-cron": "3.0.2",
+    "node-machine-id": "1.1.12",
+    "nodemailer": "6.8.0",
+    "object-hash": "3.0.0",
+    "openapi3-ts": "3.1.1",
+    "openid-client": "5.2.0",
+    "ora": "5.4.0",
+    "otplib": "12.0.1",
+    "pino": "8.6.1",
+    "pino-http": "8.2.1",
+    "pino-http-print": "3.1.0",
+    "qs": "6.11.0",
+    "rate-limiter-flexible": "2.3.12",
+    "resolve-cwd": "3.0.0",
+    "rollup": "3.2.3",
+    "sanitize-html": "2.7.2",
+    "sharp": "0.31.1",
+    "snappy": "7.2.0",
+    "stream-json": "1.7.4",
+    "strip-bom-stream": "4.0.0",
+    "tmp-promise": "3.0.3",
+    "update-check": "1.5.4",
+    "uuid": "9.0.0",
     "uuid-validate": "0.0.3",
-    "vm2": "^3.9.10",
-    "wellknown": "^0.5.0"
+    "vm2": "3.9.11",
+    "wellknown": "0.5.0"
   },
   "optionalDependencies": {
-    "@keyv/redis": "^2.3.6",
-    "keyv-memcache": "^1.2.5",
-    "memcached": "^2.2.2",
-    "mysql": "^2.18.1",
-    "nodemailer-mailgun-transport": "^2.1.4",
-    "nodemailer-sendgrid": "^1.0.3",
-    "pg": "^8.7.3",
-    "sqlite3": "^5.0.8",
-    "tedious": "^13.0.0"
+    "@keyv/redis": "2.5.2",
+    "keyv-memcache": "1.2.5",
+    "memcached": "2.2.2",
+    "mysql": "2.18.1",
+    "nodemailer-mailgun-transport": "2.1.5",
+    "nodemailer-sendgrid": "1.0.3",
+    "pg": "8.8.0",
+    "sqlite3": "5.1.2",
+    "tedious": "15.1.0"
   },
   "gitHead": "24621f3934dc77eb23441331040ed13c676ceffd",
   "devDependencies": {
-    "@otplib/preset-default": "^12.0.1",
-    "@types/async": "3.2.13",
+    "@otplib/preset-default": "12.0.1",
+    "@types/async": "3.2.15",
     "@types/body-parser": "1.19.2",
     "@types/busboy": "1.5.0",
     "@types/bytes": "3.1.1",
@@ -176,35 +176,34 @@
     "@types/cors": "2.8.12",
     "@types/deep-diff": "1.0.1",
     "@types/destroy": "1.0.0",
-    "@types/encodeurl": "^1.0.0",
-    "@types/express": "4.17.13",
+    "@types/encodeurl": "1.0.0",
+    "@types/express": "4.17.14",
     "@types/express-pino-logger": "4.0.3",
-    "@types/express-serve-static-core": "^4.17.29",
-    "@types/express-session": "1.17.4",
-    "@types/fast-redact": "^3.0.1",
+    "@types/express-serve-static-core": "4.17.31",
+    "@types/express-session": "1.17.5",
+    "@types/fast-redact": "3.0.2",
     "@types/flat": "5.0.2",
     "@types/fs-extra": "9.0.13",
     "@types/inquirer": "8.2.1",
-    "@types/ioredis": "^4.28.10",
-    "@types/jest": "27.5.2",
+    "@types/jest": "29.2.0",
     "@types/js-yaml": "4.0.5",
     "@types/json2csv": "5.0.3",
-    "@types/jsonwebtoken": "8.5.8",
+    "@types/jsonwebtoken": "8.5.9",
     "@types/keyv": "3.1.4",
-    "@types/ldapjs": "2.2.2",
-    "@types/lodash": "4.14.182",
-    "@types/marked": "4.0.3",
+    "@types/ldapjs": "2.2.4",
+    "@types/lodash": "4.14.186",
+    "@types/marked": "4.0.7",
     "@types/mime-types": "2.1.1",
     "@types/ms": "0.7.31",
-    "@types/node": "16.11.9",
-    "@types/node-cron": "2.0.5",
-    "@types/nodemailer": "6.4.4",
+    "@types/node": "18.11.2",
+    "@types/node-cron": "3.0.4",
+    "@types/nodemailer": "6.4.6",
     "@types/object-hash": "2.2.1",
-    "@types/pino": "6.3.12",
+    "@types/pino": "7.0.4",
     "@types/pino-http": "5.8.1",
     "@types/qs": "6.9.7",
     "@types/sanitize-html": "2.6.2",
-    "@types/sharp": "0.30.4",
+    "@types/sharp": "0.31.0",
     "@types/stream-json": "1.7.2",
     "@types/supertest": "2.0.12",
     "@types/uuid": "8.3.4",
@@ -212,15 +211,15 @@
     "@types/wellknown": "0.5.3",
     "copyfiles": "2.4.1",
     "cross-env": "7.0.3",
-    "form-data": "^4.0.0",
-    "jest": "28.1.2",
+    "form-data": "4.0.0",
+    "jest": "29.2.1",
     "knex-mock-client": "1.8.4",
     "rimraf": "3.0.2",
-    "supertest": "^6.2.3",
-    "ts-jest": "28.0.5",
-    "ts-node": "^10.8.2",
-    "ts-node-dev": "1.1.8",
-    "typescript": "4.7.3"
+    "supertest": "6.3.0",
+    "ts-jest": "29.0.3",
+    "ts-node": "10.9.1",
+    "ts-node-dev": "2.0.0",
+    "typescript": "4.8.4"
   },
   "scripts": {
     "start": "npx directus start",