#278 template names are properly normalized

casid · Sep 30, 2023 · 7cb7ff1 · 7cb7ff1
1 parent d940f92
commit 7cb7ff1
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 0 deletions.
diff --git a/jte/src/main/java/gg/jte/compiler/TemplateCompiler.java b/jte/src/main/java/gg/jte/compiler/TemplateCompiler.java
@@ -284,6 +284,8 @@ public ClassInfo generateTemplateCall(String name, LinkedHashSet<ClassDefinition
         Module templateModule = module.resolve(name);
         CodeResolver codeResolver = templateModule.getCodeResolver();
 
+        name = templateModule.normalize(name);
+
         templateDependencies.add(new TemplateDependency(name, codeResolver.getLastModified(name)));
         ClassInfo classInfo = new ClassInfo(name, config.packageName);
 

diff --git a/jte/src/main/java/gg/jte/compiler/module/Module.java b/jte/src/main/java/gg/jte/compiler/module/Module.java
@@ -44,6 +44,18 @@ public Module resolve(String name) {
       return result;
    }
 
+   public String normalize(String name) {
+      if (isRoot()) {
+         return name;
+      } else {
+         if (name.startsWith(alias + "/")) {
+            return name;
+         } else {
+            return alias + "/" + name;
+         }
+      }
+   }
+
    public boolean isRoot() {
       return alias.isEmpty();
    }

diff --git a/jte/src/test/java/gg/jte/TemplateEngine_ModulesTest.java b/jte/src/test/java/gg/jte/TemplateEngine_ModulesTest.java
@@ -4,6 +4,7 @@
 import static org.assertj.core.api.Assertions.catchThrowable;
 
 import java.nio.file.Path;
+import java.util.List;
 
 import org.junit.jupiter.api.Test;
 
@@ -70,5 +71,20 @@ <p>line chart (checkout)</p>
               line chart (core)""");
    }
 
+   @Test
+   void emptyTopLevelModule_generateAll() {
+      DirectoryCodeResolver codeResolver = new DirectoryCodeResolver(Path.of("src/test/modules/empty-top-level-module"));
+      TemplateEngine templateEngine = TemplateEngine.create(codeResolver, ContentType.Html);
+
+      List<String> templates = templateEngine.generateAll();
+
+      assertThat(templates).containsExactlyInAnyOrder(
+              "gg/jte/generated/ondemand/apexcharts/JtelinechartGenerated.java",
+              "gg/jte/generated/ondemand/checkout/JtepageGenerated.java",
+              "gg/jte/generated/ondemand/core/JtelayoutGenerated.java",
+              "gg/jte/generated/ondemand/core/component/JtecssGenerated.java"
+      );
+   }
+
    // TODO adjust precompileAll() and generateAll() to iterate over all module files as well!
 }