@powerlines/plugin-webpack 0.5.133 → 0.5.135

package/dist/powerlines/src/internal/helpers/hooks.cjs

@@ -20,29 +20,32 @@ const mergeResults = (0, defu.createDefu)((obj, key, value) => {
 * Calls a hook with the given context, options, and arguments.
 *
 * @param context - The context to use when calling the hook.
-* @param hook - The hook to call.
+* @param key - The hook to call.
 * @param options - Options for calling the hook.
 * @param args - Arguments to pass to the hook.
 * @returns The return value of the hook.
 */
-async function callHook(context, hook, options, ...args) {
-	const handlers = context.selectHooks(hook, options);
-	if (handlers.length > 0) {
-		context.log(__storm_software_config_tools_types.LogLevelLabel.DEBUG, ` 🧩  Calling plugin hook: ${chalk.default.bold.cyanBright(`${hook}${options?.order ? ` (${options.order})` : ""}`)}`);
+async function callHook(context, key, options, ...args) {
+	const hooks = context.selectHooks(key, options);
+	if (hooks.length > 0) {
+		context.log(__storm_software_config_tools_types.LogLevelLabel.DEBUG, ` 🧩  Calling plugin hook: ${chalk.default.bold.cyanBright(`${key}${options?.order ? ` (${options.order})` : ""}`)}`);
+		const invokeHook = async (hook, hookArgs) => {
+			return Reflect.apply(hook.handler, hook.context, hookArgs);
+		};
 		let results = [];
-		if (options?.sequential === false) results = await Promise.all(handlers.map(async (handler) => {
-			if (!(0, __stryke_type_checks_is_function.isFunction)(handler.handle)) throw new Error(`Plugin hook handler for hook "${hook}" is not a function.`);
-			return Promise.resolve(handler.handle.apply(handler.context, [...args]));
+		if (options?.sequential === false) results = await Promise.all(hooks.map(async (hook) => {
+			if (!(0, __stryke_type_checks_is_function.isFunction)(hook.handler)) throw new Error(`Plugin hook handler for hook "${key}" is not a function.`);
+			return invokeHook(hook, [...args]);
 		}));
-		else for (const handler of handlers) {
-			if (!(0, __stryke_type_checks_is_function.isFunction)(handler.handle)) throw new Error(`Plugin hook handler for hook "${hook}" is not a function.`);
+		else for (const hook of hooks) {
+			if (!(0, __stryke_type_checks_is_function.isFunction)(hook.handler)) throw new Error(`Plugin hook handler for hook "${key}" is not a function.`);
 			if (options?.result === "first" || options?.asNextParam === false) {
-				results.push(await Promise.resolve(handler.handle.apply(handler.context, [...args])));
+				results.push(await Promise.resolve(invokeHook(hook, [...args])));
 				if (options?.result === "first" && (0, __stryke_type_checks_is_set.isSet)(results[results.length - 1])) break;
 			} else {
 				const sequenceArgs = [...args];
 				if (results.length > 0 && sequenceArgs.length > 0) sequenceArgs[0] = (0, __stryke_type_checks_is_function.isFunction)(options.asNextParam) ? await Promise.resolve(options.asNextParam(results[0])) : results[0];
-				const result = await Promise.resolve(handler.handle.apply(handler.context, [...sequenceArgs]));
+				const result = await Promise.resolve(invokeHook(hook, [...sequenceArgs]));
 				if (result) {
 					if (options?.result === "last") results = [result];
 					else if ((0, __stryke_type_checks_is_string.isString)(result)) results = [`${(0, __stryke_type_checks_is_string.isString)(results[0]) ? results[0] || "" : ""}\n${result || ""}`.trim()];

package/dist/powerlines/src/internal/helpers/hooks.d.cts

@@ -0,0 +1,47 @@
+import { SelectHooksOptions } from "../../types/context.cjs";
+import { MaybePromise } from "@stryke/types/base";
+
+//#region ../powerlines/src/internal/helpers/hooks.d.ts
+type CallHookOptions = SelectHooksOptions & (({
+  /**
+   * Whether to call the hooks sequentially or in parallel.
+   *
+   * @defaultValue true
+   */
+  sequential?: true;
+} & ({
+  /**
+   * How to handle multiple return values from hooks.
+   * - "merge": Merge all non-undefined return values (if they are objects).
+   * - "first": Return the first non-undefined value.
+   *
+   * @remarks
+   * Merging only works if the return values are objects.
+   *
+   * @defaultValue "merge"
+   */
+  result: "first";
+} | {
+  /**
+   * How to handle multiple return values from hooks.
+   * - "merge": Merge all non-undefined return values (if they are objects).
+   * - "first": Return the first non-undefined value.
+   *
+   * @remarks
+   * Merging only works if the return values are objects.
+   *
+   * @defaultValue "merge"
+   */
+  result?: "merge" | "last";
+  /**
+   * An indicator specifying if the results of the previous hook should be provided as the **first** parameter of the next hook function, or a function to process the result of the previous hook function and pass the returned value as the next hook's **first** parameter
+   */
+  asNextParam?: false | ((previousResult: any) => MaybePromise<any>);
+})) | {
+  /**
+   * Whether to call the hooks sequentially or in parallel.
+   */
+  sequential: false;
+});
+//#endregion
+export { CallHookOptions };

package/dist/powerlines/src/internal/helpers/hooks.d.mts

@@ -0,0 +1,49 @@
+import "../../types/resolved.mjs";
+import "../../types/hooks.mjs";
+import { SelectHooksOptions } from "../../types/context.mjs";
+import { MaybePromise } from "@stryke/types/base";
+
+//#region ../powerlines/src/internal/helpers/hooks.d.ts
+type CallHookOptions = SelectHooksOptions & (({
+  /**
+   * Whether to call the hooks sequentially or in parallel.
+   *
+   * @defaultValue true
+   */
+  sequential?: true;
+} & ({
+  /**
+   * How to handle multiple return values from hooks.
+   * - "merge": Merge all non-undefined return values (if they are objects).
+   * - "first": Return the first non-undefined value.
+   *
+   * @remarks
+   * Merging only works if the return values are objects.
+   *
+   * @defaultValue "merge"
+   */
+  result: "first";
+} | {
+  /**
+   * How to handle multiple return values from hooks.
+   * - "merge": Merge all non-undefined return values (if they are objects).
+   * - "first": Return the first non-undefined value.
+   *
+   * @remarks
+   * Merging only works if the return values are objects.
+   *
+   * @defaultValue "merge"
+   */
+  result?: "merge" | "last";
+  /**
+   * An indicator specifying if the results of the previous hook should be provided as the **first** parameter of the next hook function, or a function to process the result of the previous hook function and pass the returned value as the next hook's **first** parameter
+   */
+  asNextParam?: false | ((previousResult: any) => MaybePromise<any>);
+})) | {
+  /**
+   * Whether to call the hooks sequentially or in parallel.
+   */
+  sequential: false;
+});
+//#endregion
+export { CallHookOptions };

package/dist/powerlines/src/internal/helpers/hooks.mjs

@@ -18,29 +18,32 @@ const mergeResults = createDefu((obj, key, value) => {
 * Calls a hook with the given context, options, and arguments.
 *
 * @param context - The context to use when calling the hook.
-* @param hook - The hook to call.
+* @param key - The hook to call.
 * @param options - Options for calling the hook.
 * @param args - Arguments to pass to the hook.
 * @returns The return value of the hook.
 */
-async function callHook(context, hook, options, ...args) {
-	const handlers = context.selectHooks(hook, options);
-	if (handlers.length > 0) {
-		context.log(LogLevelLabel.DEBUG, ` 🧩  Calling plugin hook: ${chalk.bold.cyanBright(`${hook}${options?.order ? ` (${options.order})` : ""}`)}`);
+async function callHook(context, key, options, ...args) {
+	const hooks = context.selectHooks(key, options);
+	if (hooks.length > 0) {
+		context.log(LogLevelLabel.DEBUG, ` 🧩  Calling plugin hook: ${chalk.bold.cyanBright(`${key}${options?.order ? ` (${options.order})` : ""}`)}`);
+		const invokeHook = async (hook, hookArgs) => {
+			return Reflect.apply(hook.handler, hook.context, hookArgs);
+		};
 		let results = [];
-		if (options?.sequential === false) results = await Promise.all(handlers.map(async (handler) => {
-			if (!isFunction(handler.handle)) throw new Error(`Plugin hook handler for hook "${hook}" is not a function.`);
-			return Promise.resolve(handler.handle.apply(handler.context, [...args]));
+		if (options?.sequential === false) results = await Promise.all(hooks.map(async (hook) => {
+			if (!isFunction(hook.handler)) throw new Error(`Plugin hook handler for hook "${key}" is not a function.`);
+			return invokeHook(hook, [...args]);
 		}));
-		else for (const handler of handlers) {
-			if (!isFunction(handler.handle)) throw new Error(`Plugin hook handler for hook "${hook}" is not a function.`);
+		else for (const hook of hooks) {
+			if (!isFunction(hook.handler)) throw new Error(`Plugin hook handler for hook "${key}" is not a function.`);
 			if (options?.result === "first" || options?.asNextParam === false) {
-				results.push(await Promise.resolve(handler.handle.apply(handler.context, [...args])));
+				results.push(await Promise.resolve(invokeHook(hook, [...args])));
 				if (options?.result === "first" && isSet(results[results.length - 1])) break;
 			} else {
 				const sequenceArgs = [...args];
 				if (results.length > 0 && sequenceArgs.length > 0) sequenceArgs[0] = isFunction(options.asNextParam) ? await Promise.resolve(options.asNextParam(results[0])) : results[0];
-				const result = await Promise.resolve(handler.handle.apply(handler.context, [...sequenceArgs]));
+				const result = await Promise.resolve(invokeHook(hook, [...sequenceArgs]));
 				if (result) {
 					if (options?.result === "last") results = [result];
 					else if (isString(result)) results = [`${isString(results[0]) ? results[0] || "" : ""}\n${result || ""}`.trim()];

package/dist/powerlines/src/lib/contexts/environment-context.cjs

@@ -2,10 +2,12 @@ const require_rolldown_runtime = require('../../../../_virtual/rolldown_runtime.
 const require_plugin = require('../../types/plugin.cjs');
 const require_helpers = require('../../plugin-utils/helpers.cjs');
 const require_context = require('./context.cjs');
+const require_helpers$1 = require('../unplugin/helpers.cjs');
 const require_plugin_context = require('./plugin-context.cjs');
 let __stryke_fs_resolve = require("@stryke/fs/resolve");
 let __stryke_type_checks_is_function = require("@stryke/type-checks/is-function");
 let __stryke_type_checks_is_object = require("@stryke/type-checks/is-object");
+let __stryke_type_checks_is_set_object = require("@stryke/type-checks/is-set-object");
 
 //#region ../powerlines/src/lib/contexts/environment-context.ts
 var PowerlinesEnvironmentContext = class PowerlinesEnvironmentContext extends require_context.PowerlinesContext {
@@ -60,94 +62,127 @@ var PowerlinesEnvironmentContext = class PowerlinesEnvironmentContext extends re
 		});
 		this.#hooks = Object.keys(resolvedPlugin).filter((key) => !require_plugin.PLUGIN_NON_HOOK_FIELDS.includes(key)).reduce((ret, key) => {
 			const hook = key;
-			const pluginHook = resolvedPlugin[hook];
-			if (!require_helpers.isPluginHook(pluginHook)) return ret;
-			if (!require_helpers.isHookExternal(hook)) {
-				ret[hook] ??= {};
+			if (require_helpers.isPluginHookField(hook)) {
+				const pluginHook = resolvedPlugin[hook];
+				if (!require_helpers.isPluginHook(pluginHook)) return ret;
+				ret[hook] ??= {
+					preEnforced: [],
+					preOrdered: [],
+					normal: [],
+					postEnforced: [],
+					postOrdered: []
+				};
 				if (resolvedPlugin.enforce) {
-					ret[hook][`${resolvedPlugin.enforce}Enforced`] ??= [];
-					require_helpers.addPluginHook(context, resolvedPlugin, pluginHook, ret[hook][`${resolvedPlugin.enforce}Enforced`]);
+					const hookListOrder$1 = `${resolvedPlugin.enforce}Enforced`;
+					ret[hook][hookListOrder$1] ??= [];
+					const bucket = ret[hook][hookListOrder$1];
+					require_helpers.addPluginHook(context, resolvedPlugin, pluginHook, bucket);
 					return ret;
 				}
 				if ((0, __stryke_type_checks_is_function.isFunction)(pluginHook) || !pluginHook.order) {
 					ret[hook].normal ??= [];
-					require_helpers.addPluginHook(context, resolvedPlugin, pluginHook, ret[hook].normal);
+					const bucket = ret[hook].normal;
+					require_helpers.addPluginHook(context, resolvedPlugin, pluginHook, bucket);
 					return ret;
 				}
-				ret[hook][`${pluginHook.order}Ordered`] ??= [];
-				require_helpers.addPluginHook(context, resolvedPlugin, pluginHook, ret[hook][`${pluginHook.order}Ordered`]);
-			} else {
-				ret[hook] ??= [];
-				ret[hook].push({
-					plugin: resolvedPlugin,
-					hook: require_helpers.getHookHandler(pluginHook).bind(context)
-				});
-			}
+				const hookListOrder = `${pluginHook.order}Ordered`;
+				ret[hook][hookListOrder] ??= [];
+				require_helpers.addPluginHook(context, resolvedPlugin, pluginHook, ret[hook][hookListOrder]);
+				return ret;
+			} else if (require_helpers.isUnpluginHookField(hook)) {
+				const unpluginPlugin = resolvedPlugin[hook];
+				if (!(0, __stryke_type_checks_is_set_object.isSetObject)(unpluginPlugin)) return ret;
+				for (const field of Object.keys(unpluginPlugin)) {
+					const variantField = field;
+					const pluginHook = unpluginPlugin[variantField];
+					if (!require_helpers.isPluginHook(pluginHook)) continue;
+					ret[hook] ??= {};
+					ret[hook][variantField] ??= {
+						preEnforced: [],
+						preOrdered: [],
+						normal: [],
+						postEnforced: [],
+						postOrdered: []
+					};
+					if (resolvedPlugin.enforce) {
+						require_helpers.addPluginHook(context, resolvedPlugin, pluginHook, ret[hook][variantField][`${resolvedPlugin.enforce}Enforced`]);
+						return ret;
+					}
+					if ((0, __stryke_type_checks_is_function.isFunction)(pluginHook) || !pluginHook.order) {
+						require_helpers.addPluginHook(context, resolvedPlugin, pluginHook, ret[hook][variantField].normal);
+						return ret;
+					}
+					require_helpers.addPluginHook(context, resolvedPlugin, pluginHook, ret[hook][variantField][`${pluginHook.order}Ordered`]);
+				}
+			} else this.warn(`Unknown plugin hook field: ${String(hook)}`);
 			return ret;
 		}, this.hooks);
 	}
 	/**
 	* Retrieves the hook handlers for a specific hook name
 	*/
-	selectHooks(hook, options) {
+	selectHooks(key, options) {
 		const result = [];
-		if (this.hooks[hook]) if (!require_helpers.isHookExternal(hook)) {
-			const hooks = this.hooks[hook];
-			if (options?.order) if (options?.order === "pre") {
-				result.push(...(hooks.preOrdered ?? []).map((h) => {
-					const plugin = this.plugins.find((p) => p.plugin.name === h.plugin.name);
-					if (!plugin) throw new Error(`Could not find plugin context for plugin "${h.plugin.name}".`);
-					return {
-						handle: h.handler,
-						context: plugin.context
-					};
-				}));
-				result.push(...(hooks.preEnforced ?? []).map((h) => {
-					const plugin = this.plugins.find((p) => p.plugin.name === h.plugin.name);
-					if (!plugin) throw new Error(`Could not find plugin context for plugin "${h.plugin.name}".`);
-					return {
-						handle: h.handler,
-						context: plugin.context
-					};
-				}));
-			} else if (options?.order === "post") {
-				result.push(...(hooks.postOrdered ?? []).map((h) => {
-					const plugin = this.plugins.find((p) => p.plugin.name === h.plugin.name);
-					if (!plugin) throw new Error(`Could not find plugin context for plugin "${h.plugin.name}".`);
-					return {
-						handle: h.handler,
-						context: plugin.context
-					};
-				}));
-				result.push(...(hooks.postEnforced ?? []).map((h) => {
-					const plugin = this.plugins.find((p) => p.plugin.name === h.plugin.name);
-					if (!plugin) throw new Error(`Could not find plugin context for plugin "${h.plugin.name}".`);
-					return {
-						handle: h.handler,
-						context: plugin.context
-					};
-				}));
-			} else result.push(...(hooks.normal ?? []).map((h) => {
-				const plugin = this.plugins.find((p) => p.plugin.name === h.plugin.name);
-				if (!plugin) throw new Error(`Could not find plugin context for plugin "${h.plugin.name}".`);
-				return {
-					handle: h.handler,
-					context: plugin.context
-				};
-			}));
-			else {
-				result.push(...this.selectHooks(hook, { order: "pre" }));
-				result.push(...this.selectHooks(hook, { order: "normal" }));
-				result.push(...this.selectHooks(hook, { order: "post" }));
+		if (require_helpers.isUnpluginHookKey(key)) {
+			const variant = String(key).split(":")[0];
+			if (require_helpers$1.isUnpluginBuilderVariant(variant)) {
+				const hooks = this.hooks[variant];
+				if (hooks) {
+					const field = String(key).split(":")[1];
+					if (field && hooks[field]) {
+						const fieldHooks = hooks[field];
+						if (options?.order) {
+							const mapHooksToResult = (hooksList) => hooksList.map((hook) => {
+								const plugin = this.plugins.find((p) => p.plugin.name === hook.plugin.name);
+								if (!plugin) throw new Error(`Could not find plugin context for plugin "${hook.plugin.name}".`);
+								return {
+									handler: hook.handler,
+									plugin: hook.plugin,
+									context: plugin.context
+								};
+							});
+							if (options?.order === "pre") {
+								result.push(...mapHooksToResult(fieldHooks.preOrdered ?? []));
+								result.push(...mapHooksToResult(fieldHooks.preEnforced ?? []));
+							} else if (options?.order === "post") {
+								result.push(...mapHooksToResult(fieldHooks.postOrdered ?? []));
+								result.push(...mapHooksToResult(fieldHooks.postEnforced ?? []));
+							} else result.push(...mapHooksToResult(fieldHooks.normal ?? []));
+						} else {
+							result.push(...this.selectHooks(key, { order: "pre" }));
+							result.push(...this.selectHooks(key, { order: "normal" }));
+							result.push(...this.selectHooks(key, { order: "post" }));
+						}
+					}
+				}
+			}
+		} else if (require_helpers.isPluginHookField(key)) {
+			if (this.hooks[key]) {
+				const fieldHooks = this.hooks[key];
+				if (options?.order) {
+					const mapHooksToResult = (hooksList) => hooksList.map((hook) => {
+						const plugin = this.plugins.find((p) => p.plugin.name === hook.plugin.name);
+						if (!plugin) throw new Error(`Could not find plugin context for plugin "${hook.plugin.name}".`);
+						return {
+							handler: hook.handler,
+							plugin: hook.plugin,
+							context: plugin.context
+						};
+					});
+					if (options?.order === "pre") {
+						result.push(...mapHooksToResult(fieldHooks.preOrdered ?? []));
+						result.push(...mapHooksToResult(fieldHooks.preEnforced ?? []));
+					} else if (options?.order === "post") {
+						result.push(...mapHooksToResult(fieldHooks.postOrdered ?? []));
+						result.push(...mapHooksToResult(fieldHooks.postEnforced ?? []));
+					} else result.push(...mapHooksToResult(fieldHooks.normal ?? []));
+				} else {
+					result.push(...this.selectHooks(key, { order: "pre" }));
+					result.push(...this.selectHooks(key, { order: "normal" }));
+					result.push(...this.selectHooks(key, { order: "post" }));
+				}
 			}
-		} else result.push(...this.hooks[hook].map((h) => {
-			const plugin = this.plugins.find((p) => p.plugin.name === h.plugin.name);
-			if (!plugin) throw new Error(`Could not find plugin context for plugin "${h.plugin.name}".`);
-			return {
-				handle: h.handler,
-				context: plugin.context
-			};
-		}));
+		} else throw new Error(`Unknown plugin hook key: ${String(key)}`);
 		return result;
 	}
 	constructor(config, workspaceConfig) {

package/dist/powerlines/src/lib/contexts/environment-context.mjs

@@ -1,10 +1,12 @@
 import { PLUGIN_NON_HOOK_FIELDS } from "../../types/plugin.mjs";
-import { addPluginHook, getHookHandler, isHookExternal, isPlugin, isPluginConfig, isPluginHook } from "../../plugin-utils/helpers.mjs";
+import { addPluginHook, isPlugin, isPluginConfig, isPluginHook, isPluginHookField, isUnpluginHookField, isUnpluginHookKey } from "../../plugin-utils/helpers.mjs";
 import { PowerlinesContext } from "./context.mjs";
+import { isUnpluginBuilderVariant } from "../unplugin/helpers.mjs";
 import { createPluginContext } from "./plugin-context.mjs";
 import { resolvePackage } from "@stryke/fs/resolve";
 import { isFunction } from "@stryke/type-checks/is-function";
 import { isObject } from "@stryke/type-checks/is-object";
+import { isSetObject } from "@stryke/type-checks/is-set-object";
 
 //#region ../powerlines/src/lib/contexts/environment-context.ts
 var PowerlinesEnvironmentContext = class PowerlinesEnvironmentContext extends PowerlinesContext {
@@ -59,94 +61,127 @@ var PowerlinesEnvironmentContext = class PowerlinesEnvironmentContext extends Po
 		});
 		this.#hooks = Object.keys(resolvedPlugin).filter((key) => !PLUGIN_NON_HOOK_FIELDS.includes(key)).reduce((ret, key) => {
 			const hook = key;
-			const pluginHook = resolvedPlugin[hook];
-			if (!isPluginHook(pluginHook)) return ret;
-			if (!isHookExternal(hook)) {
-				ret[hook] ??= {};
+			if (isPluginHookField(hook)) {
+				const pluginHook = resolvedPlugin[hook];
+				if (!isPluginHook(pluginHook)) return ret;
+				ret[hook] ??= {
+					preEnforced: [],
+					preOrdered: [],
+					normal: [],
+					postEnforced: [],
+					postOrdered: []
+				};
 				if (resolvedPlugin.enforce) {
-					ret[hook][`${resolvedPlugin.enforce}Enforced`] ??= [];
-					addPluginHook(context, resolvedPlugin, pluginHook, ret[hook][`${resolvedPlugin.enforce}Enforced`]);
+					const hookListOrder$1 = `${resolvedPlugin.enforce}Enforced`;
+					ret[hook][hookListOrder$1] ??= [];
+					const bucket = ret[hook][hookListOrder$1];
+					addPluginHook(context, resolvedPlugin, pluginHook, bucket);
 					return ret;
 				}
 				if (isFunction(pluginHook) || !pluginHook.order) {
 					ret[hook].normal ??= [];
-					addPluginHook(context, resolvedPlugin, pluginHook, ret[hook].normal);
+					const bucket = ret[hook].normal;
+					addPluginHook(context, resolvedPlugin, pluginHook, bucket);
 					return ret;
 				}
-				ret[hook][`${pluginHook.order}Ordered`] ??= [];
-				addPluginHook(context, resolvedPlugin, pluginHook, ret[hook][`${pluginHook.order}Ordered`]);
-			} else {
-				ret[hook] ??= [];
-				ret[hook].push({
-					plugin: resolvedPlugin,
-					hook: getHookHandler(pluginHook).bind(context)
-				});
-			}
+				const hookListOrder = `${pluginHook.order}Ordered`;
+				ret[hook][hookListOrder] ??= [];
+				addPluginHook(context, resolvedPlugin, pluginHook, ret[hook][hookListOrder]);
+				return ret;
+			} else if (isUnpluginHookField(hook)) {
+				const unpluginPlugin = resolvedPlugin[hook];
+				if (!isSetObject(unpluginPlugin)) return ret;
+				for (const field of Object.keys(unpluginPlugin)) {
+					const variantField = field;
+					const pluginHook = unpluginPlugin[variantField];
+					if (!isPluginHook(pluginHook)) continue;
+					ret[hook] ??= {};
+					ret[hook][variantField] ??= {
+						preEnforced: [],
+						preOrdered: [],
+						normal: [],
+						postEnforced: [],
+						postOrdered: []
+					};
+					if (resolvedPlugin.enforce) {
+						addPluginHook(context, resolvedPlugin, pluginHook, ret[hook][variantField][`${resolvedPlugin.enforce}Enforced`]);
+						return ret;
+					}
+					if (isFunction(pluginHook) || !pluginHook.order) {
+						addPluginHook(context, resolvedPlugin, pluginHook, ret[hook][variantField].normal);
+						return ret;
+					}
+					addPluginHook(context, resolvedPlugin, pluginHook, ret[hook][variantField][`${pluginHook.order}Ordered`]);
+				}
+			} else this.warn(`Unknown plugin hook field: ${String(hook)}`);
 			return ret;
 		}, this.hooks);
 	}
 	/**
 	* Retrieves the hook handlers for a specific hook name
 	*/
-	selectHooks(hook, options) {
+	selectHooks(key, options) {
 		const result = [];
-		if (this.hooks[hook]) if (!isHookExternal(hook)) {
-			const hooks = this.hooks[hook];
-			if (options?.order) if (options?.order === "pre") {
-				result.push(...(hooks.preOrdered ?? []).map((h) => {
-					const plugin = this.plugins.find((p) => p.plugin.name === h.plugin.name);
-					if (!plugin) throw new Error(`Could not find plugin context for plugin "${h.plugin.name}".`);
-					return {
-						handle: h.handler,
-						context: plugin.context
-					};
-				}));
-				result.push(...(hooks.preEnforced ?? []).map((h) => {
-					const plugin = this.plugins.find((p) => p.plugin.name === h.plugin.name);
-					if (!plugin) throw new Error(`Could not find plugin context for plugin "${h.plugin.name}".`);
-					return {
-						handle: h.handler,
-						context: plugin.context
-					};
-				}));
-			} else if (options?.order === "post") {
-				result.push(...(hooks.postOrdered ?? []).map((h) => {
-					const plugin = this.plugins.find((p) => p.plugin.name === h.plugin.name);
-					if (!plugin) throw new Error(`Could not find plugin context for plugin "${h.plugin.name}".`);
-					return {
-						handle: h.handler,
-						context: plugin.context
-					};
-				}));
-				result.push(...(hooks.postEnforced ?? []).map((h) => {
-					const plugin = this.plugins.find((p) => p.plugin.name === h.plugin.name);
-					if (!plugin) throw new Error(`Could not find plugin context for plugin "${h.plugin.name}".`);
-					return {
-						handle: h.handler,
-						context: plugin.context
-					};
-				}));
-			} else result.push(...(hooks.normal ?? []).map((h) => {
-				const plugin = this.plugins.find((p) => p.plugin.name === h.plugin.name);
-				if (!plugin) throw new Error(`Could not find plugin context for plugin "${h.plugin.name}".`);
-				return {
-					handle: h.handler,
-					context: plugin.context
-				};
-			}));
-			else {
-				result.push(...this.selectHooks(hook, { order: "pre" }));
-				result.push(...this.selectHooks(hook, { order: "normal" }));
-				result.push(...this.selectHooks(hook, { order: "post" }));
+		if (isUnpluginHookKey(key)) {
+			const variant = String(key).split(":")[0];
+			if (isUnpluginBuilderVariant(variant)) {
+				const hooks = this.hooks[variant];
+				if (hooks) {
+					const field = String(key).split(":")[1];
+					if (field && hooks[field]) {
+						const fieldHooks = hooks[field];
+						if (options?.order) {
+							const mapHooksToResult = (hooksList) => hooksList.map((hook) => {
+								const plugin = this.plugins.find((p) => p.plugin.name === hook.plugin.name);
+								if (!plugin) throw new Error(`Could not find plugin context for plugin "${hook.plugin.name}".`);
+								return {
+									handler: hook.handler,
+									plugin: hook.plugin,
+									context: plugin.context
+								};
+							});
+							if (options?.order === "pre") {
+								result.push(...mapHooksToResult(fieldHooks.preOrdered ?? []));
+								result.push(...mapHooksToResult(fieldHooks.preEnforced ?? []));
+							} else if (options?.order === "post") {
+								result.push(...mapHooksToResult(fieldHooks.postOrdered ?? []));
+								result.push(...mapHooksToResult(fieldHooks.postEnforced ?? []));
+							} else result.push(...mapHooksToResult(fieldHooks.normal ?? []));
+						} else {
+							result.push(...this.selectHooks(key, { order: "pre" }));
+							result.push(...this.selectHooks(key, { order: "normal" }));
+							result.push(...this.selectHooks(key, { order: "post" }));
+						}
+					}
+				}
+			}
+		} else if (isPluginHookField(key)) {
+			if (this.hooks[key]) {
+				const fieldHooks = this.hooks[key];
+				if (options?.order) {
+					const mapHooksToResult = (hooksList) => hooksList.map((hook) => {
+						const plugin = this.plugins.find((p) => p.plugin.name === hook.plugin.name);
+						if (!plugin) throw new Error(`Could not find plugin context for plugin "${hook.plugin.name}".`);
+						return {
+							handler: hook.handler,
+							plugin: hook.plugin,
+							context: plugin.context
+						};
+					});
+					if (options?.order === "pre") {
+						result.push(...mapHooksToResult(fieldHooks.preOrdered ?? []));
+						result.push(...mapHooksToResult(fieldHooks.preEnforced ?? []));
+					} else if (options?.order === "post") {
+						result.push(...mapHooksToResult(fieldHooks.postOrdered ?? []));
+						result.push(...mapHooksToResult(fieldHooks.postEnforced ?? []));
+					} else result.push(...mapHooksToResult(fieldHooks.normal ?? []));
+				} else {
+					result.push(...this.selectHooks(key, { order: "pre" }));
+					result.push(...this.selectHooks(key, { order: "normal" }));
+					result.push(...this.selectHooks(key, { order: "post" }));
+				}
 			}
-		} else result.push(...this.hooks[hook].map((h) => {
-			const plugin = this.plugins.find((p) => p.plugin.name === h.plugin.name);
-			if (!plugin) throw new Error(`Could not find plugin context for plugin "${h.plugin.name}".`);
-			return {
-				handle: h.handler,
-				context: plugin.context
-			};
-		}));
+		} else throw new Error(`Unknown plugin hook key: ${String(key)}`);
 		return result;
 	}
 	constructor(config, workspaceConfig) {