refactor: hoist hydrate child visitor logic

marko-js · Mar 11, 2024 · 858a23b · 858a23b
1 parent f5d9a3e
commit 858a23b
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 6 deletions.
diff --git a/packages/translator-default/src/util/add-dependencies.js b/packages/translator-default/src/util/add-dependencies.js
@@ -31,7 +31,14 @@ export default (entryFile, isHydrate) => {
       visitedFiles.add(resolved);
       const file = loadFileForImport(entryFile, resolved);
       if (file) {
-        entryBuilder.visit(file, entryFile, visitChild);
+        entryBuilder.visit(file, entryFile, (id) =>
+          visitChild(
+            resolveRelativePath(
+              entryFile,
+              path.join(file.opts.filename, "..", id),
+            ),
+          ),
+        );
       }
     }
   });
@@ -130,12 +137,12 @@ export const entryBuilder = {
 
     for (const tag of fileMeta.tags) {
       if (tag.endsWith(".marko")) {
-        visitChild(resolveRelativePath(entryFile, tag));
+        visitChild(tag);
       } else {
         const importedTemplates = tryGetTemplateImports(file, tag);
         if (importedTemplates) {
           for (const templateFile of importedTemplates) {
-            visitChild(resolveRelativePath(entryFile, templateFile));
+            visitChild(templateFile);
           }
         }
       }

diff --git a/packages/translator-interop/src/index.ts b/packages/translator-interop/src/index.ts
@@ -138,7 +138,14 @@ function patchTranslateProgram(visitor: t.Visitor) {
           visitedFiles.add(resolved);
           const file = loadFileForImport(entryFile, resolved);
           if (file) {
-            entryBuilder.visit(file, entryFile, visitChild);
+            entryBuilder.visit(file, entryFile, (id) =>
+              visitChild(
+                resolveRelativePath(
+                  entryFile,
+                  path.join(file.opts.filename as string, "..", id),
+                ),
+              ),
+            );
           }
         }
       });

diff --git a/packages/translator-tags/src/util/entry-builder.ts b/packages/translator-tags/src/util/entry-builder.ts
@@ -55,7 +55,7 @@ export default {
       false;
 
     for (const tag of analyzedTags || []) {
-      visitChild(resolveRelativePath(entryFile, tag));
+      visitChild(tag);
     }
   },
 };
diff --git a/packages/translator-tags/src/visitors/program/index.ts b/packages/translator-tags/src/visitors/program/index.ts
@@ -1,3 +1,4 @@
+import path from "path";
 import { loadFileForImport, resolveRelativePath } from "@marko/babel-utils";
 import { types as t } from "@marko/compiler";
 import entryBuilder from "../../util/entry-builder";
@@ -65,7 +66,14 @@ export default {
             visitedFiles.add(resolved);
             const file = loadFileForImport(entryFile, resolved);
             if (file) {
-              entryBuilder.visit(file, entryFile, visitChild);
+              entryBuilder.visit(file, entryFile, (id) =>
+                visitChild(
+                  resolveRelativePath(
+                    entryFile,
+                    path.join(file.opts.filename as string, "..", id),
+                  ),
+                ),
+              );
             }
           }
         });