directus 9.4.3 → 9.5.0

package/dist/types/index.d.ts

@@ -3,15 +3,12 @@ export * from './assets';
 export * from './ast';
 export * from './auth';
 export * from './collection';
-export * from './extensions';
 export * from './files';
 export * from './graphql';
 export * from './items';
 export * from './meta';
 export * from './migration';
-export * from './relation';
 export * from './revision';
-export * from './schema';
 export * from './services';
 export * from './snapshot';
 export * from './webhooks';

package/dist/types/index.js

@@ -15,15 +15,12 @@ __exportStar(require("./assets"), exports);
 __exportStar(require("./ast"), exports);
 __exportStar(require("./auth"), exports);
 __exportStar(require("./collection"), exports);
-__exportStar(require("./extensions"), exports);
 __exportStar(require("./files"), exports);
 __exportStar(require("./graphql"), exports);
 __exportStar(require("./items"), exports);
 __exportStar(require("./meta"), exports);
 __exportStar(require("./migration"), exports);
-__exportStar(require("./relation"), exports);
 __exportStar(require("./revision"), exports);
-__exportStar(require("./schema"), exports);
 __exportStar(require("./services"), exports);
 __exportStar(require("./snapshot"), exports);
 __exportStar(require("./webhooks"), exports);

package/dist/types/services.d.ts

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

package/dist/types/snapshot.d.ts

@@ -1,6 +1,5 @@
 import { Collection } from './collection';
