Replace @XmlNamespaceDeclSpec with @XmlNamespaceDeclSpecs

Author: pdvrieze

Changelog.md

@@ -6,6 +6,10 @@ Features:
 - Improve translation of serial names to xml names in the
   default policy (strip out text after '`<`', '`[`' and '`(`')
 
+Changes:
+- Replace `@XmlNamespaceDeclSpec` with `@XmlNamespaceDeclSpecs` that
+  accepts an array argument
+
 Fixes:
 - Fix the issue that the for JavaScript overloads cannot be different
   only in external parameter type. This breaks compiling with a

schemaTests/src/commonMain/kotlin/org/w3/xml/xmschematestsuite/override/CompactOverride.kt

@@ -28,13 +28,13 @@ import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
 import nl.adaptivity.xmlutil.serialization.XmlDefault
-import nl.adaptivity.xmlutil.serialization.XmlNamespaceDeclSpec
+import nl.adaptivity.xmlutil.serialization.XmlNamespaceDeclSpecs
 import nl.adaptivity.xmlutil.serialization.XmlSerialName
 import org.w3.xml.xmschematestsuite.TSExpected
 
 @Serializable
 @XmlSerialName("overrides", namespace = "http://pdvrieze.github.io/xmlutil/testoverride", "")
-@XmlNamespaceDeclSpec("ts=http://www.w3.org/XML/2004/xml-schema-test-suite/")
+@XmlNamespaceDeclSpecs("ts=http://www.w3.org/XML/2004/xml-schema-test-suite/")
 class CompactOverride(
     @XmlSerialName("ignore", namespace = "http://pdvrieze.github.io/xmlutil/testoverride", "")
     val ignores: List<TestPath>,

serialization/api/serialization.api

@@ -8,6 +8,7 @@ public abstract class nl/adaptivity/xmlutil/serialization/AbstractXmlSerializer
 
 public final class nl/adaptivity/xmlutil/serialization/AnnotationsKt {
 	public static final fun getNamespaces (Lnl/adaptivity/xmlutil/serialization/XmlNamespaceDeclSpec;)Ljava/util/List;
+	public static final fun getNamespaces (Lnl/adaptivity/xmlutil/serialization/XmlNamespaceDeclSpecs;)Ljava/util/List;
 }
 
 public final class nl/adaptivity/xmlutil/serialization/CompactFragmentSerializer : nl/adaptivity/xmlutil/serialization/AbstractXmlSerializer {
@@ -612,6 +613,15 @@ public synthetic class nl/adaptivity/xmlutil/serialization/XmlNamespaceDeclSpec$
 	public final synthetic fun value ()Ljava/lang/String;
 }
 
+public abstract interface annotation class nl/adaptivity/xmlutil/serialization/XmlNamespaceDeclSpecs : java/lang/annotation/Annotation {
+	public abstract fun value ()[Ljava/lang/String;
+}
+
+public synthetic class nl/adaptivity/xmlutil/serialization/XmlNamespaceDeclSpecs$Impl : nl/adaptivity/xmlutil/serialization/XmlNamespaceDeclSpecs {
+	public fun <init> ([Ljava/lang/String;)V
+	public final synthetic fun value ()[Ljava/lang/String;
+}
+
 public abstract interface annotation class nl/adaptivity/xmlutil/serialization/XmlOtherAttributes : java/lang/annotation/Annotation {
 }
 

serialization/api/serialization.klib.api

@@ -96,6 +96,13 @@ open annotation class nl.adaptivity.xmlutil.serialization/XmlNamespaceDeclSpec :
         final fun <get-value>(): kotlin/String // nl.adaptivity.xmlutil.serialization/XmlNamespaceDeclSpec.value.<get-value>|<get-value>(){}[0]
 }
 
+open annotation class nl.adaptivity.xmlutil.serialization/XmlNamespaceDeclSpecs : kotlin/Annotation { // nl.adaptivity.xmlutil.serialization/XmlNamespaceDeclSpecs|null[0]
+    constructor <init>(kotlin/Array<out kotlin/String>...) // nl.adaptivity.xmlutil.serialization/XmlNamespaceDeclSpecs.<init>|<init>(kotlin.Array<out|kotlin.String>...){}[0]
+
+    final val value // nl.adaptivity.xmlutil.serialization/XmlNamespaceDeclSpecs.value|{}value[0]
+        final fun <get-value>(): kotlin/Array<out kotlin/String> // nl.adaptivity.xmlutil.serialization/XmlNamespaceDeclSpecs.value.<get-value>|<get-value>(){}[0]
+}
+
 open annotation class nl.adaptivity.xmlutil.serialization/XmlOtherAttributes : kotlin/Annotation { // nl.adaptivity.xmlutil.serialization/XmlOtherAttributes|null[0]
     constructor <init>() // nl.adaptivity.xmlutil.serialization/XmlOtherAttributes.<init>|<init>(){}[0]
 }
@@ -1170,6 +1177,8 @@ final object nl.adaptivity.xmlutil.serialization/NodeSerializer : nl.adaptivity.
     final fun serializeXML(kotlinx.serialization.encoding/Encoder, nl.adaptivity.xmlutil/XmlWriter, nl.adaptivity.xmlutil.dom/Node, kotlin/Boolean) // nl.adaptivity.xmlutil.serialization/NodeSerializer.serializeXML|serializeXML(kotlinx.serialization.encoding.Encoder;nl.adaptivity.xmlutil.XmlWriter;nl.adaptivity.xmlutil.dom.Node;kotlin.Boolean){}[0]
 }
 
+final val nl.adaptivity.xmlutil.serialization/namespaces // nl.adaptivity.xmlutil.serialization/namespaces|@nl.adaptivity.xmlutil.serialization.XmlNamespaceDeclSpecs{}namespaces[0]
+    final fun (nl.adaptivity.xmlutil.serialization/XmlNamespaceDeclSpecs).<get-namespaces>(): kotlin.collections/List<nl.adaptivity.xmlutil/Namespace> // nl.adaptivity.xmlutil.serialization/namespaces.<get-namespaces>|<get-namespaces>@nl.adaptivity.xmlutil.serialization.XmlNamespaceDeclSpecs(){}[0]
 final val nl.adaptivity.xmlutil.serialization/namespaces // nl.adaptivity.xmlutil.serialization/namespaces|@nl.adaptivity.xmlutil.serialization.XmlNamespaceDeclSpec{}namespaces[0]
     final fun (nl.adaptivity.xmlutil.serialization/XmlNamespaceDeclSpec).<get-namespaces>(): kotlin.collections/List<nl.adaptivity.xmlutil/Namespace> // nl.adaptivity.xmlutil.serialization/namespaces.<get-namespaces>|<get-namespaces>@nl.adaptivity.xmlutil.serialization.XmlNamespaceDeclSpec(){}[0]
 

serialization/src/commonMain/kotlin/nl/adaptivity/xmlutil/serialization/annotations.kt

@@ -55,14 +55,32 @@ public annotation class XmlSerialName(
 @SerialInfo
 @Retention(AnnotationRetention.BINARY)
 @Target(AnnotationTarget.CLASS, AnnotationTarget.PROPERTY)
+@Deprecated("Use XmlNamespaceDeclSpecs instead that takes an array argument")
 public annotation class XmlNamespaceDeclSpec(
     val value: String,
 )
 
+/**
+ * Annotation allowing to specify namespaces specifications to be generated upon the element.
+ * As multiple annotations are not supported by the plugin this uses a single string. Each
+ * declaration is of the form (prefix)=(namespace). To specify the default namespace it is valid to
+ * omit the equals sign.
+ *
+ * @property value The actual specification: `"prefix1=urn:namespace1;defaultNamespace"`
+ */
+@ExperimentalXmlUtilApi
+@SerialInfo
+@Retention(AnnotationRetention.BINARY)
+@Target(AnnotationTarget.CLASS, AnnotationTarget.PROPERTY)
+public annotation class XmlNamespaceDeclSpecs(
+    vararg val value: String,
+)
+
 /**
  * Accessor that reads the declared namespaces out of an [XmlNamespaceDeclSpec] instance.
  */
 @ExperimentalXmlUtilApi
+@Deprecated("Use XmlNamespaceDeclSpecs instead of XmlNamespaceDeclSpec")
 public val XmlNamespaceDeclSpec.namespaces: List<Namespace>
     get() {
         return value.split(';').map { decl ->
@@ -73,6 +91,20 @@ public val XmlNamespaceDeclSpec.namespaces: List<Namespace>
         }
     }
 
+/**
+ * Accessor that reads the declared namespaces out of an [XmlNamespaceDeclSpecs] instance.
+ */
+@ExperimentalXmlUtilApi
+public val XmlNamespaceDeclSpecs.namespaces: List<Namespace>
+    get() {
+        return value.map { decl ->
+            when (val eq = decl.indexOf('=')) {
+                -1 -> XmlEvent.NamespaceImpl("", decl)
+                else -> XmlEvent.NamespaceImpl(decl.substring(0, eq), decl.substring(eq + 1))
+            }
+        }
+    }
+
 /**
  * Indicate the valid polymorphic children for this element.
  *

serialization/src/commonMain/kotlin/nl/adaptivity/xmlutil/serialization/structure/XmlDescriptor.kt

@@ -1824,7 +1824,7 @@ public interface SafeParentInfo {
     @ExperimentalXmlUtilApi
     public val useAnnAfter: Array<out String>? get() = null
 
-    /** Value of the [XmlNamespaceDeclSpec] annotation */
+    /** Value of the [XmlNamespaceDeclSpecs] annotation */
     @ExperimentalXmlUtilApi
     public val useAnnNsDecls: List<Namespace>? get() = null
 
@@ -2168,6 +2168,7 @@ public class ParentInfo(
                 is XmlPolyChildren -> useAnnPolyChildren = an
                 is XmlIgnoreWhitespace -> useAnnIgnoreWhitespace = an.value
                 is XmlNamespaceDeclSpec -> useAnnNsDecls = an.namespaces
+                is XmlNamespaceDeclSpecs -> useAnnNsDecls = an.namespaces
                 is XmlChildrenName -> useAnnChildrenName = an
                 is XmlKeyName -> useAnnKeyName = an
                 is XmlMapEntryName -> useAnnMapEntryName = an

serialization/src/commonMain/kotlin/nl/adaptivity/xmlutil/serialization/structure/XmlTypeDescriptor.kt

@@ -36,12 +36,12 @@ public class XmlTypeDescriptor internal constructor(
     public val serialDescriptor: SerialDescriptor,
     parentNamespace: Namespace?
 ) {
-    /** Value of the [XmlNamespaceDeclSpec] annotation */
+    /** Value of the [XmlNamespaceDeclSpecs] annotation */
     @ExperimentalXmlUtilApi
     public var typeAnnNsDecls: List<Namespace>? = null
         private set
 
-    /** Value of the [XmlNamespaceDeclSpec] annotation */
+    /** Value of the [XmlSerialName] annotation */
     @ExperimentalXmlUtilApi
     public var typeAnnXmlSerialName: XmlSerialName? = null
         private set
@@ -77,6 +77,7 @@ public class XmlTypeDescriptor internal constructor(
             @Suppress("DEPRECATION")
             when (a) {
                 is XmlNamespaceDeclSpec -> typeAnnNsDecls = a.namespaces
+                is XmlNamespaceDeclSpecs -> typeAnnNsDecls = a.namespaces
                 is XmlSerialName -> typeAnnXmlSerialName = a
                 is XmlCData -> typeAnnCData = a.value
                 is XmlValue -> typeAnnIsXmlValue = a.value