refactor: move node deletion to end of translate phase when possible (#…

…2088) * refactor: move node deletion to end of translate phase when possible * refactor: move _everything_ to end when possible
marko-js · Jan 23, 2024 · 59e73eb · 59e73eb
1 parent e2e3fbd
commit 59e73eb
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 54 deletions.
diff --git a/packages/translator-tags/src/visitors/cdata.ts b/packages/translator-tags/src/visitors/cdata.ts
@@ -3,11 +3,12 @@ import { isOutputHTML } from "../util/marko-config";
 import * as writer from "../util/writer";
 
 export default {
-  translate(cdata: t.NodePath<t.MarkoCDATA>) {
-    if (isOutputHTML()) {
-      writer.writeTo(cdata)`<![CDATA[${cdata.node.value}]]>`;
-    }
-
-    cdata.remove();
+  translate: {
+    exit(cdata: t.NodePath<t.MarkoCDATA>) {
+      if (isOutputHTML()) {
+        writer.writeTo(cdata)`<![CDATA[${cdata.node.value}]]>`;
+      }
+      cdata.remove();
+    },
   },
 };
diff --git a/packages/translator-tags/src/visitors/comment.ts b/packages/translator-tags/src/visitors/comment.ts
@@ -4,15 +4,17 @@ import * as writer from "../util/writer";
 const ieConditionalCommentRegExp = /^\[if |<!\[endif\]$/;
 
 export default {
-  translate(comment: t.NodePath<t.MarkoComment>) {
-    if (isOutputHTML()) {
-      const { value } = comment.node;
+  translate: {
+    exit(comment: t.NodePath<t.MarkoComment>) {
+      if (isOutputHTML()) {
+        const { value } = comment.node;
 
-      if (ieConditionalCommentRegExp.test(value)) {
-        writer.writeTo(comment)`<!--${value}-->`;
+        if (ieConditionalCommentRegExp.test(value)) {
+          writer.writeTo(comment)`<!--${value}-->`;
+        }
       }
-    }
 
-    comment.remove();
+      comment.remove();
+    },
   },
 };
diff --git a/packages/translator-tags/src/visitors/declaration.ts b/packages/translator-tags/src/visitors/declaration.ts
@@ -3,11 +3,13 @@ import { isOutputHTML } from "../util/marko-config";
 import * as writer from "../util/writer";
 
 export default {
-  translate(declaration: t.NodePath<t.MarkoDeclaration>) {
-    if (isOutputHTML()) {
-      writer.writeTo(declaration)`<?${declaration.node.value}?>`;
-    }
+  translate: {
+    exit(declaration: t.NodePath<t.MarkoDeclaration>) {
+      if (isOutputHTML()) {
+        writer.writeTo(declaration)`<?${declaration.node.value}?>`;
+      }
 
-    declaration.remove();
+      declaration.remove();
+    },
   },
 };
diff --git a/packages/translator-tags/src/visitors/document-type.ts b/packages/translator-tags/src/visitors/document-type.ts
@@ -3,11 +3,12 @@ import { isOutputHTML } from "../util/marko-config";
 import * as writer from "../util/writer";
 
 export default {
-  translate(documentType: t.NodePath<t.MarkoDocumentType>) {
-    if (isOutputHTML()) {
-      writer.writeTo(documentType)`<!${documentType.node.value}>`;
-    }
-
-    documentType.remove();
+  translate: {
+    exit(documentType: t.NodePath<t.MarkoDocumentType>) {
+      if (isOutputHTML()) {
+        writer.writeTo(documentType)`<!${documentType.node.value}>`;
+      }
+      documentType.remove();
+    },
   },
 };
diff --git a/packages/translator-tags/src/visitors/scriptlet.ts b/packages/translator-tags/src/visitors/scriptlet.ts
@@ -5,22 +5,24 @@ import { getSection } from "../util/sections";
 import { addStatement } from "../util/signals";
 
 export default {
-  translate(scriptlet: t.NodePath<t.MarkoScriptlet>) {
-    if (isOutputHTML()) {
-      if (scriptlet.node.static) return; // handled in program exit for html currently.
-      scriptlet.replaceWithMultiple(scriptlet.node.body);
-    } else {
-      if (scriptlet.node.static) {
+  translate: {
+    exit(scriptlet: t.NodePath<t.MarkoScriptlet>) {
+      if (isOutputHTML()) {
+        if (scriptlet.node.static) return; // handled in program exit for html currently.
         scriptlet.replaceWithMultiple(scriptlet.node.body);
       } else {
-        addStatement(
-          "render",
-          getSection(scriptlet),
-          scriptlet.node.extra?.bodyReferences as References,
-          scriptlet.node.body,
-        );
-        scriptlet.remove();
+        if (scriptlet.node.static) {
+          scriptlet.replaceWithMultiple(scriptlet.node.body);
+        } else {
+          addStatement(
+            "render",
+            getSection(scriptlet),
+            scriptlet.node.extra?.bodyReferences as References,
+            scriptlet.node.body,
+          );
+          scriptlet.remove();
+        }
       }
-    }
+    },
   },
 };
diff --git a/packages/translator-tags/src/visitors/text.ts b/packages/translator-tags/src/visitors/text.ts
@@ -4,23 +4,26 @@ import * as walks from "../util/walks";
 import * as writer from "../util/writer";
 
 export default {
-  translate(text: t.NodePath<t.MarkoText>) {
-    const followingSiblings = (text.container as t.Statement[]).slice(
-      (text.key as number) + 1,
-    );
-    let needsSeparator = false;
-    if (isOutputHTML()) {
-      for (const sibling of followingSiblings) {
-        if (t.isMarkoPlaceholder(sibling)) {
-          needsSeparator = true;
-          break;
-        } else if (t.isMarkoTag(sibling) || t.isMarkoText(sibling)) {
-          break;
+  translate: {
+    exit(text: t.NodePath<t.MarkoText>) {
+      const followingSiblings = (text.container as t.Statement[]).slice(
+        (text.key as number) + 1,
+      );
+      let needsSeparator = false;
+      if (isOutputHTML()) {
+        for (const sibling of followingSiblings) {
+          if (t.isMarkoPlaceholder(sibling)) {
+            needsSeparator = true;
+            break;
+          } else if (t.isMarkoTag(sibling) || t.isMarkoText(sibling)) {
+            break;
+          }
         }
       }
-    }
-    writer.writeTo(text)`${text.node.value}${needsSeparator ? "<!>" : ""}`;
-    walks.enterShallow(text);
-    text.remove();
+      writer.writeTo(text)`${text.node.value}${needsSeparator ? "<!>" : ""}`;
+      walks.enterShallow(text);
+
+      text.remove();
+    },
   },
 };