Merge branch 'main' into jed/async-closure

Author: j-f1

.gitignore

@@ -6,3 +6,4 @@ node_modules
 /*.xcodeproj
 xcuserdata/
 .swiftpm
+.vscode

.swift-version

@@ -1 +1 @@
-wasm-5.5.0-RELEASE
+wasm-5.6.0-RELEASE

CHANGELOG.md

@@ -1,3 +1,21 @@
+# 0.14.0 (8 April 2022)
+
+This is a breaking release that enables full support for SwiftWasm 5.6 and lays groundwork for future updates to [DOMKit](https://github.com/swiftwasm/DOMKit/).
+
+- The `ConvertibleToJSValue` conformance on `Array` and `Dictionary` has been swapped from the `== ConvertibleToJSValue` case to the `: ConvertibleToJSValue` case.
+  - This means that e.g. `[String]` is now `ConvertibleToJSValue`, but `[ConvertibleToJSValue]` no longer conforms;
+  - the `jsValue()` method still works in both cases;
+  - to adapt existing code, use one of these approaches:
+    - use generics where possible (for single-type arrays)
+    - call `.map { $0.jsValue() }` (or `mapValues`) to get an array/dictionary of `JSValue` which you can then use as `ConvertibleToJSValue`
+    - add `.jsValue` to the end of all of the values in the array/dictionary literal.
+
+**Merged pull requests:**
+
+- Reenable integration tests ([#180](https://github.com/swiftwasm/JavaScriptKit/pull/180)) via [@kateinoigakukun](https://github.com/kateinoigakukun)
+- Updates for DOMKit ([#174](https://github.com/swiftwasm/JavaScriptKit/pull/174)) via [@j-f1](https://github.com/j-f1)
+- Add 5.6 release and macOS 12 with Xcode 13.3 to CI matrix ([#176](https://github.com/swiftwasm/JavaScriptKit/pull/176)) via [@MaxDesiatov](https://github.com/MaxDesiatov)
+
 # 0.13.0 (31 March 2022)
 
 This release improves handling of JavaScript exceptions and compatibility with Xcode.
@@ -21,7 +39,7 @@ Thanks to [@kateinoigakukun](https://github.com/kateinoigakukun), [@pedrovgs](ht
 
 # 0.12.0 (08 February 2022)
 
-This release introduces a [major refactor](https://github.com/swiftwasm/JavaScriptKit/pull/150) of the JavaScript runtime by [@j-f1] and several performance enhancements. 
+This release introduces a [major refactor](https://github.com/swiftwasm/JavaScriptKit/pull/150) of the JavaScript runtime by [@j-f1] and several performance enhancements.
 
 **Merged pull requests:**
 
@@ -40,9 +58,10 @@ This is a bugfix release that removes a requirement for macOS Monterey in `Packa
 package. `README.md` was updated to explicitly specify that if you're building an app or a library
 that depends on JavaScriptKit for macOS (i.e. cross-platform code that supports both WebAssembly
 and macOS), you need either
-* macOS Monterey that has the new Swift concurrency runtime available, or
-* any version of macOS that supports Swift concurrency back-deployment with Xcode 13.2 or later, or
-* add `.unsafeFlags(["-Xfrontend", "-disable-availability-checking"])` in `Package.swift` manifest.
+
+- macOS Monterey that has the new Swift concurrency runtime available, or
+- any version of macOS that supports Swift concurrency back-deployment with Xcode 13.2 or later, or
+- add `.unsafeFlags(["-Xfrontend", "-disable-availability-checking"])` in `Package.swift` manifest.
 
 **Merged pull requests:**
 
@@ -52,7 +71,7 @@ and macOS), you need either
 
 This release adds support for `async`/`await` and SwiftWasm 5.5. Use the new `value` async property
 on a `JSPromise` instance to `await` for its result. You'll have to add a dependency on the new
-`JavaScriptEventLoop` target in your `Package.swift`, `import JavaScriptEventLoop`, and call 
+`JavaScriptEventLoop` target in your `Package.swift`, `import JavaScriptEventLoop`, and call
 `JavaScriptEventLoop.installGlobalExecutor()` in your code before you start using `await` and `Task`
 APIs.
 
@@ -64,12 +83,12 @@ compiler flags, see [`README.md`](./README.md) for more details.
 This new release of JavaScriptKit may work with SwiftWasm 5.4 and 5.3, but is no longer tested with
 those versions due to compatibility issues introduced on macOS by latest versions of Xcode.
 
-Many thanks to [@j-f1], [@kateinoigakukun], 
+Many thanks to [@j-f1], [@kateinoigakukun],
 and [@PatrickPijnappel] for their contributions to this release!
 
 **Closed issues:**
 
-- Enchancement: Add a link to the docs  ([#136](https://github.com/swiftwasm/JavaScriptKit/issues/136))
+- Enchancement: Add a link to the docs ([#136](https://github.com/swiftwasm/JavaScriptKit/issues/136))
 - Use `FinalizationRegistry` to auto-deinit `JSClosure` ([#131](https://github.com/swiftwasm/JavaScriptKit/issues/131))
 - `make test` crashes due to `JSClosure` memory issues ([#129](https://github.com/swiftwasm/JavaScriptKit/issues/129))
 - Avoid manual memory management with `JSClosure` ([#106](https://github.com/swiftwasm/JavaScriptKit/issues/106))
@@ -97,7 +116,7 @@ tweaks.
 
 **Merged pull requests:**
 
-- Update JS dependencies in package-lock.json ([#126](https://github.com/swiftwasm/JavaScriptKit/pull/126))  via [@MaxDesiatov]
+- Update JS dependencies in package-lock.json ([#126](https://github.com/swiftwasm/JavaScriptKit/pull/126)) via [@MaxDesiatov]
 - Fix typo in method documentation ([#125](https://github.com/swiftwasm/JavaScriptKit/pull/125)) via [@revolter]
 - Update exported func name to match exported name ([#123](https://github.com/swiftwasm/JavaScriptKit/pull/123)) via [@kateinoigakukun]
 - Fix incorrect link in `JSDate` documentation ([#122](https://github.com/swiftwasm/JavaScriptKit/pull/122)) via [@revolter]
@@ -107,18 +126,18 @@ tweaks.
 This release contains multiple breaking changes in preparation for enabling `async`/`await`, when
 this feature is available in a stable SwiftWasm release. Namely:
 
-* `JSClosure.init(_ body: @escaping ([JSValue]) -> ())` overload is deprecated to simplify type
-checking. Its presence requires explicit type signatures at the place of use. It will be removed
-in a future version of JavaScriptKit.
-* `JSClosure` is no longer a subclass of `JSFunction`. These classes are not related enough to keep
-them in the same class hierarchy.
-As a result, you can no longer call `JSClosure` objects directly from Swift.
-* Introduced `JSOneshotClosure` for closures that are going to be called only once. You don't need
-to manage references to these closures manually, as opposed to `JSClosure`.
-However, they can only be called a single time from the JS side. Subsequent invocation attempts will raise a fatal error on the Swift side.
-* Removed generic parameters on `JSPromise`, now both success and failure values are always assumed
-to be of `JSValue` type. This also significantly simplifies type checking and allows callers to
-fully control type casting if needed.
+- `JSClosure.init(_ body: @escaping ([JSValue]) -> ())` overload is deprecated to simplify type
+  checking. Its presence requires explicit type signatures at the place of use. It will be removed
+  in a future version of JavaScriptKit.
+- `JSClosure` is no longer a subclass of `JSFunction`. These classes are not related enough to keep
+  them in the same class hierarchy.
+  As a result, you can no longer call `JSClosure` objects directly from Swift.
+- Introduced `JSOneshotClosure` for closures that are going to be called only once. You don't need
+  to manage references to these closures manually, as opposed to `JSClosure`.
+  However, they can only be called a single time from the JS side. Subsequent invocation attempts will raise a fatal error on the Swift side.
+- Removed generic parameters on `JSPromise`, now both success and failure values are always assumed
+  to be of `JSValue` type. This also significantly simplifies type checking and allows callers to
+  fully control type casting if needed.
 
 **Closed issues:**
 
@@ -200,7 +219,7 @@ with idiomatic Swift code.
 - Update toolchain version, script, and `README.md` ([#96](https://github.com/swiftwasm/JavaScriptKit/pull/96)) via [@MaxDesiatov]
 - [Proposal] Add unsafe convenience methods for JSValue ([#98](https://github.com/swiftwasm/JavaScriptKit/pull/98)) via [@kateinoigakukun]
 - Remove all unsafe linker flags from Package.swift ([#91](https://github.com/swiftwasm/JavaScriptKit/pull/91)) via [@kateinoigakukun]
-- Sync package.json and package-lock.json  ([#90](https://github.com/swiftwasm/JavaScriptKit/pull/90)) via [@kateinoigakukun]
+- Sync package.json and package-lock.json ([#90](https://github.com/swiftwasm/JavaScriptKit/pull/90)) via [@kateinoigakukun]
 - Rename JSValueConvertible/Constructible/Codable ([#88](https://github.com/swiftwasm/JavaScriptKit/pull/88)) via [@j-f1]
 - Bump @actions/core from 1.2.2 to 1.2.6 in /ci/perf-tester ([#89](https://github.com/swiftwasm/JavaScriptKit/pull/89)) via [@dependabot]
 - Make `JSError` conform to `JSBridgedClass` ([#86](https://github.com/swiftwasm/JavaScriptKit/pull/86)) via [@MaxDesiatov]
@@ -278,10 +297,10 @@ This release adds `JSTypedArray` generic type, renames `JSObjectRef` to `JSObjec
 - Clean up the `JSObjectRef` API ([#28](https://github.com/swiftwasm/JavaScriptKit/pull/28)) via [@j-f1]
 - Remove unused `Tests` directory ([#32](https://github.com/swiftwasm/JavaScriptKit/pull/32)) via [@MaxDesiatov]
 
-[@MaxDesiatov]: https://github.com/MaxDesiatov
+[@maxdesiatov]: https://github.com/MaxDesiatov
 [@j-f1]: https://github.com/j-f1
 [@kateinoigakukun]: https://github.com/kateinoigakukun
 [@yonihemi]: https://github.com/yonihemi
-[@PatrickPijnappel]: https://github.com/PatrickPijnappel
+[@patrickpijnappel]: https://github.com/PatrickPijnappel
 [@revolter]: https://github.com/revolter
 [@dependabot]: https://github.com/dependabot

IntegrationTests/Makefile

@@ -8,6 +8,7 @@ TestSuites/.build/$(CONFIGURATION)/%.wasm: FORCE
 	            --triple wasm32-unknown-wasi \
 	            --configuration $(CONFIGURATION) \
 	            -Xswiftc -Xclang-linker -Xswiftc -mexec-model=reactor \
+		    -Xlinker --export=main \
 		    $(SWIFT_BUILD_FLAGS)
 
 dist/%.wasm: TestSuites/.build/$(CONFIGURATION)/%.wasm

IntegrationTests/TestSuites/Sources/PrimaryTests/main.swift

@@ -356,14 +356,14 @@ try test("Call Function With This") {
 
 try test("Object Conversion") {
     let array1 = [1, 2, 3]
-    let jsArray1 = array1.jsValue().object!
+    let jsArray1 = array1.jsValue.object!
     try expectEqual(jsArray1.length, .number(3))
     try expectEqual(jsArray1[0], .number(1))
     try expectEqual(jsArray1[1], .number(2))
     try expectEqual(jsArray1[2], .number(3))
 
     let array2: [ConvertibleToJSValue] = [1, "str", false]
-    let jsArray2 = array2.jsValue().object!
+    let jsArray2 = array2.jsValue.object!
     try expectEqual(jsArray2.length, .number(3))
     try expectEqual(jsArray2[0], .number(1))
     try expectEqual(jsArray2[1], .string("str"))
@@ -374,11 +374,11 @@ try test("Object Conversion") {
 
     try expectEqual(jsArray2[4], .object(jsArray1))
 
-    let dict1: [String: ConvertibleToJSValue] = [
-        "prop1": 1,
-        "prop2": "foo",
+    let dict1: [String: JSValue] = [
+        "prop1": 1.jsValue,
+        "prop2": "foo".jsValue,
     ]
-    let jsDict1 = dict1.jsValue().object!
+    let jsDict1 = dict1.jsValue.object!
     try expectEqual(jsDict1.prop1, .number(1))
     try expectEqual(jsDict1.prop2, .string("foo"))
 }
@@ -425,7 +425,7 @@ try test("Closure Identifiers") {
 #endif
 
 func checkArray<T>(_ array: [T]) throws where T: TypedArrayElement & Equatable {
-    try expectEqual(toString(JSTypedArray(array).jsValue().object!), jsStringify(array))
+    try expectEqual(toString(JSTypedArray(array).jsValue.object!), jsStringify(array))
     try checkArrayUnsafeBytes(array)
 }
 
@@ -488,7 +488,7 @@ try test("TypedArray_Mutation") {
     for i in 0..<100 {
         try expectEqual(i, array[i])
     }
-    try expectEqual(toString(array.jsValue().object!), jsStringify(Array(0..<100)))
+    try expectEqual(toString(array.jsValue.object!), jsStringify(Array(0..<100)))
 }
 
 try test("Date") {
@@ -797,11 +797,60 @@ try test("Hashable Conformance") {
 
     let objectConstructor = JSObject.global.Object.function!
     let obj = objectConstructor.new()
-    obj.a = 1.jsValue()
+    obj.a = 1.jsValue
     let firstHash = obj.hashValue
-    obj.b = 2.jsValue()
+    obj.b = 2.jsValue
     let secondHash = obj.hashValue
     try expectEqual(firstHash, secondHash)
 }
 
+try test("Symbols") {
+    let symbol1 = JSSymbol("abc")
+    let symbol2 = JSSymbol("abc")
+    try expectNotEqual(symbol1, symbol2)
+    try expectEqual(symbol1.name, symbol2.name)
+    try expectEqual(symbol1.name, "abc")
+
+    try expectEqual(JSSymbol.iterator, JSSymbol.iterator)
+
+    // let hasInstanceClass = {
+    //   prop: function () {}
+    // }.prop
+    // Object.defineProperty(hasInstanceClass, Symbol.hasInstance, { value: () => true })
+    let hasInstanceObject = JSObject.global.Object.function!.new()
+    hasInstanceObject.prop = JSClosure { _ in .undefined }.jsValue
+    let hasInstanceClass = hasInstanceObject.prop.function!
+    let propertyDescriptor = JSObject.global.Object.function!.new()
+    propertyDescriptor.value = JSClosure { _ in .boolean(true) }.jsValue
+    _ = JSObject.global.Object.function!.defineProperty!(
+        hasInstanceClass, JSSymbol.hasInstance,
+        propertyDescriptor
+    )
+    try expectEqual(hasInstanceClass[JSSymbol.hasInstance].function!().boolean, true)
+    try expectEqual(JSObject.global.Object.isInstanceOf(hasInstanceClass), true)
+}
+
+struct AnimalStruct: Decodable {
+    let name: String
+    let age: Int
+    let isCat: Bool
+}
+
+try test("JSValueDecoder") {
+    let Animal = JSObject.global.Animal.function!
+    let tama = try Animal.throws.new("Tama", 3, true)
+    let decoder = JSValueDecoder()
+    let decodedTama = try decoder.decode(AnimalStruct.self, from: tama.jsValue)
+
+    try expectEqual(decodedTama.name, tama.name.string)
+    try expectEqual(decodedTama.name, "Tama")
+
+    try expectEqual(decodedTama.age, tama.age.number.map(Int.init))
+    try expectEqual(decodedTama.age, 3)
+
+    try expectEqual(decodedTama.isCat, tama.isCat.boolean)
+    try expectEqual(decodedTama.isCat, true)
+}
+
+
 Expectation.wait(expectations)

IntegrationTests/lib.js

@@ -45,6 +45,8 @@ const startWasiTask = async (wasmPath) => {
     swift.setInstance(instance);
     // Start the WebAssembly WASI instance!
     wasi.start(instance);
+    instance.exports._initialize();
+    instance.exports.main();
 };
 
 module.exports = { startWasiTask };