Merge branch 'JuliaComputing:main' into main

Author: TimG1964

.github/workflows/Downstream.yml

@@ -0,0 +1,38 @@
+name: Downstream
+on:
+  push:
+    branches: [main]
+    tags: [v*]
+  pull_request:
+
+jobs:
+  test:
+    name: ${{ matrix.package }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        package:
+          - "XLSX"
+    steps:
+      - uses: actions/checkout@v4
+      - uses: julia-actions/setup-julia@v2
+        with:
+          version: 1
+          arch: x64
+          show-versioninfo: true
+      - uses: julia-actions/julia-buildpkg@latest
+      - name: Load this and run the downstream tests
+        shell: julia --color=yes {0}
+        run: |
+          using Pkg
+          Pkg.Registry.update()
+          Pkg.activate(;temp=true)
+          # force it to use this PR's version of the package
+          ENV["JULIA_PKG_DEVDIR"]= mktempdir()
+          Pkg.develop([
+            PackageSpec(path="."),
+            PackageSpec(name="${{ matrix.package }}"),
+          ])
+          Pkg.update()
+          Pkg.test("${{ matrix.package }}")

Project.toml

@@ -1,7 +1,7 @@
 name = "XML"
 uuid = "72c71f33-b9b6-44de-8c94-c961784809e2"
 authors = ["Josh Day <[email protected]> and contributors"]
-version = "0.3.4"
+version = "0.3.5"
 
 [deps]
 Mmap = "a63ad114-7e13-5084-954f-fe012c677804"

src/XML.jl

@@ -264,7 +264,7 @@ attributes(o) = o.attributes
 value(o) = o.value
 children(o::T) where {T} = isnothing(o.children) ? () : o.children
 
-depth(o) = 1
+depth(o) = missing
 parent(o) = missing
 next(o) = missing
 prev(o) = missing
@@ -364,7 +364,7 @@ write(x; kw...) = (io = IOBuffer(); write(io, x; kw...); String(take!(io)))
 
 write(filename::AbstractString, x; kw...) = open(io -> write(io, x; kw...), filename, "w")
 
-function write(io::IO, x; indentsize::Int=2, depth::Int=depth(x))
+function write(io::IO, x; indentsize::Int=2, depth::Int=1)
     indent = ' ' ^ indentsize
     nodetype = XML.nodetype(x)
     tag = XML.tag(x)

src/raw.jl

@@ -87,7 +87,7 @@ function Base.:(==)(a::Raw, b::Raw)
 end
 
 Base.view(o::Raw) = view(o.data, o.pos:o.pos + o.len)
-String(o::Raw) = String(view(o))
+Base.String(o::Raw) = String(view(o))
 
 Base.IteratorSize(::Type{Raw}) = Base.SizeUnknown()
 Base.eltype(::Type{Raw}) = Raw
@@ -208,14 +208,23 @@ function children(o::Raw)
     end
 end
 
+"""
+    depth(node) --> Int
+
+Return the depth of the node.  Will be `0` for `Document` nodes.  Not defined for `XML.Node`.
+"""
+function depth(o::Raw)
+    o.depth
+end
+
 """
     parent(node) --> typeof(node), Nothing
 
 Return the parent of the node.  Will be `nothing` for `Document` nodes.  Not defined for `XML.Node`.
 """
 function parent(o::Raw)
     depth = o.depth
-    depth === 1 && return nothing
+    depth === 0 && return nothing
     p = prev(o)
     while p.depth >= depth
         p = prev(p)

test/runtests.jl

@@ -134,6 +134,18 @@ end
         end
     end
 
+    @testset "depth and parent" begin
+        @test XML.depth(data) == 0
+        @test isnothing(XML.parent(data))
+        @test XML.depth(doc[1]) == 1
+        @test XML.parent(doc[1]) == data
+        @test XML.depth(doc[2]) == 1
+        @test XML.depth(doc[3]) == 2
+        @test XML.parent(doc[3]) == doc[2]
+        @test XML.depth(doc[end]) == 1
+        @test XML.parent(doc[end]) == data
+    end
+
     @testset "tag/attributes/value" begin
         x = doc[1]  # <?xml version="1.0"?>
         @test XML.tag(x) === nothing