directus 9.18.0 → 9.19.0

package/dist/services/graphql/index.js

@@ -279,12 +279,18 @@ class GraphQLService {
                         // can't non-null in update, as that would require every not-nullable field to be
                         // submitted on updates
                         if (field.nullable === false &&
+                            !field.defaultValue &&
                             !constants_1.GENERATE_SPECIAL.some((flag) => field.special.includes(flag)) &&
                             action !== 'update') {
-                            type = (0, graphql_1.GraphQLNonNull)(type);
+                            type = new graphql_1.GraphQLNonNull(type);
                         }
                         if (collection.primary === field.field) {
-                            type = (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLID);
+                            if (!field.defaultValue && !field.special.includes('uuid') && action === 'create')
+                                type = new graphql_1.GraphQLNonNull(graphql_1.GraphQLID);
+                            else if (['create', 'update'].includes(action))
+                                type = graphql_1.GraphQLID;
+                            else
+                                type = new graphql_1.GraphQLNonNull(graphql_1.GraphQLID);
                         }
                         acc[field.field] = {
                             type,
@@ -380,7 +386,7 @@ class GraphQLService {
                                         parent = parent[pathPart];
                                     }
                                     const collection = parent[relation.meta.one_collection_field];
-                                    return CollectionTypes[collection].getType();
+                                    return CollectionTypes[collection].getType().name;
                                 },
                             }),
                             resolve: (obj, _, __, info) => {
@@ -397,7 +403,7 @@ class GraphQLService {
          * Create readable types and attach resolvers for each. Also prepares full filter argument structures
          */
         function getReadableTypes() {
-            var _a, _b, _c, _d, _e, _f;
+            var _a, _b, _c, _d, _e, _f, _g, _h;
             const { CollectionTypes: ReadCollectionTypes } = getTypes('read');
             const ReadableCollectionFilterTypes = {};
             const AggregatedFunctions = {};
@@ -415,6 +421,9 @@ class GraphQLService {
                     _contains: {
                         type: graphql_1.GraphQLString,
                     },
+                    _icontains: {
+                        type: graphql_1.GraphQLString,
+                    },
                     _ncontains: {
                         type: graphql_1.GraphQLString,
                     },
@@ -494,6 +503,12 @@ class GraphQLService {
                     _nnull: {
                         type: graphql_1.GraphQLBoolean,
                     },
+                    _in: {
+                        type: new graphql_1.GraphQLList(graphql_1.GraphQLString),
+                    },
+                    _nin: {
+                        type: new graphql_1.GraphQLList(graphql_1.GraphQLString),
+                    },
                     _between: {
                         type: new graphql_1.GraphQLList(string_or_float_1.GraphQLStringOrFloat),
                     },
@@ -565,6 +580,12 @@ class GraphQLService {
                     _nintersects_bbox: {
                         type: geojson_1.GraphQLGeoJSON,
                     },
+                    _null: {
+                        type: graphql_1.GraphQLBoolean,
+                    },
+                    _nnull: {
+                        type: graphql_1.GraphQLBoolean,
+                    },
                 },
             });
             const HashFilterOperators = schemaComposer.createInputTC({
@@ -834,7 +855,7 @@ class GraphQLService {
                         name: `${collection.collection}_by_id`,
                         type: ReadCollectionTypes[collection.collection],
                         args: {
-                            id: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLID),
+                            id: new graphql_1.GraphQLNonNull(graphql_1.GraphQLID),
                         },
                         resolve: async ({ info, context }) => {
                             const result = await self.resolveQuery(info);
@@ -894,10 +915,12 @@ class GraphQLService {
                     }
                 }
                 else if ((_f = relation.meta) === null || _f === void 0 ? void 0 : _f.one_allowed_collections) {
-                    /**
-                     * @TODO
-                     * Looking to add nested typed filters per union type? This is where that's supposed to go.
-                     */
+                    (_g = ReadableCollectionFilterTypes[relation.collection]) === null || _g === void 0 ? void 0 : _g.removeField('item');
+                    for (const collection of relation.meta.one_allowed_collections) {
+                        (_h = ReadableCollectionFilterTypes[relation.collection]) === null || _h === void 0 ? void 0 : _h.addFields({
+                            [`item__${collection}`]: ReadableCollectionFilterTypes[collection],
+                        });
+                    }
                 }
             }
             return { ReadCollectionTypes, ReadableCollectionFilterTypes };
@@ -993,7 +1016,7 @@ class GraphQLService {
                                 ...(collectionIsReadable
                                     ? ReadCollectionTypes[collection.collection].getResolver(collection.collection).getArgs()
                                     : {}),
-                                ids: (0, graphql_1.GraphQLNonNull)(new graphql_1.GraphQLList(graphql_1.GraphQLID)),
+                                ids: new graphql_1.GraphQLNonNull(new graphql_1.GraphQLList(graphql_1.GraphQLID)),
                                 data: (0, graphql_compose_1.toInputObjectType)(UpdateCollectionTypes[collection.collection]).setTypeName(`update_${collection.collection}_input`).NonNull,
                             },
                             resolve: async ({ args, info }) => await self.resolveMutation(args, info),
@@ -1002,7 +1025,7 @@ class GraphQLService {
                             name: `update_${collection.collection}_item`,
                             type: collectionIsReadable ? ReadCollectionTypes[collection.collection] : graphql_1.GraphQLBoolean,
                             args: {
-                                id: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLID),
+                                id: new graphql_1.GraphQLNonNull(graphql_1.GraphQLID),
                                 data: (0, graphql_compose_1.toInputObjectType)(UpdateCollectionTypes[collection.collection]).setTypeName(`update_${collection.collection}_input`).NonNull,
                             },
                             resolve: async ({ args, info }) => await self.resolveMutation(args, info),
@@ -1013,13 +1036,13 @@ class GraphQLService {
             DeleteCollectionTypes.many = schemaComposer.createObjectTC({
                 name: `delete_many`,
                 fields: {
-                    ids: (0, graphql_1.GraphQLNonNull)(new graphql_1.GraphQLList(graphql_1.GraphQLID)),
+                    ids: new graphql_1.GraphQLNonNull(new graphql_1.GraphQLList(graphql_1.GraphQLID)),
                 },
             });
             DeleteCollectionTypes.one = schemaComposer.createObjectTC({
                 name: `delete_one`,
                 fields: {
-                    id: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLID),
+                    id: new graphql_1.GraphQLNonNull(graphql_1.GraphQLID),
                 },
             });
             for (const collection of Object.values(schema.delete.collections)) {
@@ -1027,7 +1050,7 @@ class GraphQLService {
                     name: `delete_${collection.collection}_items`,
                     type: DeleteCollectionTypes.many,
                     args: {
-                        ids: (0, graphql_1.GraphQLNonNull)(new graphql_1.GraphQLList(graphql_1.GraphQLID)),
+                        ids: new graphql_1.GraphQLNonNull(new graphql_1.GraphQLList(graphql_1.GraphQLID)),
                     },
                     resolve: async ({ args, info }) => await self.resolveMutation(args, info),
                 });
@@ -1035,7 +1058,7 @@ class GraphQLService {
                     name: `delete_${collection.collection}_item`,
                     type: DeleteCollectionTypes.one,
                     args: {
-                        id: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLID),
+                        id: new graphql_1.GraphQLNonNull(graphql_1.GraphQLID),
                     },
                     resolve: async ({ args, info }) => await self.resolveMutation(args, info),
                 });
@@ -1228,7 +1251,7 @@ class GraphQLService {
                     return Boolean(node.value);
                 case 'EnumValue':
                 default:
-                    return node.value;
+                    return 'value' in node ? node.value : null;
             }
         };
         const argsObject = Object.fromEntries(args.map((arg) => [arg.name.value, parse(arg.value)]));
@@ -1607,8 +1630,8 @@ class GraphQLService {
             auth_login: {
                 type: AuthTokens,
                 args: {
-                    email: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
-                    password: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+                    email: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
+                    password: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
                     mode: AuthMode,
                     otp: graphql_1.GraphQLString,
                 },
@@ -1707,7 +1730,7 @@ class GraphQLService {
             auth_password_request: {
                 type: graphql_1.GraphQLBoolean,
                 args: {
-                    email: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+                    email: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
                     reset_url: graphql_1.GraphQLString,
                 },
                 resolve: async (_, args, { req }) => {
@@ -1732,8 +1755,8 @@ class GraphQLService {
             auth_password_reset: {
                 type: graphql_1.GraphQLBoolean,
                 args: {
-                    token: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
-                    password: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+                    token: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
+                    password: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
                 },
                 resolve: async (_, args, { req }) => {
                     const accountability = {
@@ -1756,7 +1779,7 @@ class GraphQLService {
                     },
                 }),
                 args: {
-                    password: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+                    password: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
                 },
                 resolve: async (_, args) => {
                     var _a;
@@ -1778,8 +1801,8 @@ class GraphQLService {
             users_me_tfa_enable: {
                 type: graphql_1.GraphQLBoolean,
                 args: {
-                    otp: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
-                    secret: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+                    otp: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
+                    secret: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
                 },
                 resolve: async (_, args) => {
                     var _a;
@@ -1796,7 +1819,7 @@ class GraphQLService {
             users_me_tfa_disable: {
                 type: graphql_1.GraphQLBoolean,
                 args: {
-                    otp: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+                    otp: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
                 },
                 resolve: async (_, args) => {
                     var _a;
@@ -1817,7 +1840,7 @@ class GraphQLService {
             utils_hash_generate: {
                 type: graphql_1.GraphQLString,
                 args: {
-                    string: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+                    string: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
                 },
                 resolve: async (_, args) => {
                     return await (0, generate_hash_1.generateHash)(args.string);
@@ -1826,8 +1849,8 @@ class GraphQLService {
             utils_hash_verify: {
                 type: graphql_1.GraphQLBoolean,
                 args: {
-                    string: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
-                    hash: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+                    string: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
+                    hash: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
                 },
                 resolve: async (_, args) => {
                     return await argon2_1.default.verify(args.hash, args.string);
@@ -1836,9 +1859,9 @@ class GraphQLService {
             utils_sort: {
                 type: graphql_1.GraphQLBoolean,
                 args: {
-                    collection: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
-                    item: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLID),
-                    to: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLID),
+                    collection: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
+                    item: new graphql_1.GraphQLNonNull(graphql_1.GraphQLID),
+                    to: new graphql_1.GraphQLNonNull(graphql_1.GraphQLID),
                 },
                 resolve: async (_, args) => {
                     const service = new utils_1.UtilsService({
@@ -1853,7 +1876,7 @@ class GraphQLService {
             utils_revert: {
                 type: graphql_1.GraphQLBoolean,
                 args: {
-                    revision: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLID),
+                    revision: new graphql_1.GraphQLNonNull(graphql_1.GraphQLID),
                 },
                 resolve: async (_, args) => {
                     const service = new revisions_1.RevisionsService({
@@ -1880,8 +1903,8 @@ class GraphQLService {
             users_invite_accept: {
                 type: graphql_1.GraphQLBoolean,
                 args: {
-                    token: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
-                    password: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+                    token: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
+                    password: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
                 },
                 resolve: async (_, args) => {
                     const service = new users_1.UsersService({
@@ -1902,7 +1925,7 @@ class GraphQLService {
                         acc[field.field] = {
                             type: field.nullable
                                 ? (0, get_graphql_type_1.getGraphQLType)(field.type, field.special)
-                                : (0, graphql_1.GraphQLNonNull)((0, get_graphql_type_1.getGraphQLType)(field.type, field.special)),
+                                : new graphql_1.GraphQLNonNull((0, get_graphql_type_1.getGraphQLType)(field.type, field.special)),
                             description: field.note,
                         };
                         return acc;
@@ -1930,7 +1953,7 @@ class GraphQLService {
                 collections_by_name: {
                     type: Collection,
                     args: {
-                        name: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+                        name: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
                     },
                     resolve: async (_, args) => {
                         const collectionsService = new collections_1.CollectionsService({
@@ -1953,7 +1976,7 @@ class GraphQLService {
                         acc[field.field] = {
                             type: field.nullable
                                 ? (0, get_graphql_type_1.getGraphQLType)(field.type, field.special)
-                                : (0, graphql_1.GraphQLNonNull)((0, get_graphql_type_1.getGraphQLType)(field.type, field.special)),
+                                : new graphql_1.GraphQLNonNull((0, get_graphql_type_1.getGraphQLType)(field.type, field.special)),
                             description: field.note,
                         };
                         return acc;
@@ -1993,7 +2016,7 @@ class GraphQLService {
                 fields_in_collection: {
                     type: new graphql_1.GraphQLNonNull(new graphql_1.GraphQLList(new graphql_1.GraphQLNonNull(Field.getType()))),
                     args: {
-                        collection: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+                        collection: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
                     },
                     resolve: async (_, args) => {
                         const service = new fields_1.FieldsService({
@@ -2006,8 +2029,8 @@ class GraphQLService {
                 fields_by_name: {
                     type: Field,
                     args: {
-                        collection: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
-                        field: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+                        collection: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
+                        field: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
                     },
                     resolve: async (_, args) => {
                         const service = new fields_1.FieldsService({
@@ -2027,13 +2050,13 @@ class GraphQLService {
                 schema: schemaComposer.createObjectTC({
                     name: 'directus_relations_schema',
                     fields: {
-                        table: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
-                        column: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
-                        foreign_key_table: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
-                        foreign_key_column: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+                        table: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
+                        column: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
+                        foreign_key_table: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
+                        foreign_key_column: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
                         constraint_name: graphql_1.GraphQLString,
-                        on_update: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
-                        on_delete: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+                        on_update: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
+                        on_delete: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
                     },
                 }),
                 meta: schemaComposer.createObjectTC({
@@ -2061,7 +2084,7 @@ class GraphQLService {
                 relations_in_collection: {
                     type: new graphql_1.GraphQLNonNull(new graphql_1.GraphQLList(new graphql_1.GraphQLNonNull(Relation.getType()))),
                     args: {
-                        collection: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+                        collection: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
                     },
                     resolve: async (_, args) => {
                         const service = new relations_1.RelationsService({
@@ -2074,8 +2097,8 @@ class GraphQLService {
                 relations_by_name: {
                     type: Relation,
                     args: {
-                        collection: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
-                        field: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+                        collection: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
+                        field: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
                     },
                     resolve: async (_, args) => {
                         const service = new relations_1.RelationsService({
@@ -2112,7 +2135,7 @@ class GraphQLService {
                 update_collections_item: {
                     type: Collection,
                     args: {
-                        collection: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+                        collection: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
                         data: (0, graphql_compose_1.toInputObjectType)(Collection.clone('update_directus_collections'), {
                             postfix: '_input',
                         }).removeField(['collection', 'schema']).NonNull,
@@ -2134,7 +2157,7 @@ class GraphQLService {
                         },
                     }),
                     args: {
-                        collection: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+                        collection: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
                     },
                     resolve: async (_, args) => {
                         const collectionsService = new collections_1.CollectionsService({
@@ -2150,7 +2173,7 @@ class GraphQLService {
                 create_fields_item: {
                     type: Field,
                     args: {
-                        collection: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+                        collection: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
                         data: (0, graphql_compose_1.toInputObjectType)(Field.clone('create_directus_fields'), { postfix: '_input' }).NonNull,
                     },
                     resolve: async (_, args) => {
@@ -2165,8 +2188,8 @@ class GraphQLService {
                 update_fields_item: {
                     type: Field,
                     args: {
-                        collection: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
-                        field: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+                        collection: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
+                        field: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
                         data: (0, graphql_compose_1.toInputObjectType)(Field.clone('update_directus_fields'), { postfix: '_input' }).NonNull,
                     },
                     resolve: async (_, args) => {
@@ -2190,8 +2213,8 @@ class GraphQLService {
                         },
                     }),
                     args: {
-                        collection: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
-                        field: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+                        collection: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
+                        field: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
                     },
                     resolve: async (_, args) => {
                         const service = new fields_1.FieldsService({
@@ -2222,8 +2245,8 @@ class GraphQLService {
                 update_relations_item: {
                     type: Relation,
                     args: {
-                        collection: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
-                        field: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+                        collection: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
+                        field: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
                         data: (0, graphql_compose_1.toInputObjectType)(Relation.clone('update_directus_relations'), { postfix: '_input' }).NonNull,
                     },
                     resolve: async (_, args) => {
@@ -2244,8 +2267,8 @@ class GraphQLService {
                         },
                     }),
                     args: {
-                        collection: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
-                        field: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+                        collection: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
+                        field: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
                     },
                     resolve: async (_, args) => {
                         const relationsService = new relations_1.RelationsService({
@@ -2305,9 +2328,9 @@ class GraphQLService {
                 create_comment: {
                     type: (_d = ReadCollectionTypes['directus_activity']) !== null && _d !== void 0 ? _d : graphql_1.GraphQLBoolean,
                     args: {
-                        collection: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
-                        item: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLID),
-                        comment: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+                        collection: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
+                        item: new graphql_1.GraphQLNonNull(graphql_1.GraphQLID),
+                        comment: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
                     },
                     resolve: async (_, args, __, info) => {
                         var _a, _b, _c, _d, _e, _f;
@@ -2338,8 +2361,8 @@ class GraphQLService {
                 update_comment: {
                     type: (_e = ReadCollectionTypes['directus_activity']) !== null && _e !== void 0 ? _e : graphql_1.GraphQLBoolean,
                     args: {
-                        id: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLID),
-                        comment: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+                        id: new graphql_1.GraphQLNonNull(graphql_1.GraphQLID),
+                        comment: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
                     },
                     resolve: async (_, args, __, info) => {
                         var _a, _b;
@@ -2363,7 +2386,7 @@ class GraphQLService {
                 delete_comment: {
                     type: DeleteCollectionTypes.one,
                     args: {
-                        id: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLID),
+                        id: new graphql_1.GraphQLNonNull(graphql_1.GraphQLID),
                     },
                     resolve: async (_, args) => {
                         const service = new activity_1.ActivityService({
@@ -2381,7 +2404,7 @@ class GraphQLService {
                 import_file: {
                     type: (_f = ReadCollectionTypes['directus_files']) !== null && _f !== void 0 ? _f : graphql_1.GraphQLBoolean,
                     args: {
-                        url: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+                        url: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
                         data: (0, graphql_compose_1.toInputObjectType)(CreateCollectionTypes['directus_files']).setTypeName('create_directus_files_input'),
                     },
                     resolve: async (_, args, __, info) => {
@@ -2406,8 +2429,8 @@ class GraphQLService {
                 users_invite: {
                     type: graphql_1.GraphQLBoolean,
                     args: {
-                        email: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
-                        role: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+                        email: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
+                        role: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
                         invite_url: graphql_1.GraphQLString,
                     },
                     resolve: async (_, args) => {

package/dist/services/graphql/types/date.d.ts

@@ -1,2 +1,2 @@
 import { GraphQLScalarType } from 'graphql';
-export declare const GraphQLDate: GraphQLScalarType;
+export declare const GraphQLDate: GraphQLScalarType<string, string>;

package/dist/services/graphql/types/geojson.d.ts

@@ -1,2 +1,2 @@
 import { GraphQLScalarType } from 'graphql';
-export declare const GraphQLGeoJSON: GraphQLScalarType;
+export declare const GraphQLGeoJSON: GraphQLScalarType<unknown, unknown>;

package/dist/services/graphql/types/hash.d.ts

@@ -1,2 +1,2 @@
 import { GraphQLScalarType } from 'graphql';
-export declare const GraphQLHash: GraphQLScalarType;
+export declare const GraphQLHash: GraphQLScalarType<string, string>;

package/dist/services/graphql/types/string-or-float.d.ts

@@ -2,4 +2,4 @@ import { GraphQLScalarType } from 'graphql';
 /**
  * Adopted from https://kamranicus.com/handling-multiple-scalar-types-in-graphql/
  */
-export declare const GraphQLStringOrFloat: GraphQLScalarType;
+export declare const GraphQLStringOrFloat: GraphQLScalarType<string | number, string | number>;

package/dist/services/graphql/types/void.d.ts

@@ -1,2 +1,2 @@
 import { GraphQLScalarType } from 'graphql';
-export declare const GraphQLVoid: GraphQLScalarType;
+export declare const GraphQLVoid: GraphQLScalarType<null, null>;

package/dist/services/items.js

@@ -216,7 +216,9 @@ class ItemsService {
      */
     async readByQuery(query, opts) {
         const updatedQuery = (opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false
-            ? await emitter_1.default.emitFilter(`${this.eventScope}.query`, query, {
+            ? await emitter_1.default.emitFilter(this.eventScope === 'items'
+                ? ['items.query', `${this.collection}.items.query`]
+                : `${this.eventScope}.query`, query, {
                 collection: this.collection,
             }, {
                 database: this.knex,

package/dist/services/mail/templates/base.liquid

@@ -103,7 +103,6 @@ blockquote > p {
 </style>
 
 <meta name="generator" content="Directus">
-<meta property="og:url" content="http://directus-20534155.hs-sites.com/7dea362b-3fac-3e00-956a-4952a3d4f474">
 <meta name="x-apple-disable-message-reformatting">
 <meta name="robots" content="noindex,follow">
 

package/dist/services/payload.js

@@ -223,7 +223,7 @@ class PayloadService {
         for (const [name, dateColumn] of dateColumns) {
             for (const payload of payloads) {
                 let value = payload[name];
-                if (value === null || value === '0000-00-00') {
+                if (value === null || (typeof value === 'string' && /^[.0 :-]{10,}$/.test(value))) {
                     payload[name] = null;
                     continue;
                 }
@@ -545,7 +545,7 @@ class PayloadService {
                             .from(relation.collection)
                             .where({ [relation.field]: parent })
                             .whereNotNull(sortField)
-                            .max(sortField)
+                            .max(sortField, { as: 'max' })
                             .first();
                         createPayload = alterations.create.map((item, index) => {
                             const record = (0, lodash_1.cloneDeep)(item);

package/dist/services/payload.test.js

@@ -90,5 +90,107 @@ describe('Integration Tests', () => {
                 });
             });
         });
+        describe('processDates', () => {
+            let service;
+            const dateFieldId = 'date_field';
+            const dateTimeFieldId = 'datetime_field';
+            const timestampFieldId = 'timestamp_field';
+            beforeEach(() => {
+                service = new services_1.PayloadService('test', {
+                    knex: db,
+                    schema: {
+                        collections: {
+                            test: {
+                                collection: 'test',
+                                primary: 'id',
+                                singleton: false,
+                                sortField: null,
+                                note: null,
+                                accountability: null,
+                                fields: {
+                                    [dateFieldId]: {
+                                        field: dateFieldId,
+                                        defaultValue: null,
+                                        nullable: true,
+                                        generated: false,
+                                        type: 'date',
+                                        dbType: 'date',
+                                        precision: null,
+                                        scale: null,
+                                        special: [],
+                                        note: null,
+                                        validation: null,
+                                        alias: false,
+                                    },
+                                    [dateTimeFieldId]: {
+                                        field: dateTimeFieldId,
+                                        defaultValue: null,
+                                        nullable: true,
+                                        generated: false,
+                                        type: 'dateTime',
+                                        dbType: 'datetime',
+                                        precision: null,
+                                        scale: null,
+                                        special: [],
+                                        note: null,
+                                        validation: null,
+                                        alias: false,
+                                    },
+                                    [timestampFieldId]: {
+                                        field: timestampFieldId,
+                                        defaultValue: null,
+                                        nullable: true,
+                                        generated: false,
+                                        type: 'timestamp',
+                                        dbType: 'timestamp',
+                                        precision: null,
+                                        scale: null,
+                                        special: [],
+                                        note: null,
+                                        validation: null,
+                                        alias: false,
+                                    },
+                                },
+                            },
+                        },
+                        relations: [],
+                    },
+                });
+            });
+            describe('processes dates', () => {
+                it('with zero values', async () => {
+                    const result = await service.processDates([
+                        {
+                            [dateFieldId]: '0000-00-00',
+                            [dateTimeFieldId]: '0000-00-00 00:00:00',
+                            [timestampFieldId]: '0000-00-00 00:00:00.000',
+                        },
+                    ], 'read');
+                    expect(result).toMatchObject([
+                        {
+                            [dateFieldId]: null,
+                            [dateTimeFieldId]: null,
+                            [timestampFieldId]: null,
+                        },
+                    ]);
+                });
+                it('with typical values', async () => {
+                    const result = await service.processDates([
+                        {
+                            [dateFieldId]: '2022-01-10',
+                            [dateTimeFieldId]: '2021-09-31 12:34:56',
+                            [timestampFieldId]: '1980-12-08 00:11:22.333',
+                        },
+                    ], 'read');
+                    expect(result).toMatchObject([
+                        {
+                            [dateFieldId]: '2022-01-10',
+                            [dateTimeFieldId]: '2021-10-01T12:34:56',
+                            [timestampFieldId]: new Date('1980-12-08 00:11:22.333').toISOString(),
+                        },
+                    ]);
+                });
+            });
+        });
     });
 });