Merge pull request #658 from aml-org/W-15847817/minor-performance-imp…

…rovements W-15847817. Minor performance improvements.
aml-org · May 31, 2024 · 0d2999c · 0d2999c
2 parents f38843b + 8839b89
commit 0d2999c
Show file tree

Hide file tree

Showing 81 changed files with 1,065 additions and 1,060 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+v16.17.1
diff --git a/.sdkmanrc b/.sdkmanrc
@@ -0,0 +1,5 @@
+# Enable auto-env through the sdkman_auto_env config
+# Add key=value pairs of SDKs to use below
+java=17.0.10-tem
+scala=2.12.15
+sbt=1.7.3
diff --git a/...s/vocabularies2/dialects/annotation-mapping-with-multiple-domains/dialect.expanded.jsonld b/...s/vocabularies2/dialects/annotation-mapping-with-multiple-domains/dialect.expanded.jsonld
@@ -370,6 +370,21 @@
             ]
           }
         ],
+        "sourcemaps:aliases-array": [
+          {
+            "@id": "#/source-map/aliases-array/element_0",
+            "sourcemaps:element": [
+              {
+                "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/annotation-mapping-with-multiple-domains/dialect.yaml"
+              }
+            ],
+            "sourcemaps:value": [
+              {
+                "@value": "github->http://github.org/vocabulary#::http://github.org/vocabulary#::github.vocabulary.yaml"
+              }
+            ]
+          }
+        ],
         "sourcemaps:lexical": [
           {
             "@id": "#/source-map/lexical/element_5",
@@ -449,21 +464,6 @@
               }
             ]
           }
-        ],
-        "sourcemaps:aliases-array": [
-          {
-            "@id": "#/source-map/aliases-array/element_0",
-            "sourcemaps:element": [
-              {
-                "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/annotation-mapping-with-multiple-domains/dialect.yaml"
-              }
-            ],
-            "sourcemaps:value": [
-              {
-                "@value": "github->http://github.org/vocabulary#::http://github.org/vocabulary#::github.vocabulary.yaml"
-              }
-            ]
-          }
         ]
       }
     ],

diff --git a/.../vocabularies2/dialects/annotation-mapping-with-multiple-domains/dialect.flattened.jsonld b/.../vocabularies2/dialects/annotation-mapping-with-multiple-domains/dialect.flattened.jsonld
@@ -405,6 +405,11 @@
           "@id": "#/source-map/virtual-element/element_0"
         }
       ],
+      "sourcemaps:aliases-array": [
+        {
+          "@id": "#/source-map/aliases-array/element_0"
+        }
+      ],
       "sourcemaps:lexical": [
         {
           "@id": "#/source-map/lexical/element_5"
@@ -424,11 +429,6 @@
         {
           "@id": "#/source-map/lexical/element_4"
         }
-      ],
-      "sourcemaps:aliases-array": [
-        {
-          "@id": "#/source-map/aliases-array/element_0"
-        }
       ]
     },
     {
@@ -632,6 +632,11 @@
       "sourcemaps:element": "meta:extensions",
       "sourcemaps:value": "true"
     },
+    {
+      "@id": "#/source-map/aliases-array/element_0",
+      "sourcemaps:element": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/annotation-mapping-with-multiple-domains/dialect.yaml",
+      "sourcemaps:value": "github->http://github.org/vocabulary#::http://github.org/vocabulary#::github.vocabulary.yaml"
+    },
     {
       "@id": "#/source-map/lexical/element_5",
       "sourcemaps:element": "meta:externals",
@@ -662,11 +667,6 @@
       "sourcemaps:element": "core:version",
       "sourcemaps:value": "[(3,0)-(5,0)]"
     },
