From 8b693adaf0a43af554cffc914108a5fa86a8e006 Mon Sep 17 00:00:00 2001
From: "Kenneth G. Franqueiro" <kfranqueiro@users.noreply.github.com>
Date: Fri, 16 May 2025 09:18:36 -0400
Subject: [PATCH 1/3] Test pre/postProcess async order

---
 tests/spec/core/pre-process-spec.html | 23 ++++++++++++++---------
 tests/spec/core/pre-process-spec.js   | 26 ++++++++++++++++++--------
 2 files changed, 32 insertions(+), 17 deletions(-)
diff --git a/tests/spec/core/pre-process-spec.html b/tests/spec/core/pre-process-spec.html
index f08ca1a7a5..0bc399306c 100644
--- a/tests/spec/core/pre-process-spec.html
+++ b/tests/spec/core/pre-process-spec.html
@@ -1,53 +1,58 @@
 <!doctype html>
 <script class='remove'>
+let counter = 0;
+
+function pass(id) {
+  document.getElementById(id).innerHTML = `pass ${++counter}`;
+}
+
 function noOp() {}
 
 function preSyncFunc() {
-  document.getElementById("pre-sync").innerHTML = "pass";
+  pass("pre-sync");
 }
 
 function preAsyncFunc() {
   return new Promise(resolve => {
     setTimeout(() => {
-      document.getElementById("pre-async").innerHTML = "pass";
+      pass("pre-async");
       resolve();
     }, 4);
   });
 }
 
 function preWithWarning(_conf, _doc, utils) {
-  document.getElementById("pre-warning").innerHTML = "pass";
+  pass("pre-warning");
   utils.showWarning("This is a warning");
 }
 
 function postSyncFunc() {
-  document.getElementById("post-sync").innerHTML = "pass";
+  pass("post-sync");
 }
 
 function postAsyncFunc() {
   return new Promise(resolve => {
     setTimeout(() => {
-      document.getElementById("post-async").innerHTML = "pass";
+      pass("post-async");
       resolve();
     }, 4);
   });
 }
 
 function postWithDetailedError(_conf, _doc, utils) {
-  const el = document.getElementById("post-error");
-  el.innerHTML = "pass";
+  pass("post-error");
   utils.showError("This is an error", {
     hint: "This is a hint",
     title: "This is a title",
     details: "This is a detailed error message",
-    elements: [el],
+    elements: [document.getElementById("post-error")],
   });
 }
 
 function afterEnd() {
   return new Promise(resolve => {
     setTimeout(() => {
-      document.getElementById("afterend").innerHTML = "pass";
+      pass("afterend");
       resolve();
     }, 4);
   });
diff --git a/tests/spec/core/pre-process-spec.js b/tests/spec/core/pre-process-spec.js
index f0e091ca70..c3cfd226c5 100644
--- a/tests/spec/core/pre-process-spec.js
+++ b/tests/spec/core/pre-process-spec.js
@@ -11,13 +11,23 @@ describe("Core - preProcess, postProcess, afterEnd", () => {
     doc = await makeRSDoc(ops, "spec/core/pre-process-spec.html");
   });
 
-  it("runs the preProcess and postProces arrays", () => {
-    expect(doc.getElementById("pre-sync").innerHTML).toBe("pass");
-    expect(doc.getElementById("pre-async").innerHTML).toBe("pass");
-    expect(doc.getElementById("post-sync").innerHTML).toBe("pass");
-    expect(doc.getElementById("post-async").innerHTML).toBe("pass");
-    expect(doc.getElementById("pre-warning").innerHTML).toBe("pass");
-    expect(doc.getElementById("post-error").innerHTML).toBe("pass");
+  it("runs the preProcess and postProcess arrays", () => {
+    expect(doc.getElementById("pre-sync").innerHTML).toContain("pass");
+    expect(doc.getElementById("pre-async").innerHTML).toContain("pass");
+    expect(doc.getElementById("post-sync").innerHTML).toContain("pass");
+    expect(doc.getElementById("post-async").innerHTML).toContain("pass");
+    expect(doc.getElementById("pre-warning").innerHTML).toContain("pass");
+    expect(doc.getElementById("post-error").innerHTML).toContain("pass");
+  });
+
+  it("runs preProcess, postProcess, and afterEnd in order", () => {
+    expect(doc.getElementById("pre-sync").innerHTML).toBe("pass 1");
+    expect(doc.getElementById("pre-async").innerHTML).toBe("pass 2");
+    expect(doc.getElementById("pre-warning").innerHTML).toBe("pass 3");
+    expect(doc.getElementById("post-sync").innerHTML).toBe("pass 4");
+    expect(doc.getElementById("post-async").innerHTML).toBe("pass 5");
+    expect(doc.getElementById("post-error").innerHTML).toBe("pass 6");
+    expect(doc.getElementById("afterend").innerHTML).toBe("pass 7");
   });
 
   it("can show warnings and errors", () => {
@@ -48,6 +58,6 @@ describe("Core - preProcess, postProcess, afterEnd", () => {
   });
 
   it("runs afterEnd method", () => {
-    expect(doc.getElementById("afterend").innerHTML).toBe("pass");
+    expect(doc.getElementById("afterend").innerHTML).toContain("pass");
   });
 });

From 64d7c1b4d40d12069f67789e0adf2fd129e94c61 Mon Sep 17 00:00:00 2001
From: "Kenneth G. Franqueiro" <kfranqueiro@users.noreply.github.com>
Date: Thu, 15 May 2025 16:00:45 -0400
Subject: [PATCH 2/3] Fix pre/postProcess to run async functions in order

TODO: update integration tests
---
 src/core/post-process.js | 40 +++++++++++++++++++---------------------
 src/core/pre-process.js  | 40 +++++++++++++++++++---------------------
 2 files changed, 38 insertions(+), 42 deletions(-)

diff --git a/src/core/post-process.js b/src/core/post-process.js
index 20d0fc53f3..17ff53b1c6 100644
--- a/src/core/post-process.js
+++ b/src/core/post-process.js
@@ -15,27 +15,25 @@ export const name = "core/post-process";
 
 export async function run(config) {
   if (Array.isArray(config.postProcess)) {
-    const promises = config.postProcess
-      .filter(f => {
-        const isFunction = typeof f === "function";
-        if (!isFunction) {
-          const msg = "Every item in `postProcess` must be a JS function.";
-          showError(msg, name);
-        }
-        return isFunction;
-      })
-      .map(async (f, i) => {
-        const fnName = `${name}/${f.name || `[${i}]`}`;
-        const utils = makePluginUtils(fnName);
-        try {
-          return await f(config, document, utils);
-        } catch (err) {
-          const msg = `Function ${f.name} threw an error during \`postProcess\`.`;
-          const hint = "See developer console.";
-          showError(msg, name, { hint, cause: err });
-        }
-      });
-    await Promise.all(promises);
+    const functions = config.postProcess.filter(f => {
+      const isFunction = typeof f === "function";
+      if (!isFunction) {
+        const msg = "Every item in `postProcess` must be a JS function.";
+        showError(msg, name);
+      }
+      return isFunction;
+    });
+    for (const [i, f] of functions.entries()) {
+      const fnName = `${name}/${f.name || `[${i}]`}`;
+      const utils = makePluginUtils(fnName);
+      try {
+        await f(config, document, utils);
+      } catch (err) {
+        const msg = `Function ${f.name} threw an error during \`postProcess\`.`;
+        const hint = "See developer console.";
+        showError(msg, name, { hint, cause: err });
+      }
+    }
   }
   if (typeof config.afterEnd === "function") {
     await config.afterEnd(config, document);
diff --git a/src/core/pre-process.js b/src/core/pre-process.js
index b9a389f920..e4265fc5d4 100644
--- a/src/core/pre-process.js
+++ b/src/core/pre-process.js
@@ -14,26 +14,24 @@ export const name = "core/pre-process";
 
 export async function run(config) {
   if (Array.isArray(config.preProcess)) {
-    const promises = config.preProcess
-      .filter(f => {
-        const isFunction = typeof f === "function";
-        if (!isFunction) {
-          const msg = "Every item in `preProcess` must be a JS function.";
-          showError(msg, name);
-        }
-        return isFunction;
-      })
-      .map(async (f, i) => {
-        const fnName = `${name}/${f.name || `[${i}]`}`;
-        const utils = makePluginUtils(fnName);
-        try {
-          return await f(config, document, utils);
-        } catch (err) {
-          const msg = `Function ${f.name} threw an error during \`preProcess\`.`;
-          const hint = "See developer console.";
-          showError(msg, name, { hint, cause: err });
-        }
-      });
-    await Promise.all(promises);
+    const functions = config.preProcess.filter(f => {
+      const isFunction = typeof f === "function";
+      if (!isFunction) {
+        const msg = "Every item in `preProcess` must be a JS function.";
+        showError(msg, name);
+      }
+      return isFunction;
+    });
+    for (const [i, f] of functions.entries()) {
+      const fnName = `${name}/${f.name || `[${i}]`}`;
+      const utils = makePluginUtils(fnName);
+      try {
+        await f(config, document, utils);
+      } catch (err) {
+        const msg = `Function ${f.name} threw an error during \`preProcess\`.`;
+        const hint = "See developer console.";
+        showError(msg, name, { hint, cause: err });
+      }
+    }
   }
 }

From 56e644734f3531e50d9eddff8cea957d3ccfc9ac Mon Sep 17 00:00:00 2001
From: Sid Vishnoi <8426945+sidvishnoi@users.noreply.github.com>
Date: Wed, 6 Aug 2025 18:00:36 +0530
Subject: [PATCH 3/3] Apply suggestions from code review

---
 src/core/post-process.js | 2 +-
 src/core/pre-process.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/post-process.js b/src/core/post-process.js
index 17ff53b1c6..a1dc31a894 100644
--- a/src/core/post-process.js
+++ b/src/core/post-process.js
@@ -29,7 +29,7 @@ export async function run(config) {
       try {
         await f(config, document, utils);
       } catch (err) {
-        const msg = `Function ${f.name} threw an error during \`postProcess\`.`;
+        const msg = `Function ${fnName} threw an error during \`postProcess\`.`;
         const hint = "See developer console.";
         showError(msg, name, { hint, cause: err });
       }
diff --git a/src/core/pre-process.js b/src/core/pre-process.js
index e4265fc5d4..e66fde2ac8 100644
--- a/src/core/pre-process.js
+++ b/src/core/pre-process.js
@@ -28,7 +28,7 @@ export async function run(config) {
       try {
         await f(config, document, utils);
       } catch (err) {
-        const msg = `Function ${f.name} threw an error during \`preProcess\`.`;
+        const msg = `Function ${fnName} threw an error during \`preProcess\`.`;
         const hint = "See developer console.";
         showError(msg, name, { hint, cause: err });
       }
