directus 9.20.4 → 9.21.2

package/package.json

@@ -1,9 +1,7 @@
 {
   "name": "directus",
-  "version": "9.20.4",
-  "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.",
+  "version": "9.21.2",
+  "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "keywords": [
     "directus",
     "realtime",
@@ -23,13 +21,17 @@
     "framework",
     "vue"
   ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/directus/directus.git"
-  },
+  "homepage": "https://directus.io",
   "bugs": {
     "url": "https://github.com/directus/directus/issues"
   },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/directus/directus.git",
+    "directory": "api"
+  },
+  "funding": "https://github.com/directus/directus?sponsor=1",
+  "license": "GPL-3.0-only",
   "author": {
     "name": "Monospace Inc",
     "email": "info@monospace.io",
@@ -47,40 +49,28 @@
       "url": "https://github.com/benhaynes"
     }
   ],
-  "main": "dist/index.js",
   "exports": {
     ".": "./dist/index.js",
     "./*": "./dist/*.js",
     "./package.json": "./package.json"
   },
+  "main": "dist/index.js",
   "bin": {
     "directus": "cli.js"
   },
-  "engines": {
-    "node": ">=12.20.0"
-  },
   "files": [
     "dist",
-    "LICENSE",
-    "README.md"
+    "!**/*.test.js",
+    "!**/__*__/"
   ],
   "dependencies": {
     "@authenio/samlify-node-xmllint": "2.0.0",
-    "@aws-sdk/client-ses": "3.190.0",
-    "@directus/app": "9.20.4",
-    "@directus/drive": "9.20.4",
-    "@directus/drive-azure": "9.20.4",
-    "@directus/drive-gcs": "9.20.4",
-    "@directus/drive-s3": "9.20.4",
-    "@directus/extensions-sdk": "9.20.4",
+    "@aws-sdk/client-ses": "3.211.0",
     "@directus/format-title": "9.15.0",
-    "@directus/schema": "9.20.4",
-    "@directus/shared": "9.20.4",
-    "@directus/specs": "9.20.4",
     "@godaddy/terminus": "4.11.2",
-    "@rollup/plugin-alias": "4.0.0",
-    "@rollup/plugin-virtual": "3.0.0",
-    "argon2": "0.30.1",
+    "@rollup/plugin-alias": "4.0.2",
+    "@rollup/plugin-virtual": "3.0.1",
+    "argon2": "0.30.2",
     "async": "3.2.4",
     "async-mutex": "0.4.0",
     "axios": "1.1.3",
@@ -95,7 +85,6 @@
     "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",
@@ -108,22 +97,22 @@
     "fs-extra": "10.1.0",
     "globby": "11.0.4",
     "graphql": "16.6.0",
-    "graphql-compose": "9.0.9",
+    "graphql-compose": "9.0.10",
     "helmet": "6.0.0",
     "inquirer": "8.2.4",
-    "ioredis": "5.2.3",
-    "joi": "17.6.3",
+    "ioredis": "5.2.4",
+    "joi": "17.7.0",
     "js-yaml": "4.1.0",
     "js2xmlparser": "5.0.0",
     "json2csv": "5.0.7",
     "jsonwebtoken": "8.5.1",
-    "keyv": "4.5.0",
+    "keyv": "4.5.2",
     "knex": "2.3.0",
     "knex-schema-inspector": "3.0.0",
     "ldapjs": "2.3.3",
-    "liquidjs": "9.42.0",
+    "liquidjs": "9.42.1",
     "lodash": "4.17.21",
-    "marked": "4.1.1",
+    "marked": "4.2.2",
     "micromustache": "8.0.3",
     "mime-types": "2.1.35",
     "ms": "2.1.3",
@@ -133,20 +122,19 @@
     "nodemailer": "6.8.0",
     "object-hash": "3.0.0",
     "openapi3-ts": "3.1.1",
-    "openid-client": "5.2.0",
+    "openid-client": "5.3.0",
     "ora": "5.4.0",
     "otplib": "12.0.1",
-    "pino": "8.6.1",
+    "pino": "8.7.0",
     "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",
-    "samlify": "2.8.6",
-    "sanitize-html": "2.7.2",
-    "sharp": "0.31.1",
-    "snappy": "7.2.0",
+    "rate-limiter-flexible": "2.4.1",
+    "rollup": "3.3.0",
+    "samlify": "2.8.7",
+    "sanitize-html": "2.7.3",
+    "sharp": "0.31.2",
+    "snappy": "7.2.2",
     "stream-json": "1.7.4",
     "strip-bom-stream": "4.0.0",
     "tmp-promise": "3.0.3",
@@ -154,22 +142,18 @@
     "uuid": "9.0.0",
     "uuid-validate": "0.0.3",
     "vm2": "3.9.11",
-    "wellknown": "0.5.0"
-  },
-  "optionalDependencies": {
-    "@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"
+    "wellknown": "0.5.0",
+    "@directus/app": "9.21.2",
+    "@directus/drive": "9.21.2",
+    "@directus/drive-azure": "9.21.2",
+    "@directus/drive-gcs": "9.21.2",
+    "@directus/drive-s3": "9.21.2",
+    "@directus/extensions-sdk": "9.21.2",
+    "@directus/schema": "9.21.2",
+    "@directus/shared": "9.21.2",
+    "@directus/specs": "9.21.2"
   },
