Merge branch 'main' into finalization-registry

Author: j-f1

.github/workflows/test.yml

@@ -8,7 +8,11 @@ jobs:
     name: Build and Test
     strategy:
       matrix:
-        os: [macOS-10.15, Ubuntu-18.04]
+        os: [macos-10.15, macos-11, ubuntu-18.04, ubuntu-20.04]
+        toolchain:
+          - wasm-5.3.1-RELEASE
+          - wasm-5.4.0-RELEASE
+          - wasm-5.5-SNAPSHOT-2021-09-01-a
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
@@ -21,5 +25,6 @@ jobs:
           export SWIFTENV_ROOT="$HOME/.swiftenv"
           export PATH="$SWIFTENV_ROOT/bin:$PATH"
           eval "$(swiftenv init -)"
-          make bootstrap
+          SWIFT_VERSION=${{ matrix.toolchain }} make bootstrap
+          echo ${{ matrix.toolchain }} > .swift-version
           make test

Example/Makefile

@@ -7,7 +7,7 @@ JavaScriptKitExample:
 
 dist/JavaScriptKitExample.wasm: JavaScriptKitExample
 	mkdir -p dist
-	cp ./JavaScriptKitExample/.build/debug/JavaScriptKitExample $@
+	cp ./JavaScriptKitExample/.build/debug/JavaScriptKitExample.wasm $@
 
 node_modules:
 	npm ci

Example/package-lock.json

@@ -186,6 +186,12 @@ try test("Function Call") {
 let evalClosure = JSObject.global.globalObject1.eval_closure.function!
 
 try test("Closure Lifetime") {
+    func expectCrashByCall(ofClosure c: JSClosureProtocol) throws {
+        print("======= BEGIN OF EXPECTED FATAL ERROR =====")
+        _ = try expectThrow(try evalClosure.throws(c))
+        print("======= END OF EXPECTED FATAL ERROR =======")
+    }
+
     do {
         let c1 = JSClosure { arguments in
             return arguments[0]
@@ -220,7 +226,9 @@ try test("Closure Lifetime") {
             return .boolean(true)
         }
         try expectEqual(evalClosure(c1), .boolean(true))
-        try expectEqual(evalClosure(c1), .boolean(true))
+        // second call will cause `fatalError` that can be caught as a JavaScript exception
+        try expectCrashByCall(ofClosure: c1)
+        // OneshotClosure won't call fatalError even if it's deallocated before `release`
     }
 }
 
@@ -610,12 +618,25 @@ try test("Error") {
 }
 
 try test("JSValue accessor") {
-    let globalObject1 = JSObject.global.globalObject1
+    var globalObject1 = JSObject.global.globalObject1
     try expectEqual(globalObject1.prop_1.nested_prop, .number(1))
     try expectEqual(globalObject1.object!.prop_1.object!.nested_prop, .number(1))
 
     try expectEqual(globalObject1.prop_4[0], .number(3))
     try expectEqual(globalObject1.prop_4[1], .number(4))
+
+    globalObject1.prop_1.nested_prop = "bar"
+    try expectEqual(globalObject1.prop_1.nested_prop, .string("bar"))
+
+    /* TODO: Fix https://github.com/swiftwasm/JavaScriptKit/issues/132 and un-comment this test
+    `nested` should not be set again to `target.nested` by `target.nested.prop = .number(1)`
+
+    let observableObj = globalObject1.observable_obj.object!
+    observableObj.set_called = .boolean(false)
+    observableObj.target.nested.prop = .number(1)
+    try expectEqual(observableObj.set_called, .boolean(false))
+
+    */
 }
 
 try test("Exception") {

IntegrationTests/TestSuites/Sources/PrimaryTests/main.swift

@@ -47,9 +47,21 @@ global.globalObject1 = {
             throw 3.0
         },
     },
-    eval_closure: function(fn) {
+    eval_closure: function (fn) {
         return fn(arguments[1])
-    }
+    },
+    observable_obj: {
+        set_called: false,
+        target: new Proxy({
+            nested: {}
+        }, {
+            set(target, key, value) {
+                global.globalObject1.observable_obj.set_called = true;
+                target[key] = value;
+                return true;
+            }
+        })
+    },
 };
 
 global.Animal = function (name, age, isCat) {

IntegrationTests/bin/primary-tests.js

@@ -3,16 +3,17 @@ set -eu
 
 scripts_dir="$(cd "$(dirname $0)" && pwd)"
 
-swift_version="$(cat $scripts_dir/../.swift-version)"
-swift_tag="swift-$swift_version"
+default_swift_version="$(cat $scripts_dir/../.swift-version)"
+SWIFT_VERSION="${SWIFT_VERSION:-$default_swift_version}"
+swift_tag="swift-$SWIFT_VERSION"
 
 if [ -z "$(which swiftenv)" ]; then
   echo "swiftenv not installed, please install it before this script."
   exit 1
 fi
 
-if [ ! -z "$(swiftenv versions | grep $swift_version)" ]; then
-  echo "$swift_version is already installed."
+if [ ! -z "$(swiftenv versions | grep $SWIFT_VERSION)" ]; then
+  echo "$SWIFT_VERSION is already installed."
   exit 0
 fi