Fix URI and Build.scala for pure Wasm compatibility

- Remove top-level vals with JS types (RegExp, js.Function1) that caused
  linker errors in pure Wasm mode; inline them into linkTimeIf JS branches
- Convert quoteStr from val to def so JS function is created lazily
- Restore ClassValueTest exclusion (belongs to separate PR #1)

Author: v.karamyshev

javalib/src/main/scala/java/net/URI.scala

@@ -542,8 +542,6 @@ object URI {
     // (25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])           # 2001:db8:3:4::192.0.2.33  64:ff9b::192.0.2.33 (IPv4-Embedded IPv6 Address)
   }
 
-  private val ipv6Re = new RegExp("^" + ipv6address + "$", "i")
-
   private val ipv6ReStr = "^" + ipv6address + "$"
 
   /** Test whether a host string is an IPv6 address.
@@ -555,7 +553,7 @@ object URI {
           java.util.regex.Pattern.CASE_INSENSITIVE)
       pattern.matcher(host).matches()
     } {
-      ipv6Re.test(host)
+      new RegExp(ipv6ReStr, "i").test(host)
     }
   }
 
@@ -707,8 +705,6 @@ object URI {
     "^(?:" + absoluteURI + "|" + relativeURI + ")(?:#" + fragment + ")?$"
   }
 
-  private val uriRe = new RegExp(uriReStr, "i")
-
   /** Parse a URI string, returning an Array[String] of matched groups
    *  (null for non-matching groups), or null if the string is not a valid URI.
    *  Uses js.RegExp for JS targets and java.util.regex.Pattern for pure Wasm.
@@ -731,7 +727,7 @@ object URI {
         arr
       }
     } {
-      val result = uriRe.exec(str)
+      val result = new RegExp(uriReStr, "i").exec(str)
       if (result == null) {
         null
       } else {
@@ -911,17 +907,8 @@ object URI {
     }
   }
 
-  private val quoteStr: js.Function1[String, String] = { (str: String) =>
-    val buf = StandardCharsets.UTF_8.encode(str)
-
-    var res = ""
-    while (buf.hasRemaining()) {
-      val c = buf.get() & 0xff
-      res += (if (c <= 0xf) "%0" else "%") + Integer.toHexString(c).toUpperCase
-    }
-
-    res
-  }
+  private def quoteStr: js.Function1[String, String] =
+    (str: String) => quoteStrFn(str)
 
   /** Encode a matched string as percent-encoded UTF-8 bytes (pure Scala). */
   private def quoteStrFn(str: String): String = {
@@ -964,15 +951,13 @@ object URI {
       "[\u0000- \"#/<>?@\\[-\\^`{-}" +
       "\u007f-\u00a0\u1680\u2000-\u200a\u202f\u205f\u3000\u2028\u2029]|" +
       "%(?![0-9a-f]{2})"
-  private val userInfoQuoteRe = new RegExp(userInfoQuoteReStr, "ig")
-
   /** Quote any character not in unreserved, punct, escaped or other */
   private def quoteUserInfo(str: String): String = {
     LinkingInfo.linkTimeIf(LinkingInfo.targetPureWasm) {
       quoteWithPattern(str, userInfoQuoteReStr, caseInsensitive = true)
     } {
       import js.JSStringOps._
-      str.jsReplace(userInfoQuoteRe, quoteStr)
+      str.jsReplace(new RegExp(userInfoQuoteReStr, "ig"), quoteStr)
     }
   }
 
@@ -985,8 +970,6 @@ object URI {
       "[\u0000- \"#<>?\\[-\\^`{-}" +
       "\u007f-\u00a0\u1680\u2000-\u200a\u202f\u205f\u3000\u2028\u2029]|" +
       "%(?![0-9a-f]{2})"
-  private val pathQuoteRe = new RegExp(pathQuoteReStr, "ig")
-
   /** Quote any character not in unreserved, punct, escaped, other or equal
    *  to '/' or '@'
    */
@@ -995,7 +978,7 @@ object URI {
       quoteWithPattern(str, pathQuoteReStr, caseInsensitive = true)
     } {
       import js.JSStringOps._
-      str.jsReplace(pathQuoteRe, quoteStr)
+      str.jsReplace(new RegExp(pathQuoteReStr, "ig"), quoteStr)
     }
   }
 
@@ -1012,8 +995,6 @@ object URI {
       "[\u0000- \"#/<>?\\^`{-}" +
       "\u007f-\u00a0\u1680\u2000-\u200a\u202f\u205f\u3000\u2028\u2029]|" +
       "%(?![0-9a-f]{2})"
-  private val authorityQuoteRe = new RegExp(authorityQuoteReStr, "ig")
-
   /** Quote any character not in unreserved, punct, escaped, other or equal
    *  to '@'
    */
@@ -1022,7 +1003,7 @@ object URI {
       quoteWithPattern(str, authorityQuoteReStr, caseInsensitive = true)
     } {
       import js.JSStringOps._
-      str.jsReplace(authorityQuoteRe, quoteStr)
+      str.jsReplace(new RegExp(authorityQuoteReStr, "ig"), quoteStr)
     }
   }
 
@@ -1033,15 +1014,13 @@ object URI {
       "[\u0000- \"#<>@\\^`{-}" +
       "\u007f-\u00a0\u1680\u2000-\u200a\u202f\u205f\u3000\u2028\u2029]|" +
       "%(?![0-9a-f]{2})"
-  private val illegalQuoteRe = new RegExp(illegalQuoteReStr, "ig")
-
   /** Quote any character not in unreserved, reserved, escaped or other */
   private def quoteIllegal(str: String): String = {
     LinkingInfo.linkTimeIf(LinkingInfo.targetPureWasm) {
       quoteWithPattern(str, illegalQuoteReStr, caseInsensitive = true)
     } {
       import js.JSStringOps._
-      str.jsReplace(illegalQuoteRe, quoteStr)
+      str.jsReplace(new RegExp(illegalQuoteReStr, "ig"), quoteStr)
     }
   }
 
@@ -1051,14 +1030,12 @@ object URI {
    *  surrogates that need to be encoded in one shot.
    */
   private val nonASCIIQuoteReStr = "[^\u0000-\u007F]+"
-  private val nonASCIIQuoteRe = new RegExp(nonASCIIQuoteReStr, "g")
-
   private def quoteNonASCII(str: String): String = {
     LinkingInfo.linkTimeIf(LinkingInfo.targetPureWasm) {
       quoteWithPattern(str, nonASCIIQuoteReStr, caseInsensitive = false)
     } {
       import js.JSStringOps._
-      str.jsReplace(nonASCIIQuoteRe, quoteStr)
+      str.jsReplace(new RegExp(nonASCIIQuoteReStr, "g"), quoteStr)
     }
   }
 

project/Build.scala

@@ -2356,7 +2356,7 @@ object Build {
               contains(f, "/shared/src/test/require-scala2/") ||
               contains(f, "/shared/src/test/scala/org/scalajs/testsuite/") && (
                 // javalib/lang
-                // (ClassValueTest is now compatible with pure Wasm)
+                !endsWith(f, "/lang/ClassValueTest.scala") && // js.Map in ClassValue
 
                 // javalib/util
                 !endsWith(f, "/DateTest.scala") && // js.Date