[bugfix] fn:transform: Conversion and treeIndex problems

.github/workflows/ci-deploy.yml

@@ -5,7 +5,8 @@ jobs:
     name: Build and Test Images
     runs-on: ubuntu-latest
     # NOTE (DP): Publish on develop and master, test on PRs against these
-    if: github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master' || github.base_ref ==  'develop' || github.base_ref ==  'master'
+    # TODO(DP) Reinstate CRONed release builds to update stock apps regularly
+    if: github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/develop-6.x.x' || github.ref == 'refs/heads/master'|| github.base_ref ==  'develop' || github.base_ref ==  'develop-6.x.x' || github.base_ref ==  'master'
     steps:
       - uses: actions/checkout@v4
         with:
@@ -15,6 +16,10 @@ jobs:
         with:
           distribution: liberica
           java-version: '8'
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: linux/amd64,linux/arm64 
       - name: Make buildkit default
         uses: docker/setup-buildx-action@v3
         id: buildx
@@ -51,6 +56,14 @@ jobs:
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
         run: mvn -q -Ddocker.tag=latest -Ddocker.username=$DOCKER_USERNAME -Ddocker.password=$DOCKER_PASSWORD docker:build docker:push
         working-directory: ./exist-docker
+      - name: Publish dev6 images
+        if: github.ref == 'refs/heads/develop-6.x.x'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        run: mvn -q -Ddocker.tag=dev6 -Ddocker.username=$DOCKER_USERNAME -Ddocker.password=$DOCKER_PASSWORD docker:build docker:push
+        working-directory: ./exist-docker
       - name: Publish release images
         if: github.ref == 'refs/heads/master'
         env:
@@ -61,11 +74,11 @@ jobs:
         working-directory: ./exist-docker
       # NOTE (DP): This is for debugging, publishes an experimental image from inside PRs against develop
       # - name: Publish experimental images
-      #   if: github.base_ref == 'develop'
+      #   if: github.base_ref == 'develop-6.x.x'
       #   env:
       #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       #     DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
       #     DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-      #   run: mvn -q -Ddocker.tag=experimental -Ddocker.username=$DOCKER_USERNAME -Ddocker.password=$DOCKER_PASSWORD docker:build docker:push
+      #   run: mvn -q -Ddocker.tag=experimental6 -Ddocker.username=$DOCKER_USERNAME -Ddocker.password=$DOCKER_PASSWORD docker:build docker:push
       #   working-directory: ./exist-docker  
 

exist-core/src/main/java/org/exist/source/SourceFactory.java

