Merge pull request #513 from aml-org/publish-6.0.7-master

publish 6.0.7 master

amf-aml/shared/src/main/scala/amf/aml/client/platform/model/domain/AnyMapping.scala

@@ -13,6 +13,9 @@ abstract class AnyMapping(override private[amf] val _internal: InternalAnyMappin
   def and(): ClientList[StrField]        = _internal.and.asClient
   def or(): ClientList[StrField]         = _internal.or.asClient
   def components(): ClientList[StrField] = _internal.components.asClient
+  def ifMapping(): StrField              = _internal.ifMapping
+  def thenMapping(): StrField            = _internal.thenMapping
+  def elseMapping(): StrField            = _internal.elseMapping
 
   def withAnd(andMappings: ClientList[String]): AnyMapping = {
     _internal.withAnd(andMappings.asInternal)
@@ -26,4 +29,16 @@ abstract class AnyMapping(override private[amf] val _internal: InternalAnyMappin
     _internal.withOr(components.asInternal)
     this
   }
+  def withIfMapping(ifMapping: String): AnyMapping = {
+    _internal.withIfMapping(ifMapping)
+    this
+  }
+  def withThenMapping(thenMapping: String): AnyMapping = {
+    _internal.withIfMapping(thenMapping)
+    this
+  }
+  def withElseMapping(elseMapping: String): AnyMapping = {
+    _internal.withIfMapping(elseMapping)
+    this
+  }
 }

amf-aml/shared/src/main/scala/amf/aml/client/scala/model/domain/AnyMapping.scala

@@ -5,14 +5,26 @@ import amf.core.client.scala.model.StrField
 import amf.core.client.scala.model.domain.DomainElement
 import amf.core.internal.parser.domain.Fields
 
+// TODO This should inherit from NodeMappable and be a class (a simple allof or oneOf should be of this class).
+// But the meta field of NodeMappable make impossible to have hierarchy of classes currently. Thats why this is abstract.
 abstract class AnyMapping(fields: Fields) extends DomainElement {
 
   def and: Seq[StrField]        = fields.field(And)
   def or: Seq[StrField]         = fields.field(Or)
   def components: Seq[StrField] = fields.field(Components)
+  def ifMapping: StrField       = fields.field(If)
+  def thenMapping: StrField     = fields.field(Then)
+  def elseMapping: StrField     = fields.field(Else)
 
   def withAnd(andMapping: Seq[String]): AnyMapping        = set(And, andMapping)
   def withOr(orMapping: Seq[String]): AnyMapping          = set(Or, orMapping)
   def withComponents(components: Seq[String]): AnyMapping = set(Components, components)
+  def withIfMapping(ifMapping: String): AnyMapping        = set(If, ifMapping)
+  def withThenMapping(thenMapping: String): AnyMapping    = set(Then, thenMapping)
+  def withElseMapping(elseMapping: String): AnyMapping    = set(Else, elseMapping)
+
+  private[amf] def hasAny: Boolean         = and.nonEmpty
+  private[amf] def hasOr: Boolean          = or.nonEmpty
+  private[amf] def hasConditional: Boolean = ifMapping.nonEmpty
 
 }

amf-aml/shared/src/main/scala/amf/aml/client/scala/model/domain/NodeMapping.scala

@@ -28,6 +28,8 @@ class NodeMapping(override val fields: Fields, override val annotations: Annotat
   def withIdTemplate(idTemplate: String): NodeMapping                 = set(IdTemplate, idTemplate)
   def withResolvedExtends(ids: Seq[String]): NodeMapping              = set(ResolvedExtends, ids)
 
+  private[amf] def hasProperties: Boolean = propertiesMapping().nonEmpty
+
   /**
     * Returns the properties forming the primary key for this node.
     * Properties are already sorted.

amf-aml/shared/src/main/scala/amf/aml/internal/entities/AMLEntities.scala

@@ -38,7 +38,6 @@ private[amf] object AMLEntities extends Entities {
       BaseUnitProcessingDataModel,
       BaseUnitSourceInformationModel,
       LocationInformationModel,
-      ConditionalNodeMappingModel,
       AnyMappingModel
   )
 

amf-aml/shared/src/main/scala/amf/aml/internal/metamodel/domain/AnyMappingModel.scala

@@ -31,6 +31,30 @@ trait AnyMappingModel
                "Array of component mappings in case of component combination generated mapping")
   )
 
+  val If: Field = Field(
+      Iri,
+      Namespace.AmfAml + "if",
+      ModelDoc(ExternalModelVocabularies.Shacl,
+               "if",
+               "Conditional constraint if over the type of the mapped graph property")
+  )
+
+  val Then: Field = Field(
+      Iri,
+      Namespace.AmfAml + "then",
+      ModelDoc(ExternalModelVocabularies.Shacl,
+               "then",
+               "Conditional constraint then over the type of the mapped graph property")
+  )
+
+  val Else: Field = Field(
+      Iri,
+      Namespace.AmfAml + "else",
+      ModelDoc(ExternalModelVocabularies.Shacl,
+               "else",
+               "Conditional constraint else over the type of the mapped graph property")
+  )
+
   override val `type`
     : List[ValueType] = Namespace.Meta + "AnyMapping" :: Namespace.Shacl + "Shape" :: DomainElementModel.`type`
 
@@ -47,5 +71,5 @@ object AnyMappingModel extends AnyMappingModel {
 
   override def modelInstance = throw new Exception("AnyMapping is an abstract class")
 
-  override val fields: List[Field] = List(And, Or, Components)
+  override val fields: List[Field] = List(And, Or, Components, If, Then, Else)
 }

amf-aml/shared/src/main/scala/amf/aml/internal/parse/common/AnnotationsParser.scala

@@ -7,6 +7,7 @@ import amf.aml.internal.validate.DialectValidations.MissingVocabulary
 import amf.core.client.scala.model.domain.{AmfObject, DomainElement}
 import amf.core.client.scala.model.domain.extensions.{CustomDomainProperty, DomainExtension}
 import amf.core.client.scala.parse.document.ParserContext
+import amf.core.internal.annotations.SourceAST
 import amf.core.internal.metamodel.domain.DomainElementModel.CustomDomainProperties
 import amf.core.internal.metamodel.domain.extensions.DomainExtensionModel
 import amf.core.internal.parser.domain.Annotations

amf-aml/shared/src/main/scala/amf/aml/internal/parse/dialects/DialectSyntax.scala

@@ -29,7 +29,7 @@ trait DialectSyntax { this: DialectContext =>
   )
 
   val anyMapping: Map[String, Required] = Map(
-      "anyOf"      -> false,
+      "allOf"      -> false,
       "oneOf"      -> false,
       "components" -> false
   )
@@ -46,10 +46,6 @@ trait DialectSyntax { this: DialectContext =>
       "additionalProperties" -> false
   )
 
-  val conditionalMapping: Map[String, Required] = anyMapping ++ Map(
-      "conditional" -> true
-  )
-
   val conditionalMappingInner: Map[String, Required] = Map(
       "if"   -> true,
       "then" -> true,
@@ -113,7 +109,6 @@ trait DialectSyntax { this: DialectContext =>
       case "fragment"                => fragment
       case "nodeMapping"             => nodeMapping
       case "conditionalMappingInner" => conditionalMappingInner
-      case "conditionalMapping"      => conditionalMapping
       case "annotationMapping"       => annotationMapping
       case "propertyMapping"         => propertyMapping
       case "documentsMapping"        => documentsMapping

amf-aml/shared/src/main/scala/amf/aml/internal/parse/dialects/DialectsParser.scala

@@ -3,9 +3,9 @@ package amf.aml.internal.parse.dialects
 import amf.aml.client.scala.model.document.{Dialect, DialectFragment, DialectLibrary}
 import amf.aml.client.scala.model.domain._
 import amf.aml.internal.metamodel.document.DialectModel
-import amf.aml.internal.metamodel.document.DialectModel.{Externals, fields}
+import amf.aml.internal.metamodel.document.DialectModel.Externals
 import amf.aml.internal.metamodel.domain.UnionNodeMappingModel.ObjectRange
-import amf.aml.internal.metamodel.domain.{ConditionalNodeMappingModel, NodeMappingModel, PropertyMappingModel}
+import amf.aml.internal.metamodel.domain.{NodeMappingModel, PropertyMappingModel}
 import amf.aml.internal.parse.common.{DeclarationKey, DeclarationKeyCollector}
 import amf.aml.internal.parse.dialects.DialectAstOps._
 import amf.aml.internal.parse.dialects.nodemapping.like.NodeMappingLikeParser
@@ -294,16 +294,19 @@ class DialectsParser(root: Root)(implicit override val ctx: DialectContext)
 
     val allMembers = mappable.and.flatMap(member => findIdOrError(member, mappable))
     if (allMembers.nonEmpty) mappable.withAnd(allMembers)
-
     val oneMembers = mappable.or.flatMap(member => findIdOrError(member, mappable))
     if (oneMembers.nonEmpty) mappable.withOr(oneMembers)
-
     val components = mappable.components.flatMap(member => findIdOrError(member, mappable))
     if (components.nonEmpty) mappable.withComponents(components)
+    if (mappable.ifMapping.nonEmpty)
+      findIdOrError(mappable.ifMapping, mappable).foreach(mappable.withIfMapping)
+    if (mappable.thenMapping.nonEmpty)
+      findIdOrError(mappable.thenMapping, mappable).foreach(mappable.withThenMapping)
+    if (mappable.elseMapping.nonEmpty)
+      findIdOrError(mappable.elseMapping, mappable).foreach(mappable.withElseMapping)
 
     mappable match {
-      case unionNodeMapping: UnionNodeMapping             => checkNodeMappableReferences(unionNodeMapping)
-      case conditionalNodeMapping: ConditionalNodeMapping => checkNodeMappableReferences(conditionalNodeMapping)
+      case unionNodeMapping: UnionNodeMapping => checkNodeMappableReferences(unionNodeMapping)
       case nodeMapping: Member =>
         nodeMapping.propertiesMapping().foreach { propertyMapping =>
           checkNodeMappableReferences(propertyMapping)
@@ -370,16 +373,6 @@ class DialectsParser(root: Root)(implicit override val ctx: DialectContext)
     }
   }
 
-  // Replaces inner conditional fields references from names to ids
-  protected def checkNodeMappableReferences[T <: DomainElement](mappable: ConditionalNodeMapping): Unit = {
-    if (mappable.ifMapping.nonEmpty)
-      findIdOrError(mappable.ifMapping, mappable).foreach(mappable.withIfMapping)
-    if (mappable.thenMapping.nonEmpty)
-      findIdOrError(mappable.thenMapping, mappable).foreach(mappable.withThenMapping)
-    if (mappable.elseMapping.nonEmpty)
-      findIdOrError(mappable.elseMapping, mappable).foreach(mappable.withElseMapping)
-  }
-
   private def memberIdFromName[T <: DomainElement](name: String, union: NodeWithDiscriminator[_]): Option[String] = {
     if (name == (Namespace.Meta + "anyNode").iri()) Some(name)
     else {
@@ -514,10 +507,9 @@ class DialectsParser(root: Root)(implicit override val ctx: DialectContext)
               }
 
               parseNodeMapping(entry, adopt) match {
-                case Some(nodeMapping: NodeMapping)                   => ctx.declarations += nodeMapping
-                case Some(unionMapping: UnionNodeMapping)             => ctx.declarations += unionMapping
-                case Some(conditionalMapping: ConditionalNodeMapping) => ctx.declarations += conditionalMapping
-                case _                                                => ctx.eh.violation(DialectError, parent, s"Error parsing shape '$entry'", entry.location)
+                case Some(nodeMapping: NodeMapping)       => ctx.declarations += nodeMapping
+                case Some(unionMapping: UnionNodeMapping) => ctx.declarations += unionMapping
+                case _                                    => ctx.eh.violation(DialectError, parent, s"Error parsing shape '$entry'", entry.location)
               }
 
             }

amf-aml/shared/src/main/scala/amf/aml/internal/parse/dialects/nodemapping/like/AnyMappingParser.scala

@@ -17,6 +17,7 @@ trait AnyMappingParser {
     processAnyMappingField(map, mapping, "allOf", AnyMappingModel.And)
     processAnyMappingField(map, mapping, "oneOf", AnyMappingModel.Or)
     processAnyMappingField(map, mapping, "components", AnyMappingModel.Components)
+    ConditionalParser.parse(map, mapping)
     mapping
 
   }