[FIX] Cleanups

ChristianGruen · ChristianGruen · commit 38cb5960c7cc · 2026-03-13T14:37:58.000+01:00
diff --git a/basex-api/src/main/java/org/basex/http/web/WebFunction.java b/basex-api/src/main/java/org/basex/http/web/WebFunction.java
@@ -171,7 +171,7 @@ protected final void bind(final QNm name, final Expr[] args, final Value value,
         // casts and binds the value
         final SeqType st = var.declaredType();
         try {
-          args[p] = value.seqType().instanceOf(st) ? value : st.coerce(value, null, qc, null, null);
+          args[p] = value.seqType().instanceOf(st) ? value : st.coerce(value, qc, null);
         } catch(final QueryException ex) {
           Util.debug(ex);
           throw error(ARG_TYPE_X_X_X, input, st, value);
diff --git a/basex-core/src/main/java/org/basex/query/expr/ParseExpr.java b/basex-core/src/main/java/org/basex/query/expr/ParseExpr.java
@@ -767,7 +767,7 @@ protected final XQMap toMap(final Item item) throws QueryException {
    */
   protected final XQMap toRecord(final Item item, final RecordType type, final QueryContext qc)
       throws QueryException {
-    return (XQMap) type.seqType().coerce(item, null, qc, null, info);
+    return (XQMap) type.seqType().coerce(item, qc, info);
   }
 
   /**
diff --git a/basex-core/src/main/java/org/basex/query/expr/TypeCheck.java b/basex-core/src/main/java/org/basex/query/expr/TypeCheck.java
@@ -110,7 +110,7 @@ public Value value(final QueryContext qc) throws QueryException {
       return value;
     }
     // ignore type of result returned by tail call function
-    return qc.tcFunc != null ? value : st.coerce(value, null, qc, null, info);
+    return qc.tcFunc != null ? value : st.coerce(value, qc, info);
   }
 
   @Override
diff --git a/basex-core/src/main/java/org/basex/query/func/Closure.java b/basex-core/src/main/java/org/basex/query/func/Closure.java
@@ -305,7 +305,7 @@ public FuncItem item(final QueryContext qc, final InputInfo ii) throws QueryExce
       checked = body;
     } else if(body instanceof final Value value) {
       // we can type check immediately
-      checked = declType.coerce(value, name, qc, null, info);
+      checked = declType.coerce(value, qc, info, name, null);
     } else {
       // check at each call: reject impossible arities
       if(argType.type.instanceOf(declType.type) && argType.occ.intersect(declType.occ) == null &&
diff --git a/basex-core/src/main/java/org/basex/query/func/PartFunc.java b/basex-core/src/main/java/org/basex/query/func/PartFunc.java
@@ -92,7 +92,7 @@ public FuncItem item(final QueryContext qc, final InputInfo ii) throws QueryExce
         params[placeholderPerm == null ? p : placeholderPerm[p]] = param;
         ++p;
       } else {
-        args[e] = at.coerce(expr.value(qc), null, qc, null, ii);
+        args[e] = at.coerce(expr.value(qc), qc, info);
       }
     }
     final AnnList anns = func.annotations();
diff --git a/basex-core/src/main/java/org/basex/query/func/RecordConstructor.java b/basex-core/src/main/java/org/basex/query/func/RecordConstructor.java
@@ -93,7 +93,7 @@ private XQRecordMap recordMap(final QueryContext qc, final InputInfo ii) throws
     for(int f = 0; f < fs; ++f) {
       final RecordField rf = fields.value(f + 1);
       final Value value = f < exprs.length ? exprs[f].value(qc) : rf.init().value(qc);
-      values[f] = rf.seqType().coerce(value, names[f], qc, null, ii);
+      values[f] = rf.seqType().coerce(value, qc, ii, names[f], null);
     }
     return new XQRecordMap(recordType, values);
   }
@@ -113,7 +113,7 @@ private XQMap map(final QueryContext qc, final InputInfo ii) throws QueryExcepti
       final RecordField rf = fields.value(f + 1);
       final Value value = f < exprs.length ? exprs[f].value(qc) : rf.init().value(qc);
       if(!value.isEmpty() || rf.alwaysAdded()) {
-        mb.put(fields.key(f + 1), rf.seqType().coerce(value, names[f], qc, null, ii));
+        mb.put(fields.key(f + 1), rf.seqType().coerce(value, qc, ii, names[f], null));
       }
     }
     final XQMap map = mb.map();
diff --git a/basex-core/src/main/java/org/basex/query/func/Records.java b/basex-core/src/main/java/org/basex/query/func/Records.java
@@ -33,8 +33,8 @@ public enum Records {
   ),
   /** Record definition. */
   INFER_ENCODING(BIN_URI, "infer-encoding",
-    field("encoding", Types.STRING_O, false),
-    field("offset", Types.INTEGER_O, false)
+    field("encoding", Types.STRING_O),
+    field("offset", Types.INTEGER_O)
   ),
   /** Record definition. */
   LOAD_XQUERY_MODULE(FN_URI, "load-xquery-module",
diff --git a/basex-core/src/main/java/org/basex/query/func/StandardFunc.java b/basex-core/src/main/java/org/basex/query/func/StandardFunc.java
@@ -355,7 +355,7 @@ protected Expr embed(final CompileContext cc, final boolean skip) throws QueryEx
   protected final ADate toGregorianOrNull(final Expr expr, final QueryContext qc)
       throws QueryException {
     final Item item = expr.atomItem(qc, info);
-    return item.isEmpty() ? null : (ADate) Types.GREGORIAN_ZO.coerce(item, null, qc, null, info);
+    return item.isEmpty() ? null : (ADate) Types.GREGORIAN_ZO.coerce(item, qc, info);
   }
 
   /**
@@ -861,7 +861,9 @@ protected final boolean dataLock(final Expr expr, final boolean backup,
    */
   protected final boolean functionOption(final int i) {
     if(!(arg(i) instanceof final Value value)) return true;
-    if(value instanceof final XQMap map) {
+
+    final Value v = value instanceof final JNode jnode ? jnode.value : value;
+    if(v instanceof final XQMap map) {
       for(final Item key : map.keys()) {
         try {
           if(map.get(key) instanceof FItem) return true;
diff --git a/basex-core/src/main/java/org/basex/query/func/fn/FnInvisibleXml.java b/basex-core/src/main/java/org/basex/query/func/fn/FnInvisibleXml.java
@@ -59,7 +59,7 @@ private final class Generator {
      * @throws QueryException query exception
      */
     public FuncItem generate(final QueryContext qc) throws QueryException {
-      final Item grammar = (Item) ARG_TYPE.coerce(arg(0).value(qc), null, qc, null, info);
+      final Item grammar = (Item) ARG_TYPE.coerce(arg(0).value(qc), qc, info);
       final IxmlOptions options = toOptions(arg(1), new IxmlOptions(), qc);
 
       final String grmmr;
diff --git a/basex-core/src/main/java/org/basex/query/func/fn/FnLoadXQueryModule.java b/basex-core/src/main/java/org/basex/query/func/fn/FnLoadXQueryModule.java
@@ -77,12 +77,12 @@ public XQMap item(final QueryContext qc, final InputInfo ii) throws QueryExcepti
 
     final QNmMap<Value> bindings = new QNmMap<>();
     if(opt.contains(VARIABLES)) {
-      final XQMap vars = ((XQMap) opt.get(VARIABLES)).coerceTo(QNAME_MAP_TYPE, qc, null, info);
+      final XQMap vars = ((XQMap) opt.get(VARIABLES)).coerceTo(QNAME_MAP_TYPE, qc, info, null);
       vars.forEach((key, value) -> bindings.put((QNm) key, value));
     }
 
     if(opt.contains(VENDOR_OPTIONS)) {
-      ((XQMap) opt.get(VENDOR_OPTIONS)).coerceTo(QNAME_MAP_TYPE, qc, null, info);
+      ((XQMap) opt.get(VENDOR_OPTIONS)).coerceTo(QNAME_MAP_TYPE, qc, info, null);
     }
 
     if(opt.contains(XQUERY_VERSION)) {
diff --git a/basex-core/src/main/java/org/basex/query/func/fn/FnNodeTypeAnnotation.java b/basex-core/src/main/java/org/basex/query/func/fn/FnNodeTypeAnnotation.java
@@ -20,8 +20,7 @@ public final class FnNodeTypeAnnotation extends FnSchemaType {
 
   @Override
   public Value value(final QueryContext qc) throws QueryException {
-    final XNode node = toNode(arg(0), qc);
-    ARG_TYPE.coerce(node, null, qc, null, info);
+    final XNode node = (XNode) ARG_TYPE.coerce(toNode(arg(0), qc), qc, info);
     return annotate(qc, info, node.kind() == Kind.ATTRIBUTE ? UNTYPED_ATOMIC : UNTYPED);
   }
 }
diff --git a/basex-core/src/main/java/org/basex/query/func/fn/FnPartialApply.java b/basex-core/src/main/java/org/basex/query/func/fn/FnPartialApply.java
@@ -29,7 +29,7 @@ public class FnPartialApply extends StandardFunc {
   @Override
   public Value value(final QueryContext qc) throws QueryException {
     final FItem function = toFunction(arg(0), qc);
-    final XQMap arguments = toMap(ARGS_TYPE.coerce(arg(1).value(qc), ARGS_NAME, qc, null, info),
+    final XQMap arguments = toMap(ARGS_TYPE.coerce(arg(1).value(qc), qc, info, ARGS_NAME, null),
         qc);
     final int arity = function.arity();
     if(arity == 0 || arguments == XQMap.empty()) return function;
@@ -42,8 +42,8 @@ public Value value(final QueryContext qc) throws QueryException {
       final long index = toLong(key);
       if(index <= arity) {
         final int i = (int) index - 1;
-        funcArgs[i] = ft.argTypes[i].coerce(arguments.get(key), function.paramName(i), qc, null,
-            info);
+        funcArgs[i] = ft.argTypes[i].coerce(arguments.get(key), qc, info, function.paramName(i),
+            null);
         --placeholders;
       }
     }
diff --git a/basex-core/src/main/java/org/basex/query/func/fn/FnTypeOf.java b/basex-core/src/main/java/org/basex/query/func/fn/FnTypeOf.java
@@ -32,7 +32,7 @@ private String toString(final Value value) {
     for(final Value item : value) {
       String type = item.type.toString();
       if(item.type instanceof FType) {
-        type = type.replaceAll("\\(.*", "(*)").replace("record", "map");
+        type = type.replaceAll("\\(.*", "(*)").replaceAll("^record\\(", "map(");
       } else if(item.type.instanceOf(NodeType.JNODE)) {
         type = type.replaceAll("\\(.*", "()");
       }
diff --git a/basex-core/src/main/java/org/basex/query/scope/StaticScope.java b/basex-core/src/main/java/org/basex/query/scope/StaticScope.java
@@ -78,7 +78,7 @@ public Value value(final QueryContext qc) throws QueryException {
       final int fp = vs.enter(qc);
       try {
         final Value val = expr.value(qc);
-        value = declType != null ? declType.coerce(val, name, qc, null, info) : val;
+        value = declType != null ? declType.coerce(val, qc, info, name, null) : val;
       } finally {
         vs.exit(fp, qc);
       }
diff --git a/basex-core/src/main/java/org/basex/query/util/DeepEqual.java b/basex-core/src/main/java/org/basex/query/util/DeepEqual.java
@@ -153,7 +153,7 @@ public boolean equal(final Item item1, final Item item2) throws QueryException {
   public Bln itemsEqual(final Item item1, final Item item2) throws QueryException {
     if(itemsEqual != null) {
       final Value value = itemsEqual.invoke(qc, info, item1, item2);
-      final Value test = Types.BOOLEAN_ZO.coerce(value, null, qc, null, info);
+      final Value test = Types.BOOLEAN_ZO.coerce(value, qc, info);
       if(test != Empty.VALUE) return (Bln) test;
     }
     return null;
diff --git a/basex-core/src/main/java/org/basex/query/value/array/XQArray.java b/basex-core/src/main/java/org/basex/query/value/array/XQArray.java
@@ -278,7 +278,7 @@ final ArrayType union(final Value value) {
   @Override
   public final Value invokeInternal(final QueryContext qc, final InputInfo ii, final Value[] args)
       throws QueryException {
-    final long i = ((Itr) Types.INTEGER_O.coerce(key(args[0], qc, ii), null, qc, null, ii)).itr();
+    final long i = ((Itr) Types.INTEGER_O.coerce(key(args[0], qc, ii), qc, ii)).itr();
     final long size = structSize();
     if(i > 0 && i <= size) return valueAt(i - 1);
     throw (size == 0 ? ARRAYEMPTY : ARRAYBOUNDS_X_X).get(ii, i, size);
@@ -365,18 +365,18 @@ public final boolean instanceOf(final Type tp, final boolean coerce) {
    * Converts this array to the given array type.
    * @param at array type
    * @param qc query context
-   * @param cc compilation context ({@code null} during runtime)
    * @param ii input info (can be {@code null})
+   * @param cc compilation context ({@code null} during runtime)
    * @return coerced array
    * @throws QueryException query exception
    */
-  public final XQArray coerceTo(final ArrayType at, final QueryContext qc, final CompileContext cc,
-      final InputInfo ii) throws QueryException {
+  public final XQArray coerceTo(final ArrayType at, final QueryContext qc, final InputInfo ii,
+      final CompileContext cc) throws QueryException {
 
     final ArrayBuilder ab = new ArrayBuilder(qc, structSize());
     for(final Value value : iterable()) {
       qc.checkStop();
-      ab.add(at.valueType().coerce(value, null, qc, cc, ii));
+      ab.add(at.valueType().coerce(value, qc, ii, null, cc));
     }
     return ab.array(at);
   }
diff --git a/basex-core/src/main/java/org/basex/query/value/map/XQMap.java b/basex-core/src/main/java/org/basex/query/value/map/XQMap.java
@@ -284,21 +284,21 @@ public Item next() throws QueryException {
    * Converts this map to the given map type.
    * @param mt map type
    * @param qc query context
-   * @param cc compilation context ({@code null} during runtime)
    * @param ii input info (can be {@code null})
+   * @param cc compilation context ({@code null} during runtime)
    * @return coerced map
    * @throws QueryException query exception
    */
-  public final XQMap coerceTo(final MapType mt, final QueryContext qc, final CompileContext cc,
-      final InputInfo ii) throws QueryException {
+  public final XQMap coerceTo(final MapType mt, final QueryContext qc, final InputInfo ii,
+      final CompileContext cc) throws QueryException {
 
     final SeqType kt = mt.keyType().seqType(), vt = mt.valueType();
     final MapBuilder mb = new MapBuilder(structSize());
     forEach((key, value) -> {
       qc.checkStop();
-      final Item k = (Item) kt.coerce(key, null, qc, cc, ii);
+      final Item k = (Item) kt.coerce(key, qc, ii, null, cc);
       if(mb.contains(k)) throw typeError(this, mt, ii);
-      mb.put(k, vt.coerce(value, null, qc, cc, ii));
+      mb.put(k, vt.coerce(value, qc, ii, null, cc));
     });
     return mb.map();
   }
@@ -307,13 +307,13 @@ public final XQMap coerceTo(final MapType mt, final QueryContext qc, final Compi
    * Converts this map to the given record type.
    * @param rt record type
    * @param qc query context
-   * @param cc compilation context ({@code null} during runtime)
    * @param ii input info (can be {@code null})
+   * @param cc compilation context ({@code null} during runtime)
    * @return coerced map
    * @throws QueryException query exception
    */
-  public final XQMap coerceTo(final RecordType rt, final QueryContext qc, final CompileContext cc,
-      final InputInfo ii) throws QueryException {
+  public final XQMap coerceTo(final RecordType rt, final QueryContext qc, final InputInfo ii,
+      final CompileContext cc) throws QueryException {
 
     final long ms = structSize();
     final MapBuilder mb = new MapBuilder(ms);
@@ -325,7 +325,7 @@ public final XQMap coerceTo(final RecordType rt, final QueryContext qc, final Co
       final RecordField rf = fields.value(f);
       final Value value = getOrNull(Str.get(key));
       if(value != null) {
-        mb.put(key, rf.seqType().coerce(value, null, qc, cc, ii));
+        mb.put(key, rf.seqType().coerce(value, qc, ii, null, cc));
       } else if(!rf.isOptional()) {
         throw typeError(this, rt, ii);
       }
diff --git a/basex-core/src/main/java/org/basex/query/value/type/SeqType.java b/basex-core/src/main/java/org/basex/query/value/type/SeqType.java
@@ -205,15 +205,28 @@ private Value cast(final Item item, final boolean error, final QueryContext qc,
   /**
    * Converts the specified value to this type.
    * @param value value to promote
-   * @param name variable name (used for error message, can be {@code null})
    * @param qc query context
-   * @param cc compilation context ({@code null} during runtime)
    * @param info input info (can be {@code null})
    * @return converted value
    * @throws QueryException if the conversion was not possible
    */
-  public Value coerce(final Value value, final QNm name, final QueryContext qc,
-      final CompileContext cc, final InputInfo info) throws QueryException {
+  public Value coerce(final Value value, final QueryContext qc, final InputInfo info)
+      throws QueryException {
+    return coerce(value, qc, info, null, null);
+  }
+
+  /**
+   * Converts the specified value to this type.
+   * @param value value to promote
+   * @param qc query context
+   * @param info input info (can be {@code null})
+   * @param name variable name (used for error message, can be {@code null})
+   * @param cc compilation context ({@code null} during runtime)
+   * @return converted value
+   * @throws QueryException if the conversion was not possible
+   */
+  public Value coerce(final Value value, final QueryContext qc, final InputInfo info,
+      final QNm name, final CompileContext cc) throws QueryException {
 
     // instance check
     final SeqType[] at = type instanceof final FuncType ft ? ft.argTypes : null;
@@ -271,10 +284,10 @@ private Value coerce(final Item item, final QNm name, final QueryContext qc,
     }
     if(item instanceof final FItem fitem) {
       if(item instanceof final XQArray array) {
-        if(type instanceof final ArrayType at) return array.coerceTo(at, qc, cc, info);
+        if(type instanceof final ArrayType at) return array.coerceTo(at, qc, info, cc);
       } else if(item instanceof final XQMap map) {
-        if(type instanceof final RecordType rt) return map.coerceTo(rt, qc, cc, info);
-        if(type instanceof final MapType mt) return map.coerceTo(mt, qc, cc, info);
+        if(type instanceof final RecordType rt) return map.coerceTo(rt, qc, info, cc);
+        if(type instanceof final MapType mt) return map.coerceTo(mt, qc, info, cc);
       }
       if(type instanceof final FuncType ft) {
         return fitem.coerceTo(type == Types.FUNCTION ? item.funcType() : ft, qc, cc, info);
diff --git a/basex-core/src/main/java/org/basex/query/var/StaticVar.java b/basex-core/src/main/java/org/basex/query/var/StaticVar.java
@@ -112,7 +112,7 @@ void checkUp() throws QueryException {
   void bind(final Value val, final QueryContext qc, final boolean cast) throws QueryException {
     if(external && !compiled) {
       value = declType == null || declType.instance(val) ? val :
-        cast ? declType.cast(val, true, qc, info) : declType.coerce(val, name, qc, null, info);
+        cast ? declType.cast(val, true, qc, info) : declType.coerce(val, qc, info, name, null);
       expr = value;
     }
   }
diff --git a/basex-core/src/main/java/org/basex/query/var/Var.java b/basex-core/src/main/java/org/basex/query/var/Var.java
@@ -188,7 +188,7 @@ public Expr checked(final Expr expr, final CompileContext cc) throws QueryExcept
    */
   public Value checkType(final Value value, final QueryContext qc, final CompileContext cc)
       throws QueryException {
-    return declType != null ? declType.coerce(value, name, qc, cc, info) : value;
+    return declType != null ? declType.coerce(value, qc, info, name, cc) : value;
   }
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -767,7 +767,7 @@ protected final XQMap toMap(final Item item) throws QueryException {`
`767`	`767`	`*/`
`768`	`768`	`protected final XQMap toRecord(final Item item, final RecordType type, final QueryContext qc)`
`769`	`769`	`throws QueryException {`
`770`		`- return (XQMap) type.seqType().coerce(item, null, qc, null, info);`
	`770`	`+ return (XQMap) type.seqType().coerce(item, qc, info);`
`771`	`771`	`}`
`772`	`772`
`773`	`773`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public Value value(final QueryContext qc) throws QueryException {`
`110`	`110`	`return value;`
`111`	`111`	`}`
`112`	`112`	`// ignore type of result returned by tail call function`
`113`		`- return qc.tcFunc != null ? value : st.coerce(value, null, qc, null, info);`
	`113`	`+ return qc.tcFunc != null ? value : st.coerce(value, qc, info);`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public FuncItem item(final QueryContext qc, final InputInfo ii) throws QueryExce`
`92`	`92`	`params[placeholderPerm == null ? p : placeholderPerm[p]] = param;`
`93`	`93`	`++p;`
`94`	`94`	`} else {`
`95`		`- args[e] = at.coerce(expr.value(qc), null, qc, null, ii);`
	`95`	`+ args[e] = at.coerce(expr.value(qc), qc, info);`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`	`final AnnList anns = func.annotations();`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ private XQRecordMap recordMap(final QueryContext qc, final InputInfo ii) throws`
`93`	`93`	`for(int f = 0; f < fs; ++f) {`
`94`	`94`	`final RecordField rf = fields.value(f + 1);`
`95`	`95`	`final Value value = f < exprs.length ? exprs[f].value(qc) : rf.init().value(qc);`
`96`		`- values[f] = rf.seqType().coerce(value, names[f], qc, null, ii);`
	`96`	`+ values[f] = rf.seqType().coerce(value, qc, ii, names[f], null);`
`97`	`97`	`}`
`98`	`98`	`return new XQRecordMap(recordType, values);`
`99`	`99`	`}`
`@@ -113,7 +113,7 @@ private XQMap map(final QueryContext qc, final InputInfo ii) throws QueryExcepti`
`113`	`113`	`final RecordField rf = fields.value(f + 1);`
`114`	`114`	`final Value value = f < exprs.length ? exprs[f].value(qc) : rf.init().value(qc);`
`115`	`115`	`if(!value.isEmpty() \|\| rf.alwaysAdded()) {`
`116`		`- mb.put(fields.key(f + 1), rf.seqType().coerce(value, names[f], qc, null, ii));`
	`116`	`+ mb.put(fields.key(f + 1), rf.seqType().coerce(value, qc, ii, names[f], null));`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`	`final XQMap map = mb.map();`
Original file line number	Diff line number	Diff line change
`@@ -77,12 +77,12 @@ public XQMap item(final QueryContext qc, final InputInfo ii) throws QueryExcepti`
`77`	`77`
`78`	`78`	`final QNmMap<Value> bindings = new QNmMap<>();`
`79`	`79`	`if(opt.contains(VARIABLES)) {`
`80`		`- final XQMap vars = ((XQMap) opt.get(VARIABLES)).coerceTo(QNAME_MAP_TYPE, qc, null, info);`
	`80`	`+ final XQMap vars = ((XQMap) opt.get(VARIABLES)).coerceTo(QNAME_MAP_TYPE, qc, info, null);`
`81`	`81`	`vars.forEach((key, value) -> bindings.put((QNm) key, value));`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`if(opt.contains(VENDOR_OPTIONS)) {`
`85`		`- ((XQMap) opt.get(VENDOR_OPTIONS)).coerceTo(QNAME_MAP_TYPE, qc, null, info);`
	`85`	`+ ((XQMap) opt.get(VENDOR_OPTIONS)).coerceTo(QNAME_MAP_TYPE, qc, info, null);`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`if(opt.contains(XQUERY_VERSION)) {`