Hopefully DOM is now more solid and works with xpath better.

pdvrieze · pdvrieze · commit a491283111a2 · 2026-03-26T21:51:56.000Z
diff --git a/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/AppendableXmlWriter.kt b/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/AppendableXmlWriter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025.
+ * Copyright (c) 2025-2026.
  *
  * This file is part of xmlutil.
  *
@@ -20,7 +20,7 @@
 
 package nl.adaptivity.xmlutil
 
-import nl.adaptivity.xmlutil.core.impl.dom.unWrap
+import nl.adaptivity.xmlutil.core.impl.wrappingDom.unWrap
 import org.w3c.dom.parsing.XMLSerializer
 
 internal class AppendableXmlWriter(private val target: Appendable, private val delegate: DomWriter) :
diff --git a/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/WriterXmlWriter.kt b/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/WriterXmlWriter.kt
@@ -21,8 +21,8 @@
 package nl.adaptivity.xmlutil
 
 import nl.adaptivity.xmlutil.core.XmlVersion
-import nl.adaptivity.xmlutil.core.impl.dom.unWrap
 import nl.adaptivity.xmlutil.core.impl.multiplatform.Writer
+import nl.adaptivity.xmlutil.core.impl.wrappingDom.unWrap
 import nl.adaptivity.xmlutil.dom2.Node
 import org.w3c.dom.parsing.XMLSerializer
 
diff --git a/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/XmlStreaming.js.kt b/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/XmlStreaming.js.kt
@@ -23,10 +23,10 @@ package nl.adaptivity.xmlutil
 import nl.adaptivity.xmlutil.core.KtXmlReader
 import nl.adaptivity.xmlutil.core.KtXmlWriter
 import nl.adaptivity.xmlutil.core.XmlVersion
-import nl.adaptivity.xmlutil.core.impl.dom.DOMImplementationImpl
-import nl.adaptivity.xmlutil.core.impl.dom.wrap
 import nl.adaptivity.xmlutil.core.impl.multiplatform.Reader
 import nl.adaptivity.xmlutil.core.impl.multiplatform.Writer
+import nl.adaptivity.xmlutil.core.impl.wrappingDom.DOMImplementationImpl
+import nl.adaptivity.xmlutil.core.impl.wrappingDom.wrap
 import nl.adaptivity.xmlutil.dom.PlatformDOMImplementation
 import nl.adaptivity.xmlutil.dom.PlatformNode
 import nl.adaptivity.xmlutil.dom2.DOMImplementation
diff --git a/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/core/impl/wrappingDom/AttrImpl.kt b/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/core/impl/wrappingDom/AttrImpl.kt
@@ -18,7 +18,7 @@
  * permissions and limitations under the License.
  */
 
-package nl.adaptivity.xmlutil.core.impl.dom
+package nl.adaptivity.xmlutil.core.impl.wrappingDom
 
 import nl.adaptivity.xmlutil.dom.PlatformNode
 import nl.adaptivity.xmlutil.dom2.Attr
diff --git a/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/core/impl/wrappingDom/CDATASectionImpl.kt b/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/core/impl/wrappingDom/CDATASectionImpl.kt
@@ -18,7 +18,7 @@
  * permissions and limitations under the License.
  */
 
-package nl.adaptivity.xmlutil.core.impl.dom
+package nl.adaptivity.xmlutil.core.impl.wrappingDom
 
 import nl.adaptivity.xmlutil.dom2.CDATASection as CDATASection2
 import org.w3c.dom.CDATASection as DOMCDATASection
diff --git a/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/core/impl/wrappingDom/CharacterDataImpl.kt b/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/core/impl/wrappingDom/CharacterDataImpl.kt
@@ -18,7 +18,7 @@
  * permissions and limitations under the License.
  */
 
-package nl.adaptivity.xmlutil.core.impl.dom
+package nl.adaptivity.xmlutil.core.impl.wrappingDom
 
 import nl.adaptivity.xmlutil.dom.PlatformNode
 import nl.adaptivity.xmlutil.dom2.CharacterData as CharacterData2
diff --git a/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/core/impl/wrappingDom/CommentImpl.kt b/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/core/impl/wrappingDom/CommentImpl.kt
@@ -18,7 +18,7 @@
  * permissions and limitations under the License.
  */
 
-package nl.adaptivity.xmlutil.core.impl.dom
+package nl.adaptivity.xmlutil.core.impl.wrappingDom
 
 import nl.adaptivity.xmlutil.dom2.Comment as Comment2
 import org.w3c.dom.Comment as DOMComment
