directus 9.8.0 → 9.9.0

package/dist/services/payload.js

@@ -89,14 +89,14 @@ class PayloadService {
                     return (accountability === null || accountability === void 0 ? void 0 : accountability.role) || null;
                 return value;
             },
-            async 'date-created'({ action, value }) {
+            async 'date-created'({ action, value, helpers }) {
                 if (action === 'create')
-                    return new Date();
+                    return new Date(helpers.date.writeTimestamp(new Date().toISOString()));
                 return value;
             },
-            async 'date-updated'({ action, value }) {
+            async 'date-updated'({ action, value, helpers }) {
                 if (action === 'update')
-                    return new Date();
+                    return new Date(helpers.date.writeTimestamp(new Date().toISOString()));
                 return value;
             },
             async 'cast-csv'({ action, value }) {
@@ -181,6 +181,7 @@ class PayloadService {
                     payload,
                     accountability,
                     specials: fieldSpecials,
+                    helpers: this.helpers,
                 });
             }
         }
@@ -233,21 +234,23 @@ class PayloadService {
                         value = new Date(value);
                     }
                     if (dateColumn.type === 'timestamp') {
-                        const newValue = value.toISOString();
+                        const newValue = this.helpers.date.readTimestampString(value.toISOString());
                         payload[name] = newValue;
                     }
                     if (dateColumn.type === 'dateTime') {
-                        const year = String(value.getUTCFullYear());
-                        const month = String(value.getUTCMonth() + 1).padStart(2, '0');
-                        const date = String(value.getUTCDate()).padStart(2, '0');
-                        const hours = String(value.getUTCHours()).padStart(2, '0');
-                        const minutes = String(value.getUTCMinutes()).padStart(2, '0');
-                        const seconds = String(value.getUTCSeconds()).padStart(2, '0');
-                        const newValue = `${year}-${month}-${date}T${hours}:${minutes}:${seconds}`;
+                        const year = String(value.getFullYear());
+                        const month = String(value.getMonth() + 1).padStart(2, '0');
+                        const day = String(value.getDate()).padStart(2, '0');
+                        const hours = String(value.getHours()).padStart(2, '0');
+                        const minutes = String(value.getMinutes()).padStart(2, '0');
+                        const seconds = String(value.getSeconds()).padStart(2, '0');
+                        const newValue = `${year}-${month}-${day}T${hours}:${minutes}:${seconds}`;
                         payload[name] = newValue;
                     }
                     if (dateColumn.type === 'date') {
-                        const [year, month, day] = value.toISOString().slice(0, 10).split('-');
+                        const year = String(value.getFullYear());
+                        const month = String(value.getMonth() + 1).padStart(2, '0');
+                        const day = String(value.getDate()).padStart(2, '0');
                         // Strip off the time / timezone information from a date-only value
                         const newValue = `${year}-${month}-${day}`;
                         payload[name] = newValue;
@@ -258,16 +261,16 @@ class PayloadService {
                         if (dateColumn.type === 'date') {
                             const [date] = value.split('T');
                             const [year, month, day] = date.split('-');
-                            payload[name] = new Date(Date.UTC(Number(year), Number(month) - 1, Number(day)));
+                            payload[name] = new Date(Number(year), Number(month) - 1, Number(day));
                         }
                         if (dateColumn.type === 'dateTime') {
                             const [date, time] = value.split('T');
                             const [year, month, day] = date.split('-');
                             const [hours, minutes, seconds] = time.substring(0, 8).split(':');
-                            payload[name] = new Date(Date.UTC(Number(year), Number(month) - 1, Number(day), Number(hours), Number(minutes), Number(seconds)));
+                            payload[name] = new Date(Number(year), Number(month) - 1, Number(day), Number(hours), Number(minutes), Number(seconds));
                         }
                         if (dateColumn.type === 'timestamp') {
-                            const newValue = (0, date_fns_1.parseISO)(value);
+                            const newValue = this.helpers.date.writeTimestamp(value);
                             payload[name] = newValue;
                         }
                     }

package/dist/types/files.d.ts

@@ -19,3 +19,11 @@ export declare type File = {
     tags: string | null;
     metadata: Record<string, any> | null;
 };
+export declare type Metadata = {
+    height?: number | undefined;
+    width?: number | undefined;
+    description?: string | undefined;
+    title?: string | undefined;
+    tags?: any | undefined;
+    metadata?: any | undefined;
+};

package/dist/utils/apply-query.js

@@ -180,6 +180,7 @@ function applyFilter(knex, schema, rootQuery, rootFilter, collection, subQuery =
         }
     }
     function addWhereClauses(knex, dbQuery, filter, collection, logical = 'and') {
+        var _a, _b;
         for (const [key, value] of Object.entries(filter)) {
             if (key === '_or' || key === '_and') {
                 // If the _or array contains an empty object (full permissions), we should short-circuit and ignore all other
@@ -220,16 +221,25 @@ function applyFilter(knex, schema, rootQuery, rootFilter, collection, subQuery =
                 if (relationType === 'o2a') {
                     pkField = knex.raw(`CAST(?? AS CHAR(255))`, [pkField]);
                 }
-                // Note: knex's types don't appreciate knex.raw in whereIn, even though it's officially supported
-                dbQuery[logical].whereIn(pkField, (subQueryKnex) => {
+                const subQueryBuilder = (filter) => (subQueryKnex) => {
                     const field = relation.field;
                     const collection = relation.collection;
                     const column = `${collection}.${field}`;
-                    subQueryKnex.select({ [field]: column }).from(collection);
-                    applyQuery(knex, relation.collection, subQueryKnex, {
-                        filter: value,
-                    }, schema, true);
-                });
+                    subQueryKnex
+                        .select({ [field]: column })
+                        .from(collection)
+                        .whereNotNull(field);
+                    applyQuery(knex, relation.collection, subQueryKnex, { filter }, schema, true);
+                };
+                if (((_a = Object.keys(value)) === null || _a === void 0 ? void 0 : _a[0]) === '_none') {
+                    dbQuery[logical].whereNotIn(pkField, subQueryBuilder(Object.values(value)[0]));
+                }
+                else if (((_b = Object.keys(value)) === null || _b === void 0 ? void 0 : _b[0]) === '_some') {
+                    dbQuery[logical].whereIn(pkField, subQueryBuilder(Object.values(value)[0]));
+                }
+                else {
+                    dbQuery[logical].whereIn(pkField, subQueryBuilder(value));
+                }
             }
         }
         function applyFilterToQuery(key, operator, compareValue, logical = 'and') {

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

@@ -1,5 +1,6 @@
-import { Snapshot, SnapshotDiff } from '../types';
+import { Snapshot, SnapshotDiff, SnapshotField } from '../types';
 import { Knex } from 'knex';
+import { Diff } from 'deep-diff';
 import { SchemaOverview } from '@directus/shared/types';
 export declare function applySnapshot(snapshot: Snapshot, options?: {
     database?: Knex;
@@ -7,3 +8,4 @@ export declare function applySnapshot(snapshot: Snapshot, options?: {
     current?: Snapshot;
     diff?: SnapshotDiff;
 }): Promise<void>;
+export declare function isNestedMetaUpdate(diff: Diff<SnapshotField | undefined>): boolean;

package/dist/utils/apply-snapshot.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.applySnapshot = void 0;
+exports.isNestedMetaUpdate = exports.applySnapshot = void 0;
 const get_snapshot_1 = require("./get-snapshot");
 const get_snapshot_diff_1 = require("./get-snapshot-diff");
 const database_1 = __importDefault(require("../database"));
@@ -34,7 +34,26 @@ async function applySnapshot(snapshot, options) {
                 // creating a collection without a primary key
                 const fields = snapshotDiff.fields
                     .filter((fieldDiff) => fieldDiff.collection === collection)
-                    .map((fieldDiff) => fieldDiff.diff[0].rhs);
+                    .map((fieldDiff) => fieldDiff.diff[0].rhs)
+                    .map((fieldDiff) => {
+                    // Casts field type to UUID when applying SQLite-based schema on other databases.
+                    // This is needed because SQLite snapshots UUID fields as char with length 36, and
+                    // it will fail when trying to create relation between char field to UUID field
+                    if (!fieldDiff.schema ||
+                        fieldDiff.schema.data_type !== 'char' ||
+                        fieldDiff.schema.max_length !== 36 ||
+                        !fieldDiff.schema.foreign_key_table ||
+                        !fieldDiff.schema.foreign_key_column) {
+                        return fieldDiff;
+                    }
+                    const matchingForeignKeyTable = schema.collections[fieldDiff.schema.foreign_key_table];
+                    if (!matchingForeignKeyTable)
+                        return fieldDiff;
+                    const matchingForeignKeyField = matchingForeignKeyTable.fields[fieldDiff.schema.foreign_key_column];
+                    if (!matchingForeignKeyField || matchingForeignKeyField.type !== 'uuid')
+                        return fieldDiff;
+                    return (0, lodash_1.merge)(fieldDiff, { type: 'uuid', schema: { data_type: 'uuid', max_length: null } });
+                });
                 try {
                     await collectionsService.createOne({
                         ...diff[0].rhs,
@@ -66,7 +85,7 @@ async function applySnapshot(snapshot, options) {
         }
         const fieldsService = new services_1.FieldsService({ knex: trx, schema: await (0, get_schema_1.getSchema)({ database: trx }) });
         for (const { collection, field, diff } of snapshotDiff.fields) {
-            if ((diff === null || diff === void 0 ? void 0 : diff[0].kind) === 'N') {
+            if ((diff === null || diff === void 0 ? void 0 : diff[0].kind) === 'N' && !isNestedMetaUpdate(diff === null || diff === void 0 ? void 0 : diff[0])) {
                 try {
                     await fieldsService.createField(collection, diff[0].rhs);
                 }
@@ -75,7 +94,7 @@ async function applySnapshot(snapshot, options) {
                     throw err;
                 }
             }
-            if ((diff === null || diff === void 0 ? void 0 : diff[0].kind) === 'E' || (diff === null || diff === void 0 ? void 0 : diff[0].kind) === 'A') {
+            if ((diff === null || diff === void 0 ? void 0 : diff[0].kind) === 'E' || (diff === null || diff === void 0 ? void 0 : diff[0].kind) === 'A' || isNestedMetaUpdate(diff === null || diff === void 0 ? void 0 : diff[0])) {
                 const newValues = snapshot.fields.find((snapshotField) => {
                     return snapshotField.collection === collection && snapshotField.field === field;
                 });
@@ -91,7 +110,7 @@ async function applySnapshot(snapshot, options) {
                     }
                 }
             }
-            if ((diff === null || diff === void 0 ? void 0 : diff[0].kind) === 'D') {
+            if ((diff === null || diff === void 0 ? void 0 : diff[0].kind) === 'D' && !isNestedMetaUpdate(diff === null || diff === void 0 ? void 0 : diff[0])) {
                 try {
                     await fieldsService.deleteField(collection, field);
                 }
@@ -146,3 +165,13 @@ async function applySnapshot(snapshot, options) {
     });
 }
 exports.applySnapshot = applySnapshot;
+function isNestedMetaUpdate(diff) {
+    if (!diff)
+        return false;
+    if (diff.kind !== 'N' && diff.kind !== 'D')
+        return false;
+    if (!diff.path || diff.path.length < 2 || diff.path[0] !== 'meta')
+        return false;
+    return true;
+}
+exports.isNestedMetaUpdate = isNestedMetaUpdate;

package/dist/utils/get-graphql-type.js

@@ -9,6 +9,7 @@ function getGraphQLType(localType) {
         case 'boolean':
             return graphql_1.GraphQLBoolean;
         case 'bigInteger':
+            return graphql_1.GraphQLString;
         case 'integer':
             return graphql_1.GraphQLInt;
         case 'decimal':

package/dist/utils/get-local-type.js

@@ -88,6 +88,7 @@ const localTypeMap = {
     'time without time zone': 'time',
     float4: 'float',
     float8: 'float',
+    citext: 'text',
     // Oracle
     number: 'integer',
     sdo_geometry: 'geometry',
@@ -109,6 +110,10 @@ function getLocalType(column, field) {
             return 'csv';
         if (special.includes('uuid') || special.includes('file'))
             return 'uuid';
+        if (special.includes('cast-timestamp'))
+            return 'timestamp';
+        if (special.includes('cast-datetime'))
+            return 'dateTime';
         if (type === null || type === void 0 ? void 0 : type.startsWith('geometry')) {
             return special[0] || 'geometry';
         }

package/dist/utils/jwt.js

@@ -31,7 +31,7 @@ function verifyAccessJWT(token, secret) {
     }
     catch (err) {
         if (err instanceof jsonwebtoken_1.TokenExpiredError) {
-            throw new exceptions_1.InvalidTokenException('Token expired.');
+            throw new exceptions_1.TokenExpiredException();
         }
         else if (err instanceof jsonwebtoken_1.JsonWebTokenError) {
             throw new exceptions_1.InvalidTokenException('Token invalid.');

package/dist/utils/validate-query.js

@@ -47,21 +47,6 @@ function validateFilter(filter) {
         else if (key.startsWith('_')) {
             const value = nested;
             switch (key) {
-                case '_eq':
-                case '_neq':
-                case '_contains':
-                case '_ncontains':
-                case '_starts_with':
-                case '_nstarts_with':
-                case '_ends_with':
-                case '_nends_with':
-                case '_gt':
-                case '_gte':
-                case '_lt':
-                case '_lte':
-                default:
-                    validateFilterPrimitive(value, key);
-                    break;
                 case '_in':
                 case '_nin':
                 case '_between':
@@ -80,6 +65,25 @@ function validateFilter(filter) {
                 case '_nintersects_bbox':
                     validateGeometry(value, key);
                     break;
+                case '_none':
+                case '_some':
+                    validateFilter(nested);
+                    break;
+                case '_eq':
+                case '_neq':
+                case '_contains':
+                case '_ncontains':
+                case '_starts_with':
+                case '_nstarts_with':
+                case '_ends_with':
+                case '_nends_with':
+                case '_gt':
+                case '_gte':
+                case '_lt':
+                case '_lte':
+                default:
+                    validateFilterPrimitive(value, key);
+                    break;
             }
         }
         else if ((0, lodash_1.isPlainObject)(nested)) {

package/example.env

@@ -123,6 +123,10 @@ STORAGE_LOCAL_ROOT="./uploads"
 # STORAGE_GOOGLE_KEY_FILENAME="abcdef"
 # STORAGE_GOOGLE_BUCKET="my-files"
 
+
+## CSV of additional metadata keys
+# FILE_METADATA_ALLOW_LIST=
+
 ####################################################################################################
 # Security
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "directus",
-	"version": "9.8.0",
+	"version": "9.9.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.",
@@ -78,16 +78,16 @@
 	],
 	"dependencies": {
 		"@aws-sdk/client-ses": "^3.40.0",
-		"@directus/app": "9.8.0",
-		"@directus/drive": "9.8.0",
-		"@directus/drive-azure": "9.8.0",
-		"@directus/drive-gcs": "9.8.0",
-		"@directus/drive-s3": "9.8.0",
-		"@directus/extensions-sdk": "9.8.0",
-		"@directus/format-title": "9.8.0",
-		"@directus/schema": "9.8.0",
-		"@directus/shared": "9.8.0",
-		"@directus/specs": "9.8.0",
+		"@directus/app": "9.9.0",
+		"@directus/drive": "9.9.0",
+		"@directus/drive-azure": "9.9.0",
+		"@directus/drive-gcs": "9.9.0",
+		"@directus/drive-s3": "9.9.0",
+		"@directus/extensions-sdk": "9.9.0",
+		"@directus/format-title": "9.9.0",
+		"@directus/schema": "9.9.0",
+		"@directus/shared": "9.9.0",
+		"@directus/specs": "9.9.0",
 		"@godaddy/terminus": "^4.9.0",
 		"@rollup/plugin-alias": "^3.1.9",
 		"@rollup/plugin-virtual": "^2.0.3",
@@ -150,7 +150,7 @@
 		"resolve-cwd": "^3.0.0",
 		"rollup": "^2.67.3",
 		"sanitize-html": "^2.6.0",
-		"sharp": "^0.29.0",
+		"sharp": "^0.30.3",
 		"stream-json": "^1.7.1",
 		"supertest": "^6.1.6",
 		"tmp-promise": "^3.0.3",
@@ -173,7 +173,7 @@
 		"sqlite3": "^5.0.2",
 		"tedious": "^13.0.0"
 	},
-	"gitHead": "2a6db01c42dd1d7524962e7153d1d7e1bd63fb2f",
+	"gitHead": "fb252ca4cef57de1aa8d1914db6bc85730902e81",
 	"devDependencies": {
 		"@types/async": "3.2.10",
 		"@types/body-parser": "1.19.2",
@@ -214,6 +214,7 @@
 		"@types/wellknown": "0.5.1",
 		"copyfiles": "2.4.1",
 		"cross-env": "7.0.3",
+		"form-data": "^4.0.0",
 		"jest": "27.5.1",
 		"knex-mock-client": "1.6.1",
 		"ts-jest": "27.1.3",