fix post processor not going in proper order of functions

RpNation · Apr 27, 2024 · d9394d4 · d9394d4
1 parent 8a66786
commit d9394d4
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/assets/bundled/bbcode-parser.min.js b/assets/bundled/bbcode-parser.min.js
@@ -79,6 +79,7 @@
 
     const MD_NEWLINE_INJECT = "<!-- bbcode injected newlines -->\n\n";
     const MD_NEWLINE_PRE_INJECT = "\n\n<!-- bbcode pre injected newlines -->";
+    const MD_NEWLINE_INJECT_COMMENT = "<!-- bbcode injected newlines -->";
 
     const URL_REGEX =
       /(http|ftp|https|upload):\/\/([\w_-]+(?:(?:\.[\w_-]+)+))([\w.,@?^=%&:\/~+#-]*[\w@?^=%&\/~+#-])/;
@@ -2529,8 +2530,10 @@
      * @returns post processed string
      */
     function removeNewlineInjects(raw) {
-      const processed = raw.replaceAll(MD_NEWLINE_INJECT, "").replaceAll(MD_NEWLINE_PRE_INJECT, ""); // Remove all instances of the injected newline
-
+      const processed = raw
+        .replaceAll(MD_NEWLINE_INJECT, "")
+        .replaceAll(MD_NEWLINE_PRE_INJECT, "")
+        .replaceAll(MD_NEWLINE_INJECT_COMMENT, ""); // Remove all instances of the injected newline
       return processed;
     }
 
@@ -2555,10 +2558,10 @@
      * @returns final processed string
      */
     function postprocess(raw, data) {
-      let final = "";
+      let final = raw;
       const postprocessors = [removeNewlineInjects, renderHoistedCodeBlocks];
       for (const postprocessor of postprocessors) {
-        final = postprocessor(raw, data);
+        final = postprocessor(final, data);
       }
       return final;
     }

diff --git a/bbcode-src/utils/common.js b/bbcode-src/utils/common.js
@@ -53,6 +53,7 @@ const regexIndexOf = (string, regex, startpos) => {
 
 const MD_NEWLINE_INJECT = "<!-- bbcode injected newlines -->\n\n";
 const MD_NEWLINE_PRE_INJECT = "\n\n<!-- bbcode pre injected newlines -->";
+const MD_NEWLINE_INJECT_COMMENT = "<!-- bbcode injected newlines -->";
 
 const URL_REGEX =
   /(http|ftp|https|upload):\/\/([\w_-]+(?:(?:\.[\w_-]+)+))([\w.,@?^=%&:\/~+#-]*[\w@?^=%&\/~+#-])/;
@@ -89,6 +90,7 @@ export {
   preprocessAttr,
   regexIndexOf,
   MD_NEWLINE_INJECT,
+  MD_NEWLINE_INJECT_COMMENT,
   MD_NEWLINE_PRE_INJECT,
   URL_REGEX,
   MD_URL_REGEX,

diff --git a/bbcode-src/utils/postprocess.js b/bbcode-src/utils/postprocess.js
@@ -1,4 +1,4 @@
-import { MD_NEWLINE_INJECT, MD_NEWLINE_PRE_INJECT } from "./common";
+import { MD_NEWLINE_INJECT, MD_NEWLINE_INJECT_COMMENT, MD_NEWLINE_PRE_INJECT } from "./common";
 
 /**
  * Post Processing designed to fix issues with Markdown and BBCode that the parser can't fix.
@@ -8,8 +8,10 @@ import { MD_NEWLINE_INJECT, MD_NEWLINE_PRE_INJECT } from "./common";
  * @returns post processed string
  */
 function removeNewlineInjects(raw) {
-  const processed = raw.replaceAll(MD_NEWLINE_INJECT, "").replaceAll(MD_NEWLINE_PRE_INJECT, ""); // Remove all instances of the injected newline
-
+  const processed = raw
+    .replaceAll(MD_NEWLINE_INJECT, "")
+    .replaceAll(MD_NEWLINE_PRE_INJECT, "")
+    .replaceAll(MD_NEWLINE_INJECT_COMMENT, ""); // Remove all instances of the injected newline
   return processed;
 }
 
@@ -34,10 +36,10 @@ function renderHoistedCodeBlocks(raw, data) {
  * @returns final processed string
  */
 export function postprocess(raw, data) {
-  let final = "";
+  let final = raw;
   const postprocessors = [removeNewlineInjects, renderHoistedCodeBlocks];
   for (const postprocessor of postprocessors) {
-    final = postprocessor(raw, data);
+    final = postprocessor(final, data);
   }
   return final;
 }