diff --git a/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/core/impl/wrappingDom/DOMImplementationImpl.kt b/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/core/impl/wrappingDom/DOMImplementationImpl.kt
@@ -18,7 +18,7 @@
  * permissions and limitations under the License.
  */
 
-package nl.adaptivity.xmlutil.core.impl.dom
+package nl.adaptivity.xmlutil.core.impl.wrappingDom
 
 import kotlinx.browser.document
 import nl.adaptivity.xmlutil.dom.PlatformDOMImplementation
diff --git a/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/core/impl/wrappingDom/DocumentFragmentImpl.kt b/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/core/impl/wrappingDom/DocumentFragmentImpl.kt
@@ -18,7 +18,7 @@
  * permissions and limitations under the License.
  */
 
-package nl.adaptivity.xmlutil.core.impl.dom
+package nl.adaptivity.xmlutil.core.impl.wrappingDom
 
 import nl.adaptivity.xmlutil.dom2.DocumentFragment as DocumentFragment2
 import org.w3c.dom.DocumentFragment as DOMDocumentFragment
diff --git a/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/core/impl/wrappingDom/DocumentImpl.kt b/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/core/impl/wrappingDom/DocumentImpl.kt
@@ -18,7 +18,7 @@
  * permissions and limitations under the License.
  */
 
-package nl.adaptivity.xmlutil.core.impl.dom
+package nl.adaptivity.xmlutil.core.impl.wrappingDom
 
 import nl.adaptivity.xmlutil.dom.PlatformNode
 import nl.adaptivity.xmlutil.dom2.DOMImplementation
diff --git a/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/core/impl/wrappingDom/DocumentTypeImpl.kt b/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/core/impl/wrappingDom/DocumentTypeImpl.kt
@@ -18,7 +18,7 @@
  * permissions and limitations under the License.
  */
 
-package nl.adaptivity.xmlutil.core.impl.dom
+package nl.adaptivity.xmlutil.core.impl.wrappingDom
 
 import nl.adaptivity.xmlutil.dom.PlatformNode
 import nl.adaptivity.xmlutil.dom2.Element
diff --git a/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/core/impl/wrappingDom/ElementImpl.kt b/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/core/impl/wrappingDom/ElementImpl.kt
@@ -18,7 +18,7 @@
  * permissions and limitations under the License.
  */
 
-package nl.adaptivity.xmlutil.core.impl.dom
+package nl.adaptivity.xmlutil.core.impl.wrappingDom
 
 import nl.adaptivity.xmlutil.dom.PlatformAttr as DomAttr
 import nl.adaptivity.xmlutil.dom2.Attr as Attr2
diff --git a/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/core/impl/wrappingDom/NodeImpl.kt b/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/core/impl/wrappingDom/NodeImpl.kt
@@ -18,7 +18,7 @@
  * permissions and limitations under the License.
  */
 
-package nl.adaptivity.xmlutil.core.impl.dom
+package nl.adaptivity.xmlutil.core.impl.wrappingDom
 
 import nl.adaptivity.xmlutil.dom.NodeConsts
 import nl.adaptivity.xmlutil.dom2.*
diff --git a/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/core/impl/wrappingDom/ProcessingInstructionImpl.kt b/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/core/impl/wrappingDom/ProcessingInstructionImpl.kt
@@ -17,7 +17,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package nl.adaptivity.xmlutil.core.impl.dom
+package nl.adaptivity.xmlutil.core.impl.wrappingDom
 
 import nl.adaptivity.xmlutil.dom2.ProcessingInstruction as ProcessingInstruction2
 import org.w3c.dom.ProcessingInstruction as DomProcessingInstruction
diff --git a/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/core/impl/wrappingDom/TextImpl.kt b/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/core/impl/wrappingDom/TextImpl.kt
@@ -18,7 +18,7 @@
  * permissions and limitations under the License.
  */
 
-package nl.adaptivity.xmlutil.core.impl.dom
+package nl.adaptivity.xmlutil.core.impl.wrappingDom
 
 import nl.adaptivity.xmlutil.dom2.Text as Text2
 import org.w3c.dom.Text as DOMText
diff --git a/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/core/impl/wrappingDom/WrappingNamedNodeMap.kt b/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/core/impl/wrappingDom/WrappingNamedNodeMap.kt
@@ -18,7 +18,7 @@
  * permissions and limitations under the License.
  */
 
-package nl.adaptivity.xmlutil.core.impl.dom
+package nl.adaptivity.xmlutil.core.impl.wrappingDom
 
 import nl.adaptivity.xmlutil.dom.PlatformAttr
 import nl.adaptivity.xmlutil.dom2.NamedNodeMap as NamedNodeMap2
