directus 9.23.1 → 9.23.3

package/dist/database/helpers/fn/dialects/oracle.d.ts

@@ -1,5 +1,5 @@
+import type { Knex } from 'knex';
 import { FnHelper, FnHelperOptions } from '../types';
-import { Knex } from 'knex';
 export declare class FnHelperOracle extends FnHelper {
     year(table: string, column: string, options: FnHelperOptions): Knex.Raw;
     month(table: string, column: string, options: FnHelperOptions): Knex.Raw;

package/dist/database/helpers/fn/dialects/oracle.js

@@ -10,33 +10,32 @@ const parseLocaltime = (columnType) => {
 };
 class FnHelperOracle extends types_1.FnHelper {
     year(table, column, options) {
-        return this.knex.raw(`TO_CHAR(??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}, 'IYYY')`, [table, column]);
+        return this.knex.raw(`TO_CHAR(??.??${parseLocaltime(options?.type)}, 'IYYY')`, [table, column]);
     }
     month(table, column, options) {
-        return this.knex.raw(`TO_CHAR(??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}, 'MM')`, [table, column]);
+        return this.knex.raw(`TO_CHAR(??.??${parseLocaltime(options?.type)}, 'MM')`, [table, column]);
     }
     week(table, column, options) {
-        return this.knex.raw(`TO_CHAR(??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}, 'IW')`, [table, column]);
+        return this.knex.raw(`TO_CHAR(??.??${parseLocaltime(options?.type)}, 'IW')`, [table, column]);
     }
     day(table, column, options) {
-        return this.knex.raw(`TO_CHAR(??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}, 'DD')`, [table, column]);
+        return this.knex.raw(`TO_CHAR(??.??${parseLocaltime(options?.type)}, 'DD')`, [table, column]);
     }
     weekday(table, column, options) {
-        return this.knex.raw(`TO_CHAR(??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}, 'D')`, [table, column]);
+        return this.knex.raw(`TO_CHAR(??.??${parseLocaltime(options?.type)}, 'D')`, [table, column]);
     }
     hour(table, column, options) {
-        return this.knex.raw(`TO_CHAR(??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}, 'HH24')`, [table, column]);
+        return this.knex.raw(`TO_CHAR(??.??${parseLocaltime(options?.type)}, 'HH24')`, [table, column]);
     }
     minute(table, column, options) {
-        return this.knex.raw(`TO_CHAR(??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}, 'MI')`, [table, column]);
+        return this.knex.raw(`TO_CHAR(??.??${parseLocaltime(options?.type)}, 'MI')`, [table, column]);
     }
     second(table, column, options) {
-        return this.knex.raw(`TO_CHAR(??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}, 'SS')`, [table, column]);
+        return this.knex.raw(`TO_CHAR(??.??${parseLocaltime(options?.type)}, 'SS')`, [table, column]);
     }
     count(table, column, options) {
-        var _a, _b, _c, _d, _e;
-        const collectionName = (options === null || options === void 0 ? void 0 : options.originalCollectionName) || table;
-        const type = (_e = (_d = (_c = (_b = (_a = this.schema.collections) === null || _a === void 0 ? void 0 : _a[collectionName]) === null || _b === void 0 ? void 0 : _b.fields) === null || _c === void 0 ? void 0 : _c[column]) === null || _d === void 0 ? void 0 : _d.type) !== null && _e !== void 0 ? _e : 'unknown';
+        const collectionName = options?.originalCollectionName || table;
+        const type = this.schema.collections?.[collectionName]?.fields?.[column]?.type ?? 'unknown';
         if (type === 'json') {
             return this.knex.raw("json_value(??.??, '$.size()')", [table, column]);
         }

package/dist/database/helpers/fn/dialects/postgres.d.ts

@@ -1,5 +1,5 @@
+import type { Knex } from 'knex';
 import { FnHelper, FnHelperOptions } from '../types';
-import { Knex } from 'knex';
 export declare class FnHelperPostgres extends FnHelper {
     year(table: string, column: string, options: FnHelperOptions): Knex.Raw;
     month(table: string, column: string, options: FnHelperOptions): Knex.Raw;

package/dist/database/helpers/fn/dialects/postgres.js

@@ -10,33 +10,32 @@ const parseLocaltime = (columnType) => {
 };
 class FnHelperPostgres extends types_1.FnHelper {
     year(table, column, options) {
-        return this.knex.raw(`EXTRACT(YEAR FROM ??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)})`, [table, column]);
+        return this.knex.raw(`EXTRACT(YEAR FROM ??.??${parseLocaltime(options?.type)})`, [table, column]);
     }
     month(table, column, options) {
-        return this.knex.raw(`EXTRACT(MONTH FROM ??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)})`, [table, column]);
+        return this.knex.raw(`EXTRACT(MONTH FROM ??.??${parseLocaltime(options?.type)})`, [table, column]);
     }
     week(table, column, options) {
-        return this.knex.raw(`EXTRACT(WEEK FROM ??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)})`, [table, column]);
+        return this.knex.raw(`EXTRACT(WEEK FROM ??.??${parseLocaltime(options?.type)})`, [table, column]);
     }
     day(table, column, options) {
-        return this.knex.raw(`EXTRACT(DAY FROM ??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)})`, [table, column]);
+        return this.knex.raw(`EXTRACT(DAY FROM ??.??${parseLocaltime(options?.type)})`, [table, column]);
     }
     weekday(table, column, options) {
-        return this.knex.raw(`EXTRACT(DOW FROM ??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)})`, [table, column]);
+        return this.knex.raw(`EXTRACT(DOW FROM ??.??${parseLocaltime(options?.type)})`, [table, column]);
     }
     hour(table, column, options) {
-        return this.knex.raw(`EXTRACT(HOUR FROM ??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)})`, [table, column]);
+        return this.knex.raw(`EXTRACT(HOUR FROM ??.??${parseLocaltime(options?.type)})`, [table, column]);
     }
     minute(table, column, options) {
-        return this.knex.raw(`EXTRACT(MINUTE FROM ??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)})`, [table, column]);
+        return this.knex.raw(`EXTRACT(MINUTE FROM ??.??${parseLocaltime(options?.type)})`, [table, column]);
     }
     second(table, column, options) {
-        return this.knex.raw(`EXTRACT(SECOND FROM ??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)})`, [table, column]);
+        return this.knex.raw(`EXTRACT(SECOND FROM ??.??${parseLocaltime(options?.type)})`, [table, column]);
     }
     count(table, column, options) {
-        var _a, _b, _c, _d, _e;
-        const collectionName = (options === null || options === void 0 ? void 0 : options.originalCollectionName) || table;
-        const type = (_e = (_d = (_c = (_b = (_a = this.schema.collections) === null || _a === void 0 ? void 0 : _a[collectionName]) === null || _b === void 0 ? void 0 : _b.fields) === null || _c === void 0 ? void 0 : _c[column]) === null || _d === void 0 ? void 0 : _d.type) !== null && _e !== void 0 ? _e : 'unknown';
+        const collectionName = options?.originalCollectionName || table;
+        const type = this.schema.collections?.[collectionName]?.fields?.[column]?.type ?? 'unknown';
         if (type === 'json') {
             const { dbType } = this.schema.collections[table].fields[column];
             return this.knex.raw(dbType === 'jsonb' ? 'jsonb_array_length(??.??)' : 'json_array_length(??.??)', [

package/dist/database/helpers/fn/dialects/sqlite.d.ts

@@ -1,5 +1,5 @@
+import type { Knex } from 'knex';
 import { FnHelper, FnHelperOptions } from '../types';
-import { Knex } from 'knex';
 export declare class FnHelperSQLite extends FnHelper {
     year(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
     month(table: string, column: string, options?: FnHelperOptions): Knex.Raw;

package/dist/database/helpers/fn/dialects/sqlite.js

@@ -10,57 +10,56 @@ const parseLocaltime = (columnType) => {
 };
 class FnHelperSQLite extends types_1.FnHelper {
     year(table, column, options) {
-        return this.knex.raw(`CAST(strftime('%Y', ??.?? / 1000, 'unixepoch'${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}) AS INTEGER)`, [
+        return this.knex.raw(`CAST(strftime('%Y', ??.?? / 1000, 'unixepoch'${parseLocaltime(options?.type)}) AS INTEGER)`, [
             table,
             column,
         ]);
     }
     month(table, column, options) {
-        return this.knex.raw(`CAST(strftime('%m', ??.?? / 1000, 'unixepoch'${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}) AS INTEGER)`, [
+        return this.knex.raw(`CAST(strftime('%m', ??.?? / 1000, 'unixepoch'${parseLocaltime(options?.type)}) AS INTEGER)`, [
             table,
             column,
         ]);
     }
     week(table, column, options) {
-        return this.knex.raw(`CAST(strftime('%W', ??.?? / 1000, 'unixepoch'${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}) AS INTEGER)`, [
+        return this.knex.raw(`CAST(strftime('%W', ??.?? / 1000, 'unixepoch'${parseLocaltime(options?.type)}) AS INTEGER)`, [
             table,
             column,
         ]);
     }
     day(table, column, options) {
-        return this.knex.raw(`CAST(strftime('%d', ??.?? / 1000, 'unixepoch'${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}) AS INTEGER)`, [
+        return this.knex.raw(`CAST(strftime('%d', ??.?? / 1000, 'unixepoch'${parseLocaltime(options?.type)}) AS INTEGER)`, [
             table,
             column,
         ]);
     }
     weekday(table, column, options) {
-        return this.knex.raw(`CAST(strftime('%w', ??.?? / 1000, 'unixepoch'${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}) AS INTEGER)`, [
+        return this.knex.raw(`CAST(strftime('%w', ??.?? / 1000, 'unixepoch'${parseLocaltime(options?.type)}) AS INTEGER)`, [
             table,
             column,
         ]);
     }
     hour(table, column, options) {
-        return this.knex.raw(`CAST(strftime('%H', ??.?? / 1000, 'unixepoch'${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}) AS INTEGER)`, [
+        return this.knex.raw(`CAST(strftime('%H', ??.?? / 1000, 'unixepoch'${parseLocaltime(options?.type)}) AS INTEGER)`, [
             table,
             column,
         ]);
     }
     minute(table, column, options) {
-        return this.knex.raw(`CAST(strftime('%M', ??.?? / 1000, 'unixepoch'${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}) AS INTEGER)`, [
+        return this.knex.raw(`CAST(strftime('%M', ??.?? / 1000, 'unixepoch'${parseLocaltime(options?.type)}) AS INTEGER)`, [
             table,
             column,
         ]);
     }
     second(table, column, options) {
-        return this.knex.raw(`CAST(strftime('%S', ??.?? / 1000, 'unixepoch'${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}) AS INTEGER)`, [
+        return this.knex.raw(`CAST(strftime('%S', ??.?? / 1000, 'unixepoch'${parseLocaltime(options?.type)}) AS INTEGER)`, [
             table,
             column,
         ]);
     }
     count(table, column, options) {
-        var _a, _b, _c, _d, _e;
-        const collectionName = (options === null || options === void 0 ? void 0 : options.originalCollectionName) || table;
-        const type = (_e = (_d = (_c = (_b = (_a = this.schema.collections) === null || _a === void 0 ? void 0 : _a[collectionName]) === null || _b === void 0 ? void 0 : _b.fields) === null || _c === void 0 ? void 0 : _c[column]) === null || _d === void 0 ? void 0 : _d.type) !== null && _e !== void 0 ? _e : 'unknown';
+        const collectionName = options?.originalCollectionName || table;
+        const type = this.schema.collections?.[collectionName]?.fields?.[column]?.type ?? 'unknown';
         if (type === 'json') {
             return this.knex.raw(`json_array_length(??.??, '$')`, [table, column]);
         }

package/dist/database/helpers/fn/types.d.ts

@@ -1,10 +1,10 @@
-import { Query, SchemaOverview } from '@directus/shared/types';
-import { Knex } from 'knex';
+import type { Query, SchemaOverview } from '@directus/shared/types';
+import type { Knex } from 'knex';
 import { DatabaseHelper } from '../types';
 export type FnHelperOptions = {
-    type?: string;
-    query?: Query;
-    originalCollectionName?: string;
+    type: string | undefined;
+    query: Query | undefined;
+    originalCollectionName: string | undefined;
 };
 export declare abstract class FnHelper extends DatabaseHelper {
     protected knex: Knex;

package/dist/database/helpers/fn/types.js

@@ -4,6 +4,8 @@ exports.FnHelper = void 0;
 const apply_query_1 = require("../../../utils/apply-query");
 const types_1 = require("../types");
 class FnHelper extends types_1.DatabaseHelper {
+    knex;
+    schema;
     constructor(knex, schema) {
         super(knex);
         this.knex = knex;
@@ -11,9 +13,8 @@ class FnHelper extends types_1.DatabaseHelper {
         this.schema = schema;
     }
     _relationalCount(table, column, options) {
-        var _a;
-        const collectionName = (options === null || options === void 0 ? void 0 : options.originalCollectionName) || table;
-        const relation = this.schema.relations.find((relation) => { var _a; return relation.related_collection === collectionName && ((_a = relation === null || relation === void 0 ? void 0 : relation.meta) === null || _a === void 0 ? void 0 : _a.one_field) === column; });
+        const collectionName = options?.originalCollectionName || table;
+        const relation = this.schema.relations.find((relation) => relation.related_collection === collectionName && relation?.meta?.one_field === column);
         const currentPrimary = this.schema.collections[collectionName].primary;
         if (!relation) {
             throw new Error(`Field ${collectionName}.${column} isn't a nested relational collection`);
@@ -22,7 +23,7 @@ class FnHelper extends types_1.DatabaseHelper {
             .count('*')
             .from(relation.collection)
             .where(relation.field, '=', this.knex.raw(`??.??`, [table, currentPrimary]));
-        if ((_a = options === null || options === void 0 ? void 0 : options.query) === null || _a === void 0 ? void 0 : _a.filter) {
+        if (options?.query?.filter) {
             countQuery = (0, apply_query_1.applyFilter)(this.knex, this.schema, countQuery, options.query.filter, relation.collection, {}).query;
         }
         return this.knex.raw('(' + countQuery.toQuery() + ')');

package/dist/database/helpers/geometry/dialects/mssql.d.ts

@@ -1,7 +1,7 @@
+import type { Field, RawField } from '@directus/shared/types';
+import type { Knex } from 'knex';
+import type { GeoJSONGeometry } from 'wellknown';
 import { GeometryHelper } from '../types';
-import { Field, RawField } from '@directus/shared/types';
-import { GeoJSONGeometry } from 'wellknown';
-import { Knex } from 'knex';
 export declare class GeometryHelperMSSQL extends GeometryHelper {
     isTrue(expression: Knex.Raw): Knex.Raw<any>;
     isFalse(expression: Knex.Raw): Knex.Raw<any>;

package/dist/database/helpers/geometry/dialects/mysql.d.ts

@@ -1,5 +1,5 @@
+import type { Knex } from 'knex';
 import { GeometryHelper } from '../types';
-import { Knex } from 'knex';
 export declare class GeometryHelperMySQL extends GeometryHelper {
     collect(table: string, column: string): Knex.Raw;
     fromText(text: string): Knex.Raw;

package/dist/database/helpers/geometry/dialects/oracle.d.ts

@@ -1,7 +1,7 @@
+import type { Field, RawField } from '@directus/shared/types';
+import type { Knex } from 'knex';
+import type { GeoJSONGeometry } from 'wellknown';
 import { GeometryHelper } from '../types';
-import { Field, RawField } from '@directus/shared/types';
-import { GeoJSONGeometry } from 'wellknown';
-import { Knex } from 'knex';
 export declare class GeometryHelperOracle extends GeometryHelper {
     isTrue(expression: Knex.Raw): Knex.Raw<any>;
     isFalse(expression: Knex.Raw): Knex.Raw<any>;

package/dist/database/helpers/geometry/dialects/postgres.d.ts

@@ -1,7 +1,7 @@
+import type { Field, RawField } from '@directus/shared/types';
+import type { Knex } from 'knex';
+import type { GeoJSONGeometry } from 'wellknown';
 import { GeometryHelper } from '../types';
-import { Field, RawField } from '@directus/shared/types';
-import { GeoJSONGeometry } from 'wellknown';
-import { Knex } from 'knex';
 export declare class GeometryHelperPostgres extends GeometryHelper {
     supported(): Promise<boolean>;
     createColumn(table: Knex.CreateTableBuilder, field: RawField | Field): Knex.ColumnBuilder;

package/dist/database/helpers/geometry/dialects/postgres.js

@@ -8,8 +8,7 @@ class GeometryHelperPostgres extends types_1.GeometryHelper {
         return res.length > 0;
     }
     createColumn(table, field) {
-        var _a;
-        const type = (_a = field.type.split('.')[1]) !== null && _a !== void 0 ? _a : 'geometry';
+        const type = field.type.split('.')[1] ?? 'geometry';
         return table.specificType(field.field, `geometry(${type}, 4326)`);
     }
     _intersects_bbox(key, geojson) {

package/dist/database/helpers/geometry/dialects/redshift.d.ts

@@ -1,6 +1,6 @@
+import type { Field, RawField } from '@directus/shared/types';
+import type { Knex } from 'knex';
 import { GeometryHelper } from '../types';
-import { Field, RawField } from '@directus/shared/types';
-import { Knex } from 'knex';
 export declare class GeometryHelperRedshift extends GeometryHelper {
     createColumn(table: Knex.CreateTableBuilder, field: RawField | Field): Knex.ColumnBuilder;
     asGeoJSON(table: string, column: string): Knex.Raw;

package/dist/database/helpers/geometry/dialects/sqlite.d.ts

@@ -1,5 +1,5 @@
+import type { Knex } from 'knex';
 import { GeometryHelper } from '../types';
-import { Knex } from 'knex';
 export declare class GeometryHelperSQLite extends GeometryHelper {
     supported(): Promise<boolean>;
     asGeoJSON(table: string, column: string): Knex.Raw;

package/dist/database/helpers/geometry/types.d.ts

@@ -1,7 +1,7 @@
+import type { Field, RawField } from '@directus/shared/types';
+import type { Knex } from 'knex';
 import { GeoJSONGeometry } from 'wellknown';
-import { Field, RawField } from '@directus/shared/types';
 import { DatabaseHelper } from '../types';
-import { Knex } from 'knex';
 export declare abstract class GeometryHelper extends DatabaseHelper {
     supported(): boolean | Promise<boolean>;
     isTrue(expression: Knex.Raw): Knex.Raw<any>;

package/dist/database/helpers/geometry/types.js

@@ -14,8 +14,7 @@ class GeometryHelper extends types_1.DatabaseHelper {
         return expression.wrap('NOT ', '');
     }
     createColumn(table, field) {
-        var _a;
-        const type = (_a = field.type.split('.')[1]) !== null && _a !== void 0 ? _a : 'geometry';
+        const type = field.type.split('.')[1] ?? 'geometry';
         return table.specificType(field.field, type);
     }
     asText(table, column) {

package/dist/database/helpers/index.d.ts

@@ -1,13 +1,13 @@
-import { SchemaOverview } from '@directus/shared/types';
-import { Knex } from 'knex';
+import type { SchemaOverview } from '@directus/shared/types';
+import type { Knex } from 'knex';
 import * as dateHelpers from './date';
 import * as fnHelpers from './fn';
 import * as geometryHelpers from './geometry';
 import * as schemaHelpers from './schema';
 export declare function getHelpers(database: Knex): {
     date: dateHelpers.postgres | dateHelpers.oracle | dateHelpers.mysql | dateHelpers.mssql | dateHelpers.sqlite;
-    st: geometryHelpers.sqlite | geometryHelpers.postgres | geometryHelpers.mysql | geometryHelpers.oracle | geometryHelpers.mssql | geometryHelpers.redshift;
-    schema: schemaHelpers.sqlite | schemaHelpers.postgres | schemaHelpers.mysql | schemaHelpers.cockroachdb | schemaHelpers.oracle | schemaHelpers.mssql;
+    st: geometryHelpers.sqlite | geometryHelpers.postgres | geometryHelpers.mysql | geometryHelpers.mssql | geometryHelpers.oracle | geometryHelpers.redshift;
+    schema: schemaHelpers.sqlite | schemaHelpers.postgres | schemaHelpers.mysql | schemaHelpers.cockroachdb | schemaHelpers.mssql | schemaHelpers.oracle;
 };
-export declare function getFunctions(database: Knex, schema: SchemaOverview): fnHelpers.sqlite | fnHelpers.postgres | fnHelpers.mysql | fnHelpers.oracle | fnHelpers.mssql;
+export declare function getFunctions(database: Knex, schema: SchemaOverview): fnHelpers.sqlite | fnHelpers.postgres | fnHelpers.mysql | fnHelpers.mssql | fnHelpers.oracle;
 export type Helpers = ReturnType<typeof getHelpers>;

package/dist/database/helpers/schema/dialects/cockroachdb.d.ts

@@ -1,4 +1,4 @@
-import { KNEX_TYPES } from '@directus/shared/constants';
+import type { KNEX_TYPES } from '@directus/shared/constants';
 import { Options, SchemaHelper } from '../types';
 export declare class SchemaHelperCockroachDb extends SchemaHelper {
     changeToType(table: string, column: string, type: (typeof KNEX_TYPES)[number], options?: Options): Promise<void>;

package/dist/database/helpers/schema/dialects/mssql.d.ts

@@ -1,4 +1,4 @@
-import { Knex } from 'knex';
+import type { Knex } from 'knex';
 import { SchemaHelper } from '../types';
 export declare class SchemaHelperMSSQL extends SchemaHelper {
     applyLimit(rootQuery: Knex.QueryBuilder, limit: number): void;

package/dist/database/helpers/schema/dialects/mysql.d.ts

@@ -1,4 +1,4 @@
-import { Knex } from 'knex';
+import type { Knex } from 'knex';
 import { SchemaHelper } from '../types';
 export declare class SchemaHelperMySQL extends SchemaHelper {
     applyMultiRelationalSort(knex: Knex, dbQuery: Knex.QueryBuilder, table: string, primaryKey: string, orderByString: string, orderByFields: Knex.Raw[]): Knex.QueryBuilder;

package/dist/database/helpers/schema/dialects/mysql.js

@@ -5,8 +5,7 @@ const database_1 = require("../../../../database");
 const types_1 = require("../types");
 class SchemaHelperMySQL extends types_1.SchemaHelper {
     applyMultiRelationalSort(knex, dbQuery, table, primaryKey, orderByString, orderByFields) {
-        var _a;
-        if ((_a = (0, database_1.getDatabaseVersion)()) === null || _a === void 0 ? void 0 : _a.startsWith('5.7')) {
+        if ((0, database_1.getDatabaseVersion)()?.startsWith('5.7')) {
             dbQuery.orderByRaw(`?? asc, ${orderByString}`, [`${table}.${primaryKey}`, ...orderByFields]);
             dbQuery = knex
                 .select(knex.raw(`??, ( @rank := IF ( @cur_id = deep.${primaryKey}, @rank + 1, 1 ) ) AS directus_row_number, ( @cur_id := deep.${primaryKey} ) AS current_id`, 'deep.*'))

package/dist/database/helpers/schema/dialects/oracle.d.ts

@@ -1,5 +1,5 @@
-import { KNEX_TYPES } from '@directus/shared/constants';
-import { Field, Relation, Type } from '@directus/shared/types';
+import type { KNEX_TYPES } from '@directus/shared/constants';
+import type { Field, Relation, Type } from '@directus/shared/types';
 import { Options, SchemaHelper } from '../types';
 export declare class SchemaHelperOracle extends SchemaHelper {
     changeToType(table: string, column: string, type: (typeof KNEX_TYPES)[number], options?: Options): Promise<void>;

package/dist/database/helpers/schema/dialects/oracle.js

@@ -10,25 +10,23 @@ class SchemaHelperOracle extends types_1.SchemaHelper {
         return 'CAST(?? AS VARCHAR2(255))';
     }
     preRelationChange(relation) {
-        var _a;
         if (relation.collection === relation.related_collection) {
             // Constraints are not allowed on self referencing relationships
             // Setting NO ACTION throws - ORA-00905: missing keyword
-            if ((_a = relation.schema) === null || _a === void 0 ? void 0 : _a.on_delete) {
+            if (relation.schema?.on_delete) {
                 relation.schema.on_delete = null;
             }
         }
     }
     processFieldType(field) {
-        var _a, _b, _c, _d;
         if (field.type === 'integer') {
-            if (((_a = field.schema) === null || _a === void 0 ? void 0 : _a.numeric_precision) === 20) {
+            if (field.schema?.numeric_precision === 20) {
                 return 'bigInteger';
             }
-            else if (((_b = field.schema) === null || _b === void 0 ? void 0 : _b.numeric_precision) === 1) {
+            else if (field.schema?.numeric_precision === 1) {
                 return 'boolean';
             }
-            else if (((_c = field.schema) === null || _c === void 0 ? void 0 : _c.numeric_precision) || ((_d = field.schema) === null || _d === void 0 ? void 0 : _d.numeric_scale)) {
+            else if (field.schema?.numeric_precision || field.schema?.numeric_scale) {
                 return 'decimal';
             }
         }

package/dist/database/helpers/schema/types.d.ts

@@ -1,7 +1,7 @@
-import { KNEX_TYPES } from '@directus/shared/constants';
-import { Field, Relation, Type } from '@directus/shared/types';
-import { Knex } from 'knex';
-import { DatabaseClient } from '../../../types';
+import type { KNEX_TYPES } from '@directus/shared/constants';
+import type { Field, Relation, Type } from '@directus/shared/types';
+import type { Knex } from 'knex';
+import type { DatabaseClient } from '../../../types';
 import { DatabaseHelper } from '../types';
 export type Options = {
     nullable?: boolean;

package/dist/database/helpers/types.d.ts

@@ -1,4 +1,4 @@
-import { Knex } from 'knex';
+import type { Knex } from 'knex';
 export declare abstract class DatabaseHelper {
     protected knex: Knex;
     constructor(knex: Knex);

package/dist/database/helpers/types.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DatabaseHelper = void 0;
 class DatabaseHelper {
+    knex;
     constructor(knex) {
         this.knex = knex;
     }

package/dist/database/index.d.ts

@@ -1,6 +1,6 @@
 import SchemaInspector from '@directus/schema';
 import { Knex } from 'knex';
-import { DatabaseClient } from '../types';
+import type { DatabaseClient } from '../types';
 export default function getDatabase(): Knex;
 export declare function getSchemaInspector(): ReturnType<typeof SchemaInspector>;
 /**

package/dist/database/index.js

@@ -5,16 +5,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateDatabaseExtensions = exports.validateMigrations = exports.isInstalled = exports.getDatabaseClient = exports.validateDatabaseConnection = exports.hasDatabaseConnection = exports.getDatabaseVersion = exports.getSchemaInspector = void 0;
 const schema_1 = __importDefault(require("@directus/schema"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
 const knex_1 = require("knex");
+const lodash_1 = require("lodash");
+const path_1 = __importDefault(require("path"));
 const perf_hooks_1 = require("perf_hooks");
+const util_1 = require("util");
 const env_1 = __importDefault(require("../env"));
 const logger_1 = __importDefault(require("../logger"));
 const get_config_from_env_1 = require("../utils/get-config-from-env");
 const validate_env_1 = require("../utils/validate-env");
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const path_1 = __importDefault(require("path"));
-const lodash_1 = require("lodash");
-const util_1 = require("util");
 const helpers_1 = require("./helpers");
 let database = null;
 let inspector = null;
@@ -145,7 +145,7 @@ function getDatabaseVersion() {
 }
 exports.getDatabaseVersion = getDatabaseVersion;
 async function hasDatabaseConnection(database) {
-    database = database !== null && database !== void 0 ? database : getDatabase();
+    database = database ?? getDatabase();
     try {
         if (getDatabaseClient(database) === 'oracle') {
             await database.raw('select 1 from DUAL');
@@ -161,7 +161,7 @@ async function hasDatabaseConnection(database) {
 }
 exports.hasDatabaseConnection = hasDatabaseConnection;
 async function validateDatabaseConnection(database) {
-    database = database !== null && database !== void 0 ? database : getDatabase();
+    database = database ?? getDatabase();
     try {
         if (getDatabaseClient(database) === 'oracle') {
             await database.raw('select 1 from DUAL');
@@ -178,7 +178,7 @@ async function validateDatabaseConnection(database) {
 }
 exports.validateDatabaseConnection = validateDatabaseConnection;
 function getDatabaseClient(database) {
-    database = database !== null && database !== void 0 ? database : getDatabase();
+    database = database ?? getDatabase();
     switch (database.client.constructor.name) {
         case 'Client_MySQL':
             return 'mysql';
@@ -250,7 +250,7 @@ async function validateDatabaseExtensions() {
 }
 exports.validateDatabaseExtensions = validateDatabaseExtensions;
 async function validateDatabaseCharset(database) {
-    database = database !== null && database !== void 0 ? database : getDatabase();
+    database = database ?? getDatabase();
     if (getDatabaseClient(database) === 'mysql') {
         const { collation } = await database.select(database.raw(`@@collation_database as collation`)).first();
         const tables = await database('information_schema.tables')

package/dist/database/migrations/20201028A-remove-collection-foreign-keys.d.ts

@@ -1,3 +1,3 @@
-import { Knex } from 'knex';
+import type { Knex } from 'knex';
 export declare function up(knex: Knex): Promise<void>;
 export declare function down(knex: Knex): Promise<void>;

package/dist/database/migrations/20201029A-remove-system-relations.d.ts

@@ -1,3 +1,3 @@
-import { Knex } from 'knex';
+import type { Knex } from 'knex';
 export declare function up(knex: Knex): Promise<void>;
 export declare function down(knex: Knex): Promise<void>;

package/dist/database/migrations/20201029B-remove-system-collections.d.ts

@@ -1,3 +1,3 @@
-import { Knex } from 'knex';
+import type { Knex } from 'knex';
 export declare function up(knex: Knex): Promise<void>;
 export declare function down(knex: Knex): Promise<void>;

package/dist/database/migrations/20201029C-remove-system-fields.d.ts

@@ -1,3 +1,3 @@
-import { Knex } from 'knex';
+import type { Knex } from 'knex';
 export declare function up(knex: Knex): Promise<void>;
 export declare function down(knex: Knex): Promise<void>;

package/dist/database/migrations/20201105A-add-cascade-system-relations.d.ts

@@ -1,4 +1,4 @@
-import { Knex } from 'knex';
+import type { Knex } from 'knex';
 /**
  * NOTE:
  * Not all databases allow (or support) recursive onUpdate/onDelete triggers. MS SQL / Oracle flat out deny creating them,

package/dist/database/migrations/20201105B-change-webhook-url-type.d.ts

@@ -1,3 +1,3 @@
-import { Knex } from 'knex';
+import type { Knex } from 'knex';
 export declare function up(knex: Knex): Promise<void>;
 export declare function down(knex: Knex): Promise<void>;

package/dist/database/migrations/20210225A-add-relations-sort-field.d.ts

@@ -1,3 +1,3 @@
-import { Knex } from 'knex';
+import type { Knex } from 'knex';
 export declare function up(knex: Knex): Promise<void>;
 export declare function down(knex: Knex): Promise<void>;

package/dist/database/migrations/20210225A-add-relations-sort-field.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.down = exports.up = void 0;
 const utils_1 = require("@directus/shared/utils");
 async function up(knex) {
-    var _a;
     await knex.schema.alterTable('directus_relations', (table) => {
         table.string('sort_field');
     });
@@ -12,7 +11,7 @@ async function up(knex) {
         .from('directus_fields')
         .whereIn('interface', ['one-to-many', 'm2a-builder', 'many-to-many']);
     for (const field of fieldsWithSort) {
-        const options = typeof field.options === 'string' ? (0, utils_1.parseJSON)(field.options) : (_a = field.options) !== null && _a !== void 0 ? _a : {};
+        const options = typeof field.options === 'string' ? (0, utils_1.parseJSON)(field.options) : field.options ?? {};
         if ('sortField' in options) {
             await knex('directus_relations')
                 .update({

package/dist/database/migrations/20210304A-remove-locked-fields.d.ts

@@ -1,3 +1,3 @@
-import { Knex } from 'knex';
+import type { Knex } from 'knex';
 export declare function up(knex: Knex): Promise<void>;
 export declare function down(knex: Knex): Promise<void>;

package/dist/database/migrations/20210312A-webhooks-collections-text.d.ts

@@ -1,3 +1,3 @@
-import { Knex } from 'knex';
+import type { Knex } from 'knex';
 export declare function up(knex: Knex): Promise<void>;
 export declare function down(knex: Knex): Promise<void>;

package/dist/database/migrations/20210331A-add-refresh-interval.d.ts

@@ -1,3 +1,3 @@
-import { Knex } from 'knex';
+import type { Knex } from 'knex';
 export declare function up(knex: Knex): Promise<void>;
 export declare function down(knex: Knex): Promise<void>;

package/dist/database/migrations/20210415A-make-filesize-nullable.d.ts

@@ -1,3 +1,3 @@
-import { Knex } from 'knex';
+import type { Knex } from 'knex';
 export declare function up(knex: Knex): Promise<void>;
 export declare function down(knex: Knex): Promise<void>;

package/dist/database/migrations/20210416A-add-collections-accountability.d.ts

@@ -1,3 +1,3 @@
-import { Knex } from 'knex';
+import type { Knex } from 'knex';
 export declare function up(knex: Knex): Promise<void>;
 export declare function down(knex: Knex): Promise<void>;