Test

.github/workflows/run-qt3.yml

@@ -104,15 +104,15 @@ jobs:
 
   qt3-jsoniq:
     needs: [resolve-baseline, build]
-    uses: RumbleDB/rumble-test-suite/.github/workflows/qt3-suite.yml@master
+    uses: RumbleDB/rumble-test-suite/.github/workflows/qt3-suite.yml@jimmy/schema
     with:
       tested_parser: jsoniq
       rumble_artifact_name: rumble-build
       baseline_run_id: ${{ needs.resolve-baseline.outputs.baseline_run_id }}
 
   qt3-xquery:
     needs: [resolve-baseline, build]
-    uses: RumbleDB/rumble-test-suite/.github/workflows/qt3-suite.yml@master
+    uses: RumbleDB/rumble-test-suite/.github/workflows/qt3-suite.yml@jimmy/schema
     with:
       tested_parser: xquery
       rumble_artifact_name: rumble-build

pom.xml

@@ -424,6 +424,17 @@
             <artifactId>antlr4-runtime</artifactId>
             <version>${antlr4.version}</version>
         </dependency>
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <version>2.12.2</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>xml-apis</groupId>
+                    <artifactId>xml-apis</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.jline</groupId>
             <artifactId>jline</artifactId>

src/main/java/org/rumbledb/api/Item.java

@@ -14,6 +14,7 @@
 import org.rumbledb.exceptions.OurBadException;
 import org.rumbledb.items.structured.JSoundDataFrame;
 import org.rumbledb.items.xml.XMLDocumentPosition;
+import org.rumbledb.items.xml.XmlSchemaNodeProperties;
 import org.rumbledb.runtime.flwor.NativeClauseContext;
 import org.rumbledb.runtime.RuntimeIterator;
 import org.rumbledb.runtime.update.primitives.Collection;