-    {
-      "@id": "#/source-map/aliases-array/element_0",
-      "sourcemaps:element": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/annotation-mapping-with-multiple-domains/dialect.yaml",
-      "sourcemaps:value": "github->http://github.org/vocabulary#::http://github.org/vocabulary#::github.vocabulary.yaml"
-    },
     {
       "@id": "http://github.org/vocabulary#contributor/source-map",
       "@type": [

diff --git a/...red/src/test/resources/vocabularies2/dialects/annotation-mappings/dialect.expanded.jsonld b/...red/src/test/resources/vocabularies2/dialects/annotation-mappings/dialect.expanded.jsonld
@@ -370,6 +370,21 @@
             ]
           }
         ],
+        "http://a.ml/vocabularies/document-source-maps#aliases-array": [
+          {
+            "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/annotation-mappings/dialect.yaml#/source-map/aliases-array/element_0",
+            "http://a.ml/vocabularies/document-source-maps#element": [
+              {
+                "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/annotation-mappings/dialect.yaml"
+              }
+            ],
+            "http://a.ml/vocabularies/document-source-maps#value": [
+              {
+                "@value": "github->http://github.org/vocabulary#::http://github.org/vocabulary#::github.vocabulary.yaml"
+              }
+            ]
+          }
+        ],
         "http://a.ml/vocabularies/document-source-maps#lexical": [
           {
             "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/annotation-mappings/dialect.yaml#/source-map/lexical/element_5",
@@ -449,21 +464,6 @@
               }
             ]
           }
-        ],
-        "http://a.ml/vocabularies/document-source-maps#aliases-array": [
-          {
-            "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/annotation-mappings/dialect.yaml#/source-map/aliases-array/element_0",
-            "http://a.ml/vocabularies/document-source-maps#element": [
-              {
-                "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/annotation-mappings/dialect.yaml"
-              }
-            ],
-            "http://a.ml/vocabularies/document-source-maps#value": [
-              {
-                "@value": "github->http://github.org/vocabulary#::http://github.org/vocabulary#::github.vocabulary.yaml"
-              }
-            ]
-          }
         ]
       }
     ],

diff --git a/...ed/src/test/resources/vocabularies2/dialects/annotation-mappings/dialect.flattened.jsonld b/...ed/src/test/resources/vocabularies2/dialects/annotation-mappings/dialect.flattened.jsonld
@@ -402,6 +402,11 @@
           "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/annotation-mappings/dialect.yaml#/source-map/virtual-element/element_0"
         }
       ],
+      "http://a.ml/vocabularies/document-source-maps#aliases-array": [
+        {
+          "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/annotation-mappings/dialect.yaml#/source-map/aliases-array/element_0"
+        }
+      ],
       "http://a.ml/vocabularies/document-source-maps#lexical": [
         {
           "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/annotation-mappings/dialect.yaml#/source-map/lexical/element_5"
@@ -421,11 +426,6 @@
         {
           "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/annotation-mappings/dialect.yaml#/source-map/lexical/element_4"
         }
-      ],
-      "http://a.ml/vocabularies/document-source-maps#aliases-array": [
-        {
-          "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/annotation-mappings/dialect.yaml#/source-map/aliases-array/element_0"
-        }
       ]
     },
     {
@@ -629,6 +629,11 @@
       "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/meta#extensions",
       "http://a.ml/vocabularies/document-source-maps#value": "true"
     },
+    {
+      "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/annotation-mappings/dialect.yaml#/source-map/aliases-array/element_0",
+      "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/annotation-mappings/dialect.yaml",
+      "http://a.ml/vocabularies/document-source-maps#value": "github->http://github.org/vocabulary#::http://github.org/vocabulary#::github.vocabulary.yaml"
+    },
     {
       "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/annotation-mappings/dialect.yaml#/source-map/lexical/element_5",
       "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/meta#externals",
@@ -659,11 +664,6 @@
       "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version",
       "http://a.ml/vocabularies/document-source-maps#value": "[(3,0)-(5,0)]"
     },
