hide ##any default element namespace behind flag and fix resolution semantics

Author: GuntherRademacher

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

@@ -466,7 +466,7 @@ private ArrayList<QNm> qnames(final StringOption option) throws QueryIOException
     final ArrayList<QNm> list = new ArrayList<>();
     for(final byte[] name : distinctTokens(token(sopts.get(option)))) {
       try {
-        list.add(QNm.parse(name, sc != null ? sc.elemNS : null, qc, sc, null));
+        list.add(QNm.parse(name, sc == null ? null : sc.elemNS, qc, sc, null));
       } catch(final QueryException ex) {
         throw new QueryIOException(ex);
       }

basex-core/src/main/java/org/basex/query/QueryParser.java

@@ -546,7 +546,8 @@ private boolean defaultNamespaceDecl(final boolean fixed) throws QueryException
     if(elem) {
       if(!decl.add(ELEMENT)) throw error(DUPLNS);
       sc.elemNsFixed = fixed;
-      sc.elemNS = uri.length == 0 ? null : uri;
+      sc.elemNsAny = Token.eq(uri, QueryText.ANY_URI);
+      sc.elemNS = sc.elemNsAny || uri.length == 0 ? null : uri;
       sc.dirNS = sc.elemNS;
     } else {
       if(!decl.add(FUNCTION)) throw error(DUPLNS);
@@ -952,7 +953,7 @@ private static boolean reserved(final QNm name) {
    * @throws QueryException query exception
    */
   private void typeDecl(final AnnList anns) throws QueryException {
-    final QNm qn = eQName(sc.elemNS, TYPENAME);
+    final QNm qn = eQName(sc.elemNsAny ? XS_URI : sc.elemNS, TYPENAME);
     if(declaredTypes.contains(qn)) throw error(DUPLTYPE_X, qn.string());
     if(NSGlobal.reserved(qn.uri())) throw error(TYPERESERVED_X, qn.string());
     wsCheck(AS);
@@ -2465,8 +2466,8 @@ private ExprInfo simpleNodeTest(final Kind kind, final boolean all) throws Query
             name = new QNm(concat(name.string(), cpToken(':')));
             scope = NameTest.Scope.URI;
           } else if(!eqName) {
-            scope = kind == Kind.ELEMENT && eq(sc.elemNS, ANY_URI) ? NameTest.Scope.LOCAL
-                                                                   : NameTest.Scope.FLEXIBLE;
+            scope = kind == Kind.ELEMENT && sc.elemNsAny ? NameTest.Scope.LOCAL
+                                                         : NameTest.Scope.FLEXIBLE;
           }
         }
         // name test: prefix:name, name, Q{uri}name
@@ -3475,7 +3476,7 @@ private SeqType castTarget() throws QueryException {
     if(wsConsume("(")) {
       type = choiceItemType().type;
     } else {
-      final QNm name = eQName(eq(sc.elemNS, ANY_URI) ? XS_URI : sc.elemNS, TYPEINVALID);
+      final QNm name = eQName(sc.elemNsAny ? XS_URI : sc.elemNS, TYPEINVALID);
       if(!name.hasURI() && eq(name.local(), token(ENUM))) {
         if(!wsConsume("(")) throw error(WHICHCAST_X, BasicType.similar(name));
         type = enumerationType();
@@ -3565,7 +3566,7 @@ private SeqType itemType() throws QueryException {
       }
     } else {
       // attach default element namespace, or schema namespace if default element namespace is ##any
-      if(!name.hasURI()) name.uri(eq(sc.elemNS, ANY_URI) ? XS_URI : sc.elemNS);
+      if(!name.hasURI()) name.uri(sc.elemNsAny ? XS_URI : sc.elemNS);
       // basic type
       type = BasicType.get(name, false);
       // declared type

basex-core/src/main/java/org/basex/query/StaticContext.java

@@ -38,6 +38,8 @@ public final class StaticContext {
   public Collation collation;
   /** Default element/type namespace fixed flag. */
   public boolean elemNsFixed;
+  /** Default element/type namespace ##any flag. */
+  public boolean elemNsAny;
   /** Default element/type namespace. */
   public byte[] elemNS;
   /** Direct element constructor default element/type namespace (differs from above if "fixed"). */
@@ -92,13 +94,16 @@ public StaticContext(final QueryContext qc) {
    * @throws QueryException query exception
    */
   void namespace(final String prefix, final String uri) throws QueryException {
-    if(prefix.isEmpty()) {
-      elemNS = uri.isEmpty() ? null : token(uri);
+    final byte[] prefix1 = token(prefix);
+    final byte[] u = token(uri);
+    if(prefix1.length == 0) {
+      elemNsAny = Token.eq(u, QueryText.ANY_URI);
+      elemNS = elemNsAny || u.length == 0 ? null : u;
       dirNS = elemNS;
-    } else if(uri.isEmpty()) {
-      ns.delete(token(prefix));
+    } else if(u.length == 0) {
+      ns.delete(prefix1);
     } else {
-      ns.add(token(prefix), token(uri), null);
+      ns.add(prefix1, u, null);
     }
   }
 

basex-core/src/main/java/org/basex/query/func/inspect/InspectStaticContext.java

@@ -52,9 +52,9 @@ public Value value(final QueryContext qc) throws QueryException {
         yield mb.map();
       }
       case ELEMENT_NAMESPACE ->
-        sctx.elemNS == null ? Empty.VALUE : Uri.get(sctx.elemNS);
+      sctx.elemNsAny ? Uri.get(ANY_URI) : sctx.elemNS == null ? Empty.VALUE : Uri.get(sctx.elemNS);
       case FUNCTION_NAMESPACE ->
-        sctx.funcNS == null ? Str.get(QueryText.FN_URI) : Uri.get(sctx.funcNS);
+        sctx.funcNS == null ? Str.get(FN_URI) : Uri.get(sctx.funcNS);
       case COLLATION ->
         Uri.get(sctx.collation == null ? COLLATION_URI : sctx.collation.uri());
       case ORDERING ->

basex-core/src/main/java/org/basex/query/util/parse/QNmCheck.java

@@ -64,7 +64,7 @@ public void resolve(final QueryParser qp, final int npos, final byte[] elemNS)
         entry.name.uri(qp.qc.ns.resolve(entry.name.prefix(), qp.sc));
         if(npos == 0 && !entry.name.hasURI())
           throw qp.error(NOURI_X, entry.info, entry.name.prefix());
-      } else if(entry.nsElem && !Token.eq(elemNS, QueryText.ANY_URI)) {
+      } else if(entry.nsElem) {
         entry.name.uri(elemNS);
       }
       if(entry.name.hasURI()) entries.remove(i);

basex-core/src/main/java/org/basex/query/util/parse/QNmResolver.java

@@ -729,10 +729,16 @@ public final class NamespaceTest extends SandboxTest {
     // unprefixed type names => xs:*
     query(defAny + "42 instance of integer", true);
     query(defAny + "'42' cast as integer", 42);
+    error(defAny + "declare type t as xs:integer; 42 instance of t", TYPERESERVED_X);
 
     // other contexts fall back to no namespace
     query(defAny + "namespace-uri(element a {})", "");
     query(defAny + "<r xmlns:x='X'><a/><x:a/></r>/Q{}a", "<a/>");
+    query(defAny + "declare option output:method 'text';serialize(<x>42</x>, "
+        + "{'cdata-section-elements': 'x'})", "<x><![CDATA[42]]></x>");
+
+    // inspect:static-context reports ##any
+    query(defAny + "inspect:static-context((), 'element-namespace')", "##any");
 
     // with fixed + ##any, constructor xmlns must not suppress ##any behavior
     query("declare fixed default element namespace '##any'; " +