@@ -393,6 +394,29 @@ default Name getQNameValue() {
 
     // endregion qnames
 
+    // region notations
+
+    /**
+     * Tests whether the item is an atomic item of type xs:NOTATION.
+     *
+     * @return true if it is an xs:NOTATION item, false otherwise.
+     */
+    default boolean isNotation() {
+        return false;
+    }
+
+    /**
+     * Returns the expanded name of this item when it is an xs:NOTATION.
+     *
+     * @return the expanded name.
+     * @throws UnsupportedOperationException if the item is not an xs:NOTATION.
+     */
+    default Name getNotationValue() {
+        throw new UnsupportedOperationException("Operation not defined for type " + this.getDynamicType());
+    }
+
+    // endregion notations
+
     /**
      * Tests whether the item is an atomic item of type base64Binary or hexBinary.
      *
@@ -1704,6 +1728,14 @@ default ItemType getSchemaType() {
         return null;
     }
 
+    default void setXmlSchemaProperties(XmlSchemaNodeProperties properties) {
+        throw new UnsupportedOperationException("Operation not defined for type " + this.getDynamicType());
+    }
+
+    default XmlSchemaNodeProperties getXmlSchemaProperties() {
+        return XmlSchemaNodeProperties.none();
+    }
+
 
     /**
      * Get the position of the Node inside the XML document (and path incase of multiple docs) for sorting /

src/main/java/org/rumbledb/api/Rumble.java

@@ -2,9 +2,11 @@
 
 import org.apache.spark.sql.SparkSession;
 import org.rumbledb.compiler.VisitorHelpers;
+import org.rumbledb.config.CompilationConfiguration;
 import org.rumbledb.config.RumbleRuntimeConfiguration;
 import org.rumbledb.context.DynamicContext;
 import org.rumbledb.expressions.module.MainModule;
+import org.rumbledb.resources.ResourceResolver;
 import org.rumbledb.runtime.RuntimeIterator;
 
 import sparksoniq.spark.SparkSessionManager;
@@ -25,14 +27,35 @@
 public class Rumble {
 
     private RumbleRuntimeConfiguration configuration;
+    private CompilationConfiguration compilationConfiguration;
 
     /**
      * Creates a new Rumble instance. This initializes a brand new Spark session.
      *
      * @param configuration a RumbleRuntimeConfiguration object containing the configuration.
      */
     public Rumble(RumbleRuntimeConfiguration configuration) {
-        this.configuration = configuration;
+        this(new CompilationConfiguration(configuration));
+    }
+
+    /**
+     * Creates a new Rumble instance with a custom resolver for imported resources.
+     *
+     * @param configuration a RumbleRuntimeConfiguration object containing the configuration.
+     * @param resourceResolver the resolver used for imported modules and schemas.
+     */
+    public Rumble(RumbleRuntimeConfiguration configuration, ResourceResolver resourceResolver) {
+        this(new CompilationConfiguration(configuration, resourceResolver));
+    }
+
+    /**
+     * Creates a new Rumble instance with explicit compilation configuration.
+     *
+     * @param compilationConfiguration the configuration used to compile queries.
+     */
+    public Rumble(CompilationConfiguration compilationConfiguration) {
+        this.compilationConfiguration = compilationConfiguration;
+        this.configuration = compilationConfiguration.runtimeConfiguration();
         SparkSessionManager.getInstance().getOrCreateSession();
     }
 
@@ -42,6 +65,7 @@ public Rumble(RumbleRuntimeConfiguration configuration) {
      */
     public Rumble(SparkSession session) {
         this.configuration = new RumbleRuntimeConfiguration();
+        this.compilationConfiguration = new CompilationConfiguration(this.configuration);
         SparkSessionManager.getInstance(session);
     }
 
@@ -63,7 +87,7 @@ public RumbleRuntimeConfiguration getConfiguration() {
     public SequenceOfItems runQuery(String query) {
         MainModule mainModule = VisitorHelpers.parseMainModuleFromQuery(
             query,
-            this.configuration
+            this.compilationConfiguration
         );
         DynamicContext dynamicContext = VisitorHelpers.createDynamicContext(mainModule, this.configuration);
         RuntimeIterator iterator = VisitorHelpers.generateRuntimeIterator(
@@ -95,7 +119,7 @@ public String runQueryToString(String query) {
     public SequenceOfItems runQuery(URI location) throws IOException {
         MainModule mainModule = VisitorHelpers.parseMainModuleFromLocation(
             location,
-            this.configuration
+            this.compilationConfiguration
         );
         DynamicContext dynamicContext = VisitorHelpers.createDynamicContext(mainModule, this.configuration);
         RuntimeIterator iterator = VisitorHelpers.generateRuntimeIterator(
@@ -127,7 +151,7 @@ public String runQueryToString(URI location) throws IOException {
     public String serializeToJSONiq(String query) {
         MainModule mainModule = VisitorHelpers.parseMainModuleFromQuery(
             query,
-            this.configuration
+            this.compilationConfiguration
         );
         StringBuilder sb = new StringBuilder();
         mainModule.serializeToJSONiq(sb, 0);

src/main/java/org/rumbledb/compiler/CloneVisitor.java

@@ -91,6 +91,7 @@
 import org.rumbledb.expressions.typing.IsStaticallyExpression;
 import org.rumbledb.expressions.typing.TreatExpression;
 import org.rumbledb.expressions.typing.ValidateTypeExpression;
+import org.rumbledb.expressions.typing.ValidateExpression;
 import org.rumbledb.expressions.xml.AttributeNodeContentExpression;
 import org.rumbledb.expressions.xml.AttributeNodeExpression;
 import org.rumbledb.expressions.xml.CommentNodeConstructorExpression;
@@ -1261,6 +1262,20 @@ public Node visitValidateTypeExpression(ValidateTypeExpression expression, Node
         return result;
     }
 
+    @Override
+    public Node visitValidateExpression(ValidateExpression expression, Node argument) {
+        Expression result = new ValidateExpression(
+                (Expression) visit(expression.getMainExpression(), argument),
+                expression.getValidationMode(),
+                expression.getTypeName(),
+                expression.getMetadata()
+        );
+        result.setStaticContext(expression.getStaticContext());
+        result.setStaticSequenceType(expression.getStaticSequenceType());
+        result.setSequential(expression.isSequential());
+        return result;
+    }
+
     // region scripting
     @Override
     public Node visitApplyStatement(ApplyStatement statement, Node argument) {

src/main/java/org/rumbledb/compiler/ExecutionModeVisitor.java

@@ -85,6 +85,7 @@
 import org.rumbledb.types.ItemType;
 import org.rumbledb.types.SequenceType;
 import org.rumbledb.types.SequenceType.Arity;
+import org.rumbledb.xml.schema.XmlSchemaConstructorFunction;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -250,7 +251,11 @@ public StaticContext visitFunctionCall(FunctionCallExpression expression, Static
         visitDescendants(expression, expression.getStaticContext());
         FunctionIdentifier identifier = expression.getFunctionIdentifier();
         String queryLanguage = expression.getStaticContext().getQueryLanguage();
-        if (!BuiltinFunctionCatalogue.exists(identifier, queryLanguage)) {
+        boolean isSchemaConstructor = XmlSchemaConstructorFunction.resolve(
+            identifier,
+            expression.getStaticContext()
+        ) != null;
+        if (!BuiltinFunctionCatalogue.exists(identifier, queryLanguage) && !isSchemaConstructor) {
             List<ExecutionMode> modes = new ArrayList<>();
             for (Expression parameter : expression.getArguments()) {
                 if (parameter == null) {
@@ -283,6 +288,8 @@ public StaticContext visitFunctionCall(FunctionCallExpression expression, Static
                     this.configuration
                 )
             );
+        } else if (isSchemaConstructor) {
+            expression.setHighestExecutionMode(ExecutionMode.LOCAL);
         } else {
             if (
                 expression.getStaticContext()

src/main/java/org/rumbledb/compiler/ExpressionClassificationVisitor.java

@@ -54,6 +54,7 @@
 import org.rumbledb.expressions.update.TransformExpression;
 import org.rumbledb.expressions.update.TruncateCollectionExpression;
 import org.rumbledb.types.FunctionSignature;
+import org.rumbledb.xml.schema.XmlSchemaConstructorFunction;
 
 public class ExpressionClassificationVisitor extends AbstractNodeVisitor<ExpressionClassification> {
 
@@ -366,7 +367,10 @@ private FunctionSignature getSignature(FunctionIdentifier identifier, StaticCont
         if (function != null) {
             signature = function.getSignature();
         } else {
-            signature = staticContext.getFunctionSignature(identifier);
+            XmlSchemaConstructorFunction constructor = XmlSchemaConstructorFunction.resolve(identifier, staticContext);
+            signature = constructor == null
+                ? staticContext.getFunctionSignature(identifier)
+                : constructor.signature();
         }
         return signature;
     }

src/main/java/org/rumbledb/compiler/FunctionInliningVisitor.java

@@ -420,7 +420,7 @@ && usesQNameCoercionErrorSemantics(expression)
             typeSwitchExpression.setStaticSequenceType(paramType);
             return typeSwitchExpression;
         }
-        if (paramType.getItemType().equals(BuiltinTypesCatalogue.errorItem)) {
+        if (BuiltinTypesCatalogue.errorItem.getName().equals(paramType.getItemType().getName())) {
             TreatExpression result = new TreatExpression(
                     expression,
                     paramType,
@@ -434,8 +434,9 @@ && usesQNameCoercionErrorSemantics(expression)
     }
 
     private boolean isNamespaceSensitiveFunctionParameter(SequenceType paramType) {
-        return paramType.getItemType().equals(BuiltinTypesCatalogue.QNameItem)
-            || paramType.getItemType().equals(BuiltinTypesCatalogue.NOTATIONItem);
+        Name parameterTypeName = paramType.getItemType().getName();
+        return BuiltinTypesCatalogue.QNameItem.getName().equals(parameterTypeName)
+            || BuiltinTypesCatalogue.NOTATIONItem.getName().equals(parameterTypeName);
     }
 
     private boolean usesQNameCoercionErrorSemantics(Expression expression) {