-    {
-      "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/annotation-mappings/dialect.yaml#/source-map/aliases-array/element_0",
-      "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/annotation-mappings/dialect.yaml",
-      "http://a.ml/vocabularies/document-source-maps#value": "github->http://github.org/vocabulary#::http://github.org/vocabulary#::github.vocabulary.yaml"
-    },
     {
       "@id": "http://github.org/vocabulary#contributor/source-map",
       "@type": [

diff --git a/.../shared/src/test/resources/vocabularies2/dialects/dialect-library/dialect.expanded.jsonld b/.../shared/src/test/resources/vocabularies2/dialects/dialect-library/dialect.expanded.jsonld
@@ -152,21 +152,6 @@
         "@type": [
           "http://a.ml/vocabularies/document-source-maps#SourceMap"
         ],
-        "http://a.ml/vocabularies/document-source-maps#aliases-array": [
-          {
-            "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/dialect-library/dialect.yaml#/source-map/aliases-array/element_0",
-            "http://a.ml/vocabularies/document-source-maps#element": [
-              {
-                "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/dialect-library/dialect.yaml"
-              }
-            ],
-            "http://a.ml/vocabularies/document-source-maps#value": [
-              {
-                "@value": "lib->file://amf-aml/shared/src/test/resources/vocabularies2/dialects/dialect-library/library.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/dialects/dialect-library/library.yaml::library.yaml"
-              }
-            ]
-          }
-        ],
         "http://a.ml/vocabularies/document-source-maps#lexical": [
           {
             "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/dialect-library/dialect.yaml#/source-map/lexical/element_3",
@@ -220,6 +205,21 @@
               }
             ]
           }
+        ],
+        "http://a.ml/vocabularies/document-source-maps#aliases-array": [
+          {
+            "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/dialect-library/dialect.yaml#/source-map/aliases-array/element_0",
+            "http://a.ml/vocabularies/document-source-maps#element": [
+              {
+                "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/dialect-library/dialect.yaml"
+              }
+            ],
+            "http://a.ml/vocabularies/document-source-maps#value": [
+              {
+                "@value": "lib->file://amf-aml/shared/src/test/resources/vocabularies2/dialects/dialect-library/library.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/dialects/dialect-library/library.yaml::library.yaml"
+              }
+            ]
+          }
         ]
       }
     ],

diff --git a/...shared/src/test/resources/vocabularies2/dialects/dialect-library/dialect.flattened.jsonld b/...shared/src/test/resources/vocabularies2/dialects/dialect-library/dialect.flattened.jsonld
@@ -197,11 +197,6 @@
       "@type": [
         "http://a.ml/vocabularies/document-source-maps#SourceMap"
       ],
-      "http://a.ml/vocabularies/document-source-maps#aliases-array": [
-        {
-          "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/dialect-library/dialect.yaml#/source-map/aliases-array/element_0"
-        }
-      ],
       "http://a.ml/vocabularies/document-source-maps#lexical": [
         {
           "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/dialect-library/dialect.yaml#/source-map/lexical/element_3"
@@ -215,6 +210,11 @@
         {
           "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/dialect-library/dialect.yaml#/source-map/lexical/element_2"
         }
+      ],
+      "http://a.ml/vocabularies/document-source-maps#aliases-array": [
+        {
+          "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/dialect-library/dialect.yaml#/source-map/aliases-array/element_0"
+        }
       ]
     },
     {
@@ -312,11 +312,6 @@
         }
       ]
     },
-    {
-      "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/dialect-library/dialect.yaml#/source-map/aliases-array/element_0",
-      "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/dialect-library/dialect.yaml",
-      "http://a.ml/vocabularies/document-source-maps#value": "lib->file://amf-aml/shared/src/test/resources/vocabularies2/dialects/dialect-library/library.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/dialects/dialect-library/library.yaml::library.yaml"
-    },
     {
       "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/dialect-library/dialect.yaml#/source-map/lexical/element_3",
       "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version",
@@ -337,6 +332,11 @@
       "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/dialect-library/dialect.yaml",
       "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(14,21)]"
     },
