@directus/api 35.0.2 → 35.2.0

package/dist/services/graphql/schema/get-types.js

@@ -50,20 +50,11 @@ function getTypes(schemaComposer, scope, schema, inconsistentFields, action) {
 			fields: Object.values(collection.fields).reduce((acc, field) => {
 				let type = getGraphQLType(field.type, field.special);
 				const fieldIsInconsistent = inconsistentFields[action][collection.collection]?.includes(field.field);
-				if (field.nullable === false && !field.defaultValue && !GENERATE_SPECIAL.some((flag) => field.special.includes(flag)) && fieldIsInconsistent === false && action !== "update") {
-					type = new GraphQLNonNull(type);
-				}
-				if (collection.primary === field.field && fieldIsInconsistent === false) {
-					if (collection.collection === "directus_permissions") {
-						type = GraphQLID;
-					} else if (!field.defaultValue && !field.special.includes("uuid") && action === "create") {
-						type = new GraphQLNonNull(GraphQLID);
-					} else if (["create", "update"].includes(action)) {
-						type = GraphQLID;
-					} else {
-						type = new GraphQLNonNull(GraphQLID);
-					}
-				}
+				if (field.nullable === false && !field.defaultValue && !GENERATE_SPECIAL.some((flag) => field.special.includes(flag)) && fieldIsInconsistent === false && action !== "update") type = new GraphQLNonNull(type);
+				if (collection.primary === field.field && fieldIsInconsistent === false) if (collection.collection === "directus_permissions") type = GraphQLID;
+				else if (!field.defaultValue && !field.special.includes("uuid") && action === "create") type = new GraphQLNonNull(GraphQLID);
+				else if (["create", "update"].includes(action)) type = GraphQLID;
+				else type = new GraphQLNonNull(GraphQLID);
 				acc[field.field] = {
 					type,
 					description: field.note,
@@ -72,108 +63,85 @@ function getTypes(schemaComposer, scope, schema, inconsistentFields, action) {
 					}
 				};
 				if (action === "read") {
-					if (field.type === "date") {
-						acc[`${field.field}_func`] = {
-							type: DateFunctions,
-							resolve: (obj) => {
-								const funcFields = Object.keys(DateFunctions.getFields()).map((key) => `${field.field}_${key}`);
-								return mapKeys(pick(obj, funcFields), (_value, key) => key.substring(field.field.length + 1));
-							}
-						};
-					}
-					if (field.type === "time") {
-						acc[`${field.field}_func`] = {
-							type: TimeFunctions,
-							resolve: (obj) => {
-								const funcFields = Object.keys(TimeFunctions.getFields()).map((key) => `${field.field}_${key}`);
-								return mapKeys(pick(obj, funcFields), (_value, key) => key.substring(field.field.length + 1));
-							}
-						};
-					}
-					if (field.type === "dateTime" || field.type === "timestamp") {
-						acc[`${field.field}_func`] = {
-							type: DateTimeFunctions,
-							resolve: (obj) => {
-								const funcFields = Object.keys(DateTimeFunctions.getFields()).map((key) => `${field.field}_${key}`);
-								return mapKeys(pick(obj, funcFields), (_value, key) => key.substring(field.field.length + 1));
-							}
-						};
-					}
-					if (field.type === "json" || field.type === "alias") {
-						acc[`${field.field}_func`] = {
-							type: CountFunctions,
-							resolve: (obj) => {
-								const funcFields = Object.keys(CountFunctions.getFields()).map((key) => `${field.field}_${key}`);
-								return mapKeys(pick(obj, funcFields), (_value, key) => key.substring(field.field.length + 1));
-							}
-						};
-					}
+					if (field.type === "date") acc[`${field.field}_func`] = {
+						type: DateFunctions,
+						resolve: (obj) => {
+							return mapKeys(pick(obj, Object.keys(DateFunctions.getFields()).map((key) => `${field.field}_${key}`)), (_value, key) => key.substring(field.field.length + 1));
+						}
+					};
+					if (field.type === "time") acc[`${field.field}_func`] = {
+						type: TimeFunctions,
+						resolve: (obj) => {
+							return mapKeys(pick(obj, Object.keys(TimeFunctions.getFields()).map((key) => `${field.field}_${key}`)), (_value, key) => key.substring(field.field.length + 1));
+						}
+					};
+					if (field.type === "dateTime" || field.type === "timestamp") acc[`${field.field}_func`] = {
+						type: DateTimeFunctions,
+						resolve: (obj) => {
+							return mapKeys(pick(obj, Object.keys(DateTimeFunctions.getFields()).map((key) => `${field.field}_${key}`)), (_value, key) => key.substring(field.field.length + 1));
+						}
+					};
+					if (field.type === "json" || field.type === "alias") acc[`${field.field}_func`] = {
+						type: CountFunctions,
+						resolve: (obj) => {
+							return mapKeys(pick(obj, Object.keys(CountFunctions.getFields()).map((key) => `${field.field}_${key}`)), (_value, key) => key.substring(field.field.length + 1));
+						}
+					};
 				}
 				return acc;
 			}, {})
 		});
