@directus/api 35.0.2 → 35.1.0

package/dist/services/files/lib/extract-metadata.js

@@ -7,26 +7,13 @@ async function extractMetadata(storageLocation, data) {
 	const storage = await getStorage();
 	const fileMeta = {};
 	if (data.type && SUPPORTED_IMAGE_METADATA_FORMATS.includes(data.type)) {
-		const stream = await storage.location(storageLocation).read(data.filename_disk);
-		const { height, width, description, title, tags, metadata } = await getMetadata(stream);
-		if (!data.height && height) {
-			fileMeta.height = height;
-		}
-		if (!data.width && width) {
-			fileMeta.width = width;
-		}
-		if (!data.metadata && metadata) {
-			fileMeta.metadata = metadata;
-		}
-		if (!data.description && description) {
-			fileMeta.description = description;
-		}
-		if (!data.title && title) {
-			fileMeta.title = title;
-		}
-		if (!data.tags && tags) {
-			fileMeta.tags = tags;
-		}
+		const { height, width, description, title, tags, metadata } = await getMetadata(await storage.location(storageLocation).read(data.filename_disk));
+		if (!data.height && height) fileMeta.height = height;
+		if (!data.width && width) fileMeta.width = width;
+		if (!data.metadata && metadata) fileMeta.metadata = metadata;
+		if (!data.description && description) fileMeta.description = description;
+		if (!data.title && title) fileMeta.title = title;
+		if (!data.tags && tags) fileMeta.tags = tags;
 	}
 	return fileMeta;
 }

package/dist/services/files/utils/get-metadata.js

@@ -27,74 +27,41 @@ async function getMetadata(stream, allowList = env["FILE_METADATA_ALLOW_LIST"])
 				metadata.height = sharpMetadata.height ?? null;
 			}
 			const fullMetadata = {};
