Move requested bit to the pluginSet.

helpers/plugins.js

@@ -1,10 +1,17 @@
 const pluginSets = new Map();
-const pluginsRequested = new Set();
+
+function getPluginSet(setKey) {
+	let pluginSet = pluginSets.get(setKey);
+	if (pluginSet) return pluginSet;
+
+	pluginSet = { plugins: [], requested: false, requiresSorting: false };
+	pluginSets.set(setKey, pluginSet);
+	return pluginSet;
+}
 
 export function getPlugins(setKey) {
-	if (!pluginsRequested.has(setKey)) pluginsRequested.add(setKey);
-	const pluginSet = pluginSets.get(setKey);
-	if (!pluginSet) return [];
+	const pluginSet = getPluginSet(setKey);
+	pluginSet.requested = true;
 	if (pluginSet.requiresSorting) {
 		pluginSet.plugins.sort((item1, item2) => item1.options.sort - item2.options.sort);
 		pluginSet.requiresSorting = false;
@@ -13,14 +20,10 @@ export function getPlugins(setKey) {
 }
 
 export function registerPlugin(setKey, plugin, options) {
-	if (pluginsRequested.has(setKey)) {
-		throw new Error(`Plugin Set "${setKey}" has already been requested. Additional plugin registrations would result in stale consumer plugins.`);
-	}
+	const pluginSet = getPluginSet(setKey);
 
-	let pluginSet = pluginSets.get(setKey);
-	if (!pluginSet) {
-		pluginSet = { plugins: [], requiresSorting: false };
-		pluginSets.set(setKey, pluginSet);
+	if (pluginSet.requested) {
+		throw new Error(`Plugin Set "${setKey}" has already been requested. Additional plugin registrations would result in stale consumer plugins.`);
 	} else if (options?.key !== undefined) {
 		if (pluginSet.plugins.find(registeredPlugin => registeredPlugin.options.key === options?.key)) {
 			throw new Error(`Plugin Set "${setKey}" already has a plugin with the key "${options.key}".`);
@@ -34,7 +37,6 @@ export function registerPlugin(setKey, plugin, options) {
 // Do not import! Testing only!!
 export function resetPlugins() {
 	pluginSets.clear();
-	pluginsRequested.clear();
 }
 
 export function tryGetPluginByKey(setKey, pluginKey) {