directus 9.20.4 → 9.21.0

package/dist/types/items.d.ts

@@ -3,9 +3,9 @@
  * expecting an item vs any other generic object.
  */
 import { EventContext } from '@directus/shared/types';
-export declare type Item = Record<string, any>;
-export declare type PrimaryKey = string | number;
-export declare type Alterations = {
+export type Item = Record<string, any>;
+export type PrimaryKey = string | number;
+export type Alterations = {
     create: {
         [key: string]: any;
     }[];
@@ -14,7 +14,7 @@ export declare type Alterations = {
     }[];
     delete: (number | string)[];
 };
-export declare type MutationOptions = {
+export type MutationOptions = {
     /**
      * Callback function that's fired whenever a revision is made in the mutation
      */
@@ -37,7 +37,7 @@ export declare type MutationOptions = {
      */
     bypassEmitAction?: (params: ActionEventParams) => void;
 };
-export declare type ActionEventParams = {
+export type ActionEventParams = {
     event: string | string[];
     meta: Record<string, any>;
     context: EventContext;

package/dist/types/migration.d.ts

@@ -1,4 +1,4 @@
-export declare type Migration = {
+export type Migration = {
     version: string;
     name: string;
     timestamp: Date;

package/dist/types/revision.d.ts

@@ -1,4 +1,4 @@
-export declare type Revision = {
+export type Revision = {
     activity: number;
     collection: string;
     item: string | number;

package/dist/types/services.d.ts

@@ -1,7 +1,7 @@
 import { Knex } from 'knex';
 import { Accountability, Query, SchemaOverview } from '@directus/shared/types';
 import { Item, PrimaryKey } from './items';
-export declare type AbstractServiceOptions = {
+export type AbstractServiceOptions = {
     knex?: Knex;
     accountability?: Accountability | null;
     schema: SchemaOverview;

package/dist/types/snapshot.d.ts

@@ -1,20 +1,20 @@
 import { Collection } from './collection';
 import { Relation, RelationMeta, Field, FieldMeta } from '@directus/shared/types';
 import { Diff } from 'deep-diff';
-export declare type Snapshot = {
+export type Snapshot = {
     version: number;
     directus: string;
     collections: Collection[];
     fields: SnapshotField[];
     relations: SnapshotRelation[];
 };
-export declare type SnapshotField = Field & {
+export type SnapshotField = Field & {
     meta: Omit<FieldMeta, 'id'>;
 };
-export declare type SnapshotRelation = Relation & {
+export type SnapshotRelation = Relation & {
     meta: Omit<RelationMeta, 'id'>;
 };
-export declare type SnapshotDiff = {
+export type SnapshotDiff = {
     collections: {
         collection: string;
         diff: Diff<Collection | undefined>[];

package/dist/types/webhooks.d.ts

@@ -1,4 +1,4 @@
-export declare type Webhook = {
+export type Webhook = {
     id: number;
     name: string;
     method: 'GET' | 'POST';
@@ -9,7 +9,7 @@ export declare type Webhook = {
     collections: string[];
     headers: WebhookHeader[];
 };
-export declare type WebhookHeader = {
+export type WebhookHeader = {
     header: string;
     value: string;
 };

package/dist/utils/get-ast-from-query.d.ts

@@ -4,7 +4,7 @@
 import { Knex } from 'knex';
 import { AST } from '../types';
 import { Query, PermissionsAction, Accountability, SchemaOverview } from '@directus/shared/types';
-declare type GetASTOptions = {
+type GetASTOptions = {
     accountability?: Accountability | null;
     action?: PermissionsAction;
     knex?: Knex;

package/dist/utils/get-column-path.d.ts

@@ -1,8 +1,8 @@
 import { Relation } from '@directus/shared/types';
-declare type AliasMap = string | {
+type AliasMap = string | {
     [key: string]: AliasMap;
 };
-export declare type ColPathProps = {
+export type ColPathProps = {
     path: string[];
     collection: string;
     aliasMap: AliasMap;

package/dist/utils/get-module-default.d.ts

@@ -1,3 +1,3 @@
-export default function getModuleDefault<T>(mod: T | {
+export default function getModuleDefault<T extends object>(mod: T | {
     default: T;
 }): T;

package/dist/utils/get-relation-info.d.ts

@@ -1,5 +1,5 @@
 import { Relation } from '@directus/shared/types';
-declare type RelationInfo = {
+type RelationInfo = {
     relation: Relation | null;
     relationType: string | null;
 };

package/dist/utils/job-queue.d.ts

@@ -1,4 +1,4 @@
-declare type Job = () => Promise<void> | void;
+type Job = () => Promise<void> | void;
 export declare class JobQueue {
     private running;
     private jobs;

package/dist/utils/merge-permissions.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="lodash" />
 import { Permission } from '@directus/shared/types';
 export declare function mergePermissions(strategy: 'and' | 'or', ...permissions: Permission[][]): Permission[];
 export declare function mergePermission(strategy: 'and' | 'or', currentPerm: Permission, newPerm: Permission): import("lodash").Omit<{

package/dist/utils/reduce-schema.js

@@ -54,7 +54,9 @@ function reduceSchema(schema, permissions, actions = ['create', 'read', 'update'
             collectionsAllowed = false;
         }
         if (relation.related_collection &&
-            Object.keys(allowedFieldsInCollection).includes(relation.related_collection) === false) {
+            (Object.keys(allowedFieldsInCollection).includes(relation.related_collection) === false ||
+                // Ignore legacy permissions with an empty fields array
+                allowedFieldsInCollection[relation.related_collection].length === 0)) {
             collectionsAllowed = false;
         }
         if (((_a = relation.meta) === null || _a === void 0 ? void 0 : _a.one_allowed_collections) &&

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.0",
+  "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,37 @@
       "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/app": "9.21.0",
+    "@directus/drive": "9.21.0",
+    "@directus/drive-azure": "9.21.0",
+    "@directus/drive-gcs": "9.21.0",
+    "@directus/drive-s3": "9.21.0",
+    "@directus/extensions-sdk": "9.21.0",
     "@directus/format-title": "9.15.0",
-    "@directus/schema": "9.20.4",
-    "@directus/shared": "9.20.4",
-    "@directus/specs": "9.20.4",
+    "@directus/schema": "9.21.0",
+    "@directus/shared": "9.21.0",
+    "@directus/specs": "9.21.0",
     "@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",
@@ -108,22 +107,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 +132,20 @@
     "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",
+    "rate-limiter-flexible": "2.4.1",
     "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",
+    "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",
@@ -156,18 +155,6 @@
     "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"
-  },
-  "gitHead": "24621f3934dc77eb23441331040ed13c676ceffd",
   "devDependencies": {
     "@otplib/preset-default": "12.0.1",
     "@types/async": "3.2.15",
@@ -186,18 +173,17 @@
     "@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",
@@ -209,28 +195,41 @@
     "@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",
+    "supertest": "6.3.1",
     "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": {
-    "start": "npx directus start",
     "prebuild": "pnpm cleanup",
-    "build": "tsc --build && copyfiles \"src/**/*.*\" -e \"src/**/*.ts\" -u 1 dist",
+    "build": "tsc --build && copyfiles \"src/**/*.{yaml,liquid}\" -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"
+    "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",
+    "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[];
-};