+    {
+      "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/dialect-library/dialect.yaml#/source-map/aliases-array/element_0",
+      "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/dialect-library/dialect.yaml",
+      "http://a.ml/vocabularies/document-source-maps#value": "lib->file://amf-aml/shared/src/test/resources/vocabularies2/dialects/dialect-library/library.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/dialects/dialect-library/library.yaml::library.yaml"
+    },
     {
       "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/dialect-library/library.yaml#/declarations/AnotherNode/property/anotherProperty",
       "@type": [

diff --git a/amf-aml/shared/src/test/resources/vocabularies2/dialects/example1.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example1.expanded.jsonld
@@ -233,21 +233,6 @@
         "@type": [
           "http://a.ml/vocabularies/document-source-maps#SourceMap"
         ],
-        "http://a.ml/vocabularies/document-source-maps#aliases-array": [
-          {
-            "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example1.yaml#/source-map/aliases-array/element_0",
-            "http://a.ml/vocabularies/document-source-maps#element": [
-              {
-                "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example1.yaml"
-              }
-            ],
-            "http://a.ml/vocabularies/document-source-maps#value": [
-              {
-                "@value": "vocab2->http://a.ml/vocabularies/vocab2#::http://a.ml/vocabularies/vocab2#::vocab2.yaml"
-              }
-            ]
-          }
-        ],
         "http://a.ml/vocabularies/document-source-maps#lexical": [
           {
             "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example1.yaml#/source-map/lexical/element_3",
@@ -301,6 +286,21 @@
               }
             ]
           }
+        ],
+        "http://a.ml/vocabularies/document-source-maps#aliases-array": [
+          {
+            "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example1.yaml#/source-map/aliases-array/element_0",
+            "http://a.ml/vocabularies/document-source-maps#element": [
+              {
+                "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example1.yaml"
+              }
+            ],
+            "http://a.ml/vocabularies/document-source-maps#value": [
+              {
+                "@value": "vocab2->http://a.ml/vocabularies/vocab2#::http://a.ml/vocabularies/vocab2#::vocab2.yaml"
+              }
+            ]
+          }
         ]
       }
     ],

diff --git a/amf-aml/shared/src/test/resources/vocabularies2/dialects/example1.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example1.flattened.jsonld
@@ -271,11 +271,6 @@
       "@type": [
         "http://a.ml/vocabularies/document-source-maps#SourceMap"
       ],
-      "http://a.ml/vocabularies/document-source-maps#aliases-array": [
-        {
-          "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example1.yaml#/source-map/aliases-array/element_0"
-        }
-      ],
       "http://a.ml/vocabularies/document-source-maps#lexical": [
         {
           "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example1.yaml#/source-map/lexical/element_3"
@@ -289,6 +284,11 @@
         {
           "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example1.yaml#/source-map/lexical/element_2"
         }
+      ],
+      "http://a.ml/vocabularies/document-source-maps#aliases-array": [
+        {
+          "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example1.yaml#/source-map/aliases-array/element_0"
+        }
       ]
     },
     {
@@ -427,11 +427,6 @@
         }
       ]
     },
-    {
-      "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example1.yaml#/source-map/aliases-array/element_0",
-      "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example1.yaml",
-      "http://a.ml/vocabularies/document-source-maps#value": "vocab2->http://a.ml/vocabularies/vocab2#::http://a.ml/vocabularies/vocab2#::vocab2.yaml"
-    },
     {
       "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example1.yaml#/source-map/lexical/element_3",
       "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version",
@@ -452,6 +447,11 @@
       "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example1.yaml",
       "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(24,0)]"
     },
+    {
+      "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example1.yaml#/source-map/aliases-array/element_0",
+      "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example1.yaml",
+      "http://a.ml/vocabularies/document-source-maps#value": "vocab2->http://a.ml/vocabularies/vocab2#::http://a.ml/vocabularies/vocab2#::vocab2.yaml"
+    },
     {
       "@id": "http://a.ml/vocabularies/vocab2#A/source-map",
       "@type": [