@@ -111,7 +111,7 @@ public class SourceFactory {
                 && ((location.startsWith("/db") && !Files.exists(Paths.get(firstPathSegment(location))))
                 || (contextPath != null && contextPath.startsWith("/db") && !Files.exists(Paths.get(firstPathSegment(contextPath)))))) {
             final XmldbURI pathUri;
-            if (contextPath == null) {
+            if (contextPath == null || ".".equals(contextPath)) {
                 pathUri = XmldbURI.create(location);
             } else {
                 pathUri = XmldbURI.create(contextPath).append(location);

exist-core/src/main/java/org/exist/webstart/JnlpJarFiles.java

@@ -60,7 +60,7 @@ public class JnlpJarFiles {
             "commons-logging-%latest%",
             "commons-pool-%latest%",
             "jargo-%latest%",
-            "bcprov-jdk15on-%latest%",
+            "bcprov-jdk18on-%latest%",
             "fastutil-%latest%-min",
             "j8fu-%latest%",
             "jackson-core-%latest%",

exist-core/src/main/java/org/exist/xquery/XQueryContext.java

@@ -574,46 +574,50 @@ public Optional<ExistRepository> getRepository() {
         // the repo and its eXist handler
         final Optional<ExistRepository> repo = getRepository();
 
+        if (!repo.isPresent()) {
+            return null;
+        }
         // try an internal module
-        if (repo.isPresent()) {
-            final Module jMod = repo.get().resolveJavaModule(namespace, this);
-            if (jMod != null) {
-                return jMod;
-            }
+        final Module jMod = repo.get().resolveJavaModule(namespace, this);
+        if (jMod != null) {
+            return jMod;
         }
 
         // try an eXist-specific module
-        if (repo.isPresent()) {
-            final Path resolved = repo.get().resolveXQueryModule(namespace);
-
-            // use the resolved file or return null
-            if (resolved != null) {
-
-                String location = "";
-
-                try {
-
-                    // see if the src exists in the database and if so, use that instead
-                    Source src = repo.get().resolveStoredXQueryModuleFromDb(getBroker(), resolved);
-                    if (src != null) {
-                        // NOTE(AR) set the location of the module to import relative to this module's load path - so that transient imports of the imported module will resolve correctly!
-                        location = Paths.get(XmldbURI.create(moduleLoadPath).getCollectionPath()).relativize(Paths.get(((DBSource)src).getDocumentPath().getCollectionPath())).toString();
-                    } else {
-                        // else, fallback to the one from the filesystem
-                        src = new FileSource(resolved, false);
-                    }
+        final Path resolved = repo.get().resolveXQueryModule(namespace);
 
-                    // build a module object from the source
-                    final ExternalModule module = compileOrBorrowModule(prefix, namespace, location, src);
-                    return module;
+        if (resolved == null) {
+            return null;
+        }
 
-                } catch (final PermissionDeniedException e) {
-                    throw new XPathException(e.getMessage(), e);
+        // use the resolved file
+        try {
+            // see if the src exists in the database and if so, use that instead
+            Source src = repo.get().resolveStoredXQueryModuleFromDb(getBroker(), resolved);
+            String location = "";
+            if (src == null) {
+                // fallback to load the source from the filesystem
+                src = new FileSource(resolved, false);
+            } else {
+                final String sourceCollection = ((DBSource)src).getDocumentPath().getCollectionPath();
+                if (".".equals(moduleLoadPath)) {
+                    // module is a string passed to the xquery context, has therefore no location of its own
+                    location = sourceCollection;
+                } else {
+                    // NOTE(AR) set the location of the module to import relative to this module's load path
+                    // - so that transient imports of the imported module will resolve correctly!
+                    final Path collectionPath = Paths.get(XmldbURI.create(moduleLoadPath).getCollectionPath());
+                    final Path sourcePath = Paths.get(sourceCollection);
+                    location = collectionPath.relativize(sourcePath).toString();
                 }
             }
-        }
 
-        return null;
+            // build a module object from the source
+            return compileOrBorrowModule(prefix, namespace, location, src);
+
+        } catch (final PermissionDeniedException | IllegalArgumentException e) {
+            throw new XPathException(e.getMessage(), e);
+        }
     }
 
     /**

exist-core/src/main/java/org/exist/xquery/functions/fn/transform/Convert.java

@@ -26,6 +26,7 @@
 import net.sf.saxon.type.BuiltInAtomicType;
 import org.exist.dom.QName;
 import org.exist.dom.memtree.DocumentImpl;
+import org.exist.dom.persistent.NodeProxy;
 import org.exist.xquery.ErrorCodes;
 import org.exist.xquery.XPathException;
 import org.exist.xquery.functions.array.ArrayType;
@@ -119,6 +120,9 @@ static net.sf.saxon.s9api.QName of(final QNameValue qName) {
         }
 
         XdmValue of(final Item item) throws XPathException {
+            if (item instanceof NodeProxy) {
+              return ofNode(((NodeProxy) item).getNode());
+            }
             final int itemType = item.getType();
             if (Type.subTypeOf(itemType, Type.ATOMIC)) {
                 return ofAtomic((AtomicValue) item);

exist-core/src/main/java/org/exist/xquery/functions/fn/transform/Transform.java

@@ -192,8 +192,10 @@ public Sequence eval(final Sequence[] args, final Sequence contextSequence) thro
                 final Transform.TemplateInvocation invocation = new Transform.TemplateInvocation(
                         options, sourceNode, delivery, xslt30Transformer, resultDocuments);
                 return invocation.invoke();
-            } catch (final SaxonApiException | UncheckedXPathException e) {
-                throw originalXPathException("Could not transform input: ", e, ErrorCodes.FOXT0003);
+            } catch (final SaxonApiException e) {
+              throw originalXPathException("Could not transform with "+options.xsltSource._1+" line "+e.getLineNumber()+": ", e, ErrorCodes.FOXT0003);
+            } catch (final UncheckedXPathException e) {
+              throw originalXPathException("Could not transform with "+options.xsltSource._1+" line "+e.getXPathException().getLocationAsString()+": ", e, ErrorCodes.FOXT0003);
             }
 
         } else {

exist-core/src/main/java/org/exist/xquery/functions/fn/transform/TreeUtils.java

@@ -24,6 +24,7 @@
 
 import net.sf.saxon.s9api.XdmNode;
 import org.exist.xquery.value.NodeValue;
+import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
@@ -64,20 +65,41 @@ static StringBuilder pathTo(final Node node) {
     static List<Integer> treeIndex(final Node node) {
         final Node parent = node.getParentNode();
         if (parent == null) {
-            return new ArrayList<>();
+          final List<Integer> index = new ArrayList<>();
+          // The root element always index 0 within the document node.
+          // Some node implementations (e.g., org.exist.dom.memtree.NodeImpl) do not always have an associated document.
+          // In this case, the nodeIndex must get an extra 0 index to be valid for xdmDocument.
+          if (! (node instanceof Document)) {
+            index.add(0);
+          }
+          return index;
         }
         final List<Integer> index = treeIndex(parent);
-        Node sibling = node.getPreviousSibling();
+        Node sibling = previousSiblingNotAttribute(node);
         int position = 0;
         while (sibling != null) {
             position += 1;
-            sibling = sibling.getPreviousSibling();
+            sibling = previousSiblingNotAttribute(sibling);
         }
         index.add(position);
 
         return index;
     }
 
+    /**
+     * A org.exist.dom.persistent.StoredNode returns attributes of an element as previous siblings of the element's children.
+     * This is not compatible with the way xdmNodeAtIndex works, so we need to compensate for this.
+     * @param node
+     * @return the previous sibling of `node` that is not an attribute.
+     */
+    private static Node previousSiblingNotAttribute(Node node) {
+      Node sibling = node.getPreviousSibling();
+      if (sibling instanceof Attr) {
+        return null;
+      }
+      return sibling;
+    }
+
     static XdmNode xdmNodeAtIndex(final XdmNode xdmNode, final List<Integer> index) {
         if (index.isEmpty()) {
             return xdmNode;

exist-core/src/main/java/org/exist/xslt/XsltURIResolverHelper.java

@@ -52,14 +52,16 @@ public class XsltURIResolverHelper {
             @Nullable final URIResolver defaultResolver, @Nullable final String base, final boolean avoidSelf) {
         final List<URIResolver> resolvers = new ArrayList<>();
 
+        // EXpath Pkg resolver
+        // This resolver needs to be the first one to prevent
+        // HTTP requests for registered package names (e.g. http://www.functx.com/functx.xsl)
+        brokerPool.getExpathRepo().map(repo -> resolvers.add(new PkgXsltModuleURIResolver(repo)));
+
         if (base != null) {
             // database resolver
             resolvers.add(new EXistURISchemeURIResolver(new EXistURIResolver(brokerPool, base)));
         }
 
-        // EXpath Pkg resolver
-        brokerPool.getExpathRepo().map(repo -> resolvers.add(new PkgXsltModuleURIResolver(repo)));
-
         // default resolver
         if (defaultResolver != null) {
             if (avoidSelf) {