@directus/api 35.0.2 → 35.1.0

package/dist/extensions/manager.js

@@ -58,9 +58,9 @@ var ExtensionManager = class {
 	* Whether or not the extensions have been read from disk and registered into the system
 	*/
 	isLoaded = false;
-	localExtensions = new Map();
-	registryExtensions = new Map();
-	moduleExtensions = new Map();
+	localExtensions = /* @__PURE__ */ new Map();
+	registryExtensions = /* @__PURE__ */ new Map();
+	moduleExtensions = /* @__PURE__ */ new Map();
 	/**
 	* Settings for the extensions that are loaded within the current process
 	*/
@@ -73,7 +73,7 @@ var ExtensionManager = class {
 	/**
 	* Callbacks to be able to unregister extensions
 	*/
-	unregisterFunctionMap = new Map();
+	unregisterFunctionMap = /* @__PURE__ */ new Map();
 	/**
 	* A local-to-extensions scoped emitter that can be used to fire and listen to custom events
 	* between extensions. These events are completely isolated from the core events that trigger
@@ -129,7 +129,6 @@ var ExtensionManager = class {
 			case "registry": return this.registryExtensions.get(folder);
 			case "local": return this.localExtensions.get(folder);
 		}
-		return undefined;
 	}
 	/**
 	* Load and register all extensions
@@ -145,20 +144,13 @@ var ExtensionManager = class {
 			...options
 		};
 		const wasWatcherInitialized = this.watcher !== null;
-		if (this.options.watch && !wasWatcherInitialized) {
-			this.initializeWatcher();
-		} else if (!this.options.watch && wasWatcherInitialized) {
-			await this.closeWatcher();
-		}
+		if (this.options.watch && !wasWatcherInitialized) this.initializeWatcher();
+		else if (!this.options.watch && wasWatcherInitialized) await this.closeWatcher();
 		if (!this.isLoaded) {
 			await this.load({ forceSync: true });
-			if (this.extensions.length > 0) {
-				logger.info(`Loaded extensions: ${this.extensions.map((ext) => ext.name).join(", ")}`);
-			}
-		}
-		if (this.options.watch && !wasWatcherInitialized) {
-			this.updateWatchedExtensions([...this.extensions]);
+			if (this.extensions.length > 0) logger.info(`Loaded extensions: ${this.extensions.map((ext) => ext.name).join(", ")}`);
 		}
+		if (this.options.watch && !wasWatcherInitialized) this.updateWatchedExtensions([...this.extensions]);
 		this.messenger.subscribe(this.reloadChannel, (payload) => {
 			if (isPlainObject(payload) && "origin" in payload && payload["origin"] === this.processId) return;
 			const options$1 = {};
@@ -173,8 +165,7 @@ var ExtensionManager = class {
 	async install(versionId) {
 		const logger = useLogger();
 		await this.installationManager.install(versionId);
-		const resolvedFolder = relative(sep, resolve(sep, versionId));
-		const syncFolder = join$1(".registry", resolvedFolder);
+		const syncFolder = join$1(".registry", relative(sep, resolve(sep, versionId)));
 		await this.broadcastReloadNotification({ partialSync: syncFolder });
 		await this.reload({ skipSync: true });
 		emitter_default.emitAction("extensions.installed", {
@@ -186,8 +177,7 @@ var ExtensionManager = class {
 	async uninstall(folder) {
 		const logger = useLogger();
 		await this.installationManager.uninstall(folder);
-		const resolvedFolder = relative(sep, resolve(sep, folder));
-		const syncFolder = join$1(".registry", resolvedFolder);
+		const syncFolder = join$1(".registry", relative(sep, resolve(sep, folder)));
 		await this.broadcastReloadNotification({ partialSync: syncFolder });
 		await this.reload({ skipSync: true });
 		emitter_default.emitAction("extensions.uninstalled", {
@@ -207,14 +197,12 @@ var ExtensionManager = class {
 	*/
 	async load(options) {
 		const logger = useLogger();
-		if (env["EXTENSIONS_LOCATION"]) {
-			try {
-				await syncExtensions(options);
-			} catch (error) {
-				logger.error(`Failed to sync extensions`);
-				logger.error(error);
-				process.exit(1);
-			}
+		if (env["EXTENSIONS_LOCATION"]) try {
+			await syncExtensions(options);
+		} catch (error) {
+			logger.error(`Failed to sync extensions`);
+			logger.error(error);
+			process.exit(1);
 		}
 		try {
 			const { local, registry, module } = await getExtensions();
@@ -233,9 +221,7 @@ var ExtensionManager = class {
 			});
 		}
 		await Promise.all([this.registerInternalOperations(), this.registerApiExtensions()]);
-		if (env["SERVE_APP"]) {
-			await this.generateExtensionBundle();
-		}
+		if (env["SERVE_APP"]) await this.generateExtensionBundle();
 		this.isLoaded = true;
 		emitter_default.emitAction("extensions.load", { extensions: this.extensions });
 		logger.info("Extensions loaded");
@@ -248,16 +234,13 @@ var ExtensionManager = class {
 		this.localEmitter.offAll();
 		this.isLoaded = false;
 		emitter_default.emitAction("extensions.unload", { extensions: this.extensions });
-		const logger = useLogger();
-		logger.info("Extensions unloaded");
+		useLogger().info("Extensions unloaded");
 	}
 	/**
 	* Reload all the extensions. Will unload if extensions have already been loaded
 	*/
 	reload(options) {
-		if (this.reloadQueue.size > 0) {
-			return Promise.resolve();
-		}
+		if (this.reloadQueue.size > 0) return Promise.resolve();
 		const logger = useLogger();
 		let resolve$1;
 		let reject;
@@ -281,16 +264,12 @@ var ExtensionManager = class {
 					added: addedExtensions,
 					removed: removedExtensions
 				});
-				if (addedExtensions.length > 0) {
-					logger.info(`Added extensions: ${addedExtensions.join(", ")}`);
-				}
-				if (removedExtensions.length > 0) {
-					logger.info(`Removed extensions: ${removedExtensions.join(", ")}`);
-				}
+				if (addedExtensions.length > 0) logger.info(`Added extensions: ${addedExtensions.join(", ")}`);
+				if (removedExtensions.length > 0) logger.info(`Removed extensions: ${removedExtensions.join(", ")}`);
 				resolve$1();
 			} else {
 				logger.warn("Extensions have to be loaded before they can be reloaded");
-				reject(new Error("Extensions have to be loaded before they can be reloaded"));
+				reject(/* @__PURE__ */ new Error("Extensions have to be loaded before they can be reloaded"));
 			}
 		});
 		return this.reloadPromise;