diff --git a/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/core/impl/wrappingDom/WrappingNodeList.kt b/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/core/impl/wrappingDom/WrappingNodeList.kt
@@ -18,7 +18,7 @@
  * permissions and limitations under the License.
  */
 
-package nl.adaptivity.xmlutil.core.impl.dom
+package nl.adaptivity.xmlutil.core.impl.wrappingDom
 
 import nl.adaptivity.xmlutil.dom2.NodeList
 import nl.adaptivity.xmlutil.dom2.NodeListIterator
diff --git a/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/dom/PlatformDocument.js.kt b/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/dom/PlatformDocument.js.kt
@@ -20,7 +20,7 @@
 
 package nl.adaptivity.xmlutil.dom
 
-import nl.adaptivity.xmlutil.core.impl.dom.wrap
+import nl.adaptivity.xmlutil.core.impl.wrappingDom.wrap
 import nl.adaptivity.xmlutil.dom2.Document as Document2
 import nl.adaptivity.xmlutil.dom2.Node as Node2
 
diff --git a/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/dom2/DOMImplementation.js.kt b/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/dom2/DOMImplementation.js.kt
@@ -20,7 +20,6 @@
 
 package nl.adaptivity.xmlutil.dom2
 
-import nl.adaptivity.xmlutil.core.impl.dom.wrap
 import nl.adaptivity.xmlutil.dom.PlatformDOMImplementation
 import nl.adaptivity.xmlutil.dom.PlatformDocumentType
 
diff --git a/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/dom2/Document.js.kt b/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/dom2/Document.js.kt
@@ -20,7 +20,7 @@
 
 package nl.adaptivity.xmlutil.dom2
 
-import nl.adaptivity.xmlutil.core.impl.dom.wrap
+import nl.adaptivity.xmlutil.core.impl.wrappingDom.wrap
 import nl.adaptivity.xmlutil.dom.PlatformDocument
 import nl.adaptivity.xmlutil.dom.PlatformNode
 
diff --git a/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/dom2/NamedNodeMap.js.kt b/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/dom2/NamedNodeMap.js.kt
@@ -20,7 +20,7 @@
 
 package nl.adaptivity.xmlutil.dom2
 
-import nl.adaptivity.xmlutil.core.impl.dom.unWrap
+import nl.adaptivity.xmlutil.core.impl.wrappingDom.unWrap
 import nl.adaptivity.xmlutil.dom.PlatformAttr
 import nl.adaptivity.xmlutil.dom.PlatformNamedNodeMap
 import nl.adaptivity.xmlutil.dom.PlatformNode
diff --git a/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/dom2/Node.js.kt b/core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/dom2/Node.js.kt
@@ -23,7 +23,7 @@
 package nl.adaptivity.xmlutil.dom2
 
 import kotlinx.serialization.Serializable
-import nl.adaptivity.xmlutil.core.impl.dom.wrap
+import nl.adaptivity.xmlutil.core.impl.wrappingDom.wrap
 import nl.adaptivity.xmlutil.dom.PlatformNode
 
 @Serializable(with = NodeSerializer::class)
diff --git a/core/base/src/jvmCommonMain/kotlin/nl/adaptivity/xmlutil/core/impl/wrappingDom/AbstractNodeImpl.kt b/core/base/src/jvmCommonMain/kotlin/nl/adaptivity/xmlutil/core/impl/wrappingDom/AbstractNodeImpl.kt
@@ -164,7 +164,7 @@ internal abstract class AbstractNodeImpl<N : PlatformNode>(delegate: N) : Node {
 
         other as AbstractNodeImpl<*>
 
-        return delegate == other.delegate
+        return delegate === other.delegate
     }
 
     override fun hashCode(): Int {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2025.`
	`2`	`+ * Copyright (c) 2025-2026.`
`3`	`3`	`*`
`4`	`4`	`* This file is part of xmlutil.`
`5`	`5`	`*`
`@@ -20,7 +20,7 @@`
`20`	`20`
`21`	`21`	`package nl.adaptivity.xmlutil`
`22`	`22`
`23`		`-import nl.adaptivity.xmlutil.core.impl.dom.unWrap`
	`23`	`+import nl.adaptivity.xmlutil.core.impl.wrappingDom.unWrap`
`24`	`24`	`import org.w3c.dom.parsing.XMLSerializer`
`25`	`25`
`26`	`26`	`internal class AppendableXmlWriter(private val target: Appendable, private val delegate: DomWriter) :`