[bugfix] allow module imports in one-off xqueries

fixes #5525

- add functx to autodeploy for xquery tests
- add tests for one-off queries with module imports
  - of a registered module without location hint
  - of a module with location hint
- change XQueryContext to allow imports again
- change SourceFactory to work with contextPath set to "."

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/xquery/XQueryContext.java

@@ -587,33 +587,34 @@ public Optional<ExistRepository> getRepository() {
             return null;
         }
 
-        // 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();
+        // use the resolved file
+        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) {
+                // fallback to load the source from the filesystem
+                src = new FileSource(resolved, false);
+            } else {
+                final String sourceCollection = ((DBSource)src).getDocumentPath().getCollectionPath();
+                if (moduleLoadPath.equals(".")) {
+                    // module is a string passed to the xquery context, has therefore no location of its own
+                    location = sourceCollection;
                 } else {
-                    // else, fallback to the one from the filesystem
-                    src = new FileSource(resolved, false);
+                    // 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 sourcePath = Paths.get(sourceCollection);
+                    final Path mlp = Paths.get(XmldbURI.create(moduleLoadPath).getCollectionPath());
+                    location = mlp.relativize(sourcePath).toString();
                 }
+            }
 
-                // build a module object from the source
-                final ExternalModule module = compileOrBorrowModule(namespace, prefix, location, src);
-                return module;
+            // build a module object from the source
+            return compileOrBorrowModule(namespace, prefix, location, src);
 
-            } catch (final PermissionDeniedException e) {
-                throw new XPathException(e.getMessage(), e);
-            }
+        } catch (final PermissionDeniedException | IllegalArgumentException e) {
+            throw new XPathException(e.getMessage(), e);
         }