@@ -304,14 +283,10 @@ var ExtensionManager = class {
 	*/
 	async getAppExtensionChunk(name) {
 		let file;
-		if (!name) {
-			file = this.appExtensionChunks[0];
-		} else if (this.appExtensionChunks.includes(name)) {
-			file = name;
-		}
+		if (!name) file = this.appExtensionChunks[0];
+		else if (this.appExtensionChunks.includes(name)) file = name;
 		if (!file) return null;
-		const tempDir = join$1(env["TEMP_PATH"], "app-extensions");
-		const tmpStorage = new DriverLocal({ root: tempDir });
+		const tmpStorage = new DriverLocal({ root: join$1(env["TEMP_PATH"], "app-extensions") });
 		if (await tmpStorage.exists(file) === false) return null;
 		return await tmpStorage.read(file);
 	}
@@ -341,17 +316,14 @@ var ExtensionManager = class {
 		const extension = this.localExtensions.get(folderName);
 		if (!extension) return false;
 		const resolvedPath = path.resolve(filePath);
-		if (isTypeIn(extension, HYBRID_EXTENSION_TYPES) || extension.type === "bundle") {
-			return path.resolve(extension.path, extension.entrypoint.app) === resolvedPath || path.resolve(extension.path, extension.entrypoint.api) === resolvedPath;
-		}
+		if (isTypeIn(extension, HYBRID_EXTENSION_TYPES) || extension.type === "bundle") return path.resolve(extension.path, extension.entrypoint.app) === resolvedPath || path.resolve(extension.path, extension.entrypoint.api) === resolvedPath;
 		return path.resolve(extension.path, extension.entrypoint) === resolvedPath;
 	}
 	/**
 	* Start the chokidar watcher for extensions on the local filesystem
 	*/
 	initializeWatcher() {
-		const logger = useLogger();
-		logger.info("Watching extensions for changes...");
+		useLogger().info("Watching extensions for changes...");
 		const extensionDirPath = pathToRelativeUrl(getExtensionsPath());
 		const resolvedExtDir = path.resolve(extensionDirPath);
 		this.watcher = chokidar.watch([path.resolve("package.json"), extensionDirPath], {
@@ -411,9 +383,7 @@ var ExtensionManager = class {
 			local: this.localExtensions
 		}, this.extensionsSettings);
 		try {
-			/** Opt In for now. Should be @deprecated later to always use rolldown! */
-			const rollDirection = env$1["EXTENSIONS_ROLLDOWN"] ?? false ? rolldown : rollup;
-			const bundle = await rollDirection({
+			const bundle = await (env$1["EXTENSIONS_ROLLDOWN"] ?? false ? rolldown : rollup)({
 				input: "entry",
 				external: Object.values(sharedDepsMapping),
 				makeAbsoluteExternalsRelative: false,
@@ -457,9 +427,7 @@ var ExtensionManager = class {
 		const module = await isolate.compileModule(extensionCode, { filename: `file://${entrypointPath}` });
 		const sdkModule = await instantiateSandboxSdk(isolate, extension.sandbox?.requestedScopes ?? {});
 		await module.instantiate(context, (specifier) => {
-			if (specifier !== "directus:api") {
-				throw new Error("Imports other than \"directus:api\" are prohibited in API extension sandboxes");
-			}
+			if (specifier !== "directus:api") throw new Error("Imports other than \"directus:api\" are prohibited in API extension sandboxes");
 			return sdkModule;
 		});
 		await module.evaluate({ timeout: sandboxTimeout });
@@ -504,12 +472,10 @@ var ExtensionManager = class {
 	}
 	async registerHookExtension(hook) {
 		try {
-			if (hook.sandbox?.enabled) {
-				await this.registerSandboxedApiExtension(hook);
-			} else {
+			if (hook.sandbox?.enabled) await this.registerSandboxedApiExtension(hook);
+			else {
 				const hookPath = path.resolve(hook.path, hook.entrypoint);
-				const hookInstance = await importFileUrl(hookPath, import.meta.url, { fresh: true });
-				const config = getModuleDefault(hookInstance);
+				const config = getModuleDefault(await importFileUrl(hookPath, import.meta.url, { fresh: true }));
 				const unregisterFunctions = this.registerHook(config, hook.name);
 				this.unregisterFunctionMap.set(hook.name, async () => {
 					await Promise.all(unregisterFunctions.map((fn) => fn()));
@@ -525,12 +491,10 @@ var ExtensionManager = class {
 	}
 	async registerEndpointExtension(endpoint) {
 		try {
-			if (endpoint.sandbox?.enabled) {
-				await this.registerSandboxedApiExtension(endpoint);
-			} else {
+			if (endpoint.sandbox?.enabled) await this.registerSandboxedApiExtension(endpoint);
+			else {
 				const endpointPath = path.resolve(endpoint.path, endpoint.entrypoint);
-				const endpointInstance = await importFileUrl(endpointPath, import.meta.url, { fresh: true });
-				const config = getModuleDefault(endpointInstance);
+				const config = getModuleDefault(await importFileUrl(endpointPath, import.meta.url, { fresh: true }));
 				const unregister = this.registerEndpoint(config, endpoint.name);
 				this.unregisterFunctionMap.set(endpoint.name, async () => {
 					await unregister();
@@ -546,12 +510,10 @@ var ExtensionManager = class {
 	}
 	async registerOperationExtension(operation) {
 		try {
-			if (operation.sandbox?.enabled) {
-				await this.registerSandboxedApiExtension(operation);
-			} else {
+			if (operation.sandbox?.enabled) await this.registerSandboxedApiExtension(operation);
+			else {
 				const operationPath = path.resolve(operation.path, operation.entrypoint.api);
-				const operationInstance = await importFileUrl(operationPath, import.meta.url, { fresh: true });
-				const config = getModuleDefault(operationInstance);
+				const config = getModuleDefault(await importFileUrl(operationPath, import.meta.url, { fresh: true }));
 				const unregister = this.registerOperation(config);
 				this.unregisterFunctionMap.set(operation.name, async () => {
 					await unregister();
@@ -573,8 +535,7 @@ var ExtensionManager = class {
 		};
 		try {
 			const bundlePath = path.resolve(bundle.path, bundle.entrypoint.api);
-			const bundleInstances = await importFileUrl(bundlePath, import.meta.url, { fresh: true });
-			const configs = getModuleDefault(bundleInstances);
+			const configs = getModuleDefault(await importFileUrl(bundlePath, import.meta.url, { fresh: true }));
 			const unregisterFunctions = [];
 			for (const { config, name } of configs.hooks) {
 				if (!extensionEnabled(name)) continue;
@@ -609,8 +570,7 @@ var ExtensionManager = class {
 	async registerInternalOperations() {
 		const internalOperations = await readdir(path.join(__dirname, "..", "operations"));
 		for (const operation of internalOperations) {
-			const operationInstance = await import(`../operations/${operation}/index.js`);
-			const config = getModuleDefault(operationInstance);
+			const config = getModuleDefault(await import(`../operations/${operation}/index.js`));
 			this.registerOperation(config);
 		}
 	}
@@ -621,7 +581,7 @@ var ExtensionManager = class {
 		const logger = useLogger();
 		let scheduleIndex = 0;
 		const unregisterFunctions = [];
-		const hookRegistrationContext = {
+		hookRegistrationCallback({
 			filter: (event, handler) => {
 				emitter_default.onFilter(event, handler);
 				unregisterFunctions.push(() => {
@@ -643,44 +603,36 @@ var ExtensionManager = class {
 			schedule: (cron, handler) => {
 				if (validateCron(cron)) {
 					const job = scheduleSynchronizedJob(`${name}:${scheduleIndex}`, cron, async () => {
-						if (this.options.schedule) {
-							try {
-								await handler();
-							} catch (error) {
-								logger.error(error);
-							}
+						if (this.options.schedule) try {
+							await handler();
+						} catch (error) {
+							logger.error(error);
 						}
 					});
 					scheduleIndex++;
 					unregisterFunctions.push(async () => {
 						await job.stop();
 					});
-				} else {
-					this.handleExtensionError({ reason: `Couldn't register cron hook. Provided cron is invalid: ${cron}` });
-				}
+				} else this.handleExtensionError({ reason: `Couldn't register cron hook. Provided cron is invalid: ${cron}` });
 			},
 			embed: (position, code) => {
 				const content = typeof code === "function" ? code() : code;
-				if (content.trim().length !== 0) {
-					if (position === "head") {
-						const index = this.hookEmbedsHead.length;
-						this.hookEmbedsHead.push(content);
-						unregisterFunctions.push(() => {
-							this.hookEmbedsHead.splice(index, 1);
-						});
-					} else {
-						const index = this.hookEmbedsBody.length;
-						this.hookEmbedsBody.push(content);
-						unregisterFunctions.push(() => {
-							this.hookEmbedsBody.splice(index, 1);
-						});
-					}
+				if (content.trim().length !== 0) if (position === "head") {
+					const index = this.hookEmbedsHead.length;
+					this.hookEmbedsHead.push(content);
+					unregisterFunctions.push(() => {
+						this.hookEmbedsHead.splice(index, 1);
+					});
 				} else {
-					this.handleExtensionError({ reason: `Couldn't register embed hook. Provided code is empty!` });
+					const index = this.hookEmbedsBody.length;
+					this.hookEmbedsBody.push(content);
+					unregisterFunctions.push(() => {
+						this.hookEmbedsBody.splice(index, 1);
+					});
 				}
+				else this.handleExtensionError({ reason: `Couldn't register embed hook. Provided code is empty!` });
 			}
-		};
-		hookRegistrationCallback(hookRegistrationContext, {
+		}, {
 			services: services_exports,
 			env,
 			database: database_default(),