-		if (scope === "items") {
-			VersionTypes[collection.collection] = CollectionTypes[collection.collection].clone(`version_${collection.collection}`);
-		}
+		if (scope === "items") VersionTypes[collection.collection] = CollectionTypes[collection.collection].clone(`version_${collection.collection}`);
 	}
-	for (const relation of schema[action].relations) {
-		if (relation.related_collection) {
-			if (SYSTEM_DENY_LIST.includes(relation.related_collection)) continue;
-			CollectionTypes[relation.collection]?.addFields({ [relation.field]: {
-				type: CollectionTypes[relation.related_collection],
+	for (const relation of schema[action].relations) if (relation.related_collection) {
+		if (SYSTEM_DENY_LIST.includes(relation.related_collection)) continue;
+		CollectionTypes[relation.collection]?.addFields({ [relation.field]: {
+			type: CollectionTypes[relation.related_collection],
+			resolve: (obj, _, __, info) => {
+				return obj[info?.path?.key ?? relation.field];
+			}
+		} });
+		VersionTypes[relation.collection]?.addFields({ [relation.field]: {
+			type: GraphQLJSON,
+			resolve: (obj, _, __, info) => {
+				return obj[info?.path?.key ?? relation.field];
+			}
+		} });
+		if (relation.meta?.one_field) {
+			CollectionTypes[relation.related_collection]?.addFields({ [relation.meta.one_field]: {
+				type: [CollectionTypes[relation.collection]],
 				resolve: (obj, _, __, info) => {
-					return obj[info?.path?.key ?? relation.field];
+					return obj[info?.path?.key ?? relation.meta.one_field];
 				}
 			} });
-			VersionTypes[relation.collection]?.addFields({ [relation.field]: {
+			if (scope === "items") VersionTypes[relation.related_collection]?.addFields({ [relation.meta.one_field]: {
 				type: GraphQLJSON,
 				resolve: (obj, _, __, info) => {
-					return obj[info?.path?.key ?? relation.field];
+					return obj[info?.path?.key ?? relation.meta.one_field];
 				}
 			} });
-			if (relation.meta?.one_field) {
-				CollectionTypes[relation.related_collection]?.addFields({ [relation.meta.one_field]: {
-					type: [CollectionTypes[relation.collection]],
-					resolve: (obj, _, __, info) => {
-						return obj[info?.path?.key ?? relation.meta.one_field];
-					}
-				} });
-				if (scope === "items") {
-					VersionTypes[relation.related_collection]?.addFields({ [relation.meta.one_field]: {
-						type: GraphQLJSON,
-						resolve: (obj, _, __, info) => {
-							return obj[info?.path?.key ?? relation.meta.one_field];
-						}
-					} });
+		}
+	} else if (relation.meta?.one_allowed_collections && action === "read") CollectionTypes[relation.collection]?.addFields({ [relation.field]: {
+		type: new GraphQLUnionType({
+			name: `${relation.collection}_${relation.field}_union`,
+			types: relation.meta.one_allowed_collections.map((collection) => CollectionTypes[collection].getType()),
+			resolveType(_value, context, info) {
+				let path = [];
+				let currentPath = info.path;
+				while (currentPath.prev) {
+					path.push(currentPath.key);
+					currentPath = currentPath.prev;
 				}
+				path = path.reverse().slice(0, -1);
+				let parent = context["data"];
+				for (const pathPart of path) parent = parent[pathPart];
+				return CollectionTypes[parent[relation.meta.one_collection_field]].getType().name;
 			}
-		} else if (relation.meta?.one_allowed_collections && action === "read") {
-			CollectionTypes[relation.collection]?.addFields({ [relation.field]: {
-				type: new GraphQLUnionType({
-					name: `${relation.collection}_${relation.field}_union`,
-					types: relation.meta.one_allowed_collections.map((collection) => CollectionTypes[collection].getType()),
-					resolveType(_value, context, info) {
-						let path = [];
-						let currentPath = info.path;
-						while (currentPath.prev) {
-							path.push(currentPath.key);
-							currentPath = currentPath.prev;
-						}
-						path = path.reverse().slice(0, -1);
-						let parent = context["data"];
-						for (const pathPart of path) {
-							parent = parent[pathPart];
-						}
-						const collection = parent[relation.meta.one_collection_field];
-						return CollectionTypes[collection].getType().name;
-					}
-				}),
-				resolve: (obj, _, __, info) => {
-					return obj[info?.path?.key ?? relation.field];
-				}
-			} });
+		}),
+		resolve: (obj, _, __, info) => {
+			return obj[info?.path?.key ?? relation.field];
 		}
-	}
+	} });
 	return {
 		CollectionTypes,
 		VersionTypes

package/dist/services/graphql/schema/index.js

@@ -27,8 +27,7 @@ const SYSTEM_DENY_LIST = [
 	"directus_extensions"
 ];
 const READ_ONLY = ["directus_activity", "directus_revisions"];
-const env = useEnv();
-const semaphore = new Semaphore(env["GRAPHQL_SCHEMA_GENERATION_MAX_CONCURRENT"] ?? 5);
+const semaphore = new Semaphore(useEnv()["GRAPHQL_SCHEMA_GENERATION_MAX_CONCURRENT"] ?? 5);
 /**
 * Generate the GraphQL schema. Pulls from the schema information generated by the get-schema util.
 */
@@ -42,45 +41,42 @@ async function generateSchema(gql, type = "schema") {
 		const schemaComposer = new SchemaComposer();
 		let schema;
 		const sanitizedSchema = sanitizeGraphqlSchema(gql.schema);
-		if (!gql.accountability || gql.accountability.admin) {
-			schema = {
-				read: sanitizedSchema,
-				create: sanitizedSchema,
-				update: sanitizedSchema,
-				delete: sanitizedSchema
-			};
-		} else {
-			schema = {
-				read: reduceSchema(sanitizedSchema, await fetchAllowedFieldMap({
-					accountability: gql.accountability,
-					action: "read"
-				}, {
-					schema: gql.schema,
-					knex: gql.knex
-				})),
-				create: reduceSchema(sanitizedSchema, await fetchAllowedFieldMap({
-					accountability: gql.accountability,
-					action: "create"
-				}, {
-					schema: gql.schema,
-					knex: gql.knex
-				})),
-				update: reduceSchema(sanitizedSchema, await fetchAllowedFieldMap({
-					accountability: gql.accountability,
-					action: "update"
-				}, {
-					schema: gql.schema,
-					knex: gql.knex
-				})),
-				delete: reduceSchema(sanitizedSchema, await fetchAllowedFieldMap({
-					accountability: gql.accountability,
-					action: "delete"
-				}, {
-					schema: gql.schema,
-					knex: gql.knex
-				}))
-			};
-		}
+		if (!gql.accountability || gql.accountability.admin) schema = {
+			read: sanitizedSchema,
+			create: sanitizedSchema,
+			update: sanitizedSchema,
+			delete: sanitizedSchema
+		};
+		else schema = {
+			read: reduceSchema(sanitizedSchema, await fetchAllowedFieldMap({
+				accountability: gql.accountability,
+				action: "read"
+			}, {
+				schema: gql.schema,
+				knex: gql.knex
+			})),
+			create: reduceSchema(sanitizedSchema, await fetchAllowedFieldMap({
+				accountability: gql.accountability,
+				action: "create"
+			}, {
+				schema: gql.schema,
+				knex: gql.knex
+			})),
+			update: reduceSchema(sanitizedSchema, await fetchAllowedFieldMap({
+				accountability: gql.accountability,
+				action: "update"
+			}, {
+				schema: gql.schema,
+				knex: gql.knex
+			})),
+			delete: reduceSchema(sanitizedSchema, await fetchAllowedFieldMap({
+				accountability: gql.accountability,
+				action: "delete"
+			}, {
+				schema: gql.schema,
+				knex: gql.knex
+			}))
+		};
 		const inconsistentFields = {
 			read: await fetchInconsistentFieldMap({
 				accountability: gql.accountability,
@@ -127,58 +123,44 @@ async function generateSchema(gql, type = "schema") {
 			}
 			return true;
 		};
-		if (gql.scope === "system") {
-			injectSystemResolvers(gql, schemaComposer, CollectionTypes, schema);
-		}
+		if (gql.scope === "system") injectSystemResolvers(gql, schemaComposer, CollectionTypes, schema);
 		const readableCollections = Object.values(schema.read.collections).filter((collection) => collection.collection in ReadCollectionTypes).filter(scopeFilter);
-		if (readableCollections.length > 0) {
-			schemaComposer.Query.addFields(readableCollections.reduce((acc, collection) => {
-				const collectionName = gql.scope === "items" ? collection.collection : collection.collection.substring(9);
-				acc[collectionName] = ReadCollectionTypes[collection.collection].getResolver(collection.collection);
-				if (gql.schema.collections[collection.collection].singleton === false) {
-					acc[`${collectionName}_by_id`] = ReadCollectionTypes[collection.collection].getResolver(`${collection.collection}_by_id`);
-					acc[`${collectionName}_aggregated`] = ReadCollectionTypes[collection.collection].getResolver(`${collection.collection}_aggregated`);
-				}
-				if (gql.scope === "items") {
-					acc[`${collectionName}_by_version`] = VersionCollectionTypes[collection.collection].getResolver(`${collection.collection}_by_version`);
-				}
-				return acc;
-			}, {}));
-		} else {
-			schemaComposer.Query.addFields({ _empty: {
-				type: GraphQLVoid,
-				description: "There's no data to query."
-			} });
-		}
-		if (Object.keys(schema.create.collections).length > 0) {
-			schemaComposer.Mutation.addFields(Object.values(schema.create.collections).filter((collection) => collection.collection in CreateCollectionTypes && collection.singleton === false).filter(scopeFilter).filter((collection) => READ_ONLY.includes(collection.collection) === false).reduce((acc, collection) => {
-				const collectionName = gql.scope === "items" ? collection.collection : collection.collection.substring(9);
-				acc[`create_${collectionName}_items`] = CreateCollectionTypes[collection.collection].getResolver(`create_${collection.collection}_items`);
-				acc[`create_${collectionName}_item`] = CreateCollectionTypes[collection.collection].getResolver(`create_${collection.collection}_item`);
-				return acc;
-			}, {}));
-		}
-		if (Object.keys(schema.update.collections).length > 0) {
-			schemaComposer.Mutation.addFields(Object.values(schema.update.collections).filter((collection) => collection.collection in UpdateCollectionTypes).filter(scopeFilter).filter((collection) => READ_ONLY.includes(collection.collection) === false).reduce((acc, collection) => {
-				const collectionName = gql.scope === "items" ? collection.collection : collection.collection.substring(9);
-				if (collection.singleton) {
-					acc[`update_${collectionName}`] = UpdateCollectionTypes[collection.collection].getResolver(`update_${collection.collection}`);
-				} else {
-					acc[`update_${collectionName}_items`] = UpdateCollectionTypes[collection.collection].getResolver(`update_${collection.collection}_items`);
-					acc[`update_${collectionName}_batch`] = UpdateCollectionTypes[collection.collection].getResolver(`update_${collection.collection}_batch`);
-					acc[`update_${collectionName}_item`] = UpdateCollectionTypes[collection.collection].getResolver(`update_${collection.collection}_item`);
-				}
-				return acc;
-			}, {}));
-		}
-		if (Object.keys(schema.delete.collections).length > 0) {
-			schemaComposer.Mutation.addFields(Object.values(schema.delete.collections).filter((collection) => collection.singleton === false).filter(scopeFilter).filter((collection) => READ_ONLY.includes(collection.collection) === false).reduce((acc, collection) => {
-				const collectionName = gql.scope === "items" ? collection.collection : collection.collection.substring(9);
-				acc[`delete_${collectionName}_items`] = DeleteCollectionTypes["many"].getResolver(`delete_${collection.collection}_items`);
-				acc[`delete_${collectionName}_item`] = DeleteCollectionTypes["one"].getResolver(`delete_${collection.collection}_item`);
-				return acc;
-			}, {}));
-		}
+		if (readableCollections.length > 0) schemaComposer.Query.addFields(readableCollections.reduce((acc, collection) => {
+			const collectionName = gql.scope === "items" ? collection.collection : collection.collection.substring(9);
+			acc[collectionName] = ReadCollectionTypes[collection.collection].getResolver(collection.collection);
+			if (gql.schema.collections[collection.collection].singleton === false) {
+				acc[`${collectionName}_by_id`] = ReadCollectionTypes[collection.collection].getResolver(`${collection.collection}_by_id`);
+				acc[`${collectionName}_aggregated`] = ReadCollectionTypes[collection.collection].getResolver(`${collection.collection}_aggregated`);
+			}
+			if (gql.scope === "items") acc[`${collectionName}_by_version`] = VersionCollectionTypes[collection.collection].getResolver(`${collection.collection}_by_version`);
+			return acc;
+		}, {}));
+		else schemaComposer.Query.addFields({ _empty: {
+			type: GraphQLVoid,
+			description: "There's no data to query."
+		} });
+		if (Object.keys(schema.create.collections).length > 0) schemaComposer.Mutation.addFields(Object.values(schema.create.collections).filter((collection) => collection.collection in CreateCollectionTypes && collection.singleton === false).filter(scopeFilter).filter((collection) => READ_ONLY.includes(collection.collection) === false).reduce((acc, collection) => {
+			const collectionName = gql.scope === "items" ? collection.collection : collection.collection.substring(9);
+			acc[`create_${collectionName}_items`] = CreateCollectionTypes[collection.collection].getResolver(`create_${collection.collection}_items`);
+			acc[`create_${collectionName}_item`] = CreateCollectionTypes[collection.collection].getResolver(`create_${collection.collection}_item`);
+			return acc;
+		}, {}));
+		if (Object.keys(schema.update.collections).length > 0) schemaComposer.Mutation.addFields(Object.values(schema.update.collections).filter((collection) => collection.collection in UpdateCollectionTypes).filter(scopeFilter).filter((collection) => READ_ONLY.includes(collection.collection) === false).reduce((acc, collection) => {
+			const collectionName = gql.scope === "items" ? collection.collection : collection.collection.substring(9);
+			if (collection.singleton) acc[`update_${collectionName}`] = UpdateCollectionTypes[collection.collection].getResolver(`update_${collection.collection}`);
+			else {
+				acc[`update_${collectionName}_items`] = UpdateCollectionTypes[collection.collection].getResolver(`update_${collection.collection}_items`);
+				acc[`update_${collectionName}_batch`] = UpdateCollectionTypes[collection.collection].getResolver(`update_${collection.collection}_batch`);
+				acc[`update_${collectionName}_item`] = UpdateCollectionTypes[collection.collection].getResolver(`update_${collection.collection}_item`);
+			}
+			return acc;
+		}, {}));
+		if (Object.keys(schema.delete.collections).length > 0) schemaComposer.Mutation.addFields(Object.values(schema.delete.collections).filter((collection) => collection.singleton === false).filter(scopeFilter).filter((collection) => READ_ONLY.includes(collection.collection) === false).reduce((acc, collection) => {
+			const collectionName = gql.scope === "items" ? collection.collection : collection.collection.substring(9);
+			acc[`delete_${collectionName}_items`] = DeleteCollectionTypes["many"].getResolver(`delete_${collection.collection}_items`);
+			acc[`delete_${collectionName}_item`] = DeleteCollectionTypes["one"].getResolver(`delete_${collection.collection}_item`);
+			return acc;
+		}, {}));
 		if (type === "sdl") {
 			const sdl = schemaComposer.toSDL();
 			cache.set(key, sdl);

package/dist/services/graphql/schema/parse-args.js

@@ -22,8 +22,7 @@ function parseArgs(args, variableValues) {
 			default: return "value" in node ? node.value : null;
 		}
 	};
-	const argsObject = Object.fromEntries(args["map"]((arg) => [arg.name.value, parse(arg.value)]));
-	return argsObject;
+	return Object.fromEntries(args["map"]((arg) => [arg.name.value, parse(arg.value)]));
 }
 
 //#endregion

package/dist/services/graphql/schema/parse-query.js

@@ -18,9 +18,7 @@ async function getQuery(rawQuery, schema, selections, variableValues, accountabi
 		const aliases = {};
 		for (const selection of selections$1) {
 			if (selection.kind !== "Field") continue;
-			if (selection.alias?.value) {
-				aliases[selection.alias.value] = selection.name.value;
-			}
+			if (selection.alias?.value) aliases[selection.alias.value] = selection.name.value;
 		}
 		return aliases;
 	};
@@ -34,8 +32,7 @@ async function getQuery(rawQuery, schema, selections, variableValues, accountabi
 			let childCollection = currentCollection;
 			if (selection.kind === "InlineFragment") {
 				if (selection.typeCondition.name.value.startsWith("__")) continue;
-				const isM2A = getRelationInfo(schema.relations, currentCollection, parentFieldName).relationType === "a2o";
-				if (isM2A) {
+				if (getRelationInfo(schema.relations, currentCollection, parentFieldName).relationType === "a2o") {
 					current = `${parent}:${selection.typeCondition.name.value}`;
 					childCollection = selection.typeCondition.name.value;
 				} else {
@@ -46,9 +43,7 @@ async function getQuery(rawQuery, schema, selections, variableValues, accountabi
 			} else {
 				if (selection.name.value.startsWith("__")) continue;
 				current = selection.name.value;
-				if (selection.alias) {
-					currentAlias = selection.alias.value;
-				}
+				if (selection.alias) currentAlias = selection.alias.value;
 				if (parent) {
 					current = `${parent}.${current}`;
 					if (currentAlias) {
@@ -60,9 +55,7 @@ async function getQuery(rawQuery, schema, selections, variableValues, accountabi
 						}
 					}
 				}
-				if (currentCollection && selection.selectionSet) {
-					childCollection = getRelatedCollection(schema, currentCollection, selection.name.value) ?? currentCollection;
-				}
+				if (currentCollection && selection.selectionSet) childCollection = getRelatedCollection(schema, currentCollection, selection.name.value) ?? currentCollection;
 			}
 			if (selection.selectionSet) {
 				let children;
@@ -74,13 +67,9 @@ async function getQuery(rawQuery, schema, selections, variableValues, accountabi
 						if (subSelection.name.value.startsWith("__")) continue;
 						children.push(`${subSelection.name.value}(${rootField})`);
 					}
-				} else {
-					children = await parseFields(selection.selectionSet.selections, currentAlias ?? current, childCollection, selection.kind === "Field" ? selection.name.value : undefined);
-				}
+				} else children = await parseFields(selection.selectionSet.selections, currentAlias ?? current, childCollection, selection.kind === "Field" ? selection.name.value : void 0);
 				fields.push(...children);
-			} else {
-				fields.push(current);
-			}
+			} else fields.push(current);
 			if (selection.kind === "Field" && selection.arguments && selection.arguments.length > 0) {
 				if (!query.deep) query.deep = {};
 				const args = parseArgs(selection.arguments, variableValues);
@@ -91,13 +80,11 @@ async function getQuery(rawQuery, schema, selections, variableValues, accountabi
 		return uniq(fields);
 	};
 	query.alias = parseAliases(selections);
-	query.fields = await parseFields(selections, undefined, collection);
+	query.fields = await parseFields(selections, void 0, collection);
 	if (query.filter) query.filter = replaceFuncs(query.filter);
 	query.deep = replaceFuncs(query.deep);
 	if (collection) {
-		if (query.filter) {
-			query.filter = filterReplaceM2A(query.filter, collection, schema, { aliasMap: query.alias });
-		}
+		if (query.filter) query.filter = filterReplaceM2A(query.filter, collection, schema, { aliasMap: query.alias });
 		query.deep = filterReplaceM2ADeep(query.deep, collection, schema, { aliasMap: query.alias });
 	}
 	validateQuery(query);