fix: Fix localeCompare (#2304)

Author: MaxGraey

src/bindings/js.ts

@@ -871,8 +871,8 @@ export class JSBuilder extends ExportsWalker {
       sb.push(`
 } = await (async url => instantiate(
   await (async () => {
-    try { return await globalThis.WebAssembly.compileStreaming(globalThis.fetch(url)) }
-    catch { return globalThis.WebAssembly.compile(await (await import("node:fs/promises")).readFile(url)) }
+    try { return await globalThis.WebAssembly.compileStreaming(globalThis.fetch(url)); }
+    catch { return globalThis.WebAssembly.compile(await (await import("node:fs/promises")).readFile(url)); }
   })(), {
 `);
       let needsMaybeDefault = false;

std/assembly/string.ts

@@ -188,12 +188,13 @@ import { Array } from "./array";
   // TODO: implement full locale comparison with locales and Collator options
   localeCompare(other: String): i32 {
     if (changetype<usize>(other) == changetype<usize>(this)) return 0;
-    var len: isize = this.length;
-    var otherLen: isize = other.length;
-    if (otherLen != len) return select(1, -1, len > otherLen);
-    if (!otherLen) return 0; // "" == ""
+    var alen = this.length;
+    var blen = other.length;
     // @ts-ignore: string <-> String
-    return compareImpl(this, 0, other, 0, otherLen);
+    var res = compareImpl(this, 0, other, 0, <usize>min(alen, blen));
+    res = res ? res : alen - blen;
+    // normalize to [-1, 1] range
+    return i32(res > 0) - i32(res < 0);
   }
 
   startsWith(search: String, start: i32 = 0): bool {

std/assembly/util/sort.ts

@@ -44,7 +44,11 @@ export function COMPARATOR<T>(): Comparator<T> {
     }
   } else if (isString<T>()) {
     return (a, b) => {
-      if (changetype<usize>(a) == changetype<usize>(b) || changetype<usize>(a) == 0 || changetype<usize>(b) == 0) return 0;
+      if (
+        changetype<usize>(a) == changetype<usize>(b) ||
+        changetype<usize>(a) == 0 ||
+        changetype<usize>(b) == 0
+      ) return 0;
       var alen = changetype<string>(a).length;
       var blen = changetype<string>(b).length;
       if (!(alen | blen)) return 0;

tests/compiler/bindings/esm.debug.js

@@ -370,10 +370,9 @@ export const {
   newInternref,
   internrefFunction
 } = await (async url => instantiate(
-  await (
-    globalThis.fetch && globalThis.WebAssembly.compileStreaming
-      ? globalThis.WebAssembly.compileStreaming(globalThis.fetch(url))
-      : globalThis.WebAssembly.compile(await (await import("node:fs/promises")).readFile(url))
-  ), {
+  await (async () => {
+    try { return await globalThis.WebAssembly.compileStreaming(globalThis.fetch(url)); }
+    catch { return globalThis.WebAssembly.compile(await (await import("node:fs/promises")).readFile(url)); }
+  })(), {
   }
 ))(new URL("esm.debug.wasm", import.meta.url));

tests/compiler/bindings/esm.release.js

@@ -370,10 +370,9 @@ export const {
   newInternref,
   internrefFunction
 } = await (async url => instantiate(
-  await (
-    globalThis.fetch && globalThis.WebAssembly.compileStreaming
-      ? globalThis.WebAssembly.compileStreaming(globalThis.fetch(url))
-      : globalThis.WebAssembly.compile(await (await import("node:fs/promises")).readFile(url))
-  ), {
+  await (async () => {
+    try { return await globalThis.WebAssembly.compileStreaming(globalThis.fetch(url)); }
+    catch { return globalThis.WebAssembly.compile(await (await import("node:fs/promises")).readFile(url)); }
+  })(), {
   }
 ))(new URL("esm.release.wasm", import.meta.url));

tests/compiler/std-wasi/console.debug.wat

@@ -530,7 +530,7 @@
         if
          i32.const 160
          i32.const 224
-         i32.const 741
+         i32.const 742
          i32.const 49
          call $~lib/wasi/index/abort
          unreachable

tests/compiler/std-wasi/crypto.debug.wat

@@ -504,7 +504,7 @@
         if
          i32.const 32
          i32.const 96
-         i32.const 741
+         i32.const 742
          i32.const 49
          call $~lib/wasi/index/abort
          unreachable

tests/compiler/std-wasi/process.debug.wat

@@ -528,7 +528,7 @@
         if
          i32.const 112
          i32.const 176
-         i32.const 741
+         i32.const 742
          i32.const 49
          call $~lib/wasi/index/abort
          unreachable
@@ -6370,7 +6370,7 @@
   if
    i32.const 0
    i32.const 176
-   i32.const 769
+   i32.const 770
    i32.const 7
    call $~lib/wasi/index/abort
    unreachable

tests/compiler/std-wasi/process.release.wat

@@ -4856,7 +4856,7 @@
   if
    i32.const 0
    i32.const 1200
-   i32.const 769
+   i32.const 770
    i32.const 7
    call $~lib/wasi/index/abort
    unreachable

tests/compiler/std/string-encoding.debug.wat

@@ -2606,7 +2606,7 @@
         if
          i32.const 688
          i32.const 752
-         i32.const 741
+         i32.const 742
          i32.const 49
          call $~lib/builtins/abort
          unreachable
@@ -4748,7 +4748,7 @@
   if
    i32.const 0
    i32.const 752
-   i32.const 769
+   i32.const 770
    i32.const 7
    call $~lib/builtins/abort
    unreachable