[MOD] XQuery, map constructor, JNodes. qtspecs#2525

Author: ChristianGruen

basex-core/src/main/java/org/basex/io/serial/AdaptiveSerializer.java

@@ -13,7 +13,6 @@
 import org.basex.query.value.item.*;
 import org.basex.query.value.map.*;
 import org.basex.query.value.node.*;
-import org.basex.query.value.seq.*;
 import org.basex.query.value.type.*;
 import org.basex.util.*;
 
@@ -72,15 +71,15 @@ public final void serialize(final Item item) throws IOException {
 
   @Override
   protected void jnode(final JNode jnode) throws IOException {
-    if(jnode.key != Empty.VALUE) {
+    if(jnode.isRoot()) {
+      printChars(QueryText.JTREE);
+      printChar('(');
+    } else {
       printChars(Token.token(QueryText.JNODE));
       printChar('(');
       super.serialize(jnode.key);
       printChar(':');
       if(indent) printChar(' ');
-    } else {
-      printChars(QueryText.JTREE);
-      printChar('(');
     }
     int cc = 0;
     if(jnode.value.size() > 1) printChar('(');

basex-core/src/main/java/org/basex/query/expr/constr/CMap.java

@@ -13,6 +13,7 @@
 import org.basex.query.value.*;
 import org.basex.query.value.item.*;
 import org.basex.query.value.map.*;
+import org.basex.query.value.node.*;
 import org.basex.query.value.seq.*;
 import org.basex.query.value.type.*;
 import org.basex.query.var.*;
@@ -157,9 +158,19 @@ public XQMap item(final QueryContext qc, final InputInfo ii) throws QueryExcepti
       if(exprs[e + 1] != Empty.UNDEFINED) {
         add.accept(toAtomItem(exprs[e], qc), exprs[e + 1].value(qc));
       } else {
-        final Iter iter = exprs[e].unwrappedIter(qc);
+        final Iter iter = exprs[e].iter(qc);
         for(Item item; (item = iter.next()) != null;) {
-          toMap(item).forEach(add);
+          Item it;
+          if(item instanceof final JNode jnode) {
+            if(jnode.isRoot()) {
+              it = (Item) jnode.value;
+            } else {
+              it = XQMap.get(jnode.key, jnode.value);
+            }
+          } else {
+            it = item;
+          }
+          toMap(it).forEach(add);
         }
       }
     }

basex-core/src/main/java/org/basex/query/expr/path/JNodeTest.java

@@ -82,8 +82,7 @@ public static boolean equals(final Value v1, final Value v2) {
   @Override
   public boolean matches(final GNode node) {
     if(node instanceof final JNode jnode) {
-      final Item k1 = key, k2 = jnode.key;
-      return (k1 == null || (k1 == Empty.VALUE ? k2 == Empty.VALUE : equals(k1, k2))) &&
+      return (key == null || (key == Empty.VALUE ? jnode.isRoot() : equals(key, jnode.key))) &&
           valueType.instance(jnode.value);
     }
     return false;

basex-core/src/main/java/org/basex/query/expr/path/NameTest.java

@@ -4,7 +4,6 @@
 import org.basex.query.*;
 import org.basex.query.value.item.*;
 import org.basex.query.value.node.*;
-import org.basex.query.value.seq.*;
 import org.basex.query.value.type.*;
 import org.basex.util.*;
 
@@ -123,7 +122,7 @@ public boolean matches(final GNode node) {
     if(node instanceof final JNode jnode) {
       // JNodes
       if(scope == Scope.ALL) return true;
-      if(jnode.key == Empty.VALUE) return false;
+      if(jnode.isRoot()) return false;
       if(scope == Scope.FLEXIBLE) {
         try {
           return Token.eq(qname.string(), jnode.key.string(null));

basex-core/src/main/java/org/basex/query/value/node/JNode.java

@@ -80,6 +80,14 @@ public JNode(final Item key, final Value value, final JNode parent, final long i
     this.position = position;
   }
 
+  /**
+   * Indicates if this is a root node.
+   * @return result of check
+   */
+  public boolean isRoot() {
+    return key == Empty.VALUE;
+  }
+
   @Override
   public Value atomValue(final QueryContext qc, final InputInfo ii) throws QueryException {
     return value.atomValue(qc, ii);
@@ -335,7 +343,7 @@ public Value materialize(final Predicate<Data> test, final InputInfo ii, final Q
   @Override
   public void toString(final QueryString qs) {
     qs.token(QueryText.JTREE);
-    if(key == Empty.VALUE) {
+    if(isRoot()) {
       qs.paren(value);
     } else {
       qs.token('(').token(key).token(':').token(value).token(')');

basex-core/src/test/java/org/basex/query/expr/XQuery4Test.java

@@ -713,6 +713,9 @@ public final class XQuery4Test extends SandboxTest {
     check("{ 0: 0, { 1: 1 } } => map:size()", 2, root(Itr.class));
     check("{ 0: 0, (1 to 6) ! { .: . } } => map:size()", 7, root(_MAP_SIZE));
 
+    query("{ 'a': 'b' }/. ! { . }", "{\"a\":\"b\"}");
+    query("{ 'a': 'b' }/a ! { . }", "{\"a\":\"b\"}");
+
     check("{ 1: 1, <a/>[. = 'b'] }", "{1:1}",
         root(CMap.class), type(CMap.class, "map(*)"));
     check("{ 1: <a/>[. = 'b'], 2: 1 }", "{1:(),2:1}",