CLDR-16720 json transliterator- improve format

- hoist json content up 2 levels - fix 'BGN' in path
srl295 · Sep 19, 2024 · 054ab28 · 054ab28
1 parent 2459840
commit 054ab28
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 11 deletions.
diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/json/Ldml2JsonConverter.java b/tools/cldr-code/src/main/java/org/unicode/cldr/json/Ldml2JsonConverter.java
@@ -901,14 +901,6 @@ private int convertCldrItems(
                             }
                             // the value is now the raw filename
                             item.setValue(rawTransformFile);
-                            item.setPath(
-                                    item.getPath()
-                                            .replaceAll("\\]/tRule.*$", "]/_rulesFile")
-                                            .replace("/transforms/", "/"));
-                            item.setFullPath(
-                                    item.getFullPath()
-                                            .replaceAll("\\]/tRule.*$", "]/_rulesFile")
-                                            .replace("/transforms/", "/"));
                         }
 
                         // some items need to be split to multiple item before processing. None
@@ -970,7 +962,31 @@ private int convertCldrItems(
                         outputUnitPreferenceData(js, theItems, out, nodesForLastItem);
                     }
 
-                    // closeNodes(out, nodesForLastItem.size() - 2, 0);
+                    // Special processing for transforms.
+                    if (type == RunType.transforms) {
+                        final JsonObject jo = out.getAsJsonObject("transforms");
+                        if (jo == null || jo.isEmpty()) {
+                            throw new RuntimeException(
+                                    "Could not get transforms object in " + filename);
+                        }
+                        @SuppressWarnings("unchecked")
+                        final Entry<String, JsonElement>[] s = jo.entrySet().toArray(new Entry[0]);
+                        if (s == null || s.length != 1) {
+                            throw new RuntimeException(
+                                    "Could not get 1 subelement of transforms in " + filename);
+                        }
+                        // key doesn't matter.
+                        // move subitem up
+                        out = s[0].getValue().getAsJsonObject();
+                        final Entry<String, JsonElement>[] s2 =
+                                out.entrySet().toArray(new Entry[0]);
+                        if (s2 == null || s2.length != 1) {
+                            throw new RuntimeException(
+                                    "Could not get 1 sub-subelement of transforms in " + filename);
+                        }
+                        // move sub-subitem up.
+                        out = s2[0].getValue().getAsJsonObject();
+                    }
 
                     // write JSON
                     try (PrintWriter outf = FileUtilities.openUTF8Writer(outputDir, outFilename)) {

diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/json/pathTransforms.txt b/tools/cldr-code/src/main/resources/org/unicode/cldr/json/pathTransforms.txt
@@ -171,5 +171,5 @@
 > $1/$2$4
 
 # Transform - drop terminal tRule element
-< (.*)/tRule.*
-> $1
+< //supplementalData/transforms/transform(.*)/tRule.*$
+> //supplementalData/transforms/transform$1/_rulesFile