-  "gitHead": "24621f3934dc77eb23441331040ed13c676ceffd",
   "devDependencies": {
-    "@otplib/preset-default": "12.0.1",
     "@types/async": "3.2.15",
     "@types/busboy": "1.5.0",
     "@types/bytes": "3.1.1",
@@ -179,25 +163,22 @@
     "@types/destroy": "1.0.0",
     "@types/encodeurl": "1.0.0",
     "@types/express": "4.17.14",
-    "@types/express-pino-logger": "4.0.3",
     "@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/jest": "29.2.0",
     "@types/js-yaml": "4.0.5",
     "@types/json2csv": "5.0.3",
     "@types/jsonwebtoken": "8.5.9",
     "@types/keyv": "3.1.4",
-    "@types/ldapjs": "2.2.4",
-    "@types/lodash": "4.14.186",
+    "@types/ldapjs": "2.2.5",
+    "@types/lodash": "4.14.189",
     "@types/marked": "4.0.7",
     "@types/mime-types": "2.1.1",
     "@types/ms": "0.7.31",
-    "@types/node": "18.11.2",
-    "@types/node-cron": "3.0.4",
+    "@types/node": "18.11.9",
+    "@types/node-cron": "3.0.6",
     "@types/nodemailer": "6.4.6",
     "@types/object-hash": "2.2.1",
     "@types/pino": "7.0.4",
@@ -206,31 +187,39 @@
     "@types/sanitize-html": "2.6.2",
     "@types/sharp": "0.31.0",
     "@types/stream-json": "1.7.2",
-    "@types/supertest": "2.0.12",
     "@types/uuid": "8.3.4",
     "@types/uuid-validate": "0.0.1",
-    "@types/wellknown": "0.5.3",
+    "@types/wellknown": "0.5.4",
+    "@vitest/coverage-c8": "0.25.2",
     "copyfiles": "2.4.1",
-    "cross-env": "7.0.3",
     "form-data": "4.0.0",
-    "jest": "29.2.1",
     "knex-mock-client": "1.8.4",
-    "rimraf": "3.0.2",
-    "supertest": "6.3.0",
-    "ts-jest": "29.0.3",
     "ts-node": "10.9.1",
     "ts-node-dev": "2.0.0",
-    "typescript": "4.8.4"
+    "typescript": "4.9.3",
+    "vitest": "0.25.2"
+  },
+  "optionalDependencies": {
+    "@keyv/redis": "2.5.3",
+    "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.1"
+  },
+  "engines": {
+    "node": ">=12.20.0"
   },
   "scripts": {
+    "build": "tsc --build && copyfiles \"src/**/*.{yaml,liquid}\" -u 1 dist",
+    "cli": "NODE_ENV=development SERVE_APP=false ts-node --script-mode --transpile-only src/cli/run.ts",
+    "dev": "NODE_ENV=development SERVE_APP=false ts-node-dev --files --transpile-only --respawn --watch \".env\" --inspect=0 --exit-child -- src/start.ts",
     "start": "npx directus start",
-    "prebuild": "pnpm cleanup",
-    "build": "tsc --build && copyfiles \"src/**/*.*\" -e \"src/**/*.ts\" -u 1 dist",
-    "cleanup": "rimraf dist",
-    "dev": "cross-env NODE_ENV=development SERVE_APP=false ts-node-dev --files --transpile-only --respawn --watch \".env\" --inspect=0 --exit-child -- src/start.ts",
-    "cli": "cross-env NODE_ENV=development SERVE_APP=false ts-node --script-mode --transpile-only src/cli/run.ts",
-    "test": "jest",
-    "test:coverage": "jest --coverage",
-    "test:watch": "jest --watch"
+    "test": "vitest run",
+    "test:coverage": "vitest run --coverage",
+    "test:watch": "vitest"
   }
 }

