refactor(rstack): simplify plugin lifecycle code

Author: ScriptedAlchemy

packages/rstack/src/config.ts

@@ -254,7 +254,7 @@ export const loadRstackConfig = async ({
     active: true,
   };
 
-  const loaded = await getConfigSessionStorage().run(session, async () => {
+  const loadedConfig = await getConfigSessionStorage().run(session, async () => {
     try {
       const { filePath, dependencies } = await loadConfig({
         loader: 'native',
@@ -277,14 +277,14 @@ export const loadRstackConfig = async ({
         state.invocation.configFilePath = filePath;
       }
 
-      const loaded = {
+      const result = {
         configs: session.configs,
         plugins: session.plugins,
         filePath,
         dependencies,
       };
-      loadedConfigDirectories.set(loaded, resolve(cwd ?? process.cwd()));
-      return loaded;
+      loadedConfigDirectories.set(result, resolve(cwd ?? process.cwd()));
+      return result;
     } finally {
       session.active = false;
       session.configs = {};
@@ -293,6 +293,6 @@ export const loadRstackConfig = async ({
     }
   });
 
-  await getRstackPluginRuntime(loaded);
-  return loaded;
+  await getRstackPluginRuntime(loadedConfig);
+  return loadedConfig;
 };

packages/rstack/tests/config/plugin-modifiers/factory-order-rstack.config.ts

@@ -2,7 +2,7 @@ import { define } from 'rstack';
 
 let setupComplete = false;
 
-const assertSetupComplete = (): Record<string, never> => {
+const createConfig = () => {
   if (!setupComplete) {
     throw new Error('plugin setup must run before config factories');
   }
@@ -18,9 +18,9 @@ define.plugins([
   },
 ]);
 
-define.app(assertSetupComplete);
-define.lib(assertSetupComplete);
-define.doc(async () => assertSetupComplete());
-define.test(assertSetupComplete);
-define.lint(async () => [assertSetupComplete()]);
-define.fmt(assertSetupComplete);
+define.app(createConfig);
+define.lib(createConfig);
+define.doc(async () => createConfig());
+define.test(createConfig);
+define.lint(async () => [createConfig()]);
+define.fmt(createConfig);

packages/rstack/tests/config/plugin-modifiers/fmt.test.ts

@@ -8,18 +8,20 @@ test('applies fmt modifiers after resolving the native config definition', () =>
     'rstack.config.ts',
     `import { define } from 'rstack';
 
+let setupComplete = false;
+
 define.plugins([
   {
     name: 'fmt-modifier',
     setup({ modifyConfig }) {
-      globalThis.__fmtPluginSetupComplete = true;
+      setupComplete = true;
       modifyConfig('fmt', async (config) => ({ ...config, singleQuote: true }));
     },
   },
 ]);
 
 define.fmt(() => {
-  if (!globalThis.__fmtPluginSetupComplete) {
+  if (!setupComplete) {
     throw new Error('plugin setup must run before config factories');
   }
   return {};