Merge pull request #545 from aml-org/publish-6.0.11

Publish 6.0.11
aml-org · Jul 27, 2022 · ddd953b · ddd953b
2 parents 36164ac + 1743e55
commit ddd953b
Show file tree

Hide file tree

Showing 45 changed files with 156 additions and 152 deletions.
diff --git a/amf-aml/shared/src/main/scala/amf/aml/client/scala/AMLConfiguration.scala b/amf-aml/shared/src/main/scala/amf/aml/client/scala/AMLConfiguration.scala
@@ -132,6 +132,9 @@ class AMLConfiguration private[amf] (
   override def withPlugin(amfPlugin: AMFPlugin[_]): AMLConfiguration =
     super._withPlugin(amfPlugin)
 
+  override def withRootParsePlugin(amfParsePlugin: AMFParsePlugin): AMLConfiguration =
+    super._withRootParsePlugin(amfParsePlugin)
+
   override def withReferenceParsePlugin(amfPlugin: AMFParsePlugin): AMLConfiguration =
     super._withReferenceParsePlugin(amfPlugin)
 

diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/parse/common/SyntaxErrorReporter.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/parse/common/SyntaxErrorReporter.scala
@@ -1,14 +1,13 @@
 package amf.aml.internal.parse.common
 
+import amf.aml.client.scala.model.domain.PropertyLikeMapping
+import amf.aml.internal.metamodel.domain.PropertyMappingModel
+import amf.aml.internal.validate.DialectValidations._
 import amf.core.client.scala.parse.document.ParserContext
 import amf.core.internal.annotations.{LexicalInformation, SourceLocation}
 import amf.core.internal.parser.domain.Annotations
 import amf.core.internal.utils.AmfStrings
-import amf.aml.internal.metamodel.domain.PropertyMappingModel
-import amf.aml.client.scala.model.domain.{PropertyLikeMapping, PropertyMapping}
-import amf.aml.internal.validate.DialectValidations._
 import org.yaml.model.{YNode, YPart}
-import amf.core.client.common.position.Range
 
 trait SyntaxErrorReporter { this: ParserContext =>
 
@@ -77,7 +76,7 @@ trait SyntaxErrorReporter { this: ParserContext =>
         node,
         Some(property.nodePropertyMapping().value()),
         s"Cannot find expected range for property ${property.nodePropertyMapping().value()} (${property.name().value()}). Found '$found', expected '$expected'",
-        Some(new LexicalInformation(Range(valueNode.range))),
+        Some(new LexicalInformation(valueNode.range)),
         valueNode.sourceName.option
     )
 

diff --git a/...aml/shared/src/main/scala/amf/aml/internal/parse/instances/parser/IncludeNodeParser.scala b/...aml/shared/src/main/scala/amf/aml/internal/parse/instances/parser/IncludeNodeParser.scala
@@ -3,7 +3,7 @@ package amf.aml.internal.parse.instances.parser
 import amf.aml.client.scala.model.domain.DialectDomainElement
 import amf.aml.internal.annotations.RefInclude
 import amf.aml.internal.parse.instances.{DialectInstanceContext, NodeMappableHelper}
-import amf.core.internal.annotations.SourceAST
+import amf.core.internal.annotations.SourceYPart
 import amf.core.internal.parser.domain.{Annotations, SearchScope}
 import org.yaml.model.{YNode, YScalar}
 
@@ -36,7 +36,7 @@ object IncludeNodeParser extends NodeMappableHelper {
           .withId(id) // and the ID of the link at that position in the tree, not the ID of the linked element, tha goes in link-target
         linkedNode
       case (text: String, _) =>
-        val loc = givenAnnotations.flatMap(_.find(classOf[SourceAST])).map(_.ast) match {
+        val loc = givenAnnotations.flatMap(_.find(classOf[SourceYPart])).map(_.ast) match {
           case Some(n) => n.location
           case _       => ast.location
         }

diff --git a/...ml/shared/src/main/scala/amf/aml/internal/parse/instances/parser/LiteralValueParser.scala b/...ml/shared/src/main/scala/amf/aml/internal/parse/instances/parser/LiteralValueParser.scala
@@ -2,14 +2,12 @@ package amf.aml.internal.parse.instances.parser
 
 import amf.aml.client.scala.model.domain.{DialectDomainElement, PropertyLikeMapping}
 import amf.aml.internal.validate.DialectValidations.{DialectError, InconsistentPropertyRangeValueSpecification}
-import amf.core.client.common.position.Range
 import amf.core.client.scala.errorhandling.AMFErrorHandler
 import amf.core.client.scala.model.DataType
 import amf.core.client.scala.vocabulary.Namespace
 import amf.core.internal.annotations.LexicalInformation
 import amf.core.internal.parser.domain.Annotations
-import amf.core.internal.plugins.syntax.{SYamlBasedErrorHandler, SyamlAMFErrorHandler}
-import amf.core.internal.utils.AmfStrings
+import amf.core.internal.plugins.syntax.SyamlAMFErrorHandler
 import org.mulesoft.common.time.SimpleDateTime
 import org.yaml.model.{YMapEntry, YNode, YScalar, YType}
 

diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/registries/AMLRegistry.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/registries/AMLRegistry.scala
@@ -54,6 +54,9 @@ private[amf] class AMLRegistry(
   override def withPlugins(amfPlugins: List[AMFPlugin[_]]): AMLRegistry =
     copy(plugins = plugins.withPlugins(amfPlugins))
 
+  override def withRootParsePlugin(aMFParsePlugin: AMFParsePlugin): AMLRegistry =
+    copy(plugins = plugins.withRootParsePlugin(aMFParsePlugin))
+
   override def withFallback(plugin: DomainParsingFallback): AMLRegistry = copy(plugins = plugins.withFallback(plugin))
 
   override def withConstraints(profile: ValidationProfile): AMLRegistry = {

diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/common/ExternalEmitter.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/common/ExternalEmitter.scala
@@ -1,12 +1,12 @@
 package amf.aml.internal.render.emitters.common
 
-import amf.core.client.common.position.Position
-import amf.core.client.common.position.Position.ZERO
+import amf.aml.client.scala.model.domain.External
 import amf.core.internal.annotations.LexicalInformation
 import amf.core.internal.render.BaseEmitters.MapEntryEmitter
 import amf.core.internal.render.SpecOrdering
 import amf.core.internal.render.emitters.EntryEmitter
-import amf.aml.client.scala.model.domain.External
+import org.mulesoft.common.client.lexical.Position
+import org.mulesoft.common.client.lexical.Position.ZERO
 import org.yaml.model.YDocument
 
 case class ExternalEmitter(external: External, ordering: SpecOrdering) extends EntryEmitter {

diff --git a/...main/scala/amf/aml/internal/render/emitters/dialects/AnnotationMappingsEntryEmitter.scala b/...main/scala/amf/aml/internal/render/emitters/dialects/AnnotationMappingsEntryEmitter.scala
@@ -1,13 +1,13 @@
 package amf.aml.internal.render.emitters.dialects
 
-import amf.core.client.common.position.Position
-import amf.core.internal.render.BaseEmitters.{ArrayEmitter, pos, traverse}
-import amf.core.internal.render.SpecOrdering
-import amf.core.internal.render.emitters.EntryEmitter
-import amf.aml.internal.render.emitters.instances.NodeMappableFinder
-import amf.aml.internal.metamodel.domain.AnnotationMappingModel.Domain
 import amf.aml.client.scala.model.document.Dialect
 import amf.aml.client.scala.model.domain.AnnotationMapping
+import amf.aml.internal.metamodel.domain.AnnotationMappingModel.Domain
+import amf.aml.internal.render.emitters.instances.NodeMappableFinder
+import amf.core.internal.render.BaseEmitters.{pos, traverse}
+import amf.core.internal.render.SpecOrdering
+import amf.core.internal.render.emitters.EntryEmitter
+import org.mulesoft.common.client.lexical.Position
 import org.yaml.model.YDocument.EntryBuilder
 import org.yaml.model.YType
 

diff --git a/...d/src/main/scala/amf/aml/internal/render/emitters/dialects/DialectDocumentsEmitters.scala b/...d/src/main/scala/amf/aml/internal/render/emitters/dialects/DialectDocumentsEmitters.scala
@@ -1,17 +1,17 @@
 package amf.aml.internal.render.emitters.dialects
 
+import amf.aml.client.scala.model.document.{Dialect, Vocabulary}
+import amf.aml.client.scala.model.domain.{AnnotationMapping, NodeMappable, NodeMapping, UnionNodeMapping}
+import amf.aml.internal.render.emitters.common.ExternalEmitter
+import amf.aml.internal.render.emitters.instances.AmlEmittersHelper
+import amf.core.client.scala.model.document.DeclaresModel
 import amf.core.internal.annotations.Aliases.{Alias, ImportLocation}
 import amf.core.internal.annotations.LexicalInformation
 import amf.core.internal.render.BaseEmitters.traverse
-import amf.core.internal.render.emitters.EntryEmitter
-import amf.core.client.scala.model.document.DeclaresModel
-import amf.core.client.common.position.Position
-import amf.core.client.common.position.Position.ZERO
 import amf.core.internal.render.SpecOrdering
-import amf.aml.internal.render.emitters.common.ExternalEmitter
-import amf.aml.internal.render.emitters.instances.AmlEmittersHelper
-import amf.aml.client.scala.model.document.{Dialect, Vocabulary}
-import amf.aml.client.scala.model.domain.{AnnotationMapping, NodeMappable, NodeMapping, UnionNodeMapping}
+import amf.core.internal.render.emitters.EntryEmitter
+import org.mulesoft.common.client.lexical.Position
+import org.mulesoft.common.client.lexical.Position.ZERO
 import org.yaml.model.YDocument.EntryBuilder
 
 trait DialectDocumentsEmitters extends AmlEmittersHelper {

diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/DialectEmitter.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/DialectEmitter.scala
@@ -1,16 +1,16 @@
 package amf.aml.internal.render.emitters.dialects
 
-import amf.core.internal.annotations.Aliases.{Alias, FullUrl, ImportLocation}
+import amf.aml.client.scala.model.document.Dialect
+import amf.aml.internal.metamodel.document.DialectModel
+import amf.aml.internal.render.emitters.dialects.FieldEntryImplicit._
+import amf.aml.internal.render.emitters.instances.NodeMappableFinder
+import amf.core.internal.annotations.Aliases.{Alias, ImportLocation}
 import amf.core.internal.render.BaseEmitters._
+import amf.core.internal.render.SpecOrdering
 import amf.core.internal.render.SpecOrdering.Lexical
 import amf.core.internal.render.emitters.EntryEmitter
-import amf.core.client.common.position.Position
-import amf.core.client.common.position.Position.ZERO
-import amf.core.internal.render.SpecOrdering
-import amf.aml.internal.render.emitters.dialects.FieldEntryImplicit._
-import amf.aml.internal.render.emitters.instances.NodeMappableFinder
-import amf.aml.internal.metamodel.document.DialectModel
-import amf.aml.client.scala.model.document.Dialect
+import org.mulesoft.common.client.lexical.Position
+import org.mulesoft.common.client.lexical.Position.ZERO
 import org.yaml.model.YDocument
 import org.yaml.model.YDocument.EntryBuilder
 

diff --git a/...hared/src/main/scala/amf/aml/internal/render/emitters/dialects/DiscriminatorEmitter.scala b/...hared/src/main/scala/amf/aml/internal/render/emitters/dialects/DiscriminatorEmitter.scala
@@ -1,11 +1,11 @@
 package amf.aml.internal.render.emitters.dialects
 
+import amf.aml.client.scala.model.domain.NodeWithDiscriminator
+import amf.aml.internal.metamodel.domain.NodeWithDiscriminatorModel
+import amf.core.client.scala.model.domain.AmfScalar
 import amf.core.internal.render.BaseEmitters.MapEntryEmitter
 import amf.core.internal.render.emitters.EntryEmitter
-import amf.core.client.scala.model.domain.AmfScalar
-import amf.core.client.common.position.Position
-import amf.aml.internal.metamodel.domain.NodeWithDiscriminatorModel
-import amf.aml.client.scala.model.domain.NodeWithDiscriminator
+import org.mulesoft.common.client.lexical.Position
 import org.yaml.model.YDocument.EntryBuilder
 import org.yaml.model.YType
 

diff --git a/...ared/src/main/scala/amf/aml/internal/render/emitters/dialects/DocumentsModelEmitter.scala b/...ared/src/main/scala/amf/aml/internal/render/emitters/dialects/DocumentsModelEmitter.scala
@@ -1,15 +1,15 @@
 package amf.aml.internal.render.emitters.dialects
 
-import amf.core.client.common.position.Position
-import amf.core.client.common.position.Position.ZERO
+import amf.aml.client.scala.model.document.Dialect
+import amf.aml.client.scala.model.domain.{DocumentsModel, PublicNodeMapping}
+import amf.aml.internal.metamodel.domain.DocumentMappingModel
+import amf.aml.internal.render.emitters.instances.NodeMappableFinder
 import amf.core.internal.annotations.LexicalInformation
 import amf.core.internal.render.BaseEmitters.traverse
 import amf.core.internal.render.SpecOrdering
 import amf.core.internal.render.emitters.EntryEmitter
-import amf.aml.internal.render.emitters.instances.NodeMappableFinder
-import amf.aml.internal.metamodel.domain.DocumentMappingModel
-import amf.aml.client.scala.model.document.Dialect
-import amf.aml.client.scala.model.domain.{DocumentsModel, PublicNodeMapping}
+import org.mulesoft.common.client.lexical.Position
+import org.mulesoft.common.client.lexical.Position.ZERO
 import org.yaml.model.YDocument.EntryBuilder
 
 case class DocumentsModelEmitter(dialect: Dialect, ordering: SpecOrdering, aliases: Map[String, (String, String)])(

diff --git a/...c/main/scala/amf/aml/internal/render/emitters/dialects/DocumentsModelOptionsEmitter.scala b/...c/main/scala/amf/aml/internal/render/emitters/dialects/DocumentsModelOptionsEmitter.scala
@@ -1,13 +1,13 @@
 package amf.aml.internal.render.emitters.dialects
 
-import amf.core.internal.render.BaseEmitters.{MapEntryEmitter, pos, traverse}
-import amf.core.internal.render.emitters.EntryEmitter
-import amf.core.client.common.position.Position
-import amf.core.client.common.position.Position.ZERO
-import amf.core.internal.render.SpecOrdering
-import amf.aml.internal.render.emitters.instances.NodeMappableFinder
 import amf.aml.client.scala.model.document.Dialect
 import amf.aml.client.scala.model.domain.DocumentsModel
+import amf.aml.internal.render.emitters.instances.NodeMappableFinder
+import amf.core.internal.render.BaseEmitters.{MapEntryEmitter, pos, traverse}
+import amf.core.internal.render.SpecOrdering
+import amf.core.internal.render.emitters.EntryEmitter
+import org.mulesoft.common.client.lexical.Position
+import org.mulesoft.common.client.lexical.Position.ZERO
 import org.yaml.model.YDocument.EntryBuilder
 import org.yaml.model.YType
 

diff --git a/.../main/scala/amf/aml/internal/render/emitters/dialects/ExtensionMappingsEntryEmitter.scala b/.../main/scala/amf/aml/internal/render/emitters/dialects/ExtensionMappingsEntryEmitter.scala
@@ -3,11 +3,11 @@ package amf.aml.internal.render.emitters.dialects
 import amf.core.internal.render.BaseEmitters.{pos, traverse}
 import amf.core.internal.render.SpecOrdering
 import amf.core.internal.render.emitters.EntryEmitter
-import amf.core.client.common.position.Position
 import amf.aml.internal.render.emitters.instances.NodeMappableFinder
 import amf.aml.internal.metamodel.domain.SemanticExtensionModel
 import amf.aml.client.scala.model.document.Dialect
 import amf.aml.client.scala.model.domain.SemanticExtension
+import org.mulesoft.common.client.lexical.Position
 import org.yaml.model.YDocument.EntryBuilder
 import org.yaml.model.YType
 

diff --git a/.../shared/src/main/scala/amf/aml/internal/render/emitters/dialects/FieldEntryImplicit.scala b/.../shared/src/main/scala/amf/aml/internal/render/emitters/dialects/FieldEntryImplicit.scala
@@ -1,8 +1,8 @@
 package amf.aml.internal.render.emitters.dialects
 
-import amf.core.client.common.position.Position
 import amf.core.internal.annotations.LexicalInformation
 import amf.core.internal.parser.domain.FieldEntry
+import org.mulesoft.common.client.lexical.Position
 
 private object FieldEntryImplicit {
   implicit class FieldEntryWithPosition(entry: FieldEntry) {

diff --git a/...red/src/main/scala/amf/aml/internal/render/emitters/dialects/FragmentMappingEmitter.scala b/...red/src/main/scala/amf/aml/internal/render/emitters/dialects/FragmentMappingEmitter.scala
@@ -1,14 +1,14 @@
 package amf.aml.internal.render.emitters.dialects
 
-import amf.core.client.common.position.Position
-import amf.core.client.common.position.Position.ZERO
+import amf.aml.client.scala.model.document.Dialect
+import amf.aml.client.scala.model.domain.DocumentMapping
+import amf.aml.internal.render.emitters.instances.NodeMappableFinder
 import amf.core.internal.annotations.LexicalInformation
 import amf.core.internal.render.BaseEmitters.MapEntryEmitter
 import amf.core.internal.render.SpecOrdering
 import amf.core.internal.render.emitters.EntryEmitter
-import amf.aml.internal.render.emitters.instances.NodeMappableFinder
-import amf.aml.client.scala.model.document.Dialect
-import amf.aml.client.scala.model.domain.DocumentMapping
+import org.mulesoft.common.client.lexical.Position
+import org.mulesoft.common.client.lexical.Position.ZERO
 import org.yaml.model.YDocument.EntryBuilder
 
 case class FragmentMappingEmitter(

diff --git a/.../main/scala/amf/aml/internal/render/emitters/dialects/FragmentsDocumentModelEmitter.scala b/.../main/scala/amf/aml/internal/render/emitters/dialects/FragmentsDocumentModelEmitter.scala
@@ -1,11 +1,11 @@
 package amf.aml.internal.render.emitters.dialects
 
-import amf.core.client.common.position.Position
-import amf.core.client.common.position.Position.ZERO
 import amf.core.internal.render.SpecOrdering
 import amf.core.internal.render.emitters.EntryEmitter
 import amf.aml.internal.render.emitters.instances.NodeMappableFinder
 import amf.aml.client.scala.model.document.Dialect
+import org.mulesoft.common.client.lexical.Position
+import org.mulesoft.common.client.lexical.Position.ZERO
 import org.yaml.model.YDocument.EntryBuilder
 
 case class FragmentsDocumentModelEmitter(

diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/GroupPosition.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/GroupPosition.scala
@@ -1,8 +1,8 @@
 package amf.aml.internal.render.emitters.dialects
 
-import amf.core.internal.annotations.LexicalInformation
 import amf.core.client.scala.model.domain.DomainElement
-import amf.core.client.common.position.Position.ZERO
+import amf.core.internal.annotations.LexicalInformation
+import org.mulesoft.common.client.lexical.Position.ZERO
 
 trait GroupPosition {
   def groupPosition(elements: Seq[DomainElement]) =

diff --git a/...rc/main/scala/amf/aml/internal/render/emitters/dialects/LibraryDocumentModelEmitter.scala b/...rc/main/scala/amf/aml/internal/render/emitters/dialects/LibraryDocumentModelEmitter.scala
@@ -1,14 +1,14 @@
 package amf.aml.internal.render.emitters.dialects
 
-import amf.core.client.common.position.Position
-import amf.core.client.common.position.Position.ZERO
 import amf.core.internal.annotations.LexicalInformation
 import amf.core.internal.render.BaseEmitters.{MapEntryEmitter, traverse}
 import amf.core.internal.render.SpecOrdering
 import amf.core.internal.render.emitters.EntryEmitter
 import amf.aml.internal.render.emitters.instances.NodeMappableFinder
 import amf.aml.client.scala.model.document.Dialect
 import amf.aml.client.scala.model.domain.DocumentMapping
+import org.mulesoft.common.client.lexical.Position
+import org.mulesoft.common.client.lexical.Position.ZERO
 import org.yaml.model.YDocument.EntryBuilder
 
 case class LibraryDocumentModelEmitter(

diff --git a/.../shared/src/main/scala/amf/aml/internal/render/emitters/dialects/NodeMappingEmitter.scala b/.../shared/src/main/scala/amf/aml/internal/render/emitters/dialects/NodeMappingEmitter.scala
@@ -4,13 +4,13 @@ import amf.aml.client.scala.model.document.{Dialect, DialectFragment}
 import amf.aml.client.scala.model.domain._
 import amf.aml.internal.metamodel.domain.{NodeMappableModel, UnionNodeMappingModel}
 import amf.aml.internal.render.emitters.instances.NodeMappableFinder
-import amf.core.client.common.position.Position
-import amf.core.client.common.position.Position.ZERO
 import amf.core.client.scala.model.domain.{AmfScalar, DomainElement, Linkable}
 import amf.core.internal.annotations.LexicalInformation
 import amf.core.internal.render.BaseEmitters.{MapEntryEmitter, ScalarEmitter, traverse}
 import amf.core.internal.render.SpecOrdering
 import amf.core.internal.render.emitters.EntryEmitter
+import org.mulesoft.common.client.lexical.Position
+import org.mulesoft.common.client.lexical.Position.ZERO
 import org.yaml.model.YDocument.EntryBuilder
 import org.yaml.model.YNode
 

diff --git a/...d/src/main/scala/amf/aml/internal/render/emitters/dialects/NodeMappingsEntryEmitter.scala b/...d/src/main/scala/amf/aml/internal/render/emitters/dialects/NodeMappingsEntryEmitter.scala
@@ -3,10 +3,10 @@ package amf.aml.internal.render.emitters.dialects
 import amf.aml.client.scala.model.document.Dialect
 import amf.aml.client.scala.model.domain.NodeMappable
 import amf.aml.internal.render.emitters.instances.NodeMappableFinder
-import amf.core.client.common.position.Position
 import amf.core.internal.render.BaseEmitters.traverse
 import amf.core.internal.render.SpecOrdering
 import amf.core.internal.render.emitters.EntryEmitter
+import org.mulesoft.common.client.lexical.Position
 import org.yaml.model.YDocument.EntryBuilder
 
 case class NodeMappingsEntryEmitter(

diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/PosExtractor.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/PosExtractor.scala
@@ -2,9 +2,9 @@ package amf.aml.internal.render.emitters.dialects
 
 import amf.core.internal.metamodel.Field
 import amf.core.client.scala.model.domain.DomainElement
-import amf.core.client.common.position.Position
-import amf.core.client.common.position.Position.ZERO
 import amf.aml.internal.render.emitters.dialects.FieldEntryImplicit._
+import org.mulesoft.common.client.lexical.Position
+import org.mulesoft.common.client.lexical.Position.ZERO
 
 trait PosExtractor {
   def fieldPos(element: DomainElement, field: Field): Position = {

diff --git a/...red/src/main/scala/amf/aml/internal/render/emitters/dialects/PropertyMappingEmitter.scala b/...red/src/main/scala/amf/aml/internal/render/emitters/dialects/PropertyMappingEmitter.scala
@@ -4,15 +4,15 @@ import amf.aml.client.scala.model.document.Dialect
 import amf.aml.client.scala.model.domain.{PropertyLikeMapping, PropertyMapping}
 import amf.aml.internal.metamodel.domain.{PropertyLikeMappingModel, PropertyMappingModel}
 import amf.aml.internal.render.emitters.instances.NodeMappableFinder
-import amf.core.client.common.position.Position
-import amf.core.client.common.position.Position.ZERO
 import amf.core.client.scala.model.domain.AmfScalar
 import amf.core.client.scala.vocabulary.Namespace
 import amf.core.internal.annotations.LexicalInformation
 import amf.core.internal.parser.domain.{Annotations, FieldEntry}
 import amf.core.internal.render.BaseEmitters.{MapEntryEmitter, ScalarEmitter, pos, traverse}
 import amf.core.internal.render.SpecOrdering
 import amf.core.internal.render.emitters.EntryEmitter
+import org.mulesoft.common.client.lexical.Position
+import org.mulesoft.common.client.lexical.Position.ZERO
 import org.mulesoft.common.collections.FilterType
 import org.yaml.model.YDocument.EntryBuilder
 import org.yaml.model.YType

diff --git a/.../src/main/scala/amf/aml/internal/render/emitters/dialects/RamlDialectLibraryEmitter.scala b/.../src/main/scala/amf/aml/internal/render/emitters/dialects/RamlDialectLibraryEmitter.scala
@@ -1,18 +1,18 @@
 package amf.aml.internal.render.emitters.dialects
 
-import amf.core.internal.annotations.Aliases.{Alias, FullUrl, ImportLocation}
-import amf.core.internal.render.BaseEmitters.{MapEntryEmitter, traverse}
-import amf.core.internal.render.SpecOrdering.Lexical
+import amf.aml.client.scala.model.document.{Dialect, DialectLibrary}
+import amf.aml.internal.metamodel.document.DialectModel
+import amf.aml.internal.render.emitters.dialects.FieldEntryImplicit.FieldEntryWithPosition
+import amf.aml.internal.render.emitters.instances.NodeMappableFinder
+import amf.core.internal.annotations.Aliases.{Alias, ImportLocation}
+import amf.core.internal.render.BaseEmitters.MapEntryEmitter
 import amf.core.internal.render.SpecOrdering
+import amf.core.internal.render.SpecOrdering.Lexical
 import amf.core.internal.render.emitters.EntryEmitter
-import amf.core.client.common.position.Position
-import amf.core.client.common.position.Position.ZERO
-import amf.aml.internal.metamodel.document.DialectModel
-import amf.aml.client.scala.model.document.{Dialect, DialectLibrary}
+import org.mulesoft.common.client.lexical.Position
+import org.mulesoft.common.client.lexical.Position.ZERO
 import org.yaml.model.YDocument
 import org.yaml.model.YDocument.EntryBuilder
-import amf.aml.internal.render.emitters.dialects.FieldEntryImplicit.FieldEntryWithPosition
-import amf.aml.internal.render.emitters.instances.NodeMappableFinder
 
 case class RamlDialectLibraryEmitter(library: DialectLibrary, document: DocumentCreator)(implicit
     val nodeMappableFinder: NodeMappableFinder