package/dist/__mocks__/cache.d.ts

@@ -1,5 +0,0 @@
-/// <reference types="jest" />
-export declare const getCache: jest.Mock<any, any>;
-export declare const flushCaches: jest.Mock<any, any>;
-export declare const clearSystemCache: jest.Mock<any, any>;
-export declare const setSystemCache: jest.Mock<any, any>;

package/dist/__mocks__/cache.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.setSystemCache = exports.clearSystemCache = exports.flushCaches = exports.getCache = void 0;
-exports.getCache = jest.fn().mockReturnValue({ cache: undefined, systemCache: undefined, lockCache: undefined });
-exports.flushCaches = jest.fn();
-exports.clearSystemCache = jest.fn();
-exports.setSystemCache = jest.fn();

package/dist/__utils__/items-utils.d.ts

@@ -1,2 +0,0 @@
-export declare const sqlFieldFormatter: (schema: Record<string, any>, table: string) => string;
-export declare const sqlFieldList: (schema: Record<string, any>, table: string) => string;

package/dist/__utils__/items-utils.js

@@ -1,36 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sqlFieldList = exports.sqlFieldFormatter = void 0;
-// dynamically adds fields to the sql strings as the schema grows
-const sqlFieldFormatter = (schema, table) => {
-    const fields = [];
-    // Exclude alias fields, unable to selected in DB
-    for (const field of Object.keys(schema.collections[table].fields)) {
-        if (schema.collections[table].fields[field].type !== 'alias') {
-            fields.push(field);
-        }
-    }
-    let sql = '';
-    for (const field of fields.slice(0, fields.length - 1)) {
-        sql += `"${table}"."${field}", `;
-    }
-    sql += `"${table}"."${fields[fields.length - 1]}"`;
-    return sql;
-};
-exports.sqlFieldFormatter = sqlFieldFormatter;
-const sqlFieldList = (schema, table) => {
-    const fields = [];
-    // Exclude alias fields, unable to selected in DB
-    for (const field of Object.keys(schema.collections[table].fields)) {
-        if (schema.collections[table].fields[field].type !== 'alias') {
-            fields.push(field);
-        }
-    }
-    let sql = '';
-    for (const field of fields.slice(0, fields.length - 1)) {
-        sql += `"${field}", `;
-    }
-    sql += `"${fields[fields.length - 1]}"`;
-    return sql;
-};
-exports.sqlFieldList = sqlFieldList;

package/dist/__utils__/schemas.d.ts

@@ -1,13 +0,0 @@
-import { CollectionsOverview, Relation } from '@directus/shared/types';
-export declare const systemSchema: {
-    collections: CollectionsOverview;
-    relations: Relation[];
-};
-export declare const userSchema: {
-    collections: CollectionsOverview;
-    relations: Relation[];
-};
-export declare const snapshotApplyTestSchema: {
-    collections: CollectionsOverview;
-    relations: Relation[];
-};

