Web Bundler 2.0 and / data mapping (#685)

ia3andy · web-flow · commit 2b0779e80976 · 2025-12-05T15:22:14.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -41,7 +41,7 @@
         <quarkus-qute-web.version>3.4.4</quarkus-qute-web.version>
         <asciidoctorj.version>3.0.1</asciidoctorj.version>
         <asciidoctorj-diagram.version>3.1.0</asciidoctorj-diagram.version>
-        <quarkus-web-bundler.version>2.0.0.CR7</quarkus-web-bundler.version>
+        <quarkus-web-bundler.version>2.0.0</quarkus-web-bundler.version>
         <asciidoc-java.version>1.2.12</asciidoc-java.version>
         <jandex.version>3.5.3</jandex.version>
         <jsoup.version>1.21.2</jsoup.version>
diff --git a/roq-data/deployment/src/main/java/io/quarkiverse/roq/data/deployment/RoqDataBeanProcessor.java b/roq-data/deployment/src/main/java/io/quarkiverse/roq/data/deployment/RoqDataBeanProcessor.java
@@ -51,37 +51,37 @@ void generateSyntheticBeans(RoqDataConfig config,
 
         var mapOfFolders = new HashMap<String, TreeMap<String, Object>>();
         for (RoqDataJsonBuildItem roqData : roqDataJsonBuildItems) {
-            if (roqData.getName().contains("_")) {
-                // Subfolder case
+            if (roqData.getName().contains("/")) {
+                // Subfolder grouping case
                 // Test that there is only one level of subfolder
-                long count = roqData.getName().chars().filter(c -> c == '_').count();
-                if (count > 1) {
-                    LOG.info("Unsupported more than one subfolder %s".formatted(roqData.getName()));
+                long count = roqData.getName().chars().filter(c -> c == '/').count();
+                if (count == 1) {
+                    var fileName = roqData.getName();
+                    var key = fileName.substring(fileName.indexOf("/") + 1);
+                    var folderName = fileName.substring(0, fileName.lastIndexOf('/'));
+                    mapOfFolders.computeIfAbsent(folderName, ignored -> new TreeMap<>()).put(key, roqData.getData());
+                } else if (count > 1) {
+                    LOG.debugf(
+                            "Deeply nested data files are not processed as grouped structure: %s (only one level of nesting is supported)",
+                            roqData.getName());
                 }
-
-                var fileName = roqData.getName();
-                var key = fileName.substring(fileName.indexOf("_") + 1);
-
-                var folderName = fileName.substring(0, fileName.lastIndexOf('_'));
-                mapOfFolders.computeIfAbsent(folderName, ignored -> new TreeMap<>()).put(key, roqData.getData());
+            }
+            // Let's still add the file name mapping
+            final Class<?> cl;
+            if (roqData.getData() instanceof JsonObject) {
+                cl = JsonObject.class;
+            } else if (roqData.getData() instanceof JsonArray) {
+                cl = JsonArray.class;
             } else {
-                // Files at the root of data folder
-                final Class<?> cl;
-                if (roqData.getData() instanceof JsonObject) {
-                    cl = JsonObject.class;
-                } else if (roqData.getData() instanceof JsonArray) {
-                    cl = JsonArray.class;
-                } else {
-                    throw new IllegalStateException("Unsupported Json data bean type for %s".formatted(roqData.getName()));
-                }
-                beansProducer.produce(SyntheticBeanBuildItem.configure(cl)
-                        .scope(ApplicationScoped.class)
-                        .named(roqData.getName())
-                        .runtimeValue(recorder.createRoqDataJson(roqData.getData()))
-                        .unremovable()
-                        .done());
-                beans.add("    - %s[name=%s]*".formatted(cl.getName(), roqData.getName()));
+                throw new IllegalStateException("Unsupported Json data bean type for %s".formatted(roqData.getName()));
             }
+            beansProducer.produce(SyntheticBeanBuildItem.configure(cl)
+                    .scope(ApplicationScoped.class)
+                    .named(roqData.getName())
+                    .runtimeValue(recorder.createRoqDataJson(roqData.getData()))
+                    .unremovable()
+                    .done());
+            beans.add("    - %s[name=%s]*".formatted(cl.getName(), roqData.getName()));
         }
 
         for (RoqDataBeanBuildItem beanBuildItem : dataBeanBuildItems) {
diff --git a/roq-data/deployment/src/main/java/io/quarkiverse/roq/data/deployment/RoqDataReaderProcessor.java b/roq-data/deployment/src/main/java/io/quarkiverse/roq/data/deployment/RoqDataReaderProcessor.java
@@ -1,5 +1,8 @@
 package io.quarkiverse.roq.data.deployment;
 
+import static io.quarkiverse.roq.util.PathUtils.removeExtension;
+import static io.quarkiverse.roq.util.PathUtils.toUnixPath;
+
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.file.Files;
@@ -226,7 +229,7 @@ private static Consumer<Path> addRoqDataBuildItem(
             Path rootDir,
             Map<String, RoqDataBuildItem> items) {
         return file -> {
-            var name = rootDir.relativize(file).toString().replaceAll("\\..*", "").replaceAll("/", "_");
+            var name = toUnixPath(removeExtension(rootDir.relativize(file).toString()));
             if (items.containsKey(name)) {
                 throw new DataConflictException("Multiple data files found for the name: '%s'.".formatted(name));
             }
diff --git a/roq-data/deployment/src/test/java/io/quarkiverse/roq/data/test/RoqDataInjectableBeanLookingCustomLocationTest.java b/roq-data/deployment/src/test/java/io/quarkiverse/roq/data/test/RoqDataInjectableBeanLookingCustomLocationTest.java
@@ -27,6 +27,18 @@ public class RoqDataInjectableBeanLookingCustomLocationTest {
     @Named("bar")
     JsonObject bar;
 
+    @Inject
+    @Named("dir/bar")
+    JsonObject dirBar;
+
+    @Inject
+    @Named("dir/foo")
+    JsonObject dirFoo;
+
+    @Inject
+    @Named("dir")
+    JsonObject dir;
+
     @Inject
     @Named("baz")
     JsonObject baz;
@@ -51,4 +63,12 @@ public void baz() {
         Assertions.assertEquals("Super Heroes from Yml custom", fromYml);
     }
 
+    @Test
+    public void dir() {
+        Assertions.assertEquals("Super Heroes Foo from Yml in dir", dirFoo.getString("name"));
+        Assertions.assertEquals("Super Heroes Bar from Yaml in dir", dirBar.getString("name"));
+        Assertions.assertEquals("Super Heroes Foo from Yml in dir", dir.getJsonObject("foo").getString("name"));
+        Assertions.assertEquals("Super Heroes Bar from Yaml in dir", dir.getJsonObject("bar").getString("name"));
+    }
+
 }
diff --git a/roq-data/deployment/test-data/dir/bar.yaml b/roq-data/deployment/test-data/dir/bar.yaml
@@ -0,0 +1 @@
+name: Super Heroes Bar from Yaml in dir
diff --git a/roq-data/deployment/test-data/dir/foo.yml b/roq-data/deployment/test-data/dir/foo.yml
@@ -0,0 +1 @@
+name: Super Heroes Foo from Yml in dir
diff --git a/roq-theme/resume/deployment/pom.xml b/roq-theme/resume/deployment/pom.xml
@@ -14,7 +14,7 @@
     <dependencies>
         <dependency>
             <groupId>io.quarkiverse.web-bundler</groupId>
-            <artifactId>quarkus-web-bundler-tailwind-css-deployment</artifactId>
+            <artifactId>quarkus-web-bundler-tailwindcss-deployment</artifactId>
             <version>${quarkus-web-bundler.version}</version>
         </dependency>
         <dependency>
diff --git a/roq-theme/resume/runtime/pom.xml b/roq-theme/resume/runtime/pom.xml
@@ -14,7 +14,7 @@
     <dependencies>
         <dependency>
             <groupId>io.quarkiverse.web-bundler</groupId>
-            <artifactId>quarkus-web-bundler-tailwind-css</artifactId>
+            <artifactId>quarkus-web-bundler-tailwindcss</artifactId>
             <version>${quarkus-web-bundler.version}</version>
         </dependency>
         <dependency>

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+name: Super Heroes Bar from Yaml in dir`