From ffbd3b00e33c7ad67d7717994fadeda759856b49 Mon Sep 17 00:00:00 2001 From: Javier Isoldi Date: Fri, 24 May 2024 20:34:25 -0300 Subject: [PATCH 1/2] W-15847817. types List replaced by HashSet to make contains operation O(1). --- .nvmrc | 1 + .sdkmanrc | 5 +++++ .../internal/shacl/custom/CustomShaclValidator.scala | 5 ++--- 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 .nvmrc create mode 100644 .sdkmanrc diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 00000000..e0325e5a --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +v16.17.1 diff --git a/.sdkmanrc b/.sdkmanrc new file mode 100644 index 00000000..113d5f7f --- /dev/null +++ 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 \ No newline at end of file diff --git a/amf-validation/shared/src/main/scala/amf/validation/internal/shacl/custom/CustomShaclValidator.scala b/amf-validation/shared/src/main/scala/amf/validation/internal/shacl/custom/CustomShaclValidator.scala index 7ba3b999..cbf66814 100644 --- a/amf-validation/shared/src/main/scala/amf/validation/internal/shacl/custom/CustomShaclValidator.scala +++ b/amf-validation/shared/src/main/scala/amf/validation/internal/shacl/custom/CustomShaclValidator.scala @@ -85,7 +85,7 @@ class CustomShaclValidator( validations: Seq[ValidationSpecification], reportBuilder: ReportBuilder ): Unit = { - val classes = element.meta.`type`.map(_.iri()) + val classes = element.meta.typeIrisSet val isExternalLink = element.isExternalLink.value() validations.foreach { specification => if (!isExternalLink && (matchingClass(specification, classes) || matchingInstance(specification, element))) { @@ -116,8 +116,7 @@ class CustomShaclValidator( } } - // TODO: could this made be faster by using Sets? -> We would have to propagate Sets to several places - private def matchingClass(specification: ValidationSpecification, classes: Seq[String]): Boolean = { + private def matchingClass(specification: ValidationSpecification, classes: Set[String]): Boolean = { specification.targetClass.exists(classes.contains) } From 8839b89f678cf7535c769ca2995d021a319347b0 Mon Sep 17 00:00:00 2001 From: Javier Isoldi Date: Fri, 31 May 2024 16:44:34 -0300 Subject: [PATCH 2/2] JSON-LDs updated. source-maps map order changes. --- .../dialect.expanded.jsonld | 30 +++---- .../dialect.flattened.jsonld | 20 ++--- .../dialect.expanded.jsonld | 30 +++---- .../dialect.flattened.jsonld | 20 ++--- .../dialect-library/dialect.expanded.jsonld | 30 +++---- .../dialect-library/dialect.flattened.jsonld | 20 ++--- .../dialects/example1.expanded.jsonld | 30 +++---- .../dialects/example1.flattened.jsonld | 20 ++--- .../dialects/example13.expanded.jsonld | 30 +++---- .../dialects/example13.flattened.jsonld | 20 ++--- .../dialects/example1b.expanded.jsonld | 30 +++---- .../dialects/example1b.flattened.jsonld | 20 ++--- .../dialects/example2.expanded.jsonld | 30 +++---- .../dialects/example2.flattened.jsonld | 20 ++--- .../dialects/example23a.expanded.jsonld | 30 +++---- .../dialects/example23a.flattened.jsonld | 20 ++--- .../dialects/example23b.expanded.jsonld | 30 +++---- .../dialects/example23b.flattened.jsonld | 20 ++--- .../dialects/example3.expanded.jsonld | 30 +++---- .../dialects/example3.flattened.jsonld | 20 ++--- .../dialects/example5.expanded.jsonld | 30 +++---- .../dialects/example5.flattened.jsonld | 20 ++--- .../dialects/example6.expanded.jsonld | 30 +++---- .../dialects/example6.flattened.jsonld | 20 ++--- .../dialects/example7.expanded.jsonld | 30 +++---- .../dialects/example7.flattened.jsonld | 20 ++--- .../instances/$base/instance.expanded.jsonld | 52 +++++------ .../instances/$base/instance.flattened.jsonld | 34 ++++---- .../instances/$id/instance.expanded.jsonld | 52 +++++------ .../instances/$id/instance.flattened.jsonld | 34 ++++---- .../instances/example13b.expanded.jsonld | 52 +++++------ .../instances/example13b.flattened.jsonld | 34 ++++---- .../instances/example13c.expanded.jsonld | 30 +++---- .../instances/example13c.flattened.jsonld | 20 ++--- .../instances/example14.expanded.jsonld | 78 ++++++++--------- .../instances/example14.flattened.jsonld | 48 +++++------ .../instances/example16c.expanded.jsonld | 12 +-- .../instances/example16c.flattened.jsonld | 16 ++-- .../instances/example24.expanded.jsonld | 12 +-- .../instances/example24.flattened.jsonld | 16 ++-- .../instances/example24c.expanded.jsonld | 12 +-- .../instances/example24c.flattened.jsonld | 16 ++-- .../instances/example27a.expanded.jsonld | 86 +++++++++---------- .../instances/example27a.flattened.jsonld | 54 ++++++------ .../instances/example31.expanded.jsonld | 60 ++++++------- .../instances/example31.flattened.jsonld | 34 ++++---- .../instances/example33.expanded.jsonld | 24 +++--- .../instances/example33.flattened.jsonld | 20 ++--- .../instances/example8b.expanded.jsonld | 12 +-- .../instances/example8b.flattened.jsonld | 16 ++-- .../instances/example8c.expanded.jsonld | 12 +-- .../instances/example8c.flattened.jsonld | 16 ++-- .../instances/example9.expanded.jsonld | 12 +-- .../instances/example9.flattened.jsonld | 16 ++-- .../instances/example9b.expanded.jsonld | 12 +-- .../instances/example9b.flattened.jsonld | 16 ++-- .../instance.expanded.jsonld | 30 +++---- .../instance.flattened.jsonld | 20 ++--- .../instance.expanded.jsonld | 26 +++--- .../instance.flattened.jsonld | 20 ++--- .../dialects/example1.expanded.jsonld | 30 +++---- .../dialects/example1.flattened.jsonld | 20 ++--- .../dialects/example2.expanded.jsonld | 30 +++---- .../dialects/example2.flattened.jsonld | 20 ++--- .../dialects/example3.expanded.jsonld | 30 +++---- .../dialects/example3.flattened.jsonld | 20 ++--- .../dialects/example5.expanded.jsonld | 30 +++---- .../dialects/example5.flattened.jsonld | 20 ++--- .../dialects/example6.expanded.jsonld | 30 +++---- .../dialects/example6.flattened.jsonld | 20 ++--- .../dialects/example7.expanded.jsonld | 30 +++---- .../dialects/example7.flattened.jsonld | 20 ++--- .../ABOUT/ABOUT-dialect.expanded.jsonld | 30 +++---- .../ABOUT/ABOUT-dialect.flattened.jsonld | 20 ++--- .../production/Instagram/dialect.json | 30 +++---- .../production/streams/activity.json | 30 +++---- .../vocabularies/example6.expanded.jsonld | 30 +++---- .../vocabularies/example6.flattened.jsonld | 20 ++--- 78 files changed, 1057 insertions(+), 1057 deletions(-) diff --git a/amf-aml/shared/src/test/resources/vocabularies2/dialects/annotation-mapping-with-multiple-domains/dialect.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/dialects/annotation-mapping-with-multiple-domains/dialect.expanded.jsonld index b8428902..bee8bbbd 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/dialects/annotation-mapping-with-multiple-domains/dialect.expanded.jsonld +++ b/amf-aml/shared/src/test/resources/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/amf-aml/shared/src/test/resources/vocabularies2/dialects/annotation-mapping-with-multiple-domains/dialect.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/dialects/annotation-mapping-with-multiple-domains/dialect.flattened.jsonld index 616f5ee7..717adc35 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/dialects/annotation-mapping-with-multiple-domains/dialect.flattened.jsonld +++ b/amf-aml/shared/src/test/resources/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/amf-aml/shared/src/test/resources/vocabularies2/dialects/annotation-mappings/dialect.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/dialects/annotation-mappings/dialect.expanded.jsonld index 50f27f08..1bfeaa9b 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/dialects/annotation-mappings/dialect.expanded.jsonld +++ b/amf-aml/shared/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/amf-aml/shared/src/test/resources/vocabularies2/dialects/annotation-mappings/dialect.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/dialects/annotation-mappings/dialect.flattened.jsonld index eeae992a..4d4d1403 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/dialects/annotation-mappings/dialect.flattened.jsonld +++ b/amf-aml/shared/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/amf-aml/shared/src/test/resources/vocabularies2/dialects/dialect-library/dialect.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/dialects/dialect-library/dialect.expanded.jsonld index 9689a705..1d275762 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/dialects/dialect-library/dialect.expanded.jsonld +++ b/amf-aml/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/amf-aml/shared/src/test/resources/vocabularies2/dialects/dialect-library/dialect.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/dialects/dialect-library/dialect.flattened.jsonld index fe1786e1..baf7bd0f 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/dialects/dialect-library/dialect.flattened.jsonld +++ b/amf-aml/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 index 3d68fa5a..2cd09e8e 100644 --- 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 index 819e4efc..8302230c 100644 --- 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": [ diff --git a/amf-aml/shared/src/test/resources/vocabularies2/dialects/example13.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example13.expanded.jsonld index 525b2fd6..3df0bd11 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/dialects/example13.expanded.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example13.expanded.jsonld @@ -221,21 +221,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/example13.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/example13.yaml" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "lib->file://amf-aml/shared/src/test/resources/vocabularies2/dialects/mappings_lib.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/dialects/mappings_lib.yaml::mappings_lib.yaml" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example13.yaml#/source-map/lexical/element_4", @@ -302,6 +287,21 @@ } ] } + ], + "http://a.ml/vocabularies/document-source-maps#aliases-array": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example13.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/example13.yaml" + } + ], + "http://a.ml/vocabularies/document-source-maps#value": [ + { + "@value": "lib->file://amf-aml/shared/src/test/resources/vocabularies2/dialects/mappings_lib.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/dialects/mappings_lib.yaml::mappings_lib.yaml" + } + ] + } ] } ], diff --git a/amf-aml/shared/src/test/resources/vocabularies2/dialects/example13.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example13.flattened.jsonld index 3122de94..ee58172f 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/dialects/example13.flattened.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example13.flattened.jsonld @@ -236,11 +236,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/example13.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/example13.yaml#/source-map/lexical/element_4" @@ -257,6 +252,11 @@ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example13.yaml#/source-map/lexical/element_3" } + ], + "http://a.ml/vocabularies/document-source-maps#aliases-array": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example13.yaml#/source-map/aliases-array/element_0" + } ] }, { @@ -360,11 +360,6 @@ } ] }, - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example13.yaml#/source-map/aliases-array/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example13.yaml", - "http://a.ml/vocabularies/document-source-maps#value": "lib->file://amf-aml/shared/src/test/resources/vocabularies2/dialects/mappings_lib.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/dialects/mappings_lib.yaml::mappings_lib.yaml" - }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example13.yaml#/source-map/lexical/element_4", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/meta#externals", @@ -390,6 +385,11 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#name", "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(3,0)]" }, + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example13.yaml#/source-map/aliases-array/element_0", + "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example13.yaml", + "http://a.ml/vocabularies/document-source-maps#value": "lib->file://amf-aml/shared/src/test/resources/vocabularies2/dialects/mappings_lib.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/dialects/mappings_lib.yaml::mappings_lib.yaml" + }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/mappings_lib.yaml/externals/v2#/source-map", "@type": [ diff --git a/amf-aml/shared/src/test/resources/vocabularies2/dialects/example1b.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example1b.expanded.jsonld index ef8d7229..066aa3ad 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/dialects/example1b.expanded.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example1b.expanded.jsonld @@ -302,21 +302,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/example1b.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/example1b.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/example1b.yaml#/source-map/lexical/element_4", @@ -383,6 +368,21 @@ } ] } + ], + "http://a.ml/vocabularies/document-source-maps#aliases-array": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example1b.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/example1b.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/example1b.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example1b.flattened.jsonld index ce974388..b629a4c5 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/dialects/example1b.flattened.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example1b.flattened.jsonld @@ -331,11 +331,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/example1b.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/example1b.yaml#/source-map/lexical/element_4" @@ -352,6 +347,11 @@ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example1b.yaml#/source-map/lexical/element_3" } + ], + "http://a.ml/vocabularies/document-source-maps#aliases-array": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example1b.yaml#/source-map/aliases-array/element_0" + } ] }, { @@ -522,11 +522,6 @@ } ] }, - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example1b.yaml#/source-map/aliases-array/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example1b.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/example1b.yaml#/source-map/lexical/element_4", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/meta#externals", @@ -552,6 +547,11 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#name", "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(3,0)]" }, + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example1b.yaml#/source-map/aliases-array/element_0", + "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example1b.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": [ diff --git a/amf-aml/shared/src/test/resources/vocabularies2/dialects/example2.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example2.expanded.jsonld index 3aeab0cd..76d89332 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/dialects/example2.expanded.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example2.expanded.jsonld @@ -205,21 +205,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/example2.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/example2.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/example2.yaml#/source-map/lexical/element_3", @@ -273,6 +258,21 @@ } ] } + ], + "http://a.ml/vocabularies/document-source-maps#aliases-array": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example2.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/example2.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/example2.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example2.flattened.jsonld index 3a3b1418..30b687cf 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/dialects/example2.flattened.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example2.flattened.jsonld @@ -255,11 +255,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/example2.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/example2.yaml#/source-map/lexical/element_3" @@ -273,6 +268,11 @@ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example2.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/example2.yaml#/source-map/aliases-array/element_0" + } ] }, { @@ -409,11 +409,6 @@ } ] }, - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example2.yaml#/source-map/aliases-array/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example2.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/example2.yaml#/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", @@ -434,6 +429,11 @@ "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example2.yaml", "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(24,0)]" }, + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example2.yaml#/source-map/aliases-array/element_0", + "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example2.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": [ diff --git a/amf-aml/shared/src/test/resources/vocabularies2/dialects/example23a.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example23a.expanded.jsonld index 32c9b2a6..e3b7bed5 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/dialects/example23a.expanded.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example23a.expanded.jsonld @@ -221,21 +221,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/example23a.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/example23a.yaml" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "bis->file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example23b.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example23b.yaml::example23b.yaml" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example23a.yaml#/source-map/lexical/element_4", @@ -302,6 +287,21 @@ } ] } + ], + "http://a.ml/vocabularies/document-source-maps#aliases-array": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example23a.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/example23a.yaml" + } + ], + "http://a.ml/vocabularies/document-source-maps#value": [ + { + "@value": "bis->file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example23b.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example23b.yaml::example23b.yaml" + } + ] + } ] } ], diff --git a/amf-aml/shared/src/test/resources/vocabularies2/dialects/example23a.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example23a.flattened.jsonld index a47ac3f8..74a87d07 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/dialects/example23a.flattened.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example23a.flattened.jsonld @@ -304,11 +304,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/example23a.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/example23a.yaml#/source-map/lexical/element_4" @@ -325,6 +320,11 @@ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example23a.yaml#/source-map/lexical/element_3" } + ], + "http://a.ml/vocabularies/document-source-maps#aliases-array": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example23a.yaml#/source-map/aliases-array/element_0" + } ] }, { @@ -570,11 +570,6 @@ } ] }, - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example23a.yaml#/source-map/aliases-array/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example23a.yaml", - "http://a.ml/vocabularies/document-source-maps#value": "bis->file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example23b.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example23b.yaml::example23b.yaml" - }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example23a.yaml#/source-map/lexical/element_4", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/meta#externals", @@ -600,6 +595,11 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#name", "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(3,0)]" }, + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example23a.yaml#/source-map/aliases-array/element_0", + "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example23a.yaml", + "http://a.ml/vocabularies/document-source-maps#value": "bis->file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example23b.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example23b.yaml::example23b.yaml" + }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example23b.yaml/externals/v3#/source-map", "@type": [ diff --git a/amf-aml/shared/src/test/resources/vocabularies2/dialects/example23b.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example23b.expanded.jsonld index 7ad3cee3..ed513c4a 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/dialects/example23b.expanded.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example23b.expanded.jsonld @@ -221,21 +221,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/example23b.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/example23b.yaml" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "parent->file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example23a.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example23a.yaml::example23a.yaml" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example23b.yaml#/source-map/lexical/element_4", @@ -302,6 +287,21 @@ } ] } + ], + "http://a.ml/vocabularies/document-source-maps#aliases-array": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example23b.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/example23b.yaml" + } + ], + "http://a.ml/vocabularies/document-source-maps#value": [ + { + "@value": "parent->file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example23a.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example23a.yaml::example23a.yaml" + } + ] + } ] } ], diff --git a/amf-aml/shared/src/test/resources/vocabularies2/dialects/example23b.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example23b.flattened.jsonld index 1f68703a..601162ec 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/dialects/example23b.flattened.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example23b.flattened.jsonld @@ -254,11 +254,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/example23b.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/example23b.yaml#/source-map/lexical/element_4" @@ -275,6 +270,11 @@ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example23b.yaml#/source-map/lexical/element_3" } + ], + "http://a.ml/vocabularies/document-source-maps#aliases-array": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example23b.yaml#/source-map/aliases-array/element_0" + } ] }, { @@ -493,11 +493,6 @@ } ] }, - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example23b.yaml#/source-map/aliases-array/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example23b.yaml", - "http://a.ml/vocabularies/document-source-maps#value": "parent->file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example23a.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example23a.yaml::example23a.yaml" - }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example23b.yaml#/source-map/lexical/element_4", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/meta#externals", @@ -523,6 +518,11 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#name", "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(3,0)]" }, + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example23b.yaml#/source-map/aliases-array/element_0", + "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example23b.yaml", + "http://a.ml/vocabularies/document-source-maps#value": "parent->file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example23a.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example23a.yaml::example23a.yaml" + }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example23a.yaml/externals/v3#/source-map", "@type": [ diff --git a/amf-aml/shared/src/test/resources/vocabularies2/dialects/example3.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example3.expanded.jsonld index 7e868bd2..de5f048d 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/dialects/example3.expanded.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example3.expanded.jsonld @@ -281,21 +281,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/example3.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/example3.yaml" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "v2->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/example3.yaml#/source-map/lexical/element_3", @@ -349,6 +334,21 @@ } ] } + ], + "http://a.ml/vocabularies/document-source-maps#aliases-array": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example3.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/example3.yaml" + } + ], + "http://a.ml/vocabularies/document-source-maps#value": [ + { + "@value": "v2->http://a.ml/vocabularies/vocab2#::http://a.ml/vocabularies/vocab2#::vocab2.yaml" + } + ] + } ] } ], diff --git a/amf-aml/shared/src/test/resources/vocabularies2/dialects/example3.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example3.flattened.jsonld index 8215bb08..cefb4d10 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/dialects/example3.flattened.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example3.flattened.jsonld @@ -311,11 +311,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/example3.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/example3.yaml#/source-map/lexical/element_3" @@ -329,6 +324,11 @@ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example3.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/example3.yaml#/source-map/aliases-array/element_0" + } ] }, { @@ -465,11 +465,6 @@ } ] }, - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example3.yaml#/source-map/aliases-array/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example3.yaml", - "http://a.ml/vocabularies/document-source-maps#value": "v2->http://a.ml/vocabularies/vocab2#::http://a.ml/vocabularies/vocab2#::vocab2.yaml" - }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example3.yaml#/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", @@ -490,6 +485,11 @@ "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example3.yaml", "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(24,0)]" }, + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example3.yaml#/source-map/aliases-array/element_0", + "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example3.yaml", + "http://a.ml/vocabularies/document-source-maps#value": "v2->http://a.ml/vocabularies/vocab2#::http://a.ml/vocabularies/vocab2#::vocab2.yaml" + }, { "@id": "http://a.ml/vocabularies/vocab2#A/source-map", "@type": [ diff --git a/amf-aml/shared/src/test/resources/vocabularies2/dialects/example5.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example5.expanded.jsonld index 5d20d88a..efc84480 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/dialects/example5.expanded.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example5.expanded.jsonld @@ -302,21 +302,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/example5.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/example5.yaml" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "v2->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/example5.yaml#/source-map/lexical/element_4", @@ -383,6 +368,21 @@ } ] } + ], + "http://a.ml/vocabularies/document-source-maps#aliases-array": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example5.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/example5.yaml" + } + ], + "http://a.ml/vocabularies/document-source-maps#value": [ + { + "@value": "v2->http://a.ml/vocabularies/vocab2#::http://a.ml/vocabularies/vocab2#::vocab2.yaml" + } + ] + } ] } ], diff --git a/amf-aml/shared/src/test/resources/vocabularies2/dialects/example5.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example5.flattened.jsonld index 546564b8..667adef6 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/dialects/example5.flattened.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example5.flattened.jsonld @@ -323,11 +323,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/example5.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/example5.yaml#/source-map/lexical/element_4" @@ -344,6 +339,11 @@ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example5.yaml#/source-map/lexical/element_3" } + ], + "http://a.ml/vocabularies/document-source-maps#aliases-array": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example5.yaml#/source-map/aliases-array/element_0" + } ] }, { @@ -480,11 +480,6 @@ } ] }, - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example5.yaml#/source-map/aliases-array/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example5.yaml", - "http://a.ml/vocabularies/document-source-maps#value": "v2->http://a.ml/vocabularies/vocab2#::http://a.ml/vocabularies/vocab2#::vocab2.yaml" - }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example5.yaml#/source-map/lexical/element_4", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/meta#externals", @@ -510,6 +505,11 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#name", "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(3,0)]" }, + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example5.yaml#/source-map/aliases-array/element_0", + "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example5.yaml", + "http://a.ml/vocabularies/document-source-maps#value": "v2->http://a.ml/vocabularies/vocab2#::http://a.ml/vocabularies/vocab2#::vocab2.yaml" + }, { "@id": "http://a.ml/vocabularies/vocab2#A/source-map", "@type": [ diff --git a/amf-aml/shared/src/test/resources/vocabularies2/dialects/example6.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example6.expanded.jsonld index bc698973..d2eea390 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/dialects/example6.expanded.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example6.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/example6.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/example6.yaml" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "lib->file://amf-aml/shared/src/test/resources/vocabularies2/dialects/mappings_lib.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/dialects/mappings_lib.yaml::mappings_lib.yaml" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example6.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/example6.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/example6.yaml" + } + ], + "http://a.ml/vocabularies/document-source-maps#value": [ + { + "@value": "lib->file://amf-aml/shared/src/test/resources/vocabularies2/dialects/mappings_lib.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/dialects/mappings_lib.yaml::mappings_lib.yaml" + } + ] + } ] } ], diff --git a/amf-aml/shared/src/test/resources/vocabularies2/dialects/example6.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example6.flattened.jsonld index fc3b9035..5f170ee7 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/dialects/example6.flattened.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example6.flattened.jsonld @@ -155,11 +155,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/example6.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/example6.yaml#/source-map/lexical/element_3" @@ -173,6 +168,11 @@ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example6.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/example6.yaml#/source-map/aliases-array/element_0" + } ] }, { @@ -238,11 +238,6 @@ } ] }, - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example6.yaml#/source-map/aliases-array/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example6.yaml", - "http://a.ml/vocabularies/document-source-maps#value": "lib->file://amf-aml/shared/src/test/resources/vocabularies2/dialects/mappings_lib.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/dialects/mappings_lib.yaml::mappings_lib.yaml" - }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example6.yaml#/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", @@ -263,6 +258,11 @@ "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example6.yaml", "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(9,0)]" }, + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example6.yaml#/source-map/aliases-array/element_0", + "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example6.yaml", + "http://a.ml/vocabularies/document-source-maps#value": "lib->file://amf-aml/shared/src/test/resources/vocabularies2/dialects/mappings_lib.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/dialects/mappings_lib.yaml::mappings_lib.yaml" + }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/mappings_lib.yaml/externals/v2#/source-map", "@type": [ diff --git a/amf-aml/shared/src/test/resources/vocabularies2/dialects/example7.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example7.expanded.jsonld index 8072149e..7fe48797 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/dialects/example7.expanded.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example7.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/example7.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/example7.yaml" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "lib->file://amf-aml/shared/src/test/resources/vocabularies2/dialects/mappings_lib.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/dialects/mappings_lib.yaml::mappings_lib.yaml" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example7.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/example7.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/example7.yaml" + } + ], + "http://a.ml/vocabularies/document-source-maps#value": [ + { + "@value": "lib->file://amf-aml/shared/src/test/resources/vocabularies2/dialects/mappings_lib.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/dialects/mappings_lib.yaml::mappings_lib.yaml" + } + ] + } ] } ], diff --git a/amf-aml/shared/src/test/resources/vocabularies2/dialects/example7.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example7.flattened.jsonld index be6dd9fa..3bc03e6e 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/dialects/example7.flattened.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/dialects/example7.flattened.jsonld @@ -228,11 +228,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/example7.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/example7.yaml#/source-map/lexical/element_3" @@ -246,6 +241,11 @@ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example7.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/example7.yaml#/source-map/aliases-array/element_0" + } ] }, { @@ -398,11 +398,6 @@ } ] }, - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example7.yaml#/source-map/aliases-array/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example7.yaml", - "http://a.ml/vocabularies/document-source-maps#value": "lib->file://amf-aml/shared/src/test/resources/vocabularies2/dialects/mappings_lib.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/dialects/mappings_lib.yaml::mappings_lib.yaml" - }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example7.yaml#/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", @@ -423,6 +418,11 @@ "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example7.yaml", "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(18,0)]" }, + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example7.yaml#/source-map/aliases-array/element_0", + "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/example7.yaml", + "http://a.ml/vocabularies/document-source-maps#value": "lib->file://amf-aml/shared/src/test/resources/vocabularies2/dialects/mappings_lib.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/dialects/mappings_lib.yaml::mappings_lib.yaml" + }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/dialects/mappings_lib.yaml/externals/v2#/source-map", "@type": [ diff --git a/amf-aml/shared/src/test/resources/vocabularies2/instances/$base/instance.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/instances/$base/instance.expanded.jsonld index a22b6bf1..ee2fe4eb 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/instances/$base/instance.expanded.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/instances/$base/instance.expanded.jsonld @@ -89,9 +89,9 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#custom-id": [ + "http://a.ml/vocabularies/document-source-maps#lexical": [ { - "@id": "http://overriden.com/presidents/BarackObama#/source-map/custom-id/element_0", + "@id": "http://overriden.com/presidents/BarackObama#/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": [ { "@value": "http://overriden.com/presidents/BarackObama" @@ -99,35 +99,35 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "true" + "@value": "[(6,4)-(10,0)]" } ] - } - ], - "http://a.ml/vocabularies/document-source-maps#lexical": [ + }, { - "@id": "http://overriden.com/presidents/BarackObama#/source-map/lexical/element_1", + "@id": "http://overriden.com/presidents/BarackObama#/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { - "@value": "http://overriden.com/presidents/BarackObama" + "@value": "http://a.ml/vocabularies/data#name" } ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(6,4)-(10,0)]" + "@value": "[(6,4)-(7,0)]" } ] - }, + } + ], + "http://a.ml/vocabularies/document-source-maps#custom-id": [ { - "@id": "http://overriden.com/presidents/BarackObama#/source-map/lexical/element_0", + "@id": "http://overriden.com/presidents/BarackObama#/source-map/custom-id/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { - "@value": "http://a.ml/vocabularies/data#name" + "@value": "http://overriden.com/presidents/BarackObama" } ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(6,4)-(7,0)]" + "@value": "true" } ] } @@ -153,9 +153,9 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#custom-id": [ + "http://a.ml/vocabularies/document-source-maps#lexical": [ { - "@id": "http://overriden.com/presidents#GeorgeWBush/source-map/custom-id/element_0", + "@id": "http://overriden.com/presidents#GeorgeWBush/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": [ { "@value": "http://overriden.com/presidents#GeorgeWBush" @@ -163,35 +163,35 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "true" + "@value": "[(10,4)-(13,0)]" } ] - } - ], - "http://a.ml/vocabularies/document-source-maps#lexical": [ + }, { - "@id": "http://overriden.com/presidents#GeorgeWBush/source-map/lexical/element_1", + "@id": "http://overriden.com/presidents#GeorgeWBush/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { - "@value": "http://overriden.com/presidents#GeorgeWBush" + "@value": "http://a.ml/vocabularies/data#name" } ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(10,4)-(13,0)]" + "@value": "[(10,4)-(11,0)]" } ] - }, + } + ], + "http://a.ml/vocabularies/document-source-maps#custom-id": [ { - "@id": "http://overriden.com/presidents#GeorgeWBush/source-map/lexical/element_0", + "@id": "http://overriden.com/presidents#GeorgeWBush/source-map/custom-id/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { - "@value": "http://a.ml/vocabularies/data#name" + "@value": "http://overriden.com/presidents#GeorgeWBush" } ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(10,4)-(11,0)]" + "@value": "true" } ] } diff --git a/amf-aml/shared/src/test/resources/vocabularies2/instances/$base/instance.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/instances/$base/instance.flattened.jsonld index c7cf1525..0a51559e 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/instances/$base/instance.flattened.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/instances/$base/instance.flattened.jsonld @@ -112,11 +112,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#custom-id": [ - { - "@id": "http://overriden.com/presidents/BarackObama#/source-map/custom-id/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "http://overriden.com/presidents/BarackObama#/source-map/lexical/element_1" @@ -124,6 +119,11 @@ { "@id": "http://overriden.com/presidents/BarackObama#/source-map/lexical/element_0" } + ], + "http://a.ml/vocabularies/document-source-maps#custom-id": [ + { + "@id": "http://overriden.com/presidents/BarackObama#/source-map/custom-id/element_0" + } ] }, { @@ -131,11 +131,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#custom-id": [ - { - "@id": "http://overriden.com/presidents#GeorgeWBush/source-map/custom-id/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "http://overriden.com/presidents#GeorgeWBush/source-map/lexical/element_1" @@ -143,6 +138,11 @@ { "@id": "http://overriden.com/presidents#GeorgeWBush/source-map/lexical/element_0" } + ], + "http://a.ml/vocabularies/document-source-maps#custom-id": [ + { + "@id": "http://overriden.com/presidents#GeorgeWBush/source-map/custom-id/element_0" + } ] }, { @@ -165,11 +165,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/data#name", "http://a.ml/vocabularies/document-source-maps#value": "[(3,4)-(4,0)]" }, - { - "@id": "http://overriden.com/presidents/BarackObama#/source-map/custom-id/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "http://overriden.com/presidents/BarackObama", - "http://a.ml/vocabularies/document-source-maps#value": "true" - }, { "@id": "http://overriden.com/presidents/BarackObama#/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "http://overriden.com/presidents/BarackObama", @@ -181,8 +176,8 @@ "http://a.ml/vocabularies/document-source-maps#value": "[(6,4)-(7,0)]" }, { - "@id": "http://overriden.com/presidents#GeorgeWBush/source-map/custom-id/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "http://overriden.com/presidents#GeorgeWBush", + "@id": "http://overriden.com/presidents/BarackObama#/source-map/custom-id/element_0", + "http://a.ml/vocabularies/document-source-maps#element": "http://overriden.com/presidents/BarackObama", "http://a.ml/vocabularies/document-source-maps#value": "true" }, { @@ -195,6 +190,11 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/data#name", "http://a.ml/vocabularies/document-source-maps#value": "[(10,4)-(11,0)]" }, + { + "@id": "http://overriden.com/presidents#GeorgeWBush/source-map/custom-id/element_0", + "http://a.ml/vocabularies/document-source-maps#element": "http://overriden.com/presidents#GeorgeWBush", + "http://a.ml/vocabularies/document-source-maps#value": "true" + }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/$base/instance.yaml", "@type": [ diff --git a/amf-aml/shared/src/test/resources/vocabularies2/instances/$id/instance.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/instances/$id/instance.expanded.jsonld index 5903771a..e70e61d6 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/instances/$id/instance.expanded.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/instances/$id/instance.expanded.jsonld @@ -40,9 +40,9 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#custom-id": [ + "http://a.ml/vocabularies/document-source-maps#lexical": [ { - "@id": "file://a.ml/NodeA#/source-map/custom-id/element_0", + "@id": "file://a.ml/NodeA#/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": [ { "@value": "file://a.ml/NodeA" @@ -50,35 +50,35 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "true" + "@value": "[(2,2)-(5,0)]" } ] - } - ], - "http://a.ml/vocabularies/document-source-maps#lexical": [ + }, { - "@id": "file://a.ml/NodeA#/source-map/lexical/element_1", + "@id": "file://a.ml/NodeA#/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { - "@value": "file://a.ml/NodeA" + "@value": "http://a.ml/vocabularies/data#nameA" } ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(2,2)-(5,0)]" + "@value": "[(4,2)-(5,0)]" } ] - }, + } + ], + "http://a.ml/vocabularies/document-source-maps#custom-id": [ { - "@id": "file://a.ml/NodeA#/source-map/lexical/element_0", + "@id": "file://a.ml/NodeA#/source-map/custom-id/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { - "@value": "http://a.ml/vocabularies/data#nameA" + "@value": "file://a.ml/NodeA" } ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(4,2)-(5,0)]" + "@value": "true" } ] } @@ -106,9 +106,9 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#custom-id": [ + "http://a.ml/vocabularies/document-source-maps#lexical": [ { - "@id": "file://a.ml/NodeB#/source-map/custom-id/element_0", + "@id": "file://a.ml/NodeB#/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": [ { "@value": "file://a.ml/NodeB" @@ -116,35 +116,35 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "true" + "@value": "[(5,2)-(8,0)]" } ] - } - ], - "http://a.ml/vocabularies/document-source-maps#lexical": [ + }, { - "@id": "file://a.ml/NodeB#/source-map/lexical/element_1", + "@id": "file://a.ml/NodeB#/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { - "@value": "file://a.ml/NodeB" + "@value": "http://a.ml/vocabularies/data#nameB" } ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(5,2)-(8,0)]" + "@value": "[(7,2)-(8,0)]" } ] - }, + } + ], + "http://a.ml/vocabularies/document-source-maps#custom-id": [ { - "@id": "file://a.ml/NodeB#/source-map/lexical/element_0", + "@id": "file://a.ml/NodeB#/source-map/custom-id/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { - "@value": "http://a.ml/vocabularies/data#nameB" + "@value": "file://a.ml/NodeB" } ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(7,2)-(8,0)]" + "@value": "true" } ] } diff --git a/amf-aml/shared/src/test/resources/vocabularies2/instances/$id/instance.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/instances/$id/instance.flattened.jsonld index b68ef97d..c27493e0 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/instances/$id/instance.flattened.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/instances/$id/instance.flattened.jsonld @@ -82,11 +82,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#custom-id": [ - { - "@id": "file://a.ml/NodeA#/source-map/custom-id/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://a.ml/NodeA#/source-map/lexical/element_1" @@ -94,6 +89,11 @@ { "@id": "file://a.ml/NodeA#/source-map/lexical/element_0" } + ], + "http://a.ml/vocabularies/document-source-maps#custom-id": [ + { + "@id": "file://a.ml/NodeA#/source-map/custom-id/element_0" + } ] }, { @@ -101,11 +101,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#custom-id": [ - { - "@id": "file://a.ml/NodeB#/source-map/custom-id/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://a.ml/NodeB#/source-map/lexical/element_1" @@ -113,6 +108,11 @@ { "@id": "file://a.ml/NodeB#/source-map/lexical/element_0" } + ], + "http://a.ml/vocabularies/document-source-maps#custom-id": [ + { + "@id": "file://a.ml/NodeB#/source-map/custom-id/element_0" + } ] }, { @@ -130,11 +130,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/$id/instance.yaml#/encodes", "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(8,0)]" }, - { - "@id": "file://a.ml/NodeA#/source-map/custom-id/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://a.ml/NodeA", - "http://a.ml/vocabularies/document-source-maps#value": "true" - }, { "@id": "file://a.ml/NodeA#/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://a.ml/NodeA", @@ -146,8 +141,8 @@ "http://a.ml/vocabularies/document-source-maps#value": "[(4,2)-(5,0)]" }, { - "@id": "file://a.ml/NodeB#/source-map/custom-id/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://a.ml/NodeB", + "@id": "file://a.ml/NodeA#/source-map/custom-id/element_0", + "http://a.ml/vocabularies/document-source-maps#element": "file://a.ml/NodeA", "http://a.ml/vocabularies/document-source-maps#value": "true" }, { @@ -160,6 +155,11 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/data#nameB", "http://a.ml/vocabularies/document-source-maps#value": "[(7,2)-(8,0)]" }, + { + "@id": "file://a.ml/NodeB#/source-map/custom-id/element_0", + "http://a.ml/vocabularies/document-source-maps#element": "file://a.ml/NodeB", + "http://a.ml/vocabularies/document-source-maps#value": "true" + }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/$id/instance.yaml", "@type": [ diff --git a/amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.expanded.jsonld index 409328e6..49509efc 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.expanded.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.expanded.jsonld @@ -47,9 +47,9 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#from-union-node-mapping": [ + "http://a.ml/vocabularies/document-source-maps#lexical": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml#/encodes/ls/0/source-map/from-union-node-mapping/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml#/encodes/ls/0/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": [ { "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml#/encodes/ls/0" @@ -57,35 +57,35 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect13b.yaml#/declarations/Element" + "@value": "[(5,0)-(7,0)]" } ] - } - ], - "http://a.ml/vocabularies/document-source-maps#lexical": [ + }, { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml#/encodes/ls/0/source-map/lexical/element_1", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml#/encodes/ls/0/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { - "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml#/encodes/ls/0" + "@value": "http://test.com/vocab#name" } ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(5,0)-(7,0)]" + "@value": "[(5,4)-(6,0)]" } ] - }, + } + ], + "http://a.ml/vocabularies/document-source-maps#from-union-node-mapping": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml#/encodes/ls/0/source-map/lexical/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml#/encodes/ls/0/source-map/from-union-node-mapping/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { - "@value": "http://test.com/vocab#name" + "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml#/encodes/ls/0" } ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(5,4)-(6,0)]" + "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect13b.yaml#/declarations/Element" } ] } @@ -112,9 +112,9 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#from-union-node-mapping": [ + "http://a.ml/vocabularies/document-source-maps#lexical": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml#/encodes/ls/1/source-map/from-union-node-mapping/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml#/encodes/ls/1/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": [ { "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml#/encodes/ls/1" @@ -122,35 +122,35 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect13b.yaml#/declarations/Element" + "@value": "[(8,0)-(10,0)]" } ] - } - ], - "http://a.ml/vocabularies/document-source-maps#lexical": [ + }, { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml#/encodes/ls/1/source-map/lexical/element_1", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml#/encodes/ls/1/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { - "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml#/encodes/ls/1" + "@value": "http://test.com/vocab#name" } ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(8,0)-(10,0)]" + "@value": "[(8,4)-(9,0)]" } ] - }, + } + ], + "http://a.ml/vocabularies/document-source-maps#from-union-node-mapping": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml#/encodes/ls/1/source-map/lexical/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml#/encodes/ls/1/source-map/from-union-node-mapping/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { - "@value": "http://test.com/vocab#name" + "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml#/encodes/ls/1" } ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(8,4)-(9,0)]" + "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect13b.yaml#/declarations/Element" } ] } diff --git a/amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.flattened.jsonld index 8c959220..036e8109 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.flattened.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.flattened.jsonld @@ -88,11 +88,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#from-union-node-mapping": [ - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml#/encodes/ls/0/source-map/from-union-node-mapping/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml#/encodes/ls/0/source-map/lexical/element_1" @@ -100,6 +95,11 @@ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml#/encodes/ls/0/source-map/lexical/element_0" } + ], + "http://a.ml/vocabularies/document-source-maps#from-union-node-mapping": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml#/encodes/ls/0/source-map/from-union-node-mapping/element_0" + } ] }, { @@ -107,11 +107,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#from-union-node-mapping": [ - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml#/encodes/ls/1/source-map/from-union-node-mapping/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml#/encodes/ls/1/source-map/lexical/element_1" @@ -119,6 +114,11 @@ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml#/encodes/ls/1/source-map/lexical/element_0" } + ], + "http://a.ml/vocabularies/document-source-maps#from-union-node-mapping": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml#/encodes/ls/1/source-map/from-union-node-mapping/element_0" + } ] }, { @@ -136,11 +136,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml#/encodes", "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(10,0)]" }, - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml#/encodes/ls/0/source-map/from-union-node-mapping/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml#/encodes/ls/0", - "http://a.ml/vocabularies/document-source-maps#value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect13b.yaml#/declarations/Element" - }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml#/encodes/ls/0/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml#/encodes/ls/0", @@ -152,8 +147,8 @@ "http://a.ml/vocabularies/document-source-maps#value": "[(5,4)-(6,0)]" }, { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml#/encodes/ls/1/source-map/from-union-node-mapping/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml#/encodes/ls/1", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml#/encodes/ls/0/source-map/from-union-node-mapping/element_0", + "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml#/encodes/ls/0", "http://a.ml/vocabularies/document-source-maps#value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect13b.yaml#/declarations/Element" }, { @@ -166,6 +161,11 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://test.com/vocab#name", "http://a.ml/vocabularies/document-source-maps#value": "[(8,4)-(9,0)]" }, + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml#/encodes/ls/1/source-map/from-union-node-mapping/element_0", + "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml#/encodes/ls/1", + "http://a.ml/vocabularies/document-source-maps#value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect13b.yaml#/declarations/Element" + }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13b.yaml", "@type": [ diff --git a/amf-aml/shared/src/test/resources/vocabularies2/instances/example13c.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/instances/example13c.expanded.jsonld index 91b3fdb8..3d57152c 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/instances/example13c.expanded.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/instances/example13c.expanded.jsonld @@ -38,21 +38,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#from-union-node-mapping": [ - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13c.yaml#/encodes/source-map/from-union-node-mapping/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13c.yaml#/encodes" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect13c.yaml#/declarations/AssetUnion" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13c.yaml#/encodes/source-map/lexical/element_2", @@ -93,6 +78,21 @@ } ] } + ], + "http://a.ml/vocabularies/document-source-maps#from-union-node-mapping": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13c.yaml#/encodes/source-map/from-union-node-mapping/element_0", + "http://a.ml/vocabularies/document-source-maps#element": [ + { + "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13c.yaml#/encodes" + } + ], + "http://a.ml/vocabularies/document-source-maps#value": [ + { + "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect13c.yaml#/declarations/AssetUnion" + } + ] + } ] } ] diff --git a/amf-aml/shared/src/test/resources/vocabularies2/instances/example13c.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/instances/example13c.flattened.jsonld index eb2d8ec8..0c5ce4b0 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/instances/example13c.flattened.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/instances/example13c.flattened.jsonld @@ -34,11 +34,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#from-union-node-mapping": [ - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13c.yaml#/encodes/source-map/from-union-node-mapping/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13c.yaml#/encodes/source-map/lexical/element_2" @@ -49,13 +44,13 @@ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13c.yaml#/encodes/source-map/lexical/element_1" } + ], + "http://a.ml/vocabularies/document-source-maps#from-union-node-mapping": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13c.yaml#/encodes/source-map/from-union-node-mapping/element_0" + } ] }, - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13c.yaml#/encodes/source-map/from-union-node-mapping/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13c.yaml#/encodes", - "http://a.ml/vocabularies/document-source-maps#value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect13c.yaml#/declarations/AssetUnion" - }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13c.yaml#/encodes/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "http://anypoint.com/vocabs/schema-org#description", @@ -71,6 +66,11 @@ "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13c.yaml#/encodes", "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(5,0)]" }, + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13c.yaml#/encodes/source-map/from-union-node-mapping/element_0", + "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13c.yaml#/encodes", + "http://a.ml/vocabularies/document-source-maps#value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect13c.yaml#/declarations/AssetUnion" + }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example13c.yaml", "@type": [ diff --git a/amf-aml/shared/src/test/resources/vocabularies2/instances/example14.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/instances/example14.expanded.jsonld index fe75d88b..1579edca 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/instances/example14.expanded.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/instances/example14.expanded.jsonld @@ -42,9 +42,9 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#custom-id": [ + "http://a.ml/vocabularies/document-source-maps#lexical": [ { - "@id": "http://test.com/something#here/source-map/custom-id/element_0", + "@id": "http://test.com/something#here/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": [ { "@value": "http://test.com/something#here" @@ -52,35 +52,35 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "true" + "@value": "[(3,3)-(6,0)]" } ] - } - ], - "http://a.ml/vocabularies/document-source-maps#lexical": [ + }, { - "@id": "http://test.com/something#here/source-map/lexical/element_1", + "@id": "http://test.com/something#here/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { - "@value": "http://test.com/something#here" + "@value": "http://test.com/v2#a" } ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(3,3)-(6,0)]" + "@value": "[(4,4)-(5,0)]" } ] - }, + } + ], + "http://a.ml/vocabularies/document-source-maps#custom-id": [ { - "@id": "http://test.com/something#here/source-map/lexical/element_0", + "@id": "http://test.com/something#here/source-map/custom-id/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { - "@value": "http://test.com/v2#a" + "@value": "http://test.com/something#here" } ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(4,4)-(5,0)]" + "@value": "true" } ] } @@ -107,9 +107,9 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#custom-id": [ + "http://a.ml/vocabularies/document-source-maps#lexical": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect14.yaml#/ho/source-map/custom-id/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect14.yaml#/ho/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": [ { "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect14.yaml#/ho" @@ -117,35 +117,35 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "true" + "@value": "[(6,3)-(9,0)]" } ] - } - ], - "http://a.ml/vocabularies/document-source-maps#lexical": [ + }, { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect14.yaml#/ho/source-map/lexical/element_1", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect14.yaml#/ho/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { - "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect14.yaml#/ho" + "@value": "http://test.com/v2#a" } ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(6,3)-(9,0)]" + "@value": "[(7,4)-(8,0)]" } ] - }, + } + ], + "http://a.ml/vocabularies/document-source-maps#custom-id": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect14.yaml#/ho/source-map/lexical/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect14.yaml#/ho/source-map/custom-id/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { - "@value": "http://test.com/v2#a" + "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect14.yaml#/ho" } ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(7,4)-(8,0)]" + "@value": "true" } ] } @@ -160,9 +160,9 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#custom-id": [ + "http://a.ml/vocabularies/document-source-maps#lexical": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect14.yaml#a/source-map/custom-id/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect14.yaml#a/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": [ { "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect14.yaml#a" @@ -170,35 +170,35 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "true" + "@value": "[(2,0)-(10,0)]" } ] - } - ], - "http://a.ml/vocabularies/document-source-maps#lexical": [ + }, { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect14.yaml#a/source-map/lexical/element_1", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect14.yaml#a/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { - "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect14.yaml#a" + "@value": "http://test.com/v2#a" } ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(2,0)-(10,0)]" + "@value": "[(2,0)-(9,0)]" } ] - }, + } + ], + "http://a.ml/vocabularies/document-source-maps#custom-id": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect14.yaml#a/source-map/lexical/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect14.yaml#a/source-map/custom-id/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { - "@value": "http://test.com/v2#a" + "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect14.yaml#a" } ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(2,0)-(9,0)]" + "@value": "true" } ] } diff --git a/amf-aml/shared/src/test/resources/vocabularies2/instances/example14.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/instances/example14.flattened.jsonld index 50981b7f..f982bed9 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/instances/example14.flattened.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/instances/example14.flattened.jsonld @@ -70,11 +70,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#custom-id": [ - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect14.yaml#a/source-map/custom-id/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect14.yaml#a/source-map/lexical/element_1" @@ -82,6 +77,11 @@ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect14.yaml#a/source-map/lexical/element_0" } + ], + "http://a.ml/vocabularies/document-source-maps#custom-id": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect14.yaml#a/source-map/custom-id/element_0" + } ] }, { @@ -89,11 +89,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#custom-id": [ - { - "@id": "http://test.com/something#here/source-map/custom-id/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "http://test.com/something#here/source-map/lexical/element_1" @@ -101,6 +96,11 @@ { "@id": "http://test.com/something#here/source-map/lexical/element_0" } + ], + "http://a.ml/vocabularies/document-source-maps#custom-id": [ + { + "@id": "http://test.com/something#here/source-map/custom-id/element_0" + } ] }, { @@ -108,11 +108,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#custom-id": [ - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect14.yaml#/ho/source-map/custom-id/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect14.yaml#/ho/source-map/lexical/element_1" @@ -120,13 +115,13 @@ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect14.yaml#/ho/source-map/lexical/element_0" } + ], + "http://a.ml/vocabularies/document-source-maps#custom-id": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect14.yaml#/ho/source-map/custom-id/element_0" + } ] }, - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect14.yaml#a/source-map/custom-id/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect14.yaml#a", - "http://a.ml/vocabularies/document-source-maps#value": "true" - }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect14.yaml#a/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect14.yaml#a", @@ -138,8 +133,8 @@ "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(9,0)]" }, { - "@id": "http://test.com/something#here/source-map/custom-id/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "http://test.com/something#here", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect14.yaml#a/source-map/custom-id/element_0", + "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect14.yaml#a", "http://a.ml/vocabularies/document-source-maps#value": "true" }, { @@ -153,8 +148,8 @@ "http://a.ml/vocabularies/document-source-maps#value": "[(4,4)-(5,0)]" }, { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect14.yaml#/ho/source-map/custom-id/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect14.yaml#/ho", + "@id": "http://test.com/something#here/source-map/custom-id/element_0", + "http://a.ml/vocabularies/document-source-maps#element": "http://test.com/something#here", "http://a.ml/vocabularies/document-source-maps#value": "true" }, { @@ -167,6 +162,11 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://test.com/v2#a", "http://a.ml/vocabularies/document-source-maps#value": "[(7,4)-(8,0)]" }, + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect14.yaml#/ho/source-map/custom-id/element_0", + "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect14.yaml#/ho", + "http://a.ml/vocabularies/document-source-maps#value": "true" + }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example14.yaml", "@type": [ diff --git a/amf-aml/shared/src/test/resources/vocabularies2/instances/example16c.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/instances/example16c.expanded.jsonld index 622926a4..cd48885e 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/instances/example16c.expanded.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/instances/example16c.expanded.jsonld @@ -67,9 +67,9 @@ ] } ], - "http://a.ml/vocabularies/document-source-maps#lexical": [ + "http://a.ml/vocabularies/document-source-maps#ref-include": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example16c.yaml#/encodes/za/source-map/lexical/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example16c.yaml#/encodes/za/source-map/ref-include/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example16c.yaml#/encodes/za" @@ -77,14 +77,14 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(3,12)-(3,27)]" + "@value": "true" } ] } ], - "http://a.ml/vocabularies/document-source-maps#ref-include": [ + "http://a.ml/vocabularies/document-source-maps#lexical": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example16c.yaml#/encodes/za/source-map/ref-include/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example16c.yaml#/encodes/za/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example16c.yaml#/encodes/za" @@ -92,7 +92,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "true" + "@value": "[(3,12)-(3,27)]" } ] } diff --git a/amf-aml/shared/src/test/resources/vocabularies2/instances/example16c.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/instances/example16c.flattened.jsonld index c8c6e240..65ccfcd7 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/instances/example16c.flattened.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/instances/example16c.flattened.jsonld @@ -79,14 +79,14 @@ "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example16c.yaml#/encodes/za/source-map/synthesized-field/element_0" } ], - "http://a.ml/vocabularies/document-source-maps#lexical": [ + "http://a.ml/vocabularies/document-source-maps#ref-include": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example16c.yaml#/encodes/za/source-map/lexical/element_0" + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example16c.yaml#/encodes/za/source-map/ref-include/element_0" } ], - "http://a.ml/vocabularies/document-source-maps#ref-include": [ + "http://a.ml/vocabularies/document-source-maps#lexical": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example16c.yaml#/encodes/za/source-map/ref-include/element_0" + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example16c.yaml#/encodes/za/source-map/lexical/element_0" } ] }, @@ -106,14 +106,14 @@ "http://a.ml/vocabularies/document-source-maps#value": "true" }, { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example16c.yaml#/encodes/za/source-map/lexical/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example16c.yaml#/encodes/za/source-map/ref-include/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example16c.yaml#/encodes/za", - "http://a.ml/vocabularies/document-source-maps#value": "[(3,12)-(3,27)]" + "http://a.ml/vocabularies/document-source-maps#value": "true" }, { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example16c.yaml#/encodes/za/source-map/ref-include/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example16c.yaml#/encodes/za/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example16c.yaml#/encodes/za", - "http://a.ml/vocabularies/document-source-maps#value": "true" + "http://a.ml/vocabularies/document-source-maps#value": "[(3,12)-(3,27)]" }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example16c.yaml", diff --git a/amf-aml/shared/src/test/resources/vocabularies2/instances/example24.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/instances/example24.expanded.jsonld index 80d61e83..93dc0a41 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/instances/example24.expanded.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/instances/example24.expanded.jsonld @@ -99,9 +99,9 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#aliases-array": [ + "http://a.ml/vocabularies/document-source-maps#lexical": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example24.yaml#/source-map/aliases-array/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example24.yaml#/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example24.yaml" @@ -109,14 +109,14 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "lib->file://amf-aml/shared/src/test/resources/vocabularies2/instances/library24.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/instances/library24.yaml::library24.yaml" + "@value": "[(2,0)-(5,0)]" } ] } ], - "http://a.ml/vocabularies/document-source-maps#lexical": [ + "http://a.ml/vocabularies/document-source-maps#aliases-array": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example24.yaml#/source-map/lexical/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example24.yaml#/source-map/aliases-array/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example24.yaml" @@ -124,7 +124,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(2,0)-(5,0)]" + "@value": "lib->file://amf-aml/shared/src/test/resources/vocabularies2/instances/library24.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/instances/library24.yaml::library24.yaml" } ] } diff --git a/amf-aml/shared/src/test/resources/vocabularies2/instances/example24.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/instances/example24.flattened.jsonld index c4f1ea11..c2a20d25 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/instances/example24.flattened.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/instances/example24.flattened.jsonld @@ -116,14 +116,14 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#aliases-array": [ + "http://a.ml/vocabularies/document-source-maps#lexical": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example24.yaml#/source-map/aliases-array/element_0" + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example24.yaml#/source-map/lexical/element_0" } ], - "http://a.ml/vocabularies/document-source-maps#lexical": [ + "http://a.ml/vocabularies/document-source-maps#aliases-array": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example24.yaml#/source-map/lexical/element_0" + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example24.yaml#/source-map/aliases-array/element_0" } ], "http://a.ml/vocabularies/document-source-maps#aliases-location": [ @@ -173,14 +173,14 @@ ] }, { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example24.yaml#/source-map/aliases-array/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example24.yaml#/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example24.yaml", - "http://a.ml/vocabularies/document-source-maps#value": "lib->file://amf-aml/shared/src/test/resources/vocabularies2/instances/library24.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/instances/library24.yaml::library24.yaml" + "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(5,0)]" }, { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example24.yaml#/source-map/lexical/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example24.yaml#/source-map/aliases-array/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example24.yaml", - "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(5,0)]" + "http://a.ml/vocabularies/document-source-maps#value": "lib->file://amf-aml/shared/src/test/resources/vocabularies2/instances/library24.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/instances/library24.yaml::library24.yaml" }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example24.yaml#/source-map/aliases-location/element_0", diff --git a/amf-aml/shared/src/test/resources/vocabularies2/instances/example24c.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/instances/example24c.expanded.jsonld index 986c04db..cf9dcdca 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/instances/example24c.expanded.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/instances/example24c.expanded.jsonld @@ -62,9 +62,9 @@ ] } ], - "http://a.ml/vocabularies/document-source-maps#lexical": [ + "http://a.ml/vocabularies/document-source-maps#json-pointer-ref": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example24c.yaml#/encodes/rb/source-map/lexical/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example24c.yaml#/encodes/rb/source-map/json-pointer-ref/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example24c.yaml#/encodes/rb" @@ -72,14 +72,14 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(9,0)-(10,0)]" + "@value": "true" } ] } ], - "http://a.ml/vocabularies/document-source-maps#json-pointer-ref": [ + "http://a.ml/vocabularies/document-source-maps#lexical": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example24c.yaml#/encodes/rb/source-map/json-pointer-ref/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example24c.yaml#/encodes/rb/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example24c.yaml#/encodes/rb" @@ -87,7 +87,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "true" + "@value": "[(9,0)-(10,0)]" } ] } diff --git a/amf-aml/shared/src/test/resources/vocabularies2/instances/example24c.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/instances/example24c.flattened.jsonld index 96558e08..5d5dc916 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/instances/example24c.flattened.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/instances/example24c.flattened.jsonld @@ -78,14 +78,14 @@ "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example24c.yaml#/encodes/rb/source-map/synthesized-field/element_0" } ], - "http://a.ml/vocabularies/document-source-maps#lexical": [ + "http://a.ml/vocabularies/document-source-maps#json-pointer-ref": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example24c.yaml#/encodes/rb/source-map/lexical/element_0" + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example24c.yaml#/encodes/rb/source-map/json-pointer-ref/element_0" } ], - "http://a.ml/vocabularies/document-source-maps#json-pointer-ref": [ + "http://a.ml/vocabularies/document-source-maps#lexical": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example24c.yaml#/encodes/rb/source-map/json-pointer-ref/element_0" + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example24c.yaml#/encodes/rb/source-map/lexical/element_0" } ] }, @@ -110,14 +110,14 @@ "http://a.ml/vocabularies/document-source-maps#value": "true" }, { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example24c.yaml#/encodes/rb/source-map/lexical/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example24c.yaml#/encodes/rb/source-map/json-pointer-ref/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example24c.yaml#/encodes/rb", - "http://a.ml/vocabularies/document-source-maps#value": "[(9,0)-(10,0)]" + "http://a.ml/vocabularies/document-source-maps#value": "true" }, { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example24c.yaml#/encodes/rb/source-map/json-pointer-ref/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example24c.yaml#/encodes/rb/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example24c.yaml#/encodes/rb", - "http://a.ml/vocabularies/document-source-maps#value": "true" + "http://a.ml/vocabularies/document-source-maps#value": "[(9,0)-(10,0)]" }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example24c.yaml", diff --git a/amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.expanded.jsonld index 75c0f74e..8bbebcfc 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.expanded.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.expanded.jsonld @@ -42,9 +42,9 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#from-union-node-mapping": [ + "http://a.ml/vocabularies/document-source-maps#lexical": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/encodes/union/source-map/from-union-node-mapping/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/encodes/union/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": [ { "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/encodes/union" @@ -52,35 +52,35 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect27.yaml#/declarations/UnionNode" + "@value": "[(10,0)-(12,0)]" } ] - } - ], - "http://a.ml/vocabularies/document-source-maps#lexical": [ + }, { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/encodes/union/source-map/lexical/element_1", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/encodes/union/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { - "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/encodes/union" + "@value": "http://test.com/v3#b" } ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(10,0)-(12,0)]" + "@value": "[(10,2)-(11,0)]" } ] - }, + } + ], + "http://a.ml/vocabularies/document-source-maps#from-union-node-mapping": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/encodes/union/source-map/lexical/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/encodes/union/source-map/from-union-node-mapping/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { - "@value": "http://test.com/v3#b" + "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/encodes/union" } ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(10,2)-(11,0)]" + "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect27.yaml#/declarations/UnionNode" } ] } @@ -203,21 +203,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#from-union-node-mapping": [ - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/nodes/a/source-map/from-union-node-mapping/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/nodes/a" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect27.yaml#/declarations/UnionNode" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/nodes/a/source-map/lexical/element_2", @@ -258,6 +243,21 @@ } ] } + ], + "http://a.ml/vocabularies/document-source-maps#from-union-node-mapping": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/nodes/a/source-map/from-union-node-mapping/element_0", + "http://a.ml/vocabularies/document-source-maps#element": [ + { + "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/nodes/a" + } + ], + "http://a.ml/vocabularies/document-source-maps#value": [ + { + "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect27.yaml#/declarations/UnionNode" + } + ] + } ] } ] @@ -286,21 +286,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#from-union-node-mapping": [ - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/nodes/let's%20go/source-map/from-union-node-mapping/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/nodes/let's%20go" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect27.yaml#/declarations/UnionNode" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/nodes/let's%20go/source-map/lexical/element_2", @@ -341,6 +326,21 @@ } ] } + ], + "http://a.ml/vocabularies/document-source-maps#from-union-node-mapping": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/nodes/let's%20go/source-map/from-union-node-mapping/element_0", + "http://a.ml/vocabularies/document-source-maps#element": [ + { + "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/nodes/let's%20go" + } + ], + "http://a.ml/vocabularies/document-source-maps#value": [ + { + "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect27.yaml#/declarations/UnionNode" + } + ] + } ] } ] diff --git a/amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.flattened.jsonld index 21527f50..2782c211 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.flattened.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.flattened.jsonld @@ -64,11 +64,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#from-union-node-mapping": [ - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/encodes/union/source-map/from-union-node-mapping/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/encodes/union/source-map/lexical/element_1" @@ -76,6 +71,11 @@ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/encodes/union/source-map/lexical/element_0" } + ], + "http://a.ml/vocabularies/document-source-maps#from-union-node-mapping": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/encodes/union/source-map/from-union-node-mapping/element_0" + } ] }, { @@ -88,11 +88,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://test.com/v3#union", "http://a.ml/vocabularies/document-source-maps#value": "[(9,0)-(12,0)]" }, - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/encodes/union/source-map/from-union-node-mapping/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/encodes/union", - "http://a.ml/vocabularies/document-source-maps#value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect27.yaml#/declarations/UnionNode" - }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/encodes/union/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/encodes/union", @@ -103,6 +98,11 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://test.com/v3#b", "http://a.ml/vocabularies/document-source-maps#value": "[(10,2)-(11,0)]" }, + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/encodes/union/source-map/from-union-node-mapping/element_0", + "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/encodes/union", + "http://a.ml/vocabularies/document-source-maps#value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect27.yaml#/declarations/UnionNode" + }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml", "http://a.ml/vocabularies/document#declares": [ @@ -186,11 +186,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#from-union-node-mapping": [ - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/nodes/a/source-map/from-union-node-mapping/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/nodes/a/source-map/lexical/element_2" @@ -201,6 +196,11 @@ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/nodes/a/source-map/lexical/element_1" } + ], + "http://a.ml/vocabularies/document-source-maps#from-union-node-mapping": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/nodes/a/source-map/from-union-node-mapping/element_0" + } ] }, { @@ -208,11 +208,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#from-union-node-mapping": [ - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/nodes/let's%20go/source-map/from-union-node-mapping/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/nodes/let's%20go/source-map/lexical/element_2" @@ -223,6 +218,11 @@ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/nodes/let's%20go/source-map/lexical/element_1" } + ], + "http://a.ml/vocabularies/document-source-maps#from-union-node-mapping": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/nodes/let's%20go/source-map/from-union-node-mapping/element_0" + } ] }, { @@ -230,11 +230,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml", "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(12,0)]" }, - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/nodes/a/source-map/from-union-node-mapping/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/nodes/a", - "http://a.ml/vocabularies/document-source-maps#value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect27.yaml#/declarations/UnionNode" - }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/nodes/a/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/meta#declarationName", @@ -251,8 +246,8 @@ "http://a.ml/vocabularies/document-source-maps#value": "[(4,0)-(6,0)]" }, { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/nodes/let's%20go/source-map/from-union-node-mapping/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/nodes/let's%20go", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/nodes/a/source-map/from-union-node-mapping/element_0", + "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/nodes/a", "http://a.ml/vocabularies/document-source-maps#value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect27.yaml#/declarations/UnionNode" }, { @@ -269,6 +264,11 @@ "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/nodes/let's%20go/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/nodes/let's%20go", "http://a.ml/vocabularies/document-source-maps#value": "[(7,0)-(9,0)]" + }, + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/nodes/let's%20go/source-map/from-union-node-mapping/element_0", + "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example27a.yaml#/nodes/let's%20go", + "http://a.ml/vocabularies/document-source-maps#value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect27.yaml#/declarations/UnionNode" } ] } diff --git a/amf-aml/shared/src/test/resources/vocabularies2/instances/example31.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/instances/example31.expanded.jsonld index 85e4f5a1..2b7dcbf8 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/instances/example31.expanded.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/instances/example31.expanded.jsonld @@ -144,21 +144,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#from-union-node-mapping": [ - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example31.yaml#/decs/bType/source-map/from-union-node-mapping/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example31.yaml#/decs/bType" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect31.yaml#/declarations/Union" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example31.yaml#/decs/bType/source-map/lexical/element_3", @@ -212,6 +197,21 @@ } ] } + ], + "http://a.ml/vocabularies/document-source-maps#from-union-node-mapping": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example31.yaml#/decs/bType/source-map/from-union-node-mapping/element_0", + "http://a.ml/vocabularies/document-source-maps#element": [ + { + "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example31.yaml#/decs/bType" + } + ], + "http://a.ml/vocabularies/document-source-maps#value": [ + { + "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect31.yaml#/declarations/Union" + } + ] + } ] } ] @@ -244,21 +244,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#from-union-node-mapping": [ - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example31.yaml#/decs/cType/source-map/from-union-node-mapping/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example31.yaml#/decs/cType" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect31.yaml#/declarations/Union" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example31.yaml#/decs/cType/source-map/lexical/element_3", @@ -312,6 +297,21 @@ } ] } + ], + "http://a.ml/vocabularies/document-source-maps#from-union-node-mapping": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example31.yaml#/decs/cType/source-map/from-union-node-mapping/element_0", + "http://a.ml/vocabularies/document-source-maps#element": [ + { + "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example31.yaml#/decs/cType" + } + ], + "http://a.ml/vocabularies/document-source-maps#value": [ + { + "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect31.yaml#/declarations/Union" + } + ] + } ] } ] diff --git a/amf-aml/shared/src/test/resources/vocabularies2/instances/example31.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/instances/example31.flattened.jsonld index e6ddd7fd..7d371aa5 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/instances/example31.flattened.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/instances/example31.flattened.jsonld @@ -134,11 +134,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#from-union-node-mapping": [ - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example31.yaml#/decs/bType/source-map/from-union-node-mapping/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example31.yaml#/decs/bType/source-map/lexical/element_3" @@ -152,6 +147,11 @@ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example31.yaml#/decs/bType/source-map/lexical/element_2" } + ], + "http://a.ml/vocabularies/document-source-maps#from-union-node-mapping": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example31.yaml#/decs/bType/source-map/from-union-node-mapping/element_0" + } ] }, { @@ -159,11 +159,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#from-union-node-mapping": [ - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example31.yaml#/decs/cType/source-map/from-union-node-mapping/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example31.yaml#/decs/cType/source-map/lexical/element_3" @@ -177,6 +172,11 @@ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example31.yaml#/decs/cType/source-map/lexical/element_2" } + ], + "http://a.ml/vocabularies/document-source-maps#from-union-node-mapping": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example31.yaml#/decs/cType/source-map/from-union-node-mapping/element_0" + } ] }, { @@ -184,11 +184,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example31.yaml", "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(10,0)]" }, - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example31.yaml#/decs/bType/source-map/from-union-node-mapping/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example31.yaml#/decs/bType", - "http://a.ml/vocabularies/document-source-maps#value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect31.yaml#/declarations/Union" - }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example31.yaml#/decs/bType/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/data#type", @@ -210,8 +205,8 @@ "http://a.ml/vocabularies/document-source-maps#value": "[(4,0)-(6,0)]" }, { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example31.yaml#/decs/cType/source-map/from-union-node-mapping/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example31.yaml#/decs/cType", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example31.yaml#/decs/bType/source-map/from-union-node-mapping/element_0", + "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example31.yaml#/decs/bType", "http://a.ml/vocabularies/document-source-maps#value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect31.yaml#/declarations/Union" }, { @@ -233,6 +228,11 @@ "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example31.yaml#/decs/cType/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example31.yaml#/decs/cType", "http://a.ml/vocabularies/document-source-maps#value": "[(7,0)-(9,0)]" + }, + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example31.yaml#/decs/cType/source-map/from-union-node-mapping/element_0", + "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example31.yaml#/decs/cType", + "http://a.ml/vocabularies/document-source-maps#value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect31.yaml#/declarations/Union" } ] } diff --git a/amf-aml/shared/src/test/resources/vocabularies2/instances/example33.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/instances/example33.expanded.jsonld index 0a4bdc4b..de7acdb8 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/instances/example33.expanded.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/instances/example33.expanded.jsonld @@ -32,9 +32,9 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#from-union-node-mapping": [ + "http://a.ml/vocabularies/document-source-maps#lexical": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example33.yaml#/encodes/source-map/from-union-node-mapping/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example33.yaml#/encodes/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": [ { "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example33.yaml#/encodes" @@ -42,17 +42,15 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect33.yaml#/declarations/RootNode" + "@value": "[(2,0)-(2,18)]" } ] - } - ], - "http://a.ml/vocabularies/document-source-maps#lexical": [ + }, { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example33.yaml#/encodes/source-map/lexical/element_1", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example33.yaml#/encodes/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { - "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example33.yaml#/encodes" + "@value": "http://a.ml/vocabularies/data#propertyX" } ], "http://a.ml/vocabularies/document-source-maps#value": [ @@ -60,17 +58,19 @@ "@value": "[(2,0)-(2,18)]" } ] - }, + } + ], + "http://a.ml/vocabularies/document-source-maps#from-union-node-mapping": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example33.yaml#/encodes/source-map/lexical/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example33.yaml#/encodes/source-map/from-union-node-mapping/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { - "@value": "http://a.ml/vocabularies/data#propertyX" + "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example33.yaml#/encodes" } ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(2,0)-(2,18)]" + "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect33.yaml#/declarations/RootNode" } ] } diff --git a/amf-aml/shared/src/test/resources/vocabularies2/instances/example33.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/instances/example33.flattened.jsonld index 2d0ebc61..cbf0cbf0 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/instances/example33.flattened.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/instances/example33.flattened.jsonld @@ -32,11 +32,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#from-union-node-mapping": [ - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example33.yaml#/encodes/source-map/from-union-node-mapping/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example33.yaml#/encodes/source-map/lexical/element_1" @@ -44,13 +39,13 @@ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example33.yaml#/encodes/source-map/lexical/element_0" } + ], + "http://a.ml/vocabularies/document-source-maps#from-union-node-mapping": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example33.yaml#/encodes/source-map/from-union-node-mapping/element_0" + } ] }, - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example33.yaml#/encodes/source-map/from-union-node-mapping/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example33.yaml#/encodes", - "http://a.ml/vocabularies/document-source-maps#value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect33.yaml#/declarations/RootNode" - }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example33.yaml#/encodes/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example33.yaml#/encodes", @@ -61,6 +56,11 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/data#propertyX", "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(2,18)]" }, + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example33.yaml#/encodes/source-map/from-union-node-mapping/element_0", + "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example33.yaml#/encodes", + "http://a.ml/vocabularies/document-source-maps#value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/dialect33.yaml#/declarations/RootNode" + }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example33.yaml", "@type": [ diff --git a/amf-aml/shared/src/test/resources/vocabularies2/instances/example8b.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/instances/example8b.expanded.jsonld index f6d5877b..2bbc43ec 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/instances/example8b.expanded.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/instances/example8b.expanded.jsonld @@ -71,9 +71,9 @@ ] } ], - "http://a.ml/vocabularies/document-source-maps#lexical": [ + "http://a.ml/vocabularies/document-source-maps#ref-include": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example8b.yaml#/encodes/b/a/source-map/lexical/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example8b.yaml#/encodes/b/a/source-map/ref-include/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example8b.yaml#/encodes/b/a" @@ -81,14 +81,14 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(3,4)-(5,0)]" + "@value": "true" } ] } ], - "http://a.ml/vocabularies/document-source-maps#ref-include": [ + "http://a.ml/vocabularies/document-source-maps#lexical": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example8b.yaml#/encodes/b/a/source-map/ref-include/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example8b.yaml#/encodes/b/a/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example8b.yaml#/encodes/b/a" @@ -96,7 +96,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "true" + "@value": "[(3,4)-(5,0)]" } ] } diff --git a/amf-aml/shared/src/test/resources/vocabularies2/instances/example8b.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/instances/example8b.flattened.jsonld index 30aef275..2d538a53 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/instances/example8b.flattened.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/instances/example8b.flattened.jsonld @@ -115,14 +115,14 @@ "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example8b.yaml#/encodes/b/a/source-map/synthesized-field/element_0" } ], - "http://a.ml/vocabularies/document-source-maps#lexical": [ + "http://a.ml/vocabularies/document-source-maps#ref-include": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example8b.yaml#/encodes/b/a/source-map/lexical/element_0" + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example8b.yaml#/encodes/b/a/source-map/ref-include/element_0" } ], - "http://a.ml/vocabularies/document-source-maps#ref-include": [ + "http://a.ml/vocabularies/document-source-maps#lexical": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example8b.yaml#/encodes/b/a/source-map/ref-include/element_0" + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example8b.yaml#/encodes/b/a/source-map/lexical/element_0" } ] }, @@ -142,14 +142,14 @@ "http://a.ml/vocabularies/document-source-maps#value": "true" }, { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example8b.yaml#/encodes/b/a/source-map/lexical/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example8b.yaml#/encodes/b/a/source-map/ref-include/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example8b.yaml#/encodes/b/a", - "http://a.ml/vocabularies/document-source-maps#value": "[(3,4)-(5,0)]" + "http://a.ml/vocabularies/document-source-maps#value": "true" }, { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example8b.yaml#/encodes/b/a/source-map/ref-include/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example8b.yaml#/encodes/b/a/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example8b.yaml#/encodes/b/a", - "http://a.ml/vocabularies/document-source-maps#value": "true" + "http://a.ml/vocabularies/document-source-maps#value": "[(3,4)-(5,0)]" }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example8b.yaml", diff --git a/amf-aml/shared/src/test/resources/vocabularies2/instances/example8c.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/instances/example8c.expanded.jsonld index 4c815758..08d58c47 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/instances/example8c.expanded.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/instances/example8c.expanded.jsonld @@ -71,9 +71,9 @@ ] } ], - "http://a.ml/vocabularies/document-source-maps#lexical": [ + "http://a.ml/vocabularies/document-source-maps#json-pointer-ref": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example8c.yaml#/encodes/b/a/source-map/lexical/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example8c.yaml#/encodes/b/a/source-map/json-pointer-ref/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example8c.yaml#/encodes/b/a" @@ -81,14 +81,14 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(4,0)-(5,0)]" + "@value": "true" } ] } ], - "http://a.ml/vocabularies/document-source-maps#json-pointer-ref": [ + "http://a.ml/vocabularies/document-source-maps#lexical": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example8c.yaml#/encodes/b/a/source-map/json-pointer-ref/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example8c.yaml#/encodes/b/a/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example8c.yaml#/encodes/b/a" @@ -96,7 +96,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "true" + "@value": "[(4,0)-(5,0)]" } ] } diff --git a/amf-aml/shared/src/test/resources/vocabularies2/instances/example8c.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/instances/example8c.flattened.jsonld index d1110412..c287b618 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/instances/example8c.flattened.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/instances/example8c.flattened.jsonld @@ -115,14 +115,14 @@ "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example8c.yaml#/encodes/b/a/source-map/synthesized-field/element_0" } ], - "http://a.ml/vocabularies/document-source-maps#lexical": [ + "http://a.ml/vocabularies/document-source-maps#json-pointer-ref": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example8c.yaml#/encodes/b/a/source-map/lexical/element_0" + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example8c.yaml#/encodes/b/a/source-map/json-pointer-ref/element_0" } ], - "http://a.ml/vocabularies/document-source-maps#json-pointer-ref": [ + "http://a.ml/vocabularies/document-source-maps#lexical": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example8c.yaml#/encodes/b/a/source-map/json-pointer-ref/element_0" + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example8c.yaml#/encodes/b/a/source-map/lexical/element_0" } ] }, @@ -142,14 +142,14 @@ "http://a.ml/vocabularies/document-source-maps#value": "true" }, { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example8c.yaml#/encodes/b/a/source-map/lexical/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example8c.yaml#/encodes/b/a/source-map/json-pointer-ref/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example8c.yaml#/encodes/b/a", - "http://a.ml/vocabularies/document-source-maps#value": "[(4,0)-(5,0)]" + "http://a.ml/vocabularies/document-source-maps#value": "true" }, { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example8c.yaml#/encodes/b/a/source-map/json-pointer-ref/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example8c.yaml#/encodes/b/a/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example8c.yaml#/encodes/b/a", - "http://a.ml/vocabularies/document-source-maps#value": "true" + "http://a.ml/vocabularies/document-source-maps#value": "[(4,0)-(5,0)]" }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example8c.yaml", diff --git a/amf-aml/shared/src/test/resources/vocabularies2/instances/example9.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/instances/example9.expanded.jsonld index df3c719d..23d8927b 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/instances/example9.expanded.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/instances/example9.expanded.jsonld @@ -153,9 +153,9 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#aliases-array": [ + "http://a.ml/vocabularies/document-source-maps#lexical": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example9.yaml#/source-map/aliases-array/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example9.yaml#/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example9.yaml" @@ -163,14 +163,14 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "lib->file://amf-aml/shared/src/test/resources/vocabularies2/instances/library9.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/instances/library9.yaml::library9.yaml" + "@value": "[(2,0)-(8,0)]" } ] } ], - "http://a.ml/vocabularies/document-source-maps#lexical": [ + "http://a.ml/vocabularies/document-source-maps#aliases-array": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example9.yaml#/source-map/lexical/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example9.yaml#/source-map/aliases-array/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example9.yaml" @@ -178,7 +178,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(2,0)-(8,0)]" + "@value": "lib->file://amf-aml/shared/src/test/resources/vocabularies2/instances/library9.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/instances/library9.yaml::library9.yaml" } ] } diff --git a/amf-aml/shared/src/test/resources/vocabularies2/instances/example9.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/instances/example9.flattened.jsonld index 8dd2ed0a..e711f58b 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/instances/example9.flattened.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/instances/example9.flattened.jsonld @@ -187,14 +187,14 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#aliases-array": [ + "http://a.ml/vocabularies/document-source-maps#lexical": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example9.yaml#/source-map/aliases-array/element_0" + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example9.yaml#/source-map/lexical/element_0" } ], - "http://a.ml/vocabularies/document-source-maps#lexical": [ + "http://a.ml/vocabularies/document-source-maps#aliases-array": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example9.yaml#/source-map/lexical/element_0" + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example9.yaml#/source-map/aliases-array/element_0" } ], "http://a.ml/vocabularies/document-source-maps#aliases-location": [ @@ -282,14 +282,14 @@ ] }, { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example9.yaml#/source-map/aliases-array/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example9.yaml#/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example9.yaml", - "http://a.ml/vocabularies/document-source-maps#value": "lib->file://amf-aml/shared/src/test/resources/vocabularies2/instances/library9.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/instances/library9.yaml::library9.yaml" + "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(8,0)]" }, { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example9.yaml#/source-map/lexical/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example9.yaml#/source-map/aliases-array/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example9.yaml", - "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(8,0)]" + "http://a.ml/vocabularies/document-source-maps#value": "lib->file://amf-aml/shared/src/test/resources/vocabularies2/instances/library9.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/instances/library9.yaml::library9.yaml" }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example9.yaml#/source-map/aliases-location/element_0", diff --git a/amf-aml/shared/src/test/resources/vocabularies2/instances/example9b.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/instances/example9b.expanded.jsonld index df958fa7..1df9a31c 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/instances/example9b.expanded.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/instances/example9b.expanded.jsonld @@ -378,9 +378,9 @@ ] } ], - "http://a.ml/vocabularies/document-source-maps#lexical": [ + "http://a.ml/vocabularies/document-source-maps#json-pointer-ref": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example9b.yaml#/Bs/Hey/a/source-map/lexical/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example9b.yaml#/Bs/Hey/a/source-map/json-pointer-ref/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example9b.yaml#/Bs/Hey/a" @@ -388,14 +388,14 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(5,0)-(6,0)]" + "@value": "true" } ] } ], - "http://a.ml/vocabularies/document-source-maps#json-pointer-ref": [ + "http://a.ml/vocabularies/document-source-maps#lexical": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example9b.yaml#/Bs/Hey/a/source-map/json-pointer-ref/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example9b.yaml#/Bs/Hey/a/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example9b.yaml#/Bs/Hey/a" @@ -403,7 +403,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "true" + "@value": "[(5,0)-(6,0)]" } ] } diff --git a/amf-aml/shared/src/test/resources/vocabularies2/instances/example9b.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/instances/example9b.flattened.jsonld index f2707af8..61e29da2 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/instances/example9b.flattened.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/instances/example9b.flattened.jsonld @@ -311,14 +311,14 @@ "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example9b.yaml#/Bs/Hey/a/source-map/synthesized-field/element_0" } ], - "http://a.ml/vocabularies/document-source-maps#lexical": [ + "http://a.ml/vocabularies/document-source-maps#json-pointer-ref": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example9b.yaml#/Bs/Hey/a/source-map/lexical/element_0" + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example9b.yaml#/Bs/Hey/a/source-map/json-pointer-ref/element_0" } ], - "http://a.ml/vocabularies/document-source-maps#json-pointer-ref": [ + "http://a.ml/vocabularies/document-source-maps#lexical": [ { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example9b.yaml#/Bs/Hey/a/source-map/json-pointer-ref/element_0" + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example9b.yaml#/Bs/Hey/a/source-map/lexical/element_0" } ] }, @@ -363,14 +363,14 @@ "http://a.ml/vocabularies/document-source-maps#value": "true" }, { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example9b.yaml#/Bs/Hey/a/source-map/lexical/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example9b.yaml#/Bs/Hey/a/source-map/json-pointer-ref/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example9b.yaml#/Bs/Hey/a", - "http://a.ml/vocabularies/document-source-maps#value": "[(5,0)-(6,0)]" + "http://a.ml/vocabularies/document-source-maps#value": "true" }, { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example9b.yaml#/Bs/Hey/a/source-map/json-pointer-ref/element_0", + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example9b.yaml#/Bs/Hey/a/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/example9b.yaml#/Bs/Hey/a", - "http://a.ml/vocabularies/document-source-maps#value": "true" + "http://a.ml/vocabularies/document-source-maps#value": "[(5,0)-(6,0)]" } ] } diff --git a/amf-aml/shared/src/test/resources/vocabularies2/instances/native-links-with-native-target/instance.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/instances/native-links-with-native-target/instance.expanded.jsonld index 710256c2..00ef039d 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/instances/native-links-with-native-target/instance.expanded.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/instances/native-links-with-native-target/instance.expanded.jsonld @@ -198,21 +198,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#custom-id": [ - { - "@id": "http://test.com/declarations/B1#/source-map/custom-id/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "http://test.com/declarations/B1" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "true" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "http://test.com/declarations/B1#/source-map/lexical/element_3", @@ -266,6 +251,21 @@ } ] } + ], + "http://a.ml/vocabularies/document-source-maps#custom-id": [ + { + "@id": "http://test.com/declarations/B1#/source-map/custom-id/element_0", + "http://a.ml/vocabularies/document-source-maps#element": [ + { + "@value": "http://test.com/declarations/B1" + } + ], + "http://a.ml/vocabularies/document-source-maps#value": [ + { + "@value": "true" + } + ] + } ] } ] diff --git a/amf-aml/shared/src/test/resources/vocabularies2/instances/native-links-with-native-target/instance.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/instances/native-links-with-native-target/instance.flattened.jsonld index 5bf4ec1f..99aa71c7 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/instances/native-links-with-native-target/instance.flattened.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/instances/native-links-with-native-target/instance.flattened.jsonld @@ -131,11 +131,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#custom-id": [ - { - "@id": "http://test.com/declarations/B1#/source-map/custom-id/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "http://test.com/declarations/B1#/source-map/lexical/element_3" @@ -149,6 +144,11 @@ { "@id": "http://test.com/declarations/B1#/source-map/lexical/element_2" } + ], + "http://a.ml/vocabularies/document-source-maps#custom-id": [ + { + "@id": "http://test.com/declarations/B1#/source-map/custom-id/element_0" + } ] }, { @@ -156,11 +156,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/native-links-with-native-target/instance.yaml", "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(12,0)]" }, - { - "@id": "http://test.com/declarations/B1#/source-map/custom-id/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "http://test.com/declarations/B1", - "http://a.ml/vocabularies/document-source-maps#value": "true" - }, { "@id": "http://test.com/declarations/B1#/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/data#a", @@ -180,6 +175,11 @@ "@id": "http://test.com/declarations/B1#/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "http://test.com/declarations/B1", "http://a.ml/vocabularies/document-source-maps#value": "[(3,2)-(7,0)]" + }, + { + "@id": "http://test.com/declarations/B1#/source-map/custom-id/element_0", + "http://a.ml/vocabularies/document-source-maps#element": "http://test.com/declarations/B1", + "http://a.ml/vocabularies/document-source-maps#value": "true" } ] } diff --git a/amf-aml/shared/src/test/resources/vocabularies2/instances/native-links-with-template-ids/instance.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/instances/native-links-with-template-ids/instance.expanded.jsonld index 14d09cec..c5fd4d3b 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/instances/native-links-with-template-ids/instance.expanded.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/instances/native-links-with-template-ids/instance.expanded.jsonld @@ -133,9 +133,9 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#custom-base": [ + "http://a.ml/vocabularies/document-source-maps#lexical": [ { - "@id": "http://defined.by.me/embedOverwritten#/source-map/custom-base/element_0", + "@id": "http://defined.by.me/embedOverwritten#/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": [ { "@value": "http://defined.by.me/embedOverwritten" @@ -143,35 +143,35 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "http://defined.by.me/" + "@value": "[(14,0)-(16,0)]" } ] - } - ], - "http://a.ml/vocabularies/document-source-maps#lexical": [ + }, { - "@id": "http://defined.by.me/embedOverwritten#/source-map/lexical/element_1", + "@id": "http://defined.by.me/embedOverwritten#/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { - "@value": "http://defined.by.me/embedOverwritten" + "@value": "http://a.ml/vocabularies/data#id" } ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(14,0)-(16,0)]" + "@value": "[(14,4)-(15,0)]" } ] - }, + } + ], + "http://a.ml/vocabularies/document-source-maps#custom-base": [ { - "@id": "http://defined.by.me/embedOverwritten#/source-map/lexical/element_0", + "@id": "http://defined.by.me/embedOverwritten#/source-map/custom-base/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { - "@value": "http://a.ml/vocabularies/data#id" + "@value": "http://defined.by.me/embedOverwritten" } ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(14,4)-(15,0)]" + "@value": "http://defined.by.me/" } ] } diff --git a/amf-aml/shared/src/test/resources/vocabularies2/instances/native-links-with-template-ids/instance.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/instances/native-links-with-template-ids/instance.flattened.jsonld index 0adc5de4..00931d29 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/instances/native-links-with-template-ids/instance.flattened.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/instances/native-links-with-template-ids/instance.flattened.jsonld @@ -231,11 +231,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#custom-base": [ - { - "@id": "http://defined.by.me/embedOverwritten#/source-map/custom-base/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "http://defined.by.me/embedOverwritten#/source-map/lexical/element_1" @@ -243,6 +238,11 @@ { "@id": "http://defined.by.me/embedOverwritten#/source-map/lexical/element_0" } + ], + "http://a.ml/vocabularies/document-source-maps#custom-base": [ + { + "@id": "http://defined.by.me/embedOverwritten#/source-map/custom-base/element_0" + } ] }, { @@ -270,11 +270,6 @@ } ] }, - { - "@id": "http://defined.by.me/embedOverwritten#/source-map/custom-base/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "http://defined.by.me/embedOverwritten", - "http://a.ml/vocabularies/document-source-maps#value": "http://defined.by.me/" - }, { "@id": "http://defined.by.me/embedOverwritten#/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "http://defined.by.me/embedOverwritten", @@ -285,6 +280,11 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/data#id", "http://a.ml/vocabularies/document-source-maps#value": "[(14,4)-(15,0)]" }, + { + "@id": "http://defined.by.me/embedOverwritten#/source-map/custom-base/element_0", + "http://a.ml/vocabularies/document-source-maps#element": "http://defined.by.me/embedOverwritten", + "http://a.ml/vocabularies/document-source-maps#value": "http://defined.by.me/" + }, { "@id": "http://test/simpleAlt#/source-map/custom-id/element_0", "http://a.ml/vocabularies/document-source-maps#element": "http://test/simpleAlt", diff --git a/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example1.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example1.expanded.jsonld index 77b88b87..17a6ce1b 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example1.expanded.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/japanese/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/japanese/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/japanese/dialects/example1.yaml" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "\u4F7F\u7528\u3059\u308B->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/japanese/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/japanese/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/japanese/dialects/example1.yaml" + } + ], + "http://a.ml/vocabularies/document-source-maps#value": [ + { + "@value": "\u4F7F\u7528\u3059\u308B->http://a.ml/vocabularies/vocab2#::http://a.ml/vocabularies/vocab2#::vocab2.yaml" + } + ] + } ] } ], diff --git a/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example1.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example1.flattened.jsonld index 1c2cd59b..6454ea78 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example1.flattened.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/japanese/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/japanese/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/japanese/dialects/example1.yaml#/source-map/lexical/element_3" @@ -289,6 +284,11 @@ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/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/japanese/dialects/example1.yaml#/source-map/aliases-array/element_0" + } ] }, { @@ -422,11 +422,6 @@ } ] }, - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/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/japanese/dialects/example1.yaml", - "http://a.ml/vocabularies/document-source-maps#value": "\u4F7F\u7528\u3059\u308B->http://a.ml/vocabularies/vocab2#::http://a.ml/vocabularies/vocab2#::vocab2.yaml" - }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example1.yaml#/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", @@ -447,6 +442,11 @@ "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example1.yaml", "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(23,0)]" }, + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/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/japanese/dialects/example1.yaml", + "http://a.ml/vocabularies/document-source-maps#value": "\u4F7F\u7528\u3059\u308B->http://a.ml/vocabularies/vocab2#::http://a.ml/vocabularies/vocab2#::vocab2.yaml" + }, { "@id": "http://a.ml/vocabularies/vocab2#\u30A8\u30A2\u30A6\u30A7\u30A4/source-map", "@type": [ diff --git a/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example2.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example2.expanded.jsonld index d51e78c9..89ebf5c9 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example2.expanded.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example2.expanded.jsonld @@ -205,21 +205,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/japanese/dialects/example2.yaml#/source-map/aliases-array/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example2.yaml" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "\u4F7F\u7528\u3059\u308B->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/japanese/dialects/example2.yaml#/source-map/lexical/element_3", @@ -273,6 +258,21 @@ } ] } + ], + "http://a.ml/vocabularies/document-source-maps#aliases-array": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example2.yaml#/source-map/aliases-array/element_0", + "http://a.ml/vocabularies/document-source-maps#element": [ + { + "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example2.yaml" + } + ], + "http://a.ml/vocabularies/document-source-maps#value": [ + { + "@value": "\u4F7F\u7528\u3059\u308B->http://a.ml/vocabularies/vocab2#::http://a.ml/vocabularies/vocab2#::vocab2.yaml" + } + ] + } ] } ], diff --git a/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example2.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example2.flattened.jsonld index 79a29ab3..20d42d9e 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example2.flattened.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example2.flattened.jsonld @@ -255,11 +255,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/japanese/dialects/example2.yaml#/source-map/aliases-array/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example2.yaml#/source-map/lexical/element_3" @@ -273,6 +268,11 @@ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example2.yaml#/source-map/lexical/element_2" } + ], + "http://a.ml/vocabularies/document-source-maps#aliases-array": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example2.yaml#/source-map/aliases-array/element_0" + } ] }, { @@ -406,11 +406,6 @@ } ] }, - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example2.yaml#/source-map/aliases-array/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example2.yaml", - "http://a.ml/vocabularies/document-source-maps#value": "\u4F7F\u7528\u3059\u308B->http://a.ml/vocabularies/vocab2#::http://a.ml/vocabularies/vocab2#::vocab2.yaml" - }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example2.yaml#/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", @@ -431,6 +426,11 @@ "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example2.yaml", "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(23,0)]" }, + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example2.yaml#/source-map/aliases-array/element_0", + "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example2.yaml", + "http://a.ml/vocabularies/document-source-maps#value": "\u4F7F\u7528\u3059\u308B->http://a.ml/vocabularies/vocab2#::http://a.ml/vocabularies/vocab2#::vocab2.yaml" + }, { "@id": "http://a.ml/vocabularies/vocab2#\u30A8\u30A2\u30A6\u30A7\u30A4/source-map", "@type": [ diff --git a/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example3.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example3.expanded.jsonld index 7c75a2ec..337f52a2 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example3.expanded.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example3.expanded.jsonld @@ -281,21 +281,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/japanese/dialects/example3.yaml#/source-map/aliases-array/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example3.yaml" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "\u4F7F\u7528\u3059\u308B->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/japanese/dialects/example3.yaml#/source-map/lexical/element_3", @@ -349,6 +334,21 @@ } ] } + ], + "http://a.ml/vocabularies/document-source-maps#aliases-array": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example3.yaml#/source-map/aliases-array/element_0", + "http://a.ml/vocabularies/document-source-maps#element": [ + { + "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example3.yaml" + } + ], + "http://a.ml/vocabularies/document-source-maps#value": [ + { + "@value": "\u4F7F\u7528\u3059\u308B->http://a.ml/vocabularies/vocab2#::http://a.ml/vocabularies/vocab2#::vocab2.yaml" + } + ] + } ] } ], diff --git a/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example3.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example3.flattened.jsonld index a55c4bac..2197d385 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example3.flattened.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example3.flattened.jsonld @@ -311,11 +311,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/japanese/dialects/example3.yaml#/source-map/aliases-array/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example3.yaml#/source-map/lexical/element_3" @@ -329,6 +324,11 @@ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example3.yaml#/source-map/lexical/element_2" } + ], + "http://a.ml/vocabularies/document-source-maps#aliases-array": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example3.yaml#/source-map/aliases-array/element_0" + } ] }, { @@ -465,11 +465,6 @@ } ] }, - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example3.yaml#/source-map/aliases-array/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example3.yaml", - "http://a.ml/vocabularies/document-source-maps#value": "\u4F7F\u7528\u3059\u308B->http://a.ml/vocabularies/vocab2#::http://a.ml/vocabularies/vocab2#::vocab2.yaml" - }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example3.yaml#/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", @@ -490,6 +485,11 @@ "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example3.yaml", "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(24,0)]" }, + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example3.yaml#/source-map/aliases-array/element_0", + "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example3.yaml", + "http://a.ml/vocabularies/document-source-maps#value": "\u4F7F\u7528\u3059\u308B->http://a.ml/vocabularies/vocab2#::http://a.ml/vocabularies/vocab2#::vocab2.yaml" + }, { "@id": "http://a.ml/vocabularies/vocab2#\u30A8\u30A2\u30A6\u30A7\u30A4/source-map", "@type": [ diff --git a/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example5.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example5.expanded.jsonld index 19b65c21..11b30d1b 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example5.expanded.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example5.expanded.jsonld @@ -302,21 +302,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/japanese/dialects/example5.yaml#/source-map/aliases-array/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example5.yaml" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "\u4F7F2->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/japanese/dialects/example5.yaml#/source-map/lexical/element_4", @@ -383,6 +368,21 @@ } ] } + ], + "http://a.ml/vocabularies/document-source-maps#aliases-array": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example5.yaml#/source-map/aliases-array/element_0", + "http://a.ml/vocabularies/document-source-maps#element": [ + { + "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example5.yaml" + } + ], + "http://a.ml/vocabularies/document-source-maps#value": [ + { + "@value": "\u4F7F2->http://a.ml/vocabularies/vocab2#::http://a.ml/vocabularies/vocab2#::vocab2.yaml" + } + ] + } ] } ], diff --git a/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example5.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example5.flattened.jsonld index 2937c21e..badb32d6 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example5.flattened.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example5.flattened.jsonld @@ -323,11 +323,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/japanese/dialects/example5.yaml#/source-map/aliases-array/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example5.yaml#/source-map/lexical/element_4" @@ -344,6 +339,11 @@ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example5.yaml#/source-map/lexical/element_3" } + ], + "http://a.ml/vocabularies/document-source-maps#aliases-array": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example5.yaml#/source-map/aliases-array/element_0" + } ] }, { @@ -480,11 +480,6 @@ } ] }, - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example5.yaml#/source-map/aliases-array/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example5.yaml", - "http://a.ml/vocabularies/document-source-maps#value": "\u4F7F2->http://a.ml/vocabularies/vocab2#::http://a.ml/vocabularies/vocab2#::vocab2.yaml" - }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example5.yaml#/source-map/lexical/element_4", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/meta#externals", @@ -510,6 +505,11 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#name", "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(3,0)]" }, + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example5.yaml#/source-map/aliases-array/element_0", + "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example5.yaml", + "http://a.ml/vocabularies/document-source-maps#value": "\u4F7F2->http://a.ml/vocabularies/vocab2#::http://a.ml/vocabularies/vocab2#::vocab2.yaml" + }, { "@id": "http://a.ml/vocabularies/vocab2#\u30A8\u30A2\u30A6\u30A7\u30A4/source-map", "@type": [ diff --git a/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example6.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example6.expanded.jsonld index 9fe2225e..cd0112de 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example6.expanded.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example6.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/japanese/dialects/example6.yaml#/source-map/aliases-array/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example6.yaml" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "\u56F3\u66F8\u9928->file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/mappings_lib.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/mappings_lib.yaml::mappings_lib.yaml" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example6.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/japanese/dialects/example6.yaml#/source-map/aliases-array/element_0", + "http://a.ml/vocabularies/document-source-maps#element": [ + { + "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example6.yaml" + } + ], + "http://a.ml/vocabularies/document-source-maps#value": [ + { + "@value": "\u56F3\u66F8\u9928->file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/mappings_lib.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/mappings_lib.yaml::mappings_lib.yaml" + } + ] + } ] } ], diff --git a/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example6.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example6.flattened.jsonld index a6d7e543..51285f1c 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example6.flattened.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example6.flattened.jsonld @@ -155,11 +155,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/japanese/dialects/example6.yaml#/source-map/aliases-array/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example6.yaml#/source-map/lexical/element_3" @@ -173,6 +168,11 @@ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example6.yaml#/source-map/lexical/element_2" } + ], + "http://a.ml/vocabularies/document-source-maps#aliases-array": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example6.yaml#/source-map/aliases-array/element_0" + } ] }, { @@ -238,11 +238,6 @@ } ] }, - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example6.yaml#/source-map/aliases-array/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example6.yaml", - "http://a.ml/vocabularies/document-source-maps#value": "\u56F3\u66F8\u9928->file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/mappings_lib.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/mappings_lib.yaml::mappings_lib.yaml" - }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example6.yaml#/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", @@ -263,6 +258,11 @@ "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example6.yaml", "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(9,0)]" }, + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example6.yaml#/source-map/aliases-array/element_0", + "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example6.yaml", + "http://a.ml/vocabularies/document-source-maps#value": "\u56F3\u66F8\u9928->file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/mappings_lib.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/mappings_lib.yaml::mappings_lib.yaml" + }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/mappings_lib.yaml/externals/v2#/source-map", "@type": [ diff --git a/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example7.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example7.expanded.jsonld index c116cfc1..5f41b3f0 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example7.expanded.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example7.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/japanese/dialects/example7.yaml#/source-map/aliases-array/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example7.yaml" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "\u56F3\u66F8\u9928->file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/mappings_lib.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/mappings_lib.yaml::mappings_lib.yaml" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example7.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/japanese/dialects/example7.yaml#/source-map/aliases-array/element_0", + "http://a.ml/vocabularies/document-source-maps#element": [ + { + "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example7.yaml" + } + ], + "http://a.ml/vocabularies/document-source-maps#value": [ + { + "@value": "\u56F3\u66F8\u9928->file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/mappings_lib.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/mappings_lib.yaml::mappings_lib.yaml" + } + ] + } ] } ], diff --git a/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example7.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example7.flattened.jsonld index 1860a0a4..c538788a 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example7.flattened.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example7.flattened.jsonld @@ -228,11 +228,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/japanese/dialects/example7.yaml#/source-map/aliases-array/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example7.yaml#/source-map/lexical/element_3" @@ -246,6 +241,11 @@ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example7.yaml#/source-map/lexical/element_2" } + ], + "http://a.ml/vocabularies/document-source-maps#aliases-array": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example7.yaml#/source-map/aliases-array/element_0" + } ] }, { @@ -398,11 +398,6 @@ } ] }, - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example7.yaml#/source-map/aliases-array/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example7.yaml", - "http://a.ml/vocabularies/document-source-maps#value": "\u56F3\u66F8\u9928->file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/mappings_lib.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/mappings_lib.yaml::mappings_lib.yaml" - }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example7.yaml#/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", @@ -423,6 +418,11 @@ "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example7.yaml", "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(18,0)]" }, + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example7.yaml#/source-map/aliases-array/element_0", + "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/example7.yaml", + "http://a.ml/vocabularies/document-source-maps#value": "\u56F3\u66F8\u9928->file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/mappings_lib.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/mappings_lib.yaml::mappings_lib.yaml" + }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/japanese/dialects/mappings_lib.yaml/externals/v2#/source-map", "@type": [ diff --git a/amf-aml/shared/src/test/resources/vocabularies2/production/ABOUT/ABOUT-dialect.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/production/ABOUT/ABOUT-dialect.expanded.jsonld index 5b0ab3f7..1b888b45 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/production/ABOUT/ABOUT-dialect.expanded.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/production/ABOUT/ABOUT-dialect.expanded.jsonld @@ -539,21 +539,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/production/ABOUT/ABOUT-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/production/ABOUT/ABOUT-dialect.yaml" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "about->http://mulesoft.com/vocabularies/about#::http://mulesoft.com/vocabularies/about#::ABOUT-vocabulary.yaml" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/production/ABOUT/ABOUT-dialect.yaml#/source-map/lexical/element_4", @@ -620,6 +605,21 @@ } ] } + ], + "http://a.ml/vocabularies/document-source-maps#aliases-array": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/production/ABOUT/ABOUT-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/production/ABOUT/ABOUT-dialect.yaml" + } + ], + "http://a.ml/vocabularies/document-source-maps#value": [ + { + "@value": "about->http://mulesoft.com/vocabularies/about#::http://mulesoft.com/vocabularies/about#::ABOUT-vocabulary.yaml" + } + ] + } ] } ], diff --git a/amf-aml/shared/src/test/resources/vocabularies2/production/ABOUT/ABOUT-dialect.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/production/ABOUT/ABOUT-dialect.flattened.jsonld index bb4ea9d9..6dd910be 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/production/ABOUT/ABOUT-dialect.flattened.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/production/ABOUT/ABOUT-dialect.flattened.jsonld @@ -814,11 +814,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/production/ABOUT/ABOUT-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/production/ABOUT/ABOUT-dialect.yaml#/source-map/lexical/element_4" @@ -835,6 +830,11 @@ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/production/ABOUT/ABOUT-dialect.yaml#/source-map/lexical/element_3" } + ], + "http://a.ml/vocabularies/document-source-maps#aliases-array": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/production/ABOUT/ABOUT-dialect.yaml#/source-map/aliases-array/element_0" + } ] }, { @@ -2601,11 +2601,6 @@ } ] }, - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/production/ABOUT/ABOUT-dialect.yaml#/source-map/aliases-array/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/production/ABOUT/ABOUT-dialect.yaml", - "http://a.ml/vocabularies/document-source-maps#value": "about->http://mulesoft.com/vocabularies/about#::http://mulesoft.com/vocabularies/about#::ABOUT-vocabulary.yaml" - }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/production/ABOUT/ABOUT-dialect.yaml#/source-map/lexical/element_4", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/meta#externals", @@ -2631,6 +2626,11 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#name", "http://a.ml/vocabularies/document-source-maps#value": "[(4,0)-(6,0)]" }, + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/production/ABOUT/ABOUT-dialect.yaml#/source-map/aliases-array/element_0", + "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/production/ABOUT/ABOUT-dialect.yaml", + "http://a.ml/vocabularies/document-source-maps#value": "about->http://mulesoft.com/vocabularies/about#::http://mulesoft.com/vocabularies/about#::ABOUT-vocabulary.yaml" + }, { "@id": "http://mulesoft.com/vocabularies/about#ContinuousIntegration/source-map", "@type": [ diff --git a/amf-aml/shared/src/test/resources/vocabularies2/production/Instagram/dialect.json b/amf-aml/shared/src/test/resources/vocabularies2/production/Instagram/dialect.json index 3ee7d4ed..4c0ce743 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/production/Instagram/dialect.json +++ b/amf-aml/shared/src/test/resources/vocabularies2/production/Instagram/dialect.json @@ -288,21 +288,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/production/Instagram/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/production/Instagram/dialect.yaml" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "learning->http://mulesoft.com/vocabularies/amf-learning#::http://mulesoft.com/vocabularies/amf-learning#::vocabulary.yaml" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/production/Instagram/dialect.yaml#/source-map/lexical/element_4", @@ -369,6 +354,21 @@ } ] } + ], + "http://a.ml/vocabularies/document-source-maps#aliases-array": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/production/Instagram/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/production/Instagram/dialect.yaml" + } + ], + "http://a.ml/vocabularies/document-source-maps#value": [ + { + "@value": "learning->http://mulesoft.com/vocabularies/amf-learning#::http://mulesoft.com/vocabularies/amf-learning#::vocabulary.yaml" + } + ] + } ] } ], diff --git a/amf-aml/shared/src/test/resources/vocabularies2/production/streams/activity.json b/amf-aml/shared/src/test/resources/vocabularies2/production/streams/activity.json index db201972..ac81d3d3 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/production/streams/activity.json +++ b/amf-aml/shared/src/test/resources/vocabularies2/production/streams/activity.json @@ -221,21 +221,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/production/streams/activity.yaml#/source-map/aliases-array/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/production/streams/activity.yaml" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "crm->http://crm.com/vocabularies/core#::http://crm.com/vocabularies/core#::crm.yaml" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/production/streams/activity.yaml#/source-map/lexical/element_4", @@ -302,6 +287,21 @@ } ] } + ], + "http://a.ml/vocabularies/document-source-maps#aliases-array": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/production/streams/activity.yaml#/source-map/aliases-array/element_0", + "http://a.ml/vocabularies/document-source-maps#element": [ + { + "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/production/streams/activity.yaml" + } + ], + "http://a.ml/vocabularies/document-source-maps#value": [ + { + "@value": "crm->http://crm.com/vocabularies/core#::http://crm.com/vocabularies/core#::crm.yaml" + } + ] + } ] } ], diff --git a/amf-aml/shared/src/test/resources/vocabularies2/vocabularies/example6.expanded.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/vocabularies/example6.expanded.jsonld index e7115364..7fadce9c 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/vocabularies/example6.expanded.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/vocabularies/example6.expanded.jsonld @@ -360,6 +360,21 @@ ] } ], + "http://a.ml/vocabularies/document-source-maps#aliases-array": [ + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/vocabularies/example3.yaml#/source-map/aliases-array/element_0", + "http://a.ml/vocabularies/document-source-maps#element": [ + { + "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/vocabularies/example3.yaml" + } + ], + "http://a.ml/vocabularies/document-source-maps#value": [ + { + "@value": "test->file://amf-aml/shared/src/test/resources/vocabularies2/vocabularies/example3.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/vocabularies/example3.yaml::example3.yaml" + } + ] + } + ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/vocabularies/example3.yaml#/source-map/lexical/element_2", @@ -400,21 +415,6 @@ } ] } - ], - "http://a.ml/vocabularies/document-source-maps#aliases-array": [ - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/vocabularies/example3.yaml#/source-map/aliases-array/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-aml/shared/src/test/resources/vocabularies2/vocabularies/example3.yaml" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "test->file://amf-aml/shared/src/test/resources/vocabularies2/vocabularies/example3.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/vocabularies/example3.yaml::example3.yaml" - } - ] - } ] } ] diff --git a/amf-aml/shared/src/test/resources/vocabularies2/vocabularies/example6.flattened.jsonld b/amf-aml/shared/src/test/resources/vocabularies2/vocabularies/example6.flattened.jsonld index 0eaf82f1..7fe3121c 100644 --- a/amf-aml/shared/src/test/resources/vocabularies2/vocabularies/example6.flattened.jsonld +++ b/amf-aml/shared/src/test/resources/vocabularies2/vocabularies/example6.flattened.jsonld @@ -218,6 +218,11 @@ "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/vocabularies/example3.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/vocabularies/example3.yaml#/source-map/aliases-array/element_0" + } + ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/vocabularies/example3.yaml#/source-map/lexical/element_2" @@ -228,11 +233,6 @@ { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/vocabularies/example3.yaml#/source-map/lexical/element_1" } - ], - "http://a.ml/vocabularies/document-source-maps#aliases-array": [ - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/vocabularies/example3.yaml#/source-map/aliases-array/element_0" - } ] }, { @@ -322,6 +322,11 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/document#declares", "http://a.ml/vocabularies/document-source-maps#value": "true" }, + { + "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/vocabularies/example3.yaml#/source-map/aliases-array/element_0", + "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/vocabularies/example3.yaml", + "http://a.ml/vocabularies/document-source-maps#value": "test->file://amf-aml/shared/src/test/resources/vocabularies2/vocabularies/example3.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/vocabularies/example3.yaml::example3.yaml" + }, { "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/vocabularies/example3.yaml#/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#name", @@ -337,11 +342,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/vocabularies/example3.yaml", "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(18,0)]" }, - { - "@id": "file://amf-aml/shared/src/test/resources/vocabularies2/vocabularies/example3.yaml#/source-map/aliases-array/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-aml/shared/src/test/resources/vocabularies2/vocabularies/example3.yaml", - "http://a.ml/vocabularies/document-source-maps#value": "test->file://amf-aml/shared/src/test/resources/vocabularies2/vocabularies/example3.yaml::file://amf-aml/shared/src/test/resources/vocabularies2/vocabularies/example3.yaml::example3.yaml" - }, { "@id": "http://a.ml/vocabularies/test6#D/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/test6#D",