-			if (sharpMetadata.exif) {
-				try {
-					const { Image, ThumbnailTags, Iop, GPSInfo, Photo } = exif(sharpMetadata.exif);
-					if (Image) {
-						fullMetadata.ifd0 = Image;
-					}
-					if (ThumbnailTags) {
-						fullMetadata.ifd1 = ThumbnailTags;
-					}
-					if (Iop) {
-						fullMetadata.interop = Iop;
-					}
-					if (GPSInfo) {
-						fullMetadata.gps = GPSInfo;
-					}
-					if (Photo) {
-						fullMetadata.exif = Photo;
-					}
-				} catch (err$1) {
-					logger.warn(`Couldn't extract Exif metadata from file`);
-					logger.warn(err$1);
-				}
+			if (sharpMetadata.exif) try {
+				const { Image, ThumbnailTags, Iop, GPSInfo, Photo } = exif(sharpMetadata.exif);
+				if (Image) fullMetadata.ifd0 = Image;
+				if (ThumbnailTags) fullMetadata.ifd1 = ThumbnailTags;
+				if (Iop) fullMetadata.interop = Iop;
+				if (GPSInfo) fullMetadata.gps = GPSInfo;
+				if (Photo) fullMetadata.exif = Photo;
+			} catch (err$1) {
+				logger.warn(`Couldn't extract Exif metadata from file`);
+				logger.warn(err$1);
 			}
-			if (sharpMetadata.icc) {
-				try {
-					fullMetadata.icc = parse(sharpMetadata.icc);
-				} catch (err$1) {
-					logger.warn(`Couldn't extract ICC profile data from file`);
-					logger.warn(err$1);
-				}
+			if (sharpMetadata.icc) try {
+				fullMetadata.icc = parse(sharpMetadata.icc);
+			} catch (err$1) {
+				logger.warn(`Couldn't extract ICC profile data from file`);
+				logger.warn(err$1);
 			}
-			if (sharpMetadata.iptc) {
-				try {
-					fullMetadata.iptc = parseIptc(sharpMetadata.iptc);
-				} catch (err$1) {
-					logger.warn(`Couldn't extract IPTC Photo Metadata from file`);
-					logger.warn(err$1);
-				}
+			if (sharpMetadata.iptc) try {
+				fullMetadata.iptc = parseIptc(sharpMetadata.iptc);
+			} catch (err$1) {
+				logger.warn(`Couldn't extract IPTC Photo Metadata from file`);
+				logger.warn(err$1);
 			}
-			if (sharpMetadata.xmp) {
-				try {
-					fullMetadata.xmp = parseXmp(sharpMetadata.xmp);
-				} catch (err$1) {
-					logger.warn(`Couldn't extract XMP data from file`);
-					logger.warn(err$1);
-				}
-			}
-			if (fullMetadata?.iptc?.["caption"] && typeof fullMetadata.iptc["caption"] === "string") {
-				metadata.description = fullMetadata.iptc["caption"];
-			}
-			if (fullMetadata?.iptc?.["headline"] && typeof fullMetadata.iptc["headline"] === "string") {
-				metadata.title = fullMetadata.iptc["headline"];
-			}
-			if (fullMetadata?.iptc?.["keywords"]) {
-				metadata.tags = fullMetadata.iptc["keywords"];
-			}
-			if (allowList === "*" || allowList?.[0] === "*") {
-				metadata.metadata = fullMetadata;
-			} else {
-				metadata.metadata = pick(fullMetadata, allowList);
-			}
-			for (const section of Object.keys(metadata.metadata)) {
-				for (const [key, value] of Object.entries(metadata.metadata[section])) {
-					if (typeof value === "string") {
-						metadata.metadata[section][key] = value.trim();
-					}
-				}
+			if (sharpMetadata.xmp) try {
+				fullMetadata.xmp = parseXmp(sharpMetadata.xmp);
+			} catch (err$1) {
+				logger.warn(`Couldn't extract XMP data from file`);
+				logger.warn(err$1);
 			}
+			if (fullMetadata?.iptc?.["caption"] && typeof fullMetadata.iptc["caption"] === "string") metadata.description = fullMetadata.iptc["caption"];
+			if (fullMetadata?.iptc?.["headline"] && typeof fullMetadata.iptc["headline"] === "string") metadata.title = fullMetadata.iptc["headline"];
+			if (fullMetadata?.iptc?.["keywords"]) metadata.tags = fullMetadata.iptc["keywords"];
+			if (allowList === "*" || allowList?.[0] === "*") metadata.metadata = fullMetadata;
+			else metadata.metadata = pick(fullMetadata, allowList);
+			for (const section of Object.keys(metadata.metadata)) for (const [key, value] of Object.entries(metadata.metadata[section])) if (typeof value === "string") metadata.metadata[section][key] = value.trim();
 			resolve(metadata);
 		}));
 	});

package/dist/services/files/utils/parse-image-metadata.js

@@ -23,20 +23,12 @@ function parseIptc(buffer) {
 		const iptcBlockDataPos = iptcBlockSizePos + 2;
 		const iptcBlockType = buffer.readUInt8(iptcBlockTypePos);
 		const iptcBlockSize = buffer.readUInt16BE(iptcBlockSizePos);
-		if (!IPTC_ENTRY_TYPES.has(iptcBlockType)) {
-			continue;
-		}
+		if (!IPTC_ENTRY_TYPES.has(iptcBlockType)) continue;
 		const iptcBlockTypeId = IPTC_ENTRY_TYPES.get(iptcBlockType);
 		const iptcData = buffer.subarray(iptcBlockDataPos, iptcBlockDataPos + iptcBlockSize).toString();
-		if (iptcBlockTypeId) {
-			if (iptc[iptcBlockTypeId] == null) {
-				iptc[iptcBlockTypeId] = iptcData;
-			} else if (Array.isArray(iptc[iptcBlockTypeId])) {
-				iptc[iptcBlockTypeId].push(iptcData);
-			} else {
-				iptc[iptcBlockTypeId] = [iptc[iptcBlockTypeId], iptcData];
-			}
-		}
+		if (iptcBlockTypeId) if (iptc[iptcBlockTypeId] == null) iptc[iptcBlockTypeId] = iptcData;
+		else if (Array.isArray(iptc[iptcBlockTypeId])) iptc[iptcBlockTypeId].push(iptcData);
+		else iptc[iptcBlockTypeId] = [iptc[iptcBlockTypeId], iptcData];
 	}
 	return iptc;
 }