-
-        return null;
     }
 
     /**

exist-core/src/test/java/org/exist/xquery/AbsolutePathTests.java

@@ -27,6 +27,7 @@
 import org.exist.test.XQueryCompilationTest;
 import org.exist.xquery.value.IntegerValue;
 import org.exist.xquery.value.Sequence;
+import org.exist.xquery.value.StringValue;
 import org.junit.Test;
 
 import javax.xml.transform.Source;
@@ -133,4 +134,23 @@ public void topLevelAbsolutePath() throws EXistException, PermissionDeniedExcept
 
         assertThatXQResult(actual, equalTo(expected));
     }
+
+    @Test
+    public void importLibraryWithoutLocation() throws EXistException, PermissionDeniedException {
+        final Sequence expected = new StringValue("xs:integer");
+
+        final String query = "import module namespace functx='http://www.functx.com';functx:atomic-type(4)";
+        final Either<XPathException, Sequence> actual = executeQuery(query);
+
+        assertThatXQResult(actual, equalTo(expected));
+    }
+    @Test
+    public void importLibraryFromLocation() throws EXistException, PermissionDeniedException {
+        final Sequence expected = new StringValue("xs:integer");
+
+        final String query = "import module namespace functx='http://www.functx.com' at '/db/system/repo/functx-1.0.1/functx/functx.xq';functx:atomic-type(4)";
+        final Either<XPathException, Sequence> actual = executeQuery(query);
+
+        assertThatXQResult(actual, equalTo(expected));
+    }
 }

exist-core/src/test/java/org/exist/xquery/ModuleImportTest.java

@@ -0,0 +1,89 @@
+package org.exist.xquery;
+
+import com.evolvedbinary.j8fu.Either;
+import org.exist.EXistException;
+import org.exist.security.PermissionDeniedException;
+import org.exist.test.XQueryCompilationTest;
+import org.exist.xquery.value.Sequence;
+import org.exist.xquery.value.StringValue;
+import org.junit.Test;
+
+import static org.exist.test.XQueryAssertions.assertThatXQResult;
+import static org.exist.test.XQueryAssertions.assertXQStaticError;
+import static org.hamcrest.Matchers.equalTo;
+
+/**
+ * Ensure library module imports work in one-off queries
+ * needs functx to be installed => conf.xml => triggers => autodeploy
+ *
+ * @author <a href="mailto:[email protected]">Juri Leino</a>
+ */
+public class ModuleImportTest extends XQueryCompilationTest {
+    @Test
+    public void importLibraryWithoutLocation() throws EXistException, PermissionDeniedException {
+        final Sequence expected = new StringValue("xs:integer");
+
+        final String query = "import module namespace functx='http://www.functx.com';" +
+                "functx:atomic-type(4)";
+        final Either<XPathException, Sequence> actual = executeQuery(query);
+
+        assertThatXQResult(actual, equalTo(expected));
+    }
+    @Test
+    public void importLibraryFromDbLocation() throws EXistException, PermissionDeniedException {
+        final Sequence expected = new StringValue("xs:integer");
+
+        final String query = "import module namespace functx='http://www.functx.com'" +
+                " at '/db/system/repo/functx-1.0.1/functx/functx.xq';" +
+                "functx:atomic-type(4)";
+        final Either<XPathException, Sequence> actual = executeQuery(query);
+
+        assertThatXQResult(actual, equalTo(expected));
+    }
+
+    @Test
+    public void importLibraryFromXMLDBLocation() throws EXistException, PermissionDeniedException {
+        final Sequence expected = new StringValue("xs:integer");
+
+        final String query = "import module namespace functx='http://www.functx.com'" +
+                " at 'xmldb:///db/system/repo/functx-1.0.1/functx/functx.xq';" +
+                "functx:atomic-type(4)";
+        final Either<XPathException, Sequence> actual = executeQuery(query);
+
+        assertThatXQResult(actual, equalTo(expected));
+    }
+
+    @Test
+    public void importLibraryFromExistXMLDBLocation() throws EXistException, PermissionDeniedException {
+        final Sequence expected = new StringValue("xs:integer");
+
+        final String query = "import module namespace functx='http://www.functx.com'" +
+                " at 'xmldb:exist:///db/system/repo/functx-1.0.1/functx/functx.xq';" +
+                "functx:atomic-type(4)";
+        final Either<XPathException, Sequence> actual = executeQuery(query);
+
+        assertThatXQResult(actual, equalTo(expected));
+    }
+
+    @Test
+    public void importLibraryFromUnknownLocation() throws EXistException, PermissionDeniedException {
+
+        final String query = "import module namespace functx='http://www.functx.com'" +
+                " at 'unknown:///db/system/repo/functx-1.0.1/functx/functx.xq';" +
+                "functx:atomic-type(4)";
+        final String expectedMessage = "error found while loading module functx: Source for module 'http://www.functx.com' not found module location hint URI 'unknown:///db/system/repo/functx-1.0.1/functx/functx.xq'.";
+
+        assertXQStaticError(ErrorCodes.XQST0059, -1,-1, expectedMessage, compileQuery(query));
+    }
+
+    @Test
+    public void importLibraryFromRelativeLocation() throws EXistException, PermissionDeniedException {
+        final String query = "import module namespace functx='http://www.functx.com'" +
+                " at './functx.xq';" +
+                "functx:atomic-type(4)";
+        final String expectedMessage = "error found while loading module functx: Source for module 'http://www.functx.com' not found module location hint URI './functx.xq'.";
+
+        assertXQStaticError(ErrorCodes.XQST0059, -1,-1, expectedMessage, compileQuery(query));
+    }
+
+}

exist-core/src/test/resources-filtered/conf.xml

@@ -231,6 +231,16 @@
                     <parameter name="mode" value="memory"/>
                 </trigger>
 
+                <!--
+                    AutoDeploymentTrigger will install any .xar application package it finds
+                    in the autodeploy directory unless the application has already been installed
+                    in the db.
+                -->
+                <trigger class="org.exist.repo.AutoDeploymentTrigger">
+                    <parameter name="ignore-autodeploy-system-property" value="true"/>
+                    <parameter name="dir" value="${project.build.testOutputDirectory}/functx"/>
+                </trigger>
+
             </triggers>
         </startup>