package/dist/__utils__/schemas.js

@@ -1,304 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.snapshotApplyTestSchema = exports.userSchema = exports.systemSchema = void 0;
-exports.systemSchema = {
-    collections: {
-        directus_users: {
-            collection: 'directus_users',
-            primary: 'id',
-            singleton: false,
-            note: '$t:directus_collection.directus_users',
-            sortField: null,
-            accountability: null,
-            fields: {
-                id: {
-                    field: 'id',
-                    defaultValue: null,
-                    nullable: false,
-                    generated: false,
-                    type: 'uuid',
-                    dbType: 'uuid',
-                    precision: null,
-                    scale: null,
-                    special: [],
-                    note: null,
-                    alias: false,
-                    validation: null,
-                },
-                name: {
-                    field: 'name',
-                    defaultValue: "A User's Name",
-                    nullable: false,
-                    generated: false,
-                    type: 'uuid',
-                    dbType: 'uuid',
-                    precision: null,
-                    scale: null,
-                    special: [],
-                    note: null,
-                    alias: false,
-                    validation: null,
-                },
-                items: {
-                    field: 'items',
-                    defaultValue: null,
-                    nullable: true,
-                    generated: false,
-                    type: 'alias',
-                    dbType: null,
-                    precision: null,
-                    scale: null,
-                    special: ['o2m'],
-                    note: null,
-                    alias: true,
-                    validation: null,
-                },
-            },
-        },
-        directus_files: {
-            collection: 'directus_files',
-            primary: 'id',
-            singleton: false,
-            note: '$t:directus_collection.directus_files',
-            sortField: null,
-            accountability: null,
-            fields: {
-                id: {
-                    field: 'id',
-                    defaultValue: null,
-                    nullable: false,
-                    generated: false,
-                    type: 'uuid',
-                    dbType: 'uuid',
-                    precision: null,
-                    scale: null,
-                    special: [],
-                    note: null,
-                    alias: false,
-                    validation: null,
-                },
-                title: {
-                    field: 'title',
-                    defaultValue: "A File's Title",
-                    nullable: false,
-                    generated: false,
-                    type: 'string',
-                    dbType: 'text',
-                    precision: null,
-                    scale: null,
-                    special: [],
-                    note: null,
-                    alias: false,
-                    validation: null,
-                },
-                uploaded_by: {
-                    field: 'uploaded_by',
-                    defaultValue: null,
-                    nullable: true,
-                    generated: false,
-                    type: 'uuid',
-                    dbType: 'uuid',
-                    precision: null,
-                    scale: null,
-                    special: [],
-                    note: null,
-                    alias: false,
-                    validation: null,
-                },
-            },
-        },
-    },
-    relations: [
-        {
-            collection: 'directus_files',
-            field: 'uploaded_by',
-            related_collection: 'directus_users',
-            schema: {
-                table: 'directus_files',
-                column: 'uploaded_by',
-                foreign_key_table: 'directus_users',
-                foreign_key_column: 'id',
-                on_update: 'NO ACTION',
-                on_delete: 'NO ACTION',
-                constraint_name: null,
-            },
-            meta: {
-                system: true,
-                many_collection: 'directus_files',
-                many_field: 'uploaded_by',
-                one_collection: 'directus_users',
-                one_field: 'items',
-                one_allowed_collections: null,
-                one_collection_field: null,
-                one_deselect_action: 'nullify',
-                junction_field: null,
-                sort_field: null,
-            },
-        },
-    ],
-};
-exports.userSchema = {
-    collections: {
-        authors: {
-            collection: 'authors',
-            primary: 'id',
-            singleton: false,
-            note: 'authors',
-            sortField: null,
-            accountability: null,
-            fields: {
-                id: {
-                    field: 'id',
-                    defaultValue: null,
-                    nullable: false,
-                    generated: false,
-                    type: 'uuid',
-                    dbType: 'uuid',
-                    precision: null,
-                    scale: null,
-                    special: [],
-                    note: null,
-                    alias: false,
-                    validation: null,
-                },
-                name: {
-                    field: 'name',
-                    defaultValue: "An Author's Name",
-                    nullable: false,
-                    generated: false,
-                    type: 'uuid',
-                    dbType: 'uuid',
-                    precision: null,
-                    scale: null,
-                    special: [],
-                    note: null,
-                    alias: false,
-                    validation: null,
-                },
-                items: {
-                    field: 'items',
-                    defaultValue: null,
-                    nullable: true,
-                    generated: false,
-                    type: 'alias',
-                    dbType: null,
-                    precision: null,
-                    scale: null,
-                    special: ['o2m'],
-                    note: null,
-                    alias: true,
-                    validation: null,
-                },
-            },
-        },
-        posts: {
-            collection: 'posts',
-            primary: 'id',
-            singleton: false,
-            note: 'posts',
-            sortField: null,
-            accountability: null,
-            fields: {
-                id: {
-                    field: 'id',
-                    defaultValue: null,
-                    nullable: false,
-                    generated: false,
-                    type: 'uuid',
-                    dbType: 'uuid',
-                    precision: null,
-                    scale: null,
-                    special: [],
-                    note: null,
-                    alias: false,
-                    validation: null,
-                },
-                title: {
-                    field: 'title',
-                    defaultValue: "A Post's Title",
-                    nullable: false,
-                    generated: false,
-                    type: 'string',
-                    dbType: 'text',
-                    precision: null,
-                    scale: null,
-                    special: [],
-                    note: null,
-                    alias: false,
-                    validation: null,
-                },
-                uploaded_by: {
-                    field: 'uploaded_by',
-                    defaultValue: null,
-                    nullable: true,
-                    generated: false,
-                    type: 'uuid',
-                    dbType: 'uuid',
-                    precision: null,
-                    scale: null,
-                    special: [],
-                    note: null,
-                    alias: false,
-                    validation: null,
-                },
-            },
-        },
-    },
-    relations: [
-        {
-            collection: 'posts',
-            field: 'uploaded_by',
-            related_collection: 'authors',
-            schema: {
-                table: 'posts',
-                column: 'uploaded_by',
-                foreign_key_table: 'authors',
-                foreign_key_column: 'id',
-                on_update: 'NO ACTION',
-                on_delete: 'SET NULL',
-                constraint_name: null,
-            },
-            meta: {
-                id: 11,
-                many_collection: 'posts',
-                many_field: 'uploaded_by',
-                one_collection: 'authors',
-                one_field: 'items',
-                one_collection_field: null,
-                one_allowed_collections: null,
-                junction_field: null,
-                sort_field: null,
-                one_deselect_action: 'nullify',
-            },
-        },
-    ],
-};
-exports.snapshotApplyTestSchema = {
-    collections: {
-        test_table: {
-            collection: 'test_table',
-            primary: 'id',
-            singleton: false,
-            note: 'test_table',
-            sortField: null,
-            accountability: 'all',
-            fields: {
-                id: {
-                    field: 'id',
-                    defaultValue: null,
-                    nullable: false,
-                    generated: false,
-                    type: 'uuid',
-                    dbType: 'uuid',
-                    precision: null,
-                    scale: null,
-                    special: [],
-                    note: null,
-                    alias: false,
-                    validation: null,
-                },
-            },
-        },
-    },
-    relations: [],
-};

package/dist/__utils__/snapshots.d.ts

@@ -1,5 +0,0 @@
-import { Snapshot } from '../types';
-export declare const snapshotBeforeCreateCollection: Snapshot;
-export declare const snapshotCreateCollection: Snapshot;
-export declare const snapshotCreateCollectionNotNested: Snapshot;
-export declare const snapshotBeforeDeleteCollection: Snapshot;