@@ -49,10 +41,8 @@ function parseXmp(buffer) {
 		"creator",
 		"subject"
 	].forEach((x) => {
-		const tagRegex = new RegExp(`<dc:${x}>(.*?)</dc:${x}>`, "smig"), tagMatches = tagRegex.exec(buffer.toString());
-		if (!tagMatches || tagMatches.length === 0) {
-			return;
-		}
+		const tagMatches = new RegExp(`<dc:${x}>(.*?)</dc:${x}>`, "smig").exec(buffer.toString());
+		if (!tagMatches || tagMatches.length === 0) return;
 		const value = tagMatches[1]?.trim();
 		if (value?.toLowerCase().indexOf("<rdf:bag>") === 0) {
 			const r = new RegExp("<rdf:li>(.*?)</rdf:li>", "smig");
@@ -63,9 +53,7 @@ function parseXmp(buffer) {
 				match = r.exec(value);
 			}
 			xmp[x] = result;
-		} else {
-			xmp[x] = value?.replace(/<[^>]*>?/gm, "").trim();
-		}
+		} else xmp[x] = value?.replace(/<[^>]*>?/gm, "").trim();
 	});
 	return xmp;
 }

package/dist/services/files.js

@@ -44,13 +44,8 @@ var FilesService = class FilesService extends ItemsService {
 	*/
 	async checkUniqueFilename(filename, excludeId) {
 		const query = this.knex.select("filename_disk").from("directus_files").where({ filename_disk: filename });
-		if (excludeId) {
-			query.whereNot("id", excludeId);
-		}
-		const existingFile = await query.first();
-		if (existingFile) {
-			throw new ForbiddenError();
-		}
+		if (excludeId) query.whereNot("id", excludeId);
+		if (await query.first()) throw new ForbiddenError();
 	}
 	/**
 	* Upload a single new file to the configured storage adapter
@@ -58,9 +53,7 @@ var FilesService = class FilesService extends ItemsService {
 	async uploadOne(stream, data, primaryKey, opts) {
 		const storage = await getStorage();
 		let existingFile = null;
-		if (primaryKey !== undefined) {
-			existingFile = await this.knex.select("folder", "filename_download", "filename_disk", "title", "description", "metadata", "storage").from("directus_files").where({ id: primaryKey }).first() ?? null;
-		}
+		if (primaryKey !== void 0) existingFile = await this.knex.select("folder", "filename_download", "filename_disk", "title", "description", "metadata", "storage").from("directus_files").where({ id: primaryKey }).first() ?? null;
 		const payload = {
 			storage: toArray(env["STORAGE_LOCATIONS"])[0],
 			...existingFile ?? {},
@@ -69,104 +62,76 @@ var FilesService = class FilesService extends ItemsService {
 		const disk = storage.location(payload.storage);
 		if ("folder" in payload === false) {
 			const settings = await this.knex.select("storage_default_folder").from("directus_settings").first();
-			if (settings?.storage_default_folder) {
-				payload.folder = settings.storage_default_folder;
-			}
-		}
-		const isReplacement = existingFile !== null && primaryKey !== undefined;
-		if (isReplacement === false || primaryKey === undefined) {
-			primaryKey = await this.createOne(payload, { emitEvents: false });
+			if (settings?.storage_default_folder) payload.folder = settings.storage_default_folder;
 		}
+		const isReplacement = existingFile !== null && primaryKey !== void 0;
+		if (isReplacement === false || primaryKey === void 0) primaryKey = await this.createOne(payload, { emitEvents: false });
 		const fileExtension = path.extname(payload.filename_download) || payload.type && "." + extension(payload.type) || "";
 		const filenameDisk = primaryKey + (fileExtension || "");
 		payload.filename_disk ||= filenameDisk;
-		if (isReplacement === true && path.extname(payload.filename_disk) !== fileExtension) {
-			payload.filename_disk = filenameDisk;
-		}
+		if (isReplacement === true && path.extname(payload.filename_disk) !== fileExtension) payload.filename_disk = filenameDisk;
 		const tempFilenameDisk = "temp_" + filenameDisk;
-		if (!payload.type) {
-			payload.type = "application/octet-stream";
-		}
+		if (!payload.type) payload.type = "application/octet-stream";
 		const cleanUp = async () => {
 			try {
-				if (isReplacement === true) {
-					await disk.delete(tempFilenameDisk);
-				} else {
+				if (isReplacement === true) await disk.delete(tempFilenameDisk);
+				else {
 					await super.deleteMany([primaryKey]);
 					await disk.delete(payload.filename_disk);
 				}
 			} catch (err) {
-				if (isReplacement === true) {
-					logger.warn(`Couldn't delete temp file ${tempFilenameDisk}`);
-				} else {
-					logger.warn(`Couldn't delete file ${payload.filename_disk}`);
-				}
+				if (isReplacement === true) logger.warn(`Couldn't delete temp file ${tempFilenameDisk}`);
+				else logger.warn(`Couldn't delete file ${payload.filename_disk}`);
 				logger.warn(err);
 			}
 		};
 		try {
-			if (isReplacement === true) {
-				await disk.write(tempFilenameDisk, stream, payload.type);
-			} else {
-				await disk.write(payload.filename_disk, stream, payload.type);
-			}
-			if ("truncated" in stream && stream.truncated === true) {
-				throw new ContentTooLargeError();
-			}
+			if (isReplacement === true) await disk.write(tempFilenameDisk, stream, payload.type);
+			else await disk.write(payload.filename_disk, stream, payload.type);
+			if ("truncated" in stream && stream.truncated === true) throw new ContentTooLargeError();
 		} catch (err) {
 			logger.warn(`Couldn't save file ${payload.filename_disk}`);
 			logger.warn(err);
 			await cleanUp();
-			if (err instanceof ContentTooLargeError) {
-				throw err;
-			} else if (err?.code && [
+			if (err instanceof ContentTooLargeError) throw err;
+			else if (err?.code && [
 				"EROFS",
 				"EACCES",
 				"EPERM"
-			].includes(err.code)) {
-				throw new InternalServerError();
-			} else {
-				throw new ServiceUnavailableError({
-					service: "files",
-					reason: `Couldn't save file ${payload.filename_disk}`
-				});
-			}
+			].includes(err.code)) throw new InternalServerError();
+			else throw new ServiceUnavailableError({
+				service: "files",
+				reason: `Couldn't save file ${payload.filename_disk}`
+			});
 		}
-		if (isReplacement === true) {
-			try {
-				await this.updateOne(primaryKey, payload, { emitEvents: false });
-				for await (const filepath of disk.list(String(primaryKey))) {
-					await disk.delete(filepath);
-				}
-				await disk.move(tempFilenameDisk, payload.filename_disk);
-			} catch (err) {
-				await cleanUp();
-				throw err;
-			}
+		if (isReplacement === true) try {
+			await this.updateOne(primaryKey, payload, { emitEvents: false });
+			for await (const filepath of disk.list(String(primaryKey))) await disk.delete(filepath);
+			await disk.move(tempFilenameDisk, payload.filename_disk);
+		} catch (err) {
+			await cleanUp();
+			throw err;
 		}
 		const { size } = await storage.location(payload.storage).stat(payload.filename_disk);
 		payload.filesize = size;
 		const metadata = await extractMetadata(payload.storage, payload);
-		payload.uploaded_on = new Date().toISOString();
-		const sudoFilesItemsService = new ItemsService("directus_files", {
+		payload.uploaded_on = (/* @__PURE__ */ new Date()).toISOString();
+		await new ItemsService("directus_files", {
 			knex: this.knex,
 			schema: this.schema
-		});
-		await sudoFilesItemsService.updateOne(primaryKey, {
+		}).updateOne(primaryKey, {
 			...payload,
 			...metadata
 		}, { emitEvents: false });