-import { Relation, RelationMeta } from './relation';
-import { Field, FieldMeta } from '@directus/shared/types';
+import { Relation, RelationMeta, Field, FieldMeta } from '@directus/shared/types';
 import { Diff } from 'deep-diff';
 export declare type Snapshot = {
     version: number;

package/dist/utils/apply-query.d.ts

@@ -1,6 +1,5 @@
 import { Knex } from 'knex';
-import { SchemaOverview } from '../types';
-import { Aggregate, Filter, Query } from '@directus/shared/types';
+import { Aggregate, Filter, Query, SchemaOverview } from '@directus/shared/types';
 /**
  * Apply the Query to a given Knex query builder instance
  */

package/dist/utils/apply-query.js

@@ -177,7 +177,7 @@ function applyFilter(knex, schema, rootQuery, rootFilter, collection, subQuery =
                 if (relationType === 'o2m' && (subQuery === true || parentAlias !== undefined)) {
                     dbQuery.leftJoin({ [alias]: relation.collection }, `${parentAlias || parentCollection}.${schema.collections[relation.related_collection].primary}`, `${alias}.${relation.field}`);
                 }
-                if (relationType === 'm2o' || subQuery === true) {
+                if (relationType === 'm2o' || subQuery === true || (relationType === 'o2m' && parentAlias !== undefined)) {
                     let parent;
                     if (relationType === 'm2o') {
                         parent = relation.related_collection;

package/dist/utils/apply-snapshot.d.ts

@@ -1,5 +1,6 @@
-import { Snapshot, SnapshotDiff, SchemaOverview } from '../types';
+import { Snapshot, SnapshotDiff } from '../types';
 import { Knex } from 'knex';
+import { SchemaOverview } from '@directus/shared/types';
 export declare function applySnapshot(snapshot: Snapshot, options?: {
     database?: Knex;
     schema?: SchemaOverview;

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

@@ -2,9 +2,8 @@
  * Generate an AST based on a given collection and query
  */
 import { Knex } from 'knex';
-import { Accountability } from '@directus/shared/types';
-import { AST, SchemaOverview } from '../types';
-import { Query, PermissionsAction } from '@directus/shared/types';
+import { AST } from '../types';
+import { Query, PermissionsAction, Accountability, SchemaOverview } from '@directus/shared/types';
 declare type GetASTOptions = {
     accountability?: Accountability | null;
     action?: PermissionsAction;

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

@@ -1,3 +1,2 @@
-import { Permission, Accountability } from '@directus/shared/types';
-import { SchemaOverview } from '../types';
+import { Permission, Accountability, SchemaOverview } from '@directus/shared/types';
 export declare function getPermissions(accountability: Accountability, schema: SchemaOverview): Promise<Permission[]>;

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

@@ -1,4 +1,4 @@
-import { Relation } from '../types';
+import { Relation } from '@directus/shared/types';
 export declare function getRelationType(getRelationOptions: {
     relation: Relation;
     collection: string | null;

package/dist/utils/get-schema.d.ts

@@ -1,6 +1,5 @@
 import { Knex } from 'knex';
-import { SchemaOverview } from '../types';
-import { Accountability } from '@directus/shared/types';
+import { Accountability, SchemaOverview } from '@directus/shared/types';
 export declare function getSchema(options?: {
     accountability?: Accountability;
     database?: Knex;

package/dist/utils/get-snapshot.d.ts

@@ -1,5 +1,6 @@
-import { SchemaOverview, Snapshot } from '../types';
+import { Snapshot } from '../types';
 import { Knex } from 'knex';
+import { SchemaOverview } from '@directus/shared/types';
 export declare function getSnapshot(options?: {
     database?: Knex;
     schema?: SchemaOverview;

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

@@ -1,5 +1,4 @@
-import { Permission, Accountability, Filter } from '@directus/shared/types';
-import { SchemaOverview } from '../types';
+import { Permission, Accountability, Filter, SchemaOverview } from '@directus/shared/types';
 export declare function mergePermissionsForShare(currentPermissions: Permission[], accountability: Accountability, schema: SchemaOverview): Permission[];
 export declare function traverse(schema: SchemaOverview, rootItemPrimaryKeyField: string, rootItemPrimaryKey: string, currentCollection: string, parentCollections?: string[], path?: string[]): Partial<Permission>[];
 export declare function getFilterForPath(type: 'o2m' | 'm2o' | 'a2o', path: string[], rootPrimaryKeyField: string, rootPrimaryKey: string): Filter;

package/dist/utils/reduce-schema.d.ts

@@ -1,5 +1,4 @@
-import { SchemaOverview } from '../types';
-import { Permission, PermissionsAction } from '@directus/shared/types';
+import { Permission, PermissionsAction, SchemaOverview } from '@directus/shared/types';
 /**
  * Reduces the schema based on the included permissions. The resulting object is the schema structure, but with only
  * the allowed collections/fields/relations included based on the permissions.

package/example.env

@@ -19,6 +19,14 @@ DB_DATABASE="directus"
 DB_USER="postgres"
 DB_PASSWORD="secret"
 
+## CockroachDB
+# DB_CLIENT="cockroachdb"
+# DB_HOST="localhost"
+# DB_PORT=5113
+# DB_DATABASE="directus"
+# DB_USER="root"
+# DB_PASSWORD=""
+
 ## MySQL 8
 # DB_CLIENT="mysql"
 # DB_HOST="localhost"

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "directus",
-	"version": "9.4.3",
+	"version": "9.5.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.",
@@ -18,6 +18,7 @@
 		"cms",
 		"mysql",
 		"postgresql",
+		"cockroachdb",
 		"sqlite",
 		"framework",
 		"vue"
@@ -76,16 +77,16 @@
 	],
 	"dependencies": {
 		"@aws-sdk/client-ses": "^3.40.0",
-		"@directus/app": "9.4.3",
-		"@directus/drive": "9.4.3",
-		"@directus/drive-azure": "9.4.3",
-		"@directus/drive-gcs": "9.4.3",
-		"@directus/drive-s3": "9.4.3",
-		"@directus/extensions-sdk": "9.4.3",
-		"@directus/format-title": "9.4.3",
-		"@directus/schema": "9.4.3",
-		"@directus/shared": "9.4.3",
-		"@directus/specs": "9.4.3",
+		"@directus/app": "9.5.0",
+		"@directus/drive": "9.5.0",
+		"@directus/drive-azure": "9.5.0",
+		"@directus/drive-gcs": "9.5.0",
+		"@directus/drive-s3": "9.5.0",
+		"@directus/extensions-sdk": "9.5.0",
+		"@directus/format-title": "9.5.0",
+		"@directus/schema": "9.5.0",
+		"@directus/shared": "9.5.0",
+		"@directus/specs": "9.5.0",
 		"@godaddy/terminus": "^4.9.0",
 		"@rollup/plugin-alias": "^3.1.2",
 		"@rollup/plugin-virtual": "^2.0.3",
@@ -123,8 +124,8 @@
 		"json2csv": "^5.0.3",
 		"jsonwebtoken": "^8.5.1",
 		"keyv": "^4.0.3",
-		"knex": "^0.95.11",
-		"knex-schema-inspector": "1.6.6",
+		"knex": "^0.95.14",
+		"knex-schema-inspector": "1.7.2",
 		"ldapjs": "^2.3.1",
 		"liquidjs": "^9.25.0",
 		"lodash": "^4.17.21",
@@ -171,7 +172,7 @@
 		"sqlite3": "^5.0.2",
 		"tedious": "^13.0.0"
 	},
-	"gitHead": "65bfe68b0c7993a1bd5b0daac0855265911313d0",
+	"gitHead": "78a25fe9538dcd30452dc1a0889e720040c0596c",
 	"devDependencies": {
 		"@types/async": "3.2.10",
 		"@types/atob": "2.1.2",

package/dist/cli/index.test.d.ts

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

package/dist/cli/index.test.js

@@ -1,58 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const index_1 = require("./index");
-jest.mock('../env', () => ({
-    ...jest.requireActual('../env').default,
-    EXTENSIONS_PATH: '',
-    SERVE_APP: false,
-    DB_CLIENT: 'pg',
-    DB_HOST: 'localhost',
-    DB_PORT: 5432,
-    DB_DATABASE: 'directus',
-    DB_USER: 'postgres',
-    DB_PASSWORD: 'psql1234',
-}));
-jest.mock('@directus/shared/utils/node/get-extensions', () => ({
-    getPackageExtensions: jest.fn(() => Promise.resolve([])),
-    getLocalExtensions: jest.fn(() => Promise.resolve([customCliExtension])),
-}));
-jest.mock(`/hooks/custom-cli/index.js`, () => customCliHook, { virtual: true });
-const customCliExtension = {
-    path: `/hooks/custom-cli`,
-    name: 'custom-cli',
-    type: 'hook',
-    entrypoint: 'index.js',
-    local: true,
-};
-const beforeHook = jest.fn();
-const afterAction = jest.fn();
-const afterHook = jest.fn(({ program }) => {
-    program.command('custom').action(afterAction);
-});
-const customCliHook = ({ init }) => {
-    init('cli.before', beforeHook);
-    init('cli.after', afterHook);
-};
-const writeOut = jest.fn();
-const writeErr = jest.fn();
-const setup = async () => {
-    const program = await (0, index_1.createCli)();
-    program.exitOverride();
-    program.configureOutput({ writeOut, writeErr });
-    return program;
-};
-beforeEach(jest.clearAllMocks);
-describe('cli hooks', () => {
-    test('should call hooks before and after creating the cli', async () => {
-        const program = await setup();
-        expect(beforeHook).toHaveBeenCalledTimes(1);
-        expect(beforeHook).toHaveBeenCalledWith({ program });
-        expect(afterHook).toHaveBeenCalledTimes(1);
-        expect(afterHook).toHaveBeenCalledWith({ program });
-    });
-    test('should be able to add a custom cli command', async () => {
-        const program = await setup();
-        program.parseAsync(['custom'], { from: 'user' });
-        expect(afterAction).toHaveBeenCalledTimes(1);
-    });
-});

package/dist/middleware/cache.test.d.ts

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

package/dist/middleware/cache.test.js

@@ -1,62 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const express_1 = __importDefault(require("express"));
-const supertest_1 = __importDefault(require("supertest"));
-const cache_1 = __importDefault(require("./cache"));
-jest.mock('../cache');
-jest.mock('../env', () => ({
-    CACHE_ENABLED: true,
-    CACHE_NAMESPACE: 'test',
-    CACHE_STORE: 'memory',
-    CACHE_TTL: '5s',
-    CACHE_CONTROL_S_MAXAGE: true,
-}));
-const { cache } = jest.requireMock('../cache');
-const env = jest.requireMock('../env');
-const handler = jest.fn((req, res) => res.json({ data: 'Uncached value' }));
-const setup = () => (0, express_1.default)().use(cache_1.default).all('/items/test', handler);
-beforeEach(jest.clearAllMocks);
-describe('cache middleware', () => {
-    test('should return the cached response for a request', async () => {
-        cache.get.mockResolvedValueOnce({ data: 'Cached value' });
-        cache.get.mockResolvedValueOnce(new Date().getTime() + 1000 * 60);
-        const res = await (0, supertest_1.default)(setup()).get('/items/test').send();
-        expect(res.body.data).toBe('Cached value');
-        expect(res.headers['vary']).toBe('Origin, Cache-Control');
-        expect(res.headers['cache-control']).toMatch(/public, max-age=\d+, s-maxage=\d+/);
-        expect(handler).not.toHaveBeenCalled();
-    });
-    test('should call the handler when there is no cached value', async () => {
-        cache.get.mockResolvedValueOnce(undefined);
-        const res = await (0, supertest_1.default)(setup()).get('/items/test').send();
-        expect(res.body.data).toBe('Uncached value');
-        expect(cache.get).toHaveBeenCalledTimes(1);
-        expect(handler).toHaveBeenCalledTimes(1);
-    });
-    test('should not cache requests then the cache is disabled', async () => {
-        env.CACHE_ENABLED = false;
-        const res = await (0, supertest_1.default)(setup()).get('/items/test').send();
-        expect(res.body.data).toBe('Uncached value');
-        expect(cache.get).not.toHaveBeenCalled();
-        expect(handler).toHaveBeenCalledTimes(1);
-        env.CACHE_ENABLED = true;
-    });
-    test('should not use cache when the "Cache-Control" header is set to "no-store"', async () => {
-        const res = await (0, supertest_1.default)(setup()).get('/items/test').set('Cache-Control', 'no-store').send();
-        expect(res.body.data).toBe('Uncached value');
-        expect(cache.get).not.toHaveBeenCalled();
-        expect(handler).toHaveBeenCalledTimes(1);
-    });
-    test('should only cache get requests', async () => {
-        const app = setup();
-        await (0, supertest_1.default)(app).post('/items/test').send();
-        await (0, supertest_1.default)(app).put('/items/test').send();
-        await (0, supertest_1.default)(app).patch('/items/test').send();
-        await (0, supertest_1.default)(app).delete('/items/test').send();
-        expect(cache.get).not.toHaveBeenCalled();
-        expect(handler).toHaveBeenCalledTimes(4);
-    });
-});

package/dist/tests/database/migrations/run.test.d.ts

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

package/dist/tests/database/migrations/run.test.js

@@ -1,29 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const knex_1 = __importDefault(require("knex"));
-const knex_mock_client_1 = require("knex-mock-client");
-const run_1 = __importDefault(require("../../../database/migrations/run"));
-describe('run', () => {
-    let db;
-    let tracker;
-    beforeAll(() => {
-        db = (0, knex_1.default)({ client: knex_mock_client_1.MockClient });
-        tracker = (0, knex_mock_client_1.getTracker)();
-    });
-    afterEach(() => {
-        tracker.reset();
-    });
-    describe('when passed the argument up', () => {
-        it('returns "Nothing To Updage" if no directus_migrations', async () => {
-            // note the difference between an empty array and ['Empty']
-            tracker.on.select('directus_migrations').response(['Empty']);
-            await (0, run_1.default)(db, 'up').catch((e) => {
-                expect(e).toBeInstanceOf(Error);
-                expect(e.message).toBe('Nothing to upgrade');
-            });
-        });
-    });
-});

package/dist/types/extensions.d.ts

@@ -1,43 +0,0 @@
-import { Accountability } from '@directus/shared/types';
-import { Router } from 'express';
-import { Knex } from 'knex';
-import { Logger } from 'pino';
-import env from '../env';
-import * as exceptions from '../exceptions';
-import * as services from '../services';
-import { Emitter } from '../emitter';
-import { getSchema } from '../utils/get-schema';
-import { SchemaOverview } from './schema';
-export declare type ExtensionContext = {
-    services: typeof services;
-    exceptions: typeof exceptions;
-    database: Knex;
-    env: typeof env;
-    emitter: Emitter;
-    logger: Logger;
-    getSchema: typeof getSchema;
-};
-export declare type HookContext = {
-    database: Knex;
-    schema: SchemaOverview | null;
-    accountability: Accountability | null;
-};
-export declare type FilterHandler = (payload: any, meta: Record<string, any>, context: HookContext) => any | Promise<any>;
-export declare type ActionHandler = (meta: Record<string, any>, context: HookContext) => void | Promise<void>;
-export declare type InitHandler = (meta: Record<string, any>) => void | Promise<void>;
-export declare type ScheduleHandler = () => void | Promise<void>;
-declare type RegisterFunctions = {
-    filter: (event: string, handler: FilterHandler) => void;
-    action: (event: string, handler: ActionHandler) => void;
-    init: (event: string, handler: InitHandler) => void;
-    schedule: (cron: string, handler: ScheduleHandler) => void;
-};
-declare type HookHandlerFunction = (register: RegisterFunctions, context: ExtensionContext) => void;
-export declare type HookConfig = HookHandlerFunction;
-declare type EndpointHandlerFunction = (router: Router, context: ExtensionContext) => void;
-interface EndpointAdvancedConfig {
-    id: string;
-    handler: EndpointHandlerFunction;
-}
-export declare type EndpointConfig = EndpointHandlerFunction | EndpointAdvancedConfig;
-export {};

package/dist/types/extensions.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/types/relation.d.ts

@@ -1,21 +0,0 @@
-import { ForeignKey } from 'knex-schema-inspector/dist/types/foreign-key';
-export declare type RelationMeta = {
-    id: number;
-    many_collection: string;
-    many_field: string;
-    one_collection: string | null;
-    one_field: string | null;
-    one_collection_field: string | null;
-    one_allowed_collections: string[] | null;
-    one_deselect_action: 'nullify' | 'delete';
-    junction_field: string | null;
-    sort_field: string | null;
-    system?: boolean;
-};
-export declare type Relation = {
-    collection: string;
-    field: string;
-    related_collection: string | null;
-    schema: ForeignKey | null;
-    meta: RelationMeta | null;
-};

package/dist/types/relation.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/types/schema.d.ts

@@ -1,32 +0,0 @@
-import { Type } from '@directus/shared/types';
-import { Relation } from './relation';
-export declare type FieldOverview = {
-    field: string;
-    defaultValue: any;
-    nullable: boolean;
-    generated: boolean;
-    type: Type | 'unknown' | 'alias';
-    dbType: string | null;
-    precision: number | null;
-    scale: number | null;
-    special: string[];
-    note: string | null;
-    alias: boolean;
-};
-export declare type CollectionsOverview = {
-    [name: string]: {
-        collection: string;
-        primary: string;
-        singleton: boolean;
-        sortField: string | null;
-        note: string | null;
-        accountability: 'all' | 'activity' | null;
-        fields: {
-            [name: string]: FieldOverview;
-        };
-    };
-};
-export declare type SchemaOverview = {
-    collections: CollectionsOverview;
-    relations: Relation[];
-};

package/dist/types/schema.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/utils/get-cache-key.test.d.ts

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

package/dist/utils/get-cache-key.test.js

@@ -1,53 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const get_cache_key_1 = require("./get-cache-key");
-const restUrl = 'http://localhost/items/example';
-const graphQlUrl = 'http://localhost/graphql';
-const accountability = { user: '00000000-0000-0000-0000-000000000000' };
-const requests = [
-    {
-        name: 'as unauthenticated request',
-        params: { originalUrl: restUrl },
-        key: '17da8272c9a0ec6eea38a37d6d78bddeb7c79045',
-    },
-    {
-        name: 'as authenticated request',
-        params: { originalUrl: restUrl, accountability },
-        key: '99a6394222a3d7d149ac1662fc2fff506932db58',
-    },
-    {
-        name: 'a request with a fields query',
-        params: { originalUrl: restUrl, sanitizedQuery: { fields: ['id', 'name'] } },
-        key: 'aa6e2d8a78de4dfb4af6eaa230d1cd9b7d31ed19',
-    },
-    {
-        name: 'a request with a filter query',
-        params: { originalUrl: restUrl, sanitizedQuery: { filter: { name: { _eq: 'test' } } } },
-        key: 'd7eb8970f0429e1cf85e12eb5bb8669f618b09d3',
-    },
-    {
-        name: 'a GraphQL query request',
-        params: { originalUrl: graphQlUrl, query: { query: 'query { test { id } }' } },
-        key: '201731b75c627c60554512d819b6935b54c73814',
-    },
-];
-const cases = requests.map(({ name, params, key }) => [name, params, key]);
-describe('get cache key', () => {
-    test.each(cases)('should create a cache key for %s', (_, params, key) => {
-        expect((0, get_cache_key_1.getCacheKey)(params)).toEqual(key);
-    });
-    test('should create a unique key for each request', () => {
-        const keys = requests.map((r) => r.key);
-        const hasDuplicate = keys.some((key) => keys.indexOf(key) !== keys.lastIndexOf(key));
-        expect(hasDuplicate).toBeFalsy();
-    });
-    test('should create a unique key for GraphQL requests with different variables', () => {
-        const query = 'query Test ($name: String) { test (filter: { name: { _eq: $name } }) { id } }';
-        const operationName = 'test';
-        const variables1 = JSON.stringify({ name: 'test 1' });
-        const variables2 = JSON.stringify({ name: 'test 2' });
-        const req1 = { originalUrl: graphQlUrl, query: { query, operationName, variables: variables1 } };
-        const req2 = { originalUrl: graphQlUrl, query: { query, operationName, variables: variables2 } };
-        expect((0, get_cache_key_1.getCacheKey)(req1)).not.toEqual((0, get_cache_key_1.getCacheKey)(req2));
-    });
-});