Merge branch 'dev'

pdvrieze · Jul 5, 2023 · a35c982 · a35c982
2 parents d8e591e + 6150785
commit a35c982
Show file tree

Hide file tree

Showing 58 changed files with 1,230 additions and 2,396 deletions.
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,31 @@
+# 0.86.1
+*(July 5, 2023)<br />*
+Features:
+- Support detecting duplicate elements outside of list context #145. This
+  is not default behaviour as it is somewhat up to the serializer to deal
+  with duplicate values, rather than the format.
+- Update to Kotlinx.serialization 1.5.1
+- Add SerializableQName as an alias that links is to the serializer.
+- Add a helper function `XmlSerializationPolicy.recoverNullNamespaceUse` that
+  can be used to support recovering in case of null namespaces (and them
+  effectively functioning as wildcard)
+- Handle processing instructions correctly, expose processing instructions as
+  target (`XmlReader.piTarget`) + data (`XmlReader.piData`) pairs
+  attributes and `XmlEvent.ProcessingInstructionEvent` as event. (#160)
+- Allow processing instructions/whitespace as children of Native Document.
+
+Fixes:
+- Fix recording/copying of attribute prefixes in copying algorithms (#167).
+- Fix reading/writing of processing instruction events (#160).
+- Fix recovery of element children (#160).
+- Fix decoding of nil elements in certain cases (lists) where the end of the tag
+  wasn't parsed. Implemented decodeNull accordingly to actually finish the nil tag.
+- Fix accidental immediate emission of xsi:nil elements (rather than deferring
+  as expected #152).
+- Add expected key name to the error message when it couldn't be found for a
+  map. #140
+- Fix attribute name for empty prefix in Attr (native DOM). This should fix #142.
+
 # 0.86.0 – Go in chunks
 *(May 2, 2023)<br />*
 Features:

diff --git a/README.md b/README.md
@@ -79,36 +79,36 @@ repositories {
 ### Core
 #### multiplatform
 ```
-   implementation("io.github.pdvrieze.xmlutil:core:0.86.0")
+   implementation("io.github.pdvrieze.xmlutil:core:0.86.1")
 ```
 #### JVM -- uses the stax API _not available_ on Android
 ```
-   implementation("io.github.pdvrieze.xmlutil:core-jvm:0.86.0")
+   implementation("io.github.pdvrieze.xmlutil:core-jvm:0.86.1")
 ```
 #### Android -- Uses the android streaming library
 ```
-   implementation("io.github.pdvrieze.xmlutil:core-android:0.86.0")
+   implementation("io.github.pdvrieze.xmlutil:core-android:0.86.1")
 ```
 #### JS -- Wraps DOM
 ```
-   implementation("io.github.pdvrieze.xmlutil:core-js:0.86.0")
+   implementation("io.github.pdvrieze.xmlutil:core-js:0.86.1")
 ```
 ### Serialization
 #### multiplatform
 ```
-   implementation("io.github.pdvrieze.xmlutil:serialization:0.86.0")
+   implementation("io.github.pdvrieze.xmlutil:serialization:0.86.1")
 ```
 #### JVM
 ```
-   implementation("io.github.pdvrieze.xmlutil:serialization-jvm:0.86.0")
+   implementation("io.github.pdvrieze.xmlutil:serialization-jvm:0.86.1")
 ```
 #### Android
 ```
-   implementation("io.github.pdvrieze.xmlutil:serialization-android:0.86.0")
+   implementation("io.github.pdvrieze.xmlutil:serialization-android:0.86.1")
 ```
 #### js
 ```
-   implementation("io.github.pdvrieze.xmlutil:serialization-js:0.86.0")
+   implementation("io.github.pdvrieze.xmlutil:serialization-js:0.86.1")
 ```
 
 ### Ktor

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -13,6 +13,8 @@ strategy:
   matrix:
     jdk11:
       jdk_version: "1.11"
+    jdk17:
+        jdk_version: "1.17"
   maxParallel: 2
 
 steps:

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -150,47 +150,20 @@ allprojects {
     }
 }
 
-/*
-rootProject.plugins.withType(YarnPlugin::class.java) {
-    rootProject.the<YarnRootExtension>().disableGranularWorkspaces()
-}
-*/
-
-project.configureDokka()
-
-/*
-tasks.register("backupYarnLock") {
-    dependsOn("kotlinNpmInstall")
-
-    doLast {
-        copy {
-            from("$rootDir/build/js/yarn.lock")
-            rename { "yarn.lock.bak" }
-            into(rootDir)
+afterEvaluate {
+    rootProject.plugins.withType(YarnPlugin::class.java) {
+        rootProject.the<YarnRootExtension>().apply {
+            resolution("minimist", "1.2.6")
+            resolution("webpack", "5.76.0")
+            resolution("qs", "6.11.0")
+            resolution("follow-redirects", "1.14.8")
         }
     }
-
-    inputs.file("$rootDir/build/js/yarn.lock").withPropertyName("inputFile")
-    outputs.file("$rootDir/yarn.lock.bak").withPropertyName("outputFile")
-}
-
-val restoreYarnLock = tasks.register("restoreYarnLock") {
-    doLast {
-        copy {
-            from("$rootDir/yarn.lock.bak")
-            rename { "yarn.lock" }
-            into("$rootDir/build/js")
-        }
-    }
-
-    inputs.file("$rootDir/yarn.lock.bak").withPropertyName("inputFile")
-    outputs.file("$rootDir/build/js/yarn.lock").withPropertyName("outputFile")
 }
+/*
 */
 
-//tasks.named("kotlinNpmInstall").configure {
-//    dependsOn(restoreYarnLock)
-//}
+project.configureDokka()
 
 configurations.all {
     resolutionStrategy {

diff --git a/core/api/android/core.api b/core/api/android/core.api
@@ -40,6 +40,8 @@ public final class nl/adaptivity/xmlutil/AndroidXmlReader : nl/adaptivity/xmluti
 	public fun getNamespaceURI ()Ljava/lang/String;
 	public fun getNamespaceURI (Ljava/lang/String;)Ljava/lang/String;
 	public final fun getParser ()Lorg/xmlpull/v1/XmlPullParser;
+	public fun getPiData ()Ljava/lang/String;
+	public fun getPiTarget ()Ljava/lang/String;
 	public fun getPrefix ()Ljava/lang/String;
 	public fun getStandalone ()Ljava/lang/Boolean;
 	public fun getText ()Ljava/lang/String;
@@ -121,6 +123,8 @@ public final class nl/adaptivity/xmlutil/DomReader : nl/adaptivity/xmlutil/XmlRe
 	public fun getNamespacePrefix (Ljava/lang/String;)Ljava/lang/String;
 	public fun getNamespaceURI ()Ljava/lang/String;
 	public fun getNamespaceURI (Ljava/lang/String;)Ljava/lang/String;
+	public fun getPiData ()Ljava/lang/String;
+	public fun getPiTarget ()Ljava/lang/String;
 	public fun getPrefix ()Ljava/lang/String;
 	public fun getStandalone ()Ljava/lang/Boolean;
 	public fun getText ()Ljava/lang/String;
@@ -167,6 +171,7 @@ public final class nl/adaptivity/xmlutil/DomWriter : nl/adaptivity/xmlutil/core/
 	public final fun isAppend ()Z
 	public fun namespaceAttr (Ljava/lang/String;Ljava/lang/String;)V
 	public fun processingInstruction (Ljava/lang/String;)V
+	public fun processingInstruction (Ljava/lang/String;Ljava/lang/String;)V
 	public fun setPrefix (Ljava/lang/String;Ljava/lang/String;)V
 	public fun startDocument (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Boolean;)V
 	public fun startTag (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
@@ -298,6 +303,8 @@ public final class nl/adaptivity/xmlutil/XmlBufferReader : nl/adaptivity/xmlutil
 	public fun getNamespacePrefix (Ljava/lang/String;)Ljava/lang/String;
 	public fun getNamespaceURI ()Ljava/lang/String;
 	public fun getNamespaceURI (Ljava/lang/String;)Ljava/lang/String;
+	public fun getPiData ()Ljava/lang/String;
+	public fun getPiTarget ()Ljava/lang/String;
 	public fun getPrefix ()Ljava/lang/String;
 	public fun getStandalone ()Ljava/lang/Boolean;
 	public fun getText ()Ljava/lang/String;
@@ -347,6 +354,7 @@ public final class nl/adaptivity/xmlutil/XmlBufferedWriter : nl/adaptivity/xmlut
 	public fun namespaceAttr (Ljava/lang/String;Ljava/lang/String;)V
 	public fun namespaceAttr (Lnl/adaptivity/xmlutil/Namespace;)V
 	public fun processingInstruction (Ljava/lang/String;)V
+	public fun processingInstruction (Ljava/lang/String;Ljava/lang/String;)V
 	public final fun reader ()Lnl/adaptivity/xmlutil/XmlBufferReader;
 	public fun setIndent (I)V
 	public fun setIndentString (Ljava/lang/String;)V
@@ -389,6 +397,8 @@ public class nl/adaptivity/xmlutil/XmlDelegatingReader : nl/adaptivity/xmlutil/X
 	public fun getNamespacePrefix (Ljava/lang/String;)Ljava/lang/String;
 	public fun getNamespaceURI ()Ljava/lang/String;
 	public fun getNamespaceURI (Ljava/lang/String;)Ljava/lang/String;
+	public fun getPiData ()Ljava/lang/String;
+	public fun getPiTarget ()Ljava/lang/String;
 	public fun getPrefix ()Ljava/lang/String;
 	public fun getStandalone ()Ljava/lang/Boolean;
 	public fun getText ()Ljava/lang/String;
@@ -430,6 +440,7 @@ public abstract class nl/adaptivity/xmlutil/XmlDelegatingWriter : nl/adaptivity/
 	public fun namespaceAttr (Ljava/lang/String;Ljava/lang/String;)V
 	public fun namespaceAttr (Lnl/adaptivity/xmlutil/Namespace;)V
 	public fun processingInstruction (Ljava/lang/String;)V
+	public fun processingInstruction (Ljava/lang/String;Ljava/lang/String;)V
 	public fun setIndent (I)V
 	public fun setIndentString (Ljava/lang/String;)V
 	public fun setPrefix (Ljava/lang/CharSequence;Ljava/lang/CharSequence;)V
@@ -515,6 +526,12 @@ public final class nl/adaptivity/xmlutil/XmlEvent$NamespaceImpl : nl/adaptivity/
 	public fun toString ()Ljava/lang/String;
 }
 
+public final class nl/adaptivity/xmlutil/XmlEvent$ProcessingInstructionEvent : nl/adaptivity/xmlutil/XmlEvent$TextEvent {
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+	public final fun getData ()Ljava/lang/String;
+	public final fun getTarget ()Ljava/lang/String;
+}
+
 public final class nl/adaptivity/xmlutil/XmlEvent$StartDocumentEvent : nl/adaptivity/xmlutil/XmlEvent {
 	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Boolean;)V
 	public final fun getEncoding ()Ljava/lang/String;
@@ -579,6 +596,8 @@ public abstract interface class nl/adaptivity/xmlutil/XmlReader : java/io/Closea
 	public abstract fun getNamespacePrefix (Ljava/lang/String;)Ljava/lang/String;
 	public abstract fun getNamespaceURI ()Ljava/lang/String;
 	public abstract fun getNamespaceURI (Ljava/lang/String;)Ljava/lang/String;
+	public abstract fun getPiData ()Ljava/lang/String;
+	public abstract fun getPiTarget ()Ljava/lang/String;
 	public abstract fun getPrefix ()Ljava/lang/String;
 	public abstract fun getStandalone ()Ljava/lang/Boolean;
 	public abstract fun getText ()Ljava/lang/String;
@@ -744,6 +763,7 @@ public abstract interface class nl/adaptivity/xmlutil/XmlWriter : java/io/Closea
 	public abstract fun namespaceAttr (Ljava/lang/String;Ljava/lang/String;)V
 	public abstract fun namespaceAttr (Lnl/adaptivity/xmlutil/Namespace;)V
 	public abstract fun processingInstruction (Ljava/lang/String;)V
+	public abstract fun processingInstruction (Ljava/lang/String;Ljava/lang/String;)V
 	public abstract fun setIndent (I)V
 	public abstract fun setIndentString (Ljava/lang/String;)V
 	public abstract fun setPrefix (Ljava/lang/CharSequence;Ljava/lang/CharSequence;)V
@@ -757,6 +777,7 @@ public final class nl/adaptivity/xmlutil/XmlWriter$DefaultImpls {
 	public static fun getIndent (Lnl/adaptivity/xmlutil/XmlWriter;)I
 	public static fun namespaceAttr (Lnl/adaptivity/xmlutil/XmlWriter;Ljava/lang/CharSequence;Ljava/lang/CharSequence;)V
 	public static fun namespaceAttr (Lnl/adaptivity/xmlutil/XmlWriter;Lnl/adaptivity/xmlutil/Namespace;)V
+	public static fun processingInstruction (Lnl/adaptivity/xmlutil/XmlWriter;Ljava/lang/String;Ljava/lang/String;)V
 	public static fun setIndent (Lnl/adaptivity/xmlutil/XmlWriter;I)V
 	public static fun setPrefix (Lnl/adaptivity/xmlutil/XmlWriter;Ljava/lang/CharSequence;Ljava/lang/CharSequence;)V
 	public static synthetic fun startDocument$default (Lnl/adaptivity/xmlutil/XmlWriter;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Boolean;ILjava/lang/Object;)V
@@ -833,6 +854,8 @@ public final class nl/adaptivity/xmlutil/core/KtXmlReader : nl/adaptivity/xmluti
 	public fun getNamespacePrefix (Ljava/lang/String;)Ljava/lang/String;
 	public fun getNamespaceURI ()Ljava/lang/String;
 	public fun getNamespaceURI (Ljava/lang/String;)Ljava/lang/String;
+	public fun getPiData ()Ljava/lang/String;
+	public fun getPiTarget ()Ljava/lang/String;
 	public fun getPrefix ()Ljava/lang/String;
 	public final fun getRelaxed ()Z
 	public fun getStandalone ()Ljava/lang/Boolean;
@@ -884,6 +907,7 @@ public final class nl/adaptivity/xmlutil/core/KtXmlWriter : nl/adaptivity/xmluti
 	public final fun isRepairNamespaces ()Z
 	public fun namespaceAttr (Ljava/lang/String;Ljava/lang/String;)V
 	public fun processingInstruction (Ljava/lang/String;)V
+	public fun processingInstruction (Ljava/lang/String;Ljava/lang/String;)V
 	public final fun setAddTrailingSpaceBeforeEnd (Z)V
 	public fun setPrefix (Ljava/lang/String;Ljava/lang/String;)V
 	public fun startDocument (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Boolean;)V
@@ -950,6 +974,7 @@ public final class nl/adaptivity/xmlutil/dom/DomaliassesKt {
 	public static final fun getPrefix (Lorg/w3c/dom/Attr;)Ljava/lang/String;
 	public static final fun getPrefix (Lorg/w3c/dom/Element;)Ljava/lang/String;
 	public static final fun getPreviousSibling (Lorg/w3c/dom/Node;)Lorg/w3c/dom/Node;
+	public static final fun getSupportsWhitespaceAtToplevel (Lorg/w3c/dom/Document;)Z
 	public static final fun getTagName (Lorg/w3c/dom/Element;)Ljava/lang/String;
 	public static final fun getTarget (Lorg/w3c/dom/ProcessingInstruction;)Ljava/lang/String;
 	public static final fun getTextContent (Lorg/w3c/dom/Node;)Ljava/lang/String;