-		if (opts?.emitEvents !== false) {
-			emitter_default.emitAction("files.upload", {
-				payload,
-				key: primaryKey,
-				collection: this.collection
-			}, {
-				database: this.knex,
-				schema: this.schema,
-				accountability: this.accountability
-			});
-		}
+		if (opts?.emitEvents !== false) emitter_default.emitAction("files.upload", {
+			payload,
+			key: primaryKey,
+			collection: this.collection
+		}, {
+			database: this.knex,
+			schema: this.schema,
+			accountability: this.accountability
+		});
 		return primaryKey;
 	}
 	/**
@@ -176,20 +141,17 @@ var FilesService = class FilesService extends ItemsService {
 	* Import a single file from an external URL
 	*/
 	async importOne(importURL, body, options = {}) {
-		if (this.accountability) {
-			await validateAccess({
-				accountability: this.accountability,
-				action: "create",
-				collection: "directus_files"
-			}, {
-				knex: this.knex,
-				schema: this.schema
-			});
-		}
+		if (this.accountability) await validateAccess({
+			accountability: this.accountability,
+			action: "create",
+			collection: "directus_files"
+		}, {
+			knex: this.knex,
+			schema: this.schema
+		});
 		let fileResponse;
 		try {
-			const axios = await getAxios();
-			fileResponse = await axios.get(encodeURL(importURL), {
+			fileResponse = await (await getAxios()).get(encodeURL(importURL), {
 				responseType: "stream",
 				decompress: false
 			});
@@ -204,17 +166,10 @@ var FilesService = class FilesService extends ItemsService {
 		const parsedURL = url.parse(fileResponse.request.res.responseUrl);
 		const filename = decodeURI(path.basename(parsedURL.pathname));
 		const mimeType = fileResponse.headers["content-type"]?.split(";")[0]?.trim() || "application/octet-stream";
-		const globalAllowedPatterns = toArray(env["FILES_MIME_TYPE_ALLOW_LIST"]);
-		const globalMimeTypeAllowed = globalAllowedPatterns.some((pattern) => minimatch(mimeType, pattern));
-		if (globalMimeTypeAllowed === false) {
-			throw new InvalidPayloadError({ reason: `File content type "${mimeType}" is not allowed for upload by your global file type restrictions` });
-		}
+		if (toArray(env["FILES_MIME_TYPE_ALLOW_LIST"]).some((pattern) => minimatch(mimeType, pattern)) === false) throw new InvalidPayloadError({ reason: `File content type "${mimeType}" is not allowed for upload by your global file type restrictions` });
 		const { filterMimeType } = options;
 		if (filterMimeType && filterMimeType.length > 0) {
-			const interfaceMimeTypeAllowed = filterMimeType.some((pattern) => minimatch(mimeType, pattern));
-			if (interfaceMimeTypeAllowed === false) {
-				throw new InvalidPayloadError({ reason: `File content type "${mimeType}" is not allowed for upload by this field's file type restrictions` });
-			}
+			if (filterMimeType.some((pattern) => minimatch(mimeType, pattern)) === false) throw new InvalidPayloadError({ reason: `File content type "${mimeType}" is not allowed for upload by this field's file type restrictions` });
 		}
 		const payload = {
 			filename_download: filename,
@@ -228,9 +183,7 @@ var FilesService = class FilesService extends ItemsService {
 	* Create a file
 	*/
 	async createOne(data, opts = {}) {
-		if (!data.type) {
-			throw new InvalidPayloadError({ reason: `"type" is required` });
-		}
+		if (!data.type) throw new InvalidPayloadError({ reason: `"type" is required` });
 		if (data.filename_disk) {
 			data.filename_disk = this.generateFilenamePath(data.filename_disk);
 			try {
@@ -239,8 +192,7 @@ var FilesService = class FilesService extends ItemsService {
 				opts.preMutationError = err;
 			}
 		}
-		const key = await super.createOne(data, opts);
-		return key;
+		return await super.createOne(data, opts);
 	}
 	/**
 	* Update many files
@@ -257,61 +209,52 @@ var FilesService = class FilesService extends ItemsService {
 				knex: this.knex,
 				schema: this.schema
 			});
-			const updatedFiles = new Map();
+			const updatedFiles = /* @__PURE__ */ new Map();
 			const changedFiles = await sudoFilesItemsService.readMany(keys, { fields: [
 				"id",
 				"storage",
 				"filename_disk"
 			] });
-			for (const file of changedFiles) {
-				updatedFiles.set(file.id, file);
-			}
-			for (const key of keys) {
-				await transaction(this.knex, async (trx) => {
-					const filesItemService = new ItemsService(this.collection, {
-						knex: trx,
-						schema: this.schema,
-						accountability: this.accountability
-					});
-					await filesItemService.updateMany([key], data, opts);
-					if (data.filename_disk) {
-						const storage = await getStorage();
-						const file = updatedFiles.get(key);
-						if (!file || !file.filename_disk) return;
-						const existingFilePath = this.generateFilenamePath(file.filename_disk);
-						if (existingFilePath === data.filename_disk) return;
-						const disk = storage.location(file["storage"]);
-						const { name: filePrefix, dir: fileDir } = path.parse(existingFilePath);
-						const updatedFilePath = this.generateFilenamePath(data.filename_disk);
-						const remoteFileExists = await disk.exists(data.filename_disk);
-						const filePrefixPath = fileDir ? normalizePath(path.join(fileDir, filePrefix)) : filePrefix;
-						for await (const filePath of disk.list(filePrefixPath)) {
-							/**
-							* If the remote file exists, repoint the primary asset to it (i.e. db update only).
-							* If the remote file does not exist, move the primary asset to location.
-							*
-							* NOTE
-							* - On repoint the original asset will be deleted if `FILES_DELETE_ORIGINAL_ON_MOVE` is true.
-							* - Any associated generated assets are deleted.
-							*/
-							if (filePath === existingFilePath) {
-								if (!remoteFileExists) {
-									await disk.move(filePath, updatedFilePath);
-									continue;
-								} else if (toBoolean(env["FILES_DELETE_ORIGINAL_ON_MOVE"]) === false) {
-									continue;
-								}
-							}
-							await disk.delete(filePath);
+			for (const file of changedFiles) updatedFiles.set(file.id, file);
+			for (const key of keys) await transaction(this.knex, async (trx) => {
+				await new ItemsService(this.collection, {
+					knex: trx,
+					schema: this.schema,
+					accountability: this.accountability
+				}).updateMany([key], data, opts);
+				if (data.filename_disk) {
+					const storage = await getStorage();
+					const file = updatedFiles.get(key);
+					if (!file || !file.filename_disk) return;
+					const existingFilePath = this.generateFilenamePath(file.filename_disk);
+					if (existingFilePath === data.filename_disk) return;
+					const disk = storage.location(file["storage"]);
+					const { name: filePrefix, dir: fileDir } = path.parse(existingFilePath);
+					const updatedFilePath = this.generateFilenamePath(data.filename_disk);
+					const remoteFileExists = await disk.exists(data.filename_disk);
+					const filePrefixPath = fileDir ? normalizePath(path.join(fileDir, filePrefix)) : filePrefix;
+					for await (const filePath of disk.list(filePrefixPath)) {
+						/**
+						* If the remote file exists, repoint the primary asset to it (i.e. db update only).
+						* If the remote file does not exist, move the primary asset to location.
+						*
+						* NOTE
+						* - On repoint the original asset will be deleted if `FILES_DELETE_ORIGINAL_ON_MOVE` is true.
+						* - Any associated generated assets are deleted.
+						*/
+						if (filePath === existingFilePath) {
+							if (!remoteFileExists) {
+								await disk.move(filePath, updatedFilePath);
+								continue;
+							} else if (toBoolean(env["FILES_DELETE_ORIGINAL_ON_MOVE"]) === false) continue;
 						}
+						await disk.delete(filePath);
 					}
-				});
-			}
+				}
+			});
 			return keys;
 		}
-		if (keys.length > 1 && data.filename_disk) {
-			opts.preMutationError = new InvalidPayloadError({ reason: "\"filename_disk\" cannot be modified in bulk operations" });
-		}
+		if (keys.length > 1 && data.filename_disk) opts.preMutationError = new InvalidPayloadError({ reason: "\"filename_disk\" cannot be modified in bulk operations" });
 		await super.updateMany(keys, data, opts);
 		return keys;
 	}
@@ -320,11 +263,10 @@ var FilesService = class FilesService extends ItemsService {
 	*/
 	async deleteMany(keys) {
 		const storage = await getStorage();
-		const sudoFilesItemsService = new FilesService({
+		const files = await new FilesService({
 			knex: this.knex,
 			schema: this.schema
-		});
-		const files = await sudoFilesItemsService.readMany(keys, {
+		}).readMany(keys, {
 			fields: [
 				"id",
 				"storage",
@@ -336,9 +278,7 @@ var FilesService = class FilesService extends ItemsService {
 		for (const file of files) {
 			const disk = storage.location(file["storage"]);
 			const filePrefix = path.parse(file["filename_disk"]).name;
-			for await (const filepath of disk.list(filePrefix)) {
-				await disk.delete(filepath);
-			}
+			for await (const filepath of disk.list(filePrefix)) await disk.delete(filepath);
 		}
 		return keys;
 	}
@@ -346,13 +286,9 @@ var FilesService = class FilesService extends ItemsService {
 		const filteredQuery = cloneDeep(query);
 		if (RESUMABLE_UPLOADS.ENABLED === true) {
 			const filterPartialUploads = { tus_id: { _null: true } };
-			if (!filteredQuery.filter) {
-				filteredQuery.filter = filterPartialUploads;
-			} else if ("_and" in filteredQuery.filter && Array.isArray(filteredQuery.filter["_and"])) {
-				filteredQuery.filter["_and"].push(filterPartialUploads);
-			} else {
-				filteredQuery.filter = { _and: [filteredQuery.filter, filterPartialUploads] };
-			}
+			if (!filteredQuery.filter) filteredQuery.filter = filterPartialUploads;
+			else if ("_and" in filteredQuery.filter && Array.isArray(filteredQuery.filter["_and"])) filteredQuery.filter["_and"].push(filterPartialUploads);
+			else filteredQuery.filter = { _and: [filteredQuery.filter, filterPartialUploads] };
 		}
 		return super.readByQuery(filteredQuery, opts);
 	}
@@ -363,9 +299,7 @@ function decompressResponse(stream, headers) {
 		"gzip",
 		"deflate",
 		"br"
-	].includes(contentEncoding)) {
-		return stream;
-	}
+	].includes(contentEncoding)) return stream;
 	let isEmpty$1 = true;
 	const checker = new Transform({
 		transform(data, _encoding, callback) {
@@ -392,13 +326,9 @@ function decompressResponse(stream, headers) {
 	return finalStream;
 	function handleContentEncoding(data) {
 		let decompressStream;
-		if (contentEncoding === "br") {
-			decompressStream = zlib.createBrotliDecompress();
-		} else if (contentEncoding === "deflate" && isDeflateAlgorithm(data)) {
-			decompressStream = zlib.createInflateRaw();
-		} else {
-			decompressStream = zlib.createUnzip();
-		}
+		if (contentEncoding === "br") decompressStream = zlib.createBrotliDecompress();
+		else if (contentEncoding === "deflate" && isDeflateAlgorithm(data)) decompressStream = zlib.createInflateRaw();
+		else decompressStream = zlib.createUnzip();
 		decompressStream.once("error", (error) => {
 			if (isEmpty$1 && !stream.readable) {
 				finalStream.end();
@@ -409,8 +339,7 @@ function decompressResponse(stream, headers) {
 		checker.pipe(decompressStream).pipe(finalStream);
 	}
 	function isDeflateAlgorithm(data) {
-		const DEFLATE_ALGORITHM_HEADER = 8;
-		return data.length > 0 && (data[0] & DEFLATE_ALGORITHM_HEADER) === 0;
+		return data.length > 0 && (data[0] & 8) === 0;
 	}
 }
 

package/dist/services/flows.js

@@ -8,14 +8,12 @@ var FlowsService = class extends ItemsService {
 	}
 	async createOne(data, opts) {
 		const result = await super.createOne(data, opts);
-		const flowManager = getFlowManager();
-		await flowManager.reload();
+		await getFlowManager().reload();
 		return result;
 	}
 	async updateMany(keys, data, opts) {
 		const result = await super.updateMany(keys, data, opts);
-		const flowManager = getFlowManager();
-		await flowManager.reload();
+		await getFlowManager().reload();
 		return result;
 	}
 	async deleteMany(keys, opts) {
@@ -24,8 +22,7 @@ var FlowsService = class extends ItemsService {
 			reject: null
 		}).whereIn("flow", keys);
 		const result = await super.deleteMany(keys, opts);
-		const flowManager = getFlowManager();
-		await flowManager.reload();
+		await getFlowManager().reload();
